diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-02-08 21:58:55 +0100 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-02-14 14:10:51 +0100 |
commit | 7d7aa2fd924c27829ec25f825481554dd81bce97 (patch) | |
tree | 658b87b89331670266163e522ea5fb52535633cb /target/linux/bcm27xx/patches-4.19/950-0327-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch | |
parent | e7bfda2c243e66a75ff966ba04c28b1590b5d24c (diff) | |
download | upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.gz upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.bz2 upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.zip |
brcm2708: rename target to bcm27xx
This change makes the names of Broadcom targets consistent by using
the common notation based on SoC/CPU ID (which is used internally
anyway), bcmXXXX instead of brcmXXXX.
This is even used for target TITLE in make menuconfig already,
only the short target name used brcm so far.
Despite, since subtargets range from bcm2708 to bcm2711, it seems
appropriate to use bcm27xx instead of bcm2708 (again, as already done
for BOARDNAME).
This also renames the packages brcm2708-userland and brcm2708-gpu-fw.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-4.19/950-0327-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-4.19/950-0327-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-4.19/950-0327-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch b/target/linux/bcm27xx/patches-4.19/950-0327-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch new file mode 100644 index 0000000000..e16e12da3c --- /dev/null +++ b/target/linux/bcm27xx/patches-4.19/950-0327-bcm2835-sdhost-Allow-for-sg-entries-that-cross-pages.patch @@ -0,0 +1,32 @@ +From 44db7882be675cdf2d89741af5bbeba41b3e25af Mon Sep 17 00:00:00 2001 +From: Phil Elwell <phil@raspberrypi.org> +Date: Wed, 13 Mar 2019 14:19:11 +0000 +Subject: [PATCH] bcm2835-sdhost: Allow for sg entries that cross pages + +The dma_complete handling code calculates a virtual address for a page +then adds an offset, but if the offset is more than a page and HIGHMEM +is in use then the summed address could be in an unmapped (or just +incorrect) page. + +The upstream SDHOST driver allows for this possibility - copy the code +that does so. + +Signed-off-by: Phil Elwell <phil@raspberrypi.org> +--- + drivers/mmc/host/bcm2835-sdhost.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/mmc/host/bcm2835-sdhost.c ++++ b/drivers/mmc/host/bcm2835-sdhost.c +@@ -543,6 +543,11 @@ static void bcm2835_sdhost_dma_complete( + void *page; + u32 *buf; + ++ if (host->drain_offset & PAGE_MASK) { ++ host->drain_page += host->drain_offset >> PAGE_SHIFT; ++ host->drain_offset &= ~PAGE_MASK; ++ } ++ + page = kmap_atomic(host->drain_page); + buf = page + host->drain_offset; + |