aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/bcm47xxpart.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-12-05 02:09:43 +0100
committerBrian Norris <computersforpeace@gmail.com>2016-01-23 14:40:00 -0800
commit2a36a5c30eab9cd1c9d2d08bd27cd763325d70c5 (patch)
tree44911db7b1d63d7c827b6b3fa1f45ad780c50597 /drivers/mtd/bcm47xxpart.c
parentmtd: onenand: unexport onenand_default_bbt() (diff)
downloadlinux-dev-2a36a5c30eab9cd1c9d2d08bd27cd763325d70c5.tar.xz
linux-dev-2a36a5c30eab9cd1c9d2d08bd27cd763325d70c5.zip
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 <zajec5@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/bcm47xxpart.c')
-rw-r--r--drivers/mtd/bcm47xxpart.c4
1 files changed, 2 insertions, 2 deletions
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) {