aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-08-24 15:57:49 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-08-24 15:57:49 +0000
commit823659f458637665ebb91bcf25fae22e4ab74d6b (patch)
treecb13ff278a99b276b38c857936cdf445eb0ce2d8 /target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch
parentbefad7432bc17b6cb34ccc2bd1f0961cf161617c (diff)
downloadupstream-823659f458637665ebb91bcf25fae22e4ab74d6b.tar.gz
upstream-823659f458637665ebb91bcf25fae22e4ab74d6b.tar.bz2
upstream-823659f458637665ebb91bcf25fae22e4ab74d6b.zip
bcm53xx: update bcma device tree intergeneration and fix nvram parsing
This fixes lots of sparse and checkpatch errors and extends the documentation. This also fixes a problem in the nvram parser, it now detects the correct nvram on my Netgear R6250. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 42272
Diffstat (limited to 'target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch')
-rw-r--r--target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch36
1 files changed, 30 insertions, 6 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch b/target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch
index 30e03e30e4..719b161f36 100644
--- a/target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch
+++ b/target/linux/bcm53xx/patches-3.14/140-bcma-only-map-wrap-if-it-is-not-null.patch
@@ -1,15 +1,39 @@
-From f8ea60bbaf880d8d8d99fde3b5155f472e00141f Mon Sep 17 00:00:00 2001
+From c6516d2c672450fb27783866397a487511d90bba Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Mon, 12 May 2014 20:16:39 +0200
-Subject: [PATCH 09/15] bcma: only map wrap if it is not null
+Date: Fri, 22 Aug 2014 08:44:52 +0200
+Subject: [PATCH 08/17] bcma: only map wrapper if its address is available
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
-The chipcommon B core does not have a wrap address and it would fail here.
+The Chipcommon B core does not have a wrap address and it would fail here.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
- drivers/bcma/scan.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
+ drivers/bcma/host_soc.c | 4 ++++
+ drivers/bcma/scan.c | 11 +++++++----
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+--- a/drivers/bcma/host_soc.c
++++ b/drivers/bcma/host_soc.c
+@@ -137,12 +137,16 @@ static void bcma_host_soc_block_write(st
+
+ static u32 bcma_host_soc_aread32(struct bcma_device *core, u16 offset)
+ {
++ if (WARN_ONCE(!core->io_wrap, "Accessed core has no wrapper/agent\n"))
++ return ~0;
+ return readl(core->io_wrap + offset);
+ }
+
+ static void bcma_host_soc_awrite32(struct bcma_device *core, u16 offset,
+ u32 value)
+ {
++ if (WARN_ONCE(!core->io_wrap, "Accessed core has no wrapper/agent\n"))
++ return;
+ writel(value, core->io_wrap + offset);
+ }
+
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -421,10 +421,13 @@ static int bcma_get_next_core(struct bcm