lkml.org 
[lkml]   [2023]   [Jan]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH v2 1/5] brcmfmac: Drop all the RAW device IDs
From
On 1/31/2023 12:28 PM, 'Hector Martin' via BRCM80211-DEV-LIST,PDL wrote:
> These device IDs are only supposed to be visible internally, in devices
> without a proper OTP. They should never be seen in devices in the wild,
> so drop them to avoid confusion.

Thanks for this cleanup.

Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Hector Martin <marcan@marcan.st>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 ----
> drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 4 ----
> 2 files changed, 8 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
> index ae57a9a3ab05..93f961d484c3 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
> @@ -2589,17 +2589,14 @@ static const struct dev_pm_ops brcmf_pciedrvr_pm = {
> 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_4356_DEVICE_ID, WCC),
> BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID, WCC),
> BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID, WCC),
> - BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_RAW_DEVICE_ID, WCC),
> BRCMF_PCIE_DEVICE(BRCM_PCIE_4358_DEVICE_ID, WCC),
> BRCMF_PCIE_DEVICE(BRCM_PCIE_4359_DEVICE_ID, WCC),
> BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_DEVICE_ID, WCC),
> BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_2G_DEVICE_ID, WCC),
> BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_5G_DEVICE_ID, WCC),
> - BRCMF_PCIE_DEVICE(BRCM_PCIE_43602_RAW_DEVICE_ID, WCC),
> BRCMF_PCIE_DEVICE(BRCM_PCIE_4364_DEVICE_ID, BCA),
> BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID, BCA),
> BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID, BCA),
> @@ -2611,7 +2608,6 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = {
> BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_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..a211a72fca42 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
> +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
> @@ -71,17 +71,14 @@
> /* PCIE Device IDs */
> #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_4356_DEVICE_ID 0x43ec
> #define BRCM_PCIE_43567_DEVICE_ID 0x43d3
> #define BRCM_PCIE_43570_DEVICE_ID 0x43d9
> -#define BRCM_PCIE_43570_RAW_DEVICE_ID 0xaa31
> #define BRCM_PCIE_4358_DEVICE_ID 0x43e9
> #define BRCM_PCIE_4359_DEVICE_ID 0x43ef
> #define BRCM_PCIE_43602_DEVICE_ID 0x43ba
> #define BRCM_PCIE_43602_2G_DEVICE_ID 0x43bb
> #define BRCM_PCIE_43602_5G_DEVICE_ID 0x43bc
> -#define BRCM_PCIE_43602_RAW_DEVICE_ID 43602
> #define BRCM_PCIE_4364_DEVICE_ID 0x4464
> #define BRCM_PCIE_4365_DEVICE_ID 0x43ca
> #define BRCM_PCIE_4365_2G_DEVICE_ID 0x43cb
> @@ -92,7 +89,6 @@
> #define BRCM_PCIE_4371_DEVICE_ID 0x440d
> #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 */
[unhandled content-type:application/pkcs7-signature]
\
 
 \ /
  Last update: 2023-03-27 00:03    [W:0.113 / U:0.040 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site