From f0fc9d4c049a85c250fb331272b4daf13629a125 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 22 Sep 2015 23:48:38 +0200 Subject: [PATCH] mmc: Drop "eMMC: Don't initialize partitions on RPMB flagged areas" Upstream commit 4e93b9a6abc0 ("mmc: card: Don't access RPMB partitions for normal read/write") looks like a cleaner solution. --- debian/changelog | 3 +++ ...ize-partitions-on-rpmb-flagged-areas.patch | 27 ------------------- debian/patches/series | 1 - 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 debian/patches/debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch diff --git a/debian/changelog b/debian/changelog index b20696cf3..3b1ff64f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,9 @@ linux (4.2.1-1) UNRELEASED; urgency=medium (CVE-2015-6937) * Set ABI to 1 * e1000e: Fix tight loop implementation of systime read algorithm + * mmc: Drop "eMMC: Don't initialize partitions on RPMB flagged areas", as + upstream commit 4e93b9a6abc0 ("mmc: card: Don't access RPMB partitions for + normal read/write") looks like a cleaner solution [ Aurelien Jarno ] * [mips*el] Fix BPF assembly code for pre-R2 CPUs. (fixes FTBFS) diff --git a/debian/patches/debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch b/debian/patches/debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch deleted file mode 100644 index 5495a30f8..000000000 --- a/debian/patches/debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Nell Hardcastle -Date: Thu, 29 May 2014 22:06:50 -0700 -Subject: [PATCH] eMMC: Don't initialize partitions on RPMB flagged areas. -Origin: https://dev-nell.com/rpmb-emmc-errors-under-linux.html -Bug-Debian: https://bugs.debian.org/782038 - -Prevents a lot of pointless hanging at boot on some devices. ---- -[bwh: An RPMB is unlikely to be useful on any platform supported by a Debian -kernel, so I think it's best to hide them for now. Once we are confident -that userland will ignore them or the kernel does a better job of avoiding -hanging reads, we can drop this patch.] - - drivers/mmc/card/block.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/mmc/card/block.c -+++ b/drivers/mmc/card/block.c -@@ -2258,7 +2258,7 @@ static int mmc_blk_alloc_parts(struct mm - return 0; - - for (idx = 0; idx < card->nr_parts; idx++) { -- if (card->part[idx].size) { -+ if (card->part[idx].size && !(card->part[idx].area_type & MMC_BLK_DATA_AREA_RPMB)) { - ret = mmc_blk_alloc_part(card, md, - card->part[idx].part_cfg, - card->part[idx].size >> 9, diff --git a/debian/patches/series b/debian/patches/series index 7bb0ee796..7fc75221f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -68,7 +68,6 @@ bugfix/all/disable-some-marvell-phys.patch bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch bugfix/all/rtsx_usb_ms-use-msleep_interruptible-in-polling-loop.patch bugfix/all/net-mv643xx-disable-tso-by-default.patch -debian/emmc-don-t-initialize-partitions-on-rpmb-flagged-areas.patch # Reproducible docs bugfix/all/scripts-kernel-doc-parse-kernel-doc-deterministicall.patch