| From 2a36a5c30eab9cd1c9d2d08bd27cd763325d70c5 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> |
| Date: Sat, 5 Dec 2015 02:09:43 +0100 |
| Subject: mtd: bcm47xxpart: limit scanned flash area on BCM47XX (MIPS) only |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Rafał Miłecki <zajec5@gmail.com> |
| |
| commit 2a36a5c30eab9cd1c9d2d08bd27cd763325d70c5 upstream. |
| |
| 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> |
| Signed-off-by: Amit Pundir <amit.pundir@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/mtd/bcm47xxpart.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/mtd/bcm47xxpart.c |
| +++ b/drivers/mtd/bcm47xxpart.c |
| @@ -87,8 +87,8 @@ static int bcm47xxpart_parse(struct mtd_ |
| /* 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) { |
