From: Rafał Miłecki Date: Sat, 5 Dec 2015 01:09:43 +0000 (+0100) Subject: mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2a36a5c30eab9cd1c9d2d08bd27cd763325d70c5;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only We allowed using bcm47xxpart on BCM5301X arch with commit: 9e3afa5f5c7 ("mtd: bcm47xxpart: allow enabling on ARCH_BCM_5301X") BCM5301X devices may contain some partitions in higher memory, e.g. Netgear R8000 has board_data at 0x2600000. To detect them we should use size limit on MIPS only. Signed-off-by: Rafał Miłecki Signed-off-by: Brian Norris --- diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c index 8282f47bcf5d..b06d4c4553ed 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c @@ -118,8 +118,8 @@ static int bcm47xxpart_parse(struct mtd_info *master, /* Parse block by block looking for magics */ for (offset = 0; offset <= master->size - blocksize; offset += blocksize) { - /* Nothing more in higher memory */ - if (offset >= 0x2000000) + /* Nothing more in higher memory on BCM47XX (MIPS) */ + if (config_enabled(CONFIG_BCM47XX) && offset >= 0x2000000) break; if (curr_part >= BCM47XXPART_MAX_PARTS) {