brcmfmac: Call brcmf_dmi_probe before brcmf_of_probe

jwrdegoede · Kalle Valo · commit 554da3868eb1 · 2018-11-29T17:32:25.000+02:00
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: bd1e82b ("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>
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -449,8 +449,8 @@ struct brcmf_mp_device brcmf_get_module_param(struct device dev,`
`449`	`449`	`}`
`450`	`450`	`if (!found) {`
`451`	`451`	`/* No platform data for this device, try OF and DMI data */`
`452`		`- brcmf_of_probe(dev, bus_type, settings);`
`453`	`452`	`brcmf_dmi_probe(settings, chip, chiprev);`
	`453`	`+ brcmf_of_probe(dev, bus_type, settings);`
`454`	`454`	`}`
`455`	`455`	`return settings;`
`456`	`456`	`}`