diff options
| author | John Crispin <john@openwrt.org> | 2016-02-25 10:14:01 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2016-02-25 10:14:01 +0000 |
| commit | b3dc9566a46efa67951ff6ae28e4397da9db92af (patch) | |
| tree | 708022d9254ba347bfcf279d9ad1151cb3c4c2aa /target/linux/brcm2708/patches-4.4/0152-bcm2835-sdhost-Restore-ATOMIC-flag-to-PIO-sg-mapping.patch | |
| parent | dac55e665efa29510abf0cb5f70a43036727c539 (diff) | |
| download | upstream-b3dc9566a46efa67951ff6ae28e4397da9db92af.tar.gz upstream-b3dc9566a46efa67951ff6ae28e4397da9db92af.tar.bz2 upstream-b3dc9566a46efa67951ff6ae28e4397da9db92af.zip | |
brcm2708: switch to linux 4.4 and update patches
As usual these patches were extracted from:
https://github.com/raspberrypi/linux/commits/rpi-4.4.y
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 48765
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0152-bcm2835-sdhost-Restore-ATOMIC-flag-to-PIO-sg-mapping.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.4/0152-bcm2835-sdhost-Restore-ATOMIC-flag-to-PIO-sg-mapping.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0152-bcm2835-sdhost-Restore-ATOMIC-flag-to-PIO-sg-mapping.patch b/target/linux/brcm2708/patches-4.4/0152-bcm2835-sdhost-Restore-ATOMIC-flag-to-PIO-sg-mapping.patch new file mode 100644 index 0000000000..a7fbc443d4 --- /dev/null +++ b/target/linux/brcm2708/patches-4.4/0152-bcm2835-sdhost-Restore-ATOMIC-flag-to-PIO-sg-mapping.patch @@ -0,0 +1,32 @@ +From 8e6120c43831dc99923873d061c88355cc9bd7a2 Mon Sep 17 00:00:00 2001 +From: Phil Elwell <phil@raspberrypi.org> +Date: Mon, 15 Feb 2016 10:00:27 +0000 +Subject: [PATCH 152/156] bcm2835-sdhost: Restore ATOMIC flag to PIO sg mapping + +Allocation problems have been seen in a wireless driver, and +this is the only change which might have been responsible. +--- + drivers/mmc/host/bcm2835-sdhost.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +--- a/drivers/mmc/host/bcm2835-sdhost.c ++++ b/drivers/mmc/host/bcm2835-sdhost.c +@@ -874,15 +874,14 @@ static void bcm2835_sdhost_prepare_data( + host->flush_fifo = 0; + host->data->bytes_xfered = 0; + +- + if (!host->dma_desc) { + /* Use PIO */ +- int flags; ++ int flags = SG_MITER_ATOMIC; + + if (data->flags & MMC_DATA_READ) +- flags = SG_MITER_TO_SG; ++ flags |= SG_MITER_TO_SG; + else +- flags = SG_MITER_FROM_SG; ++ flags |= SG_MITER_FROM_SG; + sg_miter_start(&host->sg_miter, data->sg, data->sg_len, flags); + host->blocks = data->blocks; + } |