Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Brugger <mbrugger@suse.com>2019-01-11 14:15:19 +0100
committerMatthias Brugger <mbrugger@suse.com>2019-01-11 14:15:30 +0100
commit90664f1c2bbe6257c5d0187e9419ae0c767a95de (patch)
treeb67070407a4e606f1d09ba02001454d22ec1d3c9
parent98800c0ee8553ea826d38c30c0678bd41f1d7e89 (diff)
brcmfmac: Call brcmf_dmi_probe before brcmf_of_probe
-rw-r--r--patches.drivers/brcmfmac-Call-brcmf_dmi_probe-before-brcmf_of_probe.patch47
-rw-r--r--series.conf1
2 files changed, 48 insertions, 0 deletions
diff --git a/patches.drivers/brcmfmac-Call-brcmf_dmi_probe-before-brcmf_of_probe.patch b/patches.drivers/brcmfmac-Call-brcmf_dmi_probe-before-brcmf_of_probe.patch
new file mode 100644
index 0000000000..3cbe63408c
--- /dev/null
+++ b/patches.drivers/brcmfmac-Call-brcmf_dmi_probe-before-brcmf_of_probe.patch
@@ -0,0 +1,47 @@
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Fri, 23 Nov 2018 10:11:48 +0100
+Subject: brcmfmac: Call brcmf_dmi_probe before brcmf_of_probe
+Git-commit: 554da3868eb1d7174710c18b4ddd6ff01f6d612c
+Patch-mainline: v5.0
+References: fate#326215
+
+ARM systems with UEFI may have both devicetree (of) and DMI data in this
+case we end up setting brcmf_mp_device.board_type twice.
+
+In this case we should prefer the devicetree data, because:
+1) The devicerree data is more reliable
+2) Some ARM systems (e.g. the Raspberry Pi 3 models) support both UEFI and
+ classic uboot booting, the devicetree data is always there, so using it
+ makes sure we ask for the same nvram file independent of how we booted.
+
+This commit moves the brcmf_dmi_probe call to before the brcmf_of_probe
+call, so that the latter can override the value of the first if both are
+set.
+
+Fixes: bd1e82bb420a ("brcmfmac: Set board_type from DMI on x86 based ...")
+Cc: Peter Robinson <pbrobinson@gmail.com>
+Tested-and-reported-by: Peter Robinson <pbrobinson@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+---
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+index e738112ed87c..1f1e95a15a17 100644
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+@@ -449,8 +449,8 @@ struct brcmf_mp_device *brcmf_get_module_param(struct device *dev,
+ }
+ if (!found) {
+ /* No platform data for this device, try OF and DMI data */
+- brcmf_of_probe(dev, bus_type, settings);
+ brcmf_dmi_probe(settings, chip, chiprev);
++ brcmf_of_probe(dev, bus_type, settings);
+ }
+ return settings;
+ }
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 826a769647..21880de503 100644
--- a/series.conf
+++ b/series.conf
@@ -42055,6 +42055,7 @@
patches.fixes/0001-fbdev-fbmem-behave-better-with-small-rotated-display.patch
patches.fixes/0001-fbdev-fbcon-Fix-unregister-crash-when-more-than-one-.patch
patches.suse/mm-page_alloc-do-not-wake-kswapd-with-zone-lock-held.patch
+ patches.drivers/brcmfmac-Call-brcmf_dmi_probe-before-brcmf_of_probe.patch
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch