On 07/01/2023 01.21, Arend Van Spriel wrote:
> On 1/6/2023 2:19 PM, Ivan T. Ivanov wrote:
>> The introduction of support for Apple board types inadvertently changed
>> the precedence order, causing hybrid SMBIOS+DT platforms to look up the
>> firmware using the DMI information instead of the device tree compatible
>> to generate the board type. Revert back to the old behavior,
>> as affected platforms use firmwares named after the DT compatible.
>>
>> Fixes: 7682de8b3351 ("wifi: brcmfmac: of: Fetch Apple properties")
>>
>> [1] https://bugzilla.opensuse.org/show_bug.cgi?id=1206697#c13
>>
>> Cc: stable@xxxxxxxxxxxxxxx
>> Signed-off-by: Ivan T. Ivanov <iivanov@xxxxxxx>
>
> Looks good to me. I do have a question about the devicetree node for
> brcmfmac. The driver does a compatible check against
> "brcm,bcm4329-fmac". I actually expect all devicetree specifications to
> use this. That said I noticed the check for it in brcmf_of_probe()
> should be moved so it is the first check done.
We're talking about the machine compatible in the root OF node, not the
compatible for the device itself. That's how firmware selection for
non-Apple platforms works (and has worked since before the Apple stuff
got introduced): first try the machine type which is either derived from
DMI info or the root compatible, and fall back to generic firmware.
The device compatible is indeed always brcm,bcm4329-fmac.
- Hector
