mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=2a36a5c30eab9cd1c9d2d08bd27cd763325d70c5
Commit:     2a36a5c30eab9cd1c9d2d08bd27cd763325d70c5
Parent:     d652436102b1580d8d968a2047decbb737cc4e6d
Author:     Rafał Miłecki <zajec5 at gmail.com>
AuthorDate: Sat Dec 5 02:09:43 2015 +0100
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Sat Jan 23 14:40:00 2016 -0800

    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 at gmail.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/bcm47xxpart.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index 8282f47..b06d4c4 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) {