| Message ID | 20230104100116.729-2-marcan@marcan.st (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | BCM4355/4364/4377 support & identification fixes | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On 1/4/2023 11:01 AM, 'Hector Martin' via BRCM80211-DEV-LIST,PDL wrote: > The commit that introduced support for this chip incorrectly claimed it > is a Cypress-specific part, while in actuality it is just a variant of > BCM4355 silicon (as evidenced by the chip ID). > > The relationship between Cypress products and Broadcom products isn't > entirely clear, but given what little information is available and prior > art in the driver, it seems the convention should be that originally > Broadcom parts should retain the Broadcom name. > > Thus, rename the relevant constants and firmware file. Also rename the > specific 89459 PCIe ID to BCM43596, which seems to be the original > subvariant name for this PCI ID (as defined in the out-of-tree bcmdhd > driver). Also declare the firmware as CLM-capable, since it is. > > Fixes: dce45ded7619 ("brcmfmac: Support 89459 pcie") > Signed-off-by: Hector Martin <marcan@marcan.st> > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 5 ++--- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 8 ++++---- > .../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 6 +++--- > 3 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c > index 121893bbaa1d..3e42c2bd0d9a 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c [...] > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c > index ae57a9a3ab05..3264be485e20 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c [...] > @@ -2590,6 +2590,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { > BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID, WCC), > BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355, WCC), > BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID, WCC), > + BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_RAW_DEVICE_ID, WCC), A bit of a problem here. If Cypress want to support this device, regardless how they branded it, they will provide its firmware. Given that they initially added it (as 89459) I suppose we should mark it with CYW and not WCC. Actually, see my comment below on RAW dev ids. > BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID, WCC), > BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID, WCC), > BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID, WCC), [...] > diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h > index f4939cf62767..cacc43db86eb 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h > +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h [...] > @@ -72,6 +72,7 @@ > #define BRCM_PCIE_4350_DEVICE_ID 0x43a3 > #define BRCM_PCIE_4354_DEVICE_ID 0x43df > #define BRCM_PCIE_4354_RAW_DEVICE_ID 0x4354 > +#define BRCM_PCIE_4355_RAW_DEVICE_ID 0x4355 I would remove all RAW device ids. These should not be observed outside chip vendor walls.
On 1/4/2023 11:01 AM, 'Hector Martin' via BRCM80211-DEV-LIST,PDL wrote: > The commit that introduced support for this chip incorrectly claimed it > is a Cypress-specific part, while in actuality it is just a variant of > BCM4355 silicon (as evidenced by the chip ID). [...] > Fixes: dce45ded7619 ("brcmfmac: Support 89459 pcie") Forgot to add: Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com> > Signed-off-by: Hector Martin <marcan@marcan.st> > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 5 ++--- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 8 ++++---- > .../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 6 +++--- > 3 files changed, 9 insertions(+), 10 deletions(-)
On 04/01/2023 22.29, Arend van Spriel wrote: > On 1/4/2023 11:01 AM, 'Hector Martin' via BRCM80211-DEV-LIST,PDL wrote: >> The commit that introduced support for this chip incorrectly claimed it >> is a Cypress-specific part, while in actuality it is just a variant of >> BCM4355 silicon (as evidenced by the chip ID). >> >> The relationship between Cypress products and Broadcom products isn't >> entirely clear, but given what little information is available and prior >> art in the driver, it seems the convention should be that originally >> Broadcom parts should retain the Broadcom name. >> >> Thus, rename the relevant constants and firmware file. Also rename the >> specific 89459 PCIe ID to BCM43596, which seems to be the original >> subvariant name for this PCI ID (as defined in the out-of-tree bcmdhd >> driver). Also declare the firmware as CLM-capable, since it is. >> >> Fixes: dce45ded7619 ("brcmfmac: Support 89459 pcie") >> Signed-off-by: Hector Martin <marcan@marcan.st> >> --- >> drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 5 ++--- >> drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 8 ++++---- >> .../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 6 +++--- >> 3 files changed, 9 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c >> index 121893bbaa1d..3e42c2bd0d9a 100644 >> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c >> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c > > [...] > >> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> index ae57a9a3ab05..3264be485e20 100644 >> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c > > [...] > >> @@ -2590,6 +2590,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { >> BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID, WCC), >> BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355, WCC), >> BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID, WCC), >> + BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_RAW_DEVICE_ID, WCC), > > A bit of a problem here. If Cypress want to support this device, > regardless how they branded it, they will provide its firmware. Given > that they initially added it (as 89459) I suppose we should mark it with > CYW and not WCC. Actually, see my comment below on RAW dev ids. Right, I thought we might wind up with this issue. So then the question becomes: can we give responsibility over PCI ID 0x4415 to Cypress and mark just that one as CYW (if so it probably makes sense to keep that labeled CYW89459 instead of BCM43596), and if not, is there some other way to tell apart Cypress and Broadcom products we can use? I believe the Apple side firmware is developed by Broadcom, not Cypress. Note that even if we split by PCI device ID here, we still have a problem with firmware selection, since that means we're requesting the same firmware filename for both vendors (since that only tests the chip ID and revision ID). If Apple is the *only* Broadcom customer using these chips then we can get away with this, since I can just make sure the fancy Apple firmware selection will never collide with the vanilla firmware filename. But if other customers of both companies are both shipping the same chip with different and incompatible generic firmware, we need some way to tell them apart. > >> BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID, WCC), >> BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID, WCC), >> BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID, WCC), > > [...] > >> diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h >> index f4939cf62767..cacc43db86eb 100644 >> --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h >> +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h > > [...] > >> @@ -72,6 +72,7 @@ >> #define BRCM_PCIE_4350_DEVICE_ID 0x43a3 >> #define BRCM_PCIE_4354_DEVICE_ID 0x43df >> #define BRCM_PCIE_4354_RAW_DEVICE_ID 0x4354 >> +#define BRCM_PCIE_4355_RAW_DEVICE_ID 0x4355 > > I would remove all RAW device ids. These should not be observed outside > chip vendor walls. Ack, I'll remove this one instead of renaming it (or I can just drop all the existing RAW IDs first in one commit at the head of v2 if you prefer that). - Hector
On January 4, 2023 5:35:08 PM Hector Martin <marcan@marcan.st> wrote: > On 04/01/2023 22.29, Arend van Spriel wrote: >> On 1/4/2023 11:01 AM, 'Hector Martin' via BRCM80211-DEV-LIST,PDL wrote: >>> The commit that introduced support for this chip incorrectly claimed it >>> is a Cypress-specific part, while in actuality it is just a variant of >>> BCM4355 silicon (as evidenced by the chip ID). >>> >>> The relationship between Cypress products and Broadcom products isn't >>> entirely clear, but given what little information is available and prior >>> art in the driver, it seems the convention should be that originally >>> Broadcom parts should retain the Broadcom name. >>> >>> Thus, rename the relevant constants and firmware file. Also rename the >>> specific 89459 PCIe ID to BCM43596, which seems to be the original >>> subvariant name for this PCI ID (as defined in the out-of-tree bcmdhd >>> driver). Also declare the firmware as CLM-capable, since it is. >>> >>> Fixes: dce45ded7619 ("brcmfmac: Support 89459 pcie") >>> Signed-off-by: Hector Martin <marcan@marcan.st> >>> --- >>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 5 ++--- >>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 8 ++++---- >>> .../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 6 +++--- >>> 3 files changed, 9 insertions(+), 10 deletions(-) >>> >>> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c >>> b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c >>> index 121893bbaa1d..3e42c2bd0d9a 100644 >>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c >>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c >> >> [...] >> >>> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >>> b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >>> index ae57a9a3ab05..3264be485e20 100644 >>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> >> [...] >> >>> @@ -2590,6 +2590,7 @@ static const struct pci_device_id >>> brcmf_pcie_devid_table[] = { >>> BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID, WCC), >>> BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355, WCC), >>> BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID, WCC), >>> + BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_RAW_DEVICE_ID, WCC), >> >> A bit of a problem here. If Cypress want to support this device, >> regardless how they branded it, they will provide its firmware. Given >> that they initially added it (as 89459) I suppose we should mark it with >> CYW and not WCC. Actually, see my comment below on RAW dev ids. > > Right, I thought we might wind up with this issue. So then the question > becomes: can we give responsibility over PCI ID 0x4415 to Cypress and > mark just that one as CYW (if so it probably makes sense to keep that > labeled CYW89459 instead of BCM43596), and if not, is there some other > way to tell apart Cypress and Broadcom products we can use? I believe > the Apple side firmware is developed by Broadcom, not Cypress. > > Note that even if we split by PCI device ID here, we still have a > problem with firmware selection, since that means we're requesting the > same firmware filename for both vendors (since that only tests the chip > ID and revision ID). If Apple is the *only* Broadcom customer using > these chips then we can get away with this, since I can just make sure > the fancy Apple firmware selection will never collide with the vanilla > firmware filename. But if other customers of both companies are both > shipping the same chip with different and incompatible generic firmware, > we need some way to tell them apart. AFAIK Apple chips are exclusive. The vendor marking was added by recent patch series I worked on. So per device id we assign the vendor. If needed we can use subvendor or subdevid to separate them appropriately. > > >> >>> BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID, WCC), >>> BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID, WCC), >>> BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID, WCC), >> >> [...] >> >>> diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h >>> b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h >>> index f4939cf62767..cacc43db86eb 100644 >>> --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h >>> +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h >> >> [...] >> >>> @@ -72,6 +72,7 @@ >>> #define BRCM_PCIE_4350_DEVICE_ID 0x43a3 >>> #define BRCM_PCIE_4354_DEVICE_ID 0x43df >>> #define BRCM_PCIE_4354_RAW_DEVICE_ID 0x4354 >>> +#define BRCM_PCIE_4355_RAW_DEVICE_ID 0x4355 >> >> I would remove all RAW device ids. These should not be observed outside >> chip vendor walls. > > Ack, I'll remove this one instead of renaming it (or I can just drop all > the existing RAW IDs first in one commit at the head of v2 if you prefer > that). Let's drop the existing RAW IDs with a separate patch explaining why ;-) Regards, Arend
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c index 121893bbaa1d..3e42c2bd0d9a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c @@ -726,6 +726,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci) case BRCM_CC_43664_CHIP_ID: case BRCM_CC_43666_CHIP_ID: return 0x200000; + case BRCM_CC_4355_CHIP_ID: case BRCM_CC_4359_CHIP_ID: return (ci->pub.chiprev < 9) ? 0x180000 : 0x160000; case BRCM_CC_4364_CHIP_ID: @@ -735,8 +736,6 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci) return 0x170000; case BRCM_CC_4378_CHIP_ID: return 0x352000; - case CY_CC_89459_CHIP_ID: - return ((ci->pub.chiprev < 9) ? 0x180000 : 0x160000); default: brcmf_err("unknown chip: %s\n", ci->pub.name); break; @@ -1426,8 +1425,8 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub) addr = CORE_CC_REG(base, sr_control1); reg = chip->ops->read32(chip->ctx, addr); return reg != 0; + case BRCM_CC_4355_CHIP_ID: case CY_CC_4373_CHIP_ID: - case CY_CC_89459_CHIP_ID: /* explicitly check SR engine enable bit */ addr = CORE_CC_REG(base, sr_control0); reg = chip->ops->read32(chip->ctx, addr); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index ae57a9a3ab05..3264be485e20 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -51,6 +51,7 @@ enum brcmf_pcie_state { BRCMF_FW_DEF(43602, "brcmfmac43602-pcie"); BRCMF_FW_DEF(4350, "brcmfmac4350-pcie"); BRCMF_FW_DEF(4350C, "brcmfmac4350c2-pcie"); +BRCMF_FW_CLM_DEF(4355, "brcmfmac4355-pcie"); BRCMF_FW_CLM_DEF(4356, "brcmfmac4356-pcie"); BRCMF_FW_CLM_DEF(43570, "brcmfmac43570-pcie"); BRCMF_FW_DEF(4358, "brcmfmac4358-pcie"); @@ -62,7 +63,6 @@ BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie"); BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie"); BRCMF_FW_DEF(4371, "brcmfmac4371-pcie"); BRCMF_FW_CLM_DEF(4378B1, "brcmfmac4378b1-pcie"); -BRCMF_FW_DEF(4355, "brcmfmac89459-pcie"); /* firmware config files */ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.txt"); @@ -78,6 +78,7 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = { BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C), BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0xFFFFFF00, 4350), BRCMF_FW_ENTRY(BRCM_CC_43525_CHIP_ID, 0xFFFFFFF0, 4365C), + BRCMF_FW_ENTRY(BRCM_CC_4355_CHIP_ID, 0xFFFFFFFF, 4355), BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356), BRCMF_FW_ENTRY(BRCM_CC_43567_CHIP_ID, 0xFFFFFFFF, 43570), BRCMF_FW_ENTRY(BRCM_CC_43569_CHIP_ID, 0xFFFFFFFF, 43570), @@ -93,7 +94,6 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = { BRCMF_FW_ENTRY(BRCM_CC_43666_CHIP_ID, 0xFFFFFFF0, 4366C), BRCMF_FW_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371), BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFFF, 4378B1), /* revision ID 3 */ - BRCMF_FW_ENTRY(CY_CC_89459_CHIP_ID, 0xFFFFFFFF, 4355), }; #define BRCMF_PCIE_FW_UP_TIMEOUT 5000 /* msec */ @@ -2590,6 +2590,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID, WCC), BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355, WCC), BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID, WCC), + BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_RAW_DEVICE_ID, WCC), BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID, WCC), BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID, WCC), BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID, WCC), @@ -2609,9 +2610,8 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID, BCA), BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID, BCA), BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_DEVICE_ID, WCC), + BRCMF_PCIE_DEVICE(BRCM_PCIE_43596_DEVICE_ID, WCC), BRCMF_PCIE_DEVICE(BRCM_PCIE_4378_DEVICE_ID, WCC), - BRCMF_PCIE_DEVICE(CY_PCIE_89459_DEVICE_ID, CYW), - BRCMF_PCIE_DEVICE(CY_PCIE_89459_RAW_DEVICE_ID, CYW), { /* end: all zeroes */ } }; diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h index f4939cf62767..cacc43db86eb 100644 --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h @@ -37,6 +37,7 @@ #define BRCM_CC_4350_CHIP_ID 0x4350 #define BRCM_CC_43525_CHIP_ID 43525 #define BRCM_CC_4354_CHIP_ID 0x4354 +#define BRCM_CC_4355_CHIP_ID 0x4355 #define BRCM_CC_4356_CHIP_ID 0x4356 #define BRCM_CC_43566_CHIP_ID 43566 #define BRCM_CC_43567_CHIP_ID 43567 @@ -56,7 +57,6 @@ #define CY_CC_43012_CHIP_ID 43012 #define CY_CC_43439_CHIP_ID 43439 #define CY_CC_43752_CHIP_ID 43752 -#define CY_CC_89459_CHIP_ID 0x4355 /* USB Device IDs */ #define BRCM_USB_43143_DEVICE_ID 0xbd1e @@ -72,6 +72,7 @@ #define BRCM_PCIE_4350_DEVICE_ID 0x43a3 #define BRCM_PCIE_4354_DEVICE_ID 0x43df #define BRCM_PCIE_4354_RAW_DEVICE_ID 0x4354 +#define BRCM_PCIE_4355_RAW_DEVICE_ID 0x4355 #define BRCM_PCIE_4356_DEVICE_ID 0x43ec #define BRCM_PCIE_43567_DEVICE_ID 0x43d3 #define BRCM_PCIE_43570_DEVICE_ID 0x43d9 @@ -90,9 +91,8 @@ #define BRCM_PCIE_4366_2G_DEVICE_ID 0x43c4 #define BRCM_PCIE_4366_5G_DEVICE_ID 0x43c5 #define BRCM_PCIE_4371_DEVICE_ID 0x440d +#define BRCM_PCIE_43596_DEVICE_ID 0x4415 #define BRCM_PCIE_4378_DEVICE_ID 0x4425 -#define CY_PCIE_89459_DEVICE_ID 0x4415 -#define CY_PCIE_89459_RAW_DEVICE_ID 0x4355 /* brcmsmac IDs */ #define BCM4313_D11N2G_ID 0x4727 /* 4313 802.11n 2.4G device */
The commit that introduced support for this chip incorrectly claimed it is a Cypress-specific part, while in actuality it is just a variant of BCM4355 silicon (as evidenced by the chip ID). The relationship between Cypress products and Broadcom products isn't entirely clear, but given what little information is available and prior art in the driver, it seems the convention should be that originally Broadcom parts should retain the Broadcom name. Thus, rename the relevant constants and firmware file. Also rename the specific 89459 PCIe ID to BCM43596, which seems to be the original subvariant name for this PCI ID (as defined in the out-of-tree bcmdhd driver). Also declare the firmware as CLM-capable, since it is. Fixes: dce45ded7619 ("brcmfmac: Support 89459 pcie") Signed-off-by: Hector Martin <marcan@marcan.st> --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 5 ++--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 8 ++++---- .../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-)