rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

drivers/dma/abma-pl08x.c: avoid a 64-bit division callout to libgcc

Browse Source
This commit is contained in:
Kyle McMartin 2013-07-29 11:57:43 -04:00
parent d71372b35c
commit 8260f13a38
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arm-dma-amba_pl08x-avoid-64bit-division.patch Normal file
View File

@ -0,0 +1,33 @@
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 06fe45c..4ce4ac1 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -886,8 +886,8 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
return 0;
}
- if ((bd.srcbus.addr % bd.srcbus.buswidth) ||
- (bd.dstbus.addr % bd.dstbus.buswidth)) {
+ if ((((u8)(bd.srcbus.addr & 0xff)) % bd.srcbus.buswidth) ||
+ (((u8)(bd.dstbus.addr & 0xff)) % bd.dstbus.buswidth)) {
dev_err(&pl08x->adev->dev,
"%s src & dst address must be aligned to src"
" & dst width if peripheral is flow controller",
@@ -908,7 +908,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
*/
if (bd.remainder < mbus->buswidth)
early_bytes = bd.remainder;
- else if ((mbus->addr) % (mbus->buswidth)) {
+ else if (((u8)(mbus->addr & 0xff)) % (mbus->buswidth)) {
early_bytes = mbus->buswidth - (mbus->addr) %
(mbus->buswidth);
if ((bd.remainder - early_bytes) < mbus->buswidth)
@@ -928,7 +928,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x,
* Master now aligned
* - if slave is not then we must set its width down
*/
- if (sbus->addr % sbus->buswidth) {
+ if (((u8)(sbus->addr & 0xff)) % sbus->buswidth) {
dev_dbg(&pl08x->adev->dev,
"%s set down bus width to one byte\n",
__func__);

5
kernel.spec
View File

@ -694,6 +694,7 @@ Patch15000: nowatchdog-on-virt.patch
# lpae
Patch21001: arm-lpae-ax88796.patch
Patch21002: drm-exynos-fix-multiple-definition-build-error.patch
Patch21003: arm-dma-amba_pl08x-avoid-64bit-division.patch
# ARM omap
Patch21010: arm-omap-load-tfp410.patch
@ -1302,6 +1303,7 @@ ApplyPatch debug-bad-pte-modules.patch
#
ApplyPatch arm-lpae-ax88796.patch
ApplyPatch drm-exynos-fix-multiple-definition-build-error.patch
ApplyPatch arm-dma-amba_pl08x-avoid-64bit-division.patch
ApplyPatch arm-omap-load-tfp410.patch
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
ApplyPatch arm-tegra-remove-direct-vbus-regulator-control.patch
@ -2246,6 +2248,9 @@ fi
# ||----w |
# || ||
%changelog
* Mon Jul 29 2013 Kyle McMartin <kyle@redhat.com>
- arm-dma-amba_pl08x-avoid-64bit-division.patch: STAHP libgcc callouts
* Mon Jul 29 2013 Josh Boyer <jwboyer@redhat.com> - 3.11.0-0.rc3.git0.1
- Linux v3.11-rc3
- Disable debugging options.