On 09/01/2022 05.03, Arend van Spriel wrote:
>> The chip revision nominally comes from OTP on Apple platforms, but it
>> can be mapped to the PCI revision number, so we ignore the OTP revision
>> and continue to use the existing PCI revision mechanism to identify chip
>> revisions, as the driver already does for other chips. Unfortunately,
>> the mapping is not consistent between different chip types, so this has
>> to be determined experimentally.
>
> Not sure I understand this. The chip revision comes from the chipcommon
> register [1]. Maybe that is what you mean by "PCI revision number". For
> some chips it is possible OTP is used to override that.
What I mean is the Apple custom OTP segment stores a textual revision
number, like "C0". Apple's driver uses this to pick a firmware. There is
an ad-hoc mapping between this and the numeric revision (which as you
say is present in chipcommon but AFAICT the same number also ends up as
the Revision ID in PCI config space).
>
> Reviewed-by: Arend van Spriel <arend.vanspriel@xxxxxxxxxxxx>
>> Reviewed-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
>> Signed-off-by: Hector Martin <marcan@xxxxxxxxx>
>> ---
>> .../broadcom/brcm80211/brcmfmac/pcie.c | 58 ++++++++++++++++++-
>> 1 file changed, 56 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
>> index 74c9a4f74813..250e0bd40cb3 100644
>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
>> @@ -2094,8 +2094,62 @@ brcmf_pcie_prepare_fw_request(struct brcmf_pciedev_info *devinfo)
>> fwreq->domain_nr = pci_domain_nr(devinfo->pdev->bus) + 1;
>> fwreq->bus_nr = devinfo->pdev->bus->number;
>>
>> - brcmf_dbg(PCIE, "Board: %s\n", devinfo->settings->board_type);
>> - fwreq->board_types[0] = devinfo->settings->board_type;
>> + /* Apple platforms with fancy firmware/NVRAM selection */
>> + if (devinfo->settings->board_type &&
>> + devinfo->settings->antenna_sku &&
>> + devinfo->otp.valid) {
>> + char *buf;
>> + int len;
>> +
>> + brcmf_dbg(PCIE, "Apple board: %s\n",
>> + devinfo->settings->board_type);
>
> maybe good to use local reference for devinfo->settings->board_type,
> which is used several times below.
Yup, and also antenna_sku.
--
Hector Martin (marcan@xxxxxxxxx)
Public Key: https://mrcn.st/pub
