diff mbox series

[v3,1/4] wifi: brcmfmac: Rename Cypress 89459 to BCM4355

Message ID 20230210025009.21873-2-marcan@marcan.st
State New
Headers
Series BCM4355/4364/4377 support & identification fixes |

Commit Message

Hector Martin Feb. 10, 2023, 2:50 a.m. UTC 
  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).

v2: Since Cypress added this part and will presumably be providing
its supported firmware, we keep the CYW designation for this device.

v3: Drop the RAW device ID in this commit. We don't do this for the
other chips since apparently some devices with them exist in the wild,
but there is already a 4355 entry with the Broadcom subvendor and WCC
firmware vendor, so adding a generic fallback to Cypress seems
redundant (no reason why a device would have the raw device ID *and* an
explicitly programmed subvendor).

Fixes: dce45ded7619 ("brcmfmac: Support 89459 pcie")
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    | 7 +++----
 .../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h  | 5 ++---
 3 files changed, 7 insertions(+), 10 deletions(-)

Comments

Ping-Ke Shih Feb. 10, 2023, 3:42 a.m. UTC | #1 
> -----Original Message-----
> From: Hector Martin <marcan@marcan.st>
> Sent: Friday, February 10, 2023 10:50 AM
> To: Arend van Spriel <aspriel@gmail.com>; Franky Lin <franky.lin@broadcom.com>; Hante Meuleman
> <hante.meuleman@broadcom.com>; Kalle Valo <kvalo@kernel.org>; David S. Miller <davem@davemloft.net>; Eric
> Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>
> Cc: Alexander Prutskov <alep@cypress.com>; Chi-Hsien Lin <chi-hsien.lin@cypress.com>; Wright Feng
> <wright.feng@cypress.com>; Ian Lin <ian.lin@infineon.com>; Soontak Lee <soontak.lee@cypress.com>; Joseph
> chuang <jiac@cypress.com>; Sven Peter <sven@svenpeter.dev>; Alyssa Rosenzweig <alyssa@rosenzweig.io>;
> Aditya Garg <gargaditya08@live.com>; Jonas Gorski <jonas.gorski@gmail.com>; asahi@lists.linux.dev;
> linux-wireless@vger.kernel.org; brcm80211-dev-list.pdl@broadcom.com; SHA-cyfmac-dev-list@infineon.com;
> netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Hector Martin <marcan@marcan.st>; Arend van Spriel
> <arend.vanspriel@broadcom.com>
> Subject: [PATCH v3 1/4] wifi: brcmfmac: Rename Cypress 89459 to BCM4355
> 
> 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).
> 
> v2: Since Cypress added this part and will presumably be providing
> its supported firmware, we keep the CYW designation for this device.
> 
> v3: Drop the RAW device ID in this commit. We don't do this for the
> other chips since apparently some devices with them exist in the wild,
> but there is already a 4355 entry with the Broadcom subvendor and WCC
> firmware vendor, so adding a generic fallback to Cypress seems
> redundant (no reason why a device would have the raw device ID *and* an
> explicitly programmed subvendor).

Do you really want to add changes of v2 and v3 to commit message? Or,
just want to let reviewers know that? If latter one is what you want,
move them after s-o-b with delimiter ---

> 
> Fixes: dce45ded7619 ("brcmfmac: Support 89459 pcie")
> Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Hector Martin <marcan@marcan.st>
---
I mean here.
> ---
>  drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c    | 5 ++---
>  drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c    | 7 +++----
>  .../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h  | 5 ++---
>  3 files changed, 7 insertions(+), 10 deletions(-)
>
Hector Martin Feb. 11, 2023, 10:08 a.m. UTC | #2 
On 10/02/2023 12.42, Ping-Ke Shih wrote:
> 
> 
>> -----Original Message-----
>> From: Hector Martin <marcan@marcan.st>
>> Sent: Friday, February 10, 2023 10:50 AM
>> To: Arend van Spriel <aspriel@gmail.com>; Franky Lin <franky.lin@broadcom.com>; Hante Meuleman
>> <hante.meuleman@broadcom.com>; Kalle Valo <kvalo@kernel.org>; David S. Miller <davem@davemloft.net>; Eric
>> Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>
>> Cc: Alexander Prutskov <alep@cypress.com>; Chi-Hsien Lin <chi-hsien.lin@cypress.com>; Wright Feng
>> <wright.feng@cypress.com>; Ian Lin <ian.lin@infineon.com>; Soontak Lee <soontak.lee@cypress.com>; Joseph
>> chuang <jiac@cypress.com>; Sven Peter <sven@svenpeter.dev>; Alyssa Rosenzweig <alyssa@rosenzweig.io>;
>> Aditya Garg <gargaditya08@live.com>; Jonas Gorski <jonas.gorski@gmail.com>; asahi@lists.linux.dev;
>> linux-wireless@vger.kernel.org; brcm80211-dev-list.pdl@broadcom.com; SHA-cyfmac-dev-list@infineon.com;
>> netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Hector Martin <marcan@marcan.st>; Arend van Spriel
>> <arend.vanspriel@broadcom.com>
>> Subject: [PATCH v3 1/4] wifi: brcmfmac: Rename Cypress 89459 to BCM4355
>>
>> 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).
>>
>> v2: Since Cypress added this part and will presumably be providing
>> its supported firmware, we keep the CYW designation for this device.
>>
>> v3: Drop the RAW device ID in this commit. We don't do this for the
>> other chips since apparently some devices with them exist in the wild,
>> but there is already a 4355 entry with the Broadcom subvendor and WCC
>> firmware vendor, so adding a generic fallback to Cypress seems
>> redundant (no reason why a device would have the raw device ID *and* an
>> explicitly programmed subvendor).
> 
> Do you really want to add changes of v2 and v3 to commit message? Or,
> just want to let reviewers know that? If latter one is what you want,
> move them after s-o-b with delimiter ---

Both; I thought those things were worth mentioning in the commit message
as it stands on its own, and left the version tags in so reviewers know
when they were introduced.

- Hector
Arend van Spriel Feb. 11, 2023, 11:23 a.m. UTC | #3 
On February 11, 2023 11:09:02 AM Hector Martin <marcan@marcan.st> wrote:

> On 10/02/2023 12.42, Ping-Ke Shih wrote:
>>
>>
>>> -----Original Message-----
>>> From: Hector Martin <marcan@marcan.st>
>>> Sent: Friday, February 10, 2023 10:50 AM
>>> To: Arend van Spriel <aspriel@gmail.com>; Franky Lin 
>>> <franky.lin@broadcom.com>; Hante Meuleman
>>> <hante.meuleman@broadcom.com>; Kalle Valo <kvalo@kernel.org>; David S. 
>>> Miller <davem@davemloft.net>; Eric
>>> Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo 
>>> Abeni <pabeni@redhat.com>
>>> Cc: Alexander Prutskov <alep@cypress.com>; Chi-Hsien Lin 
>>> <chi-hsien.lin@cypress.com>; Wright Feng
>>> <wright.feng@cypress.com>; Ian Lin <ian.lin@infineon.com>; Soontak Lee 
>>> <soontak.lee@cypress.com>; Joseph
>>> chuang <jiac@cypress.com>; Sven Peter <sven@svenpeter.dev>; Alyssa 
>>> Rosenzweig <alyssa@rosenzweig.io>;
>>> Aditya Garg <gargaditya08@live.com>; Jonas Gorski <jonas.gorski@gmail.com>; 
>>> asahi@lists.linux.dev;
>>> linux-wireless@vger.kernel.org; brcm80211-dev-list.pdl@broadcom.com; 
>>> SHA-cyfmac-dev-list@infineon.com;
>>> netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Hector Martin 
>>> <marcan@marcan.st>; Arend van Spriel
>>> <arend.vanspriel@broadcom.com>
>>> Subject: [PATCH v3 1/4] wifi: brcmfmac: Rename Cypress 89459 to BCM4355
>>>
>>> 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).
>>>
>>> v2: Since Cypress added this part and will presumably be providing
>>> its supported firmware, we keep the CYW designation for this device.
>>>
>>> v3: Drop the RAW device ID in this commit. We don't do this for the
>>> other chips since apparently some devices with them exist in the wild,
>>> but there is already a 4355 entry with the Broadcom subvendor and WCC
>>> firmware vendor, so adding a generic fallback to Cypress seems
>>> redundant (no reason why a device would have the raw device ID *and* an
>>> explicitly programmed subvendor).
>>
>> Do you really want to add changes of v2 and v3 to commit message? Or,
>> just want to let reviewers know that? If latter one is what you want,
>> move them after s-o-b with delimiter ---
>
> Both; I thought those things were worth mentioning in the commit message
> as it stands on its own, and left the version tags in so reviewers know
> when they were introduced.

The commit message is documenting what we end up with post reviewing so 
patch versions are meaningless there. Of course useful information that 
came up in review cycles should end up in the commit message.

Regards,
Arend
Hector Martin Feb. 11, 2023, 12:46 p.m. UTC | #4 
On 11/02/2023 20.23, Arend Van Spriel wrote:
> On February 11, 2023 11:09:02 AM Hector Martin <marcan@marcan.st> wrote:
> 
>> On 10/02/2023 12.42, Ping-Ke Shih wrote:
>>>
>>>
>>>> -----Original Message-----
>>>> From: Hector Martin <marcan@marcan.st>
>>>> Sent: Friday, February 10, 2023 10:50 AM
>>>> To: Arend van Spriel <aspriel@gmail.com>; Franky Lin 
>>>> <franky.lin@broadcom.com>; Hante Meuleman
>>>> <hante.meuleman@broadcom.com>; Kalle Valo <kvalo@kernel.org>; David S. 
>>>> Miller <davem@davemloft.net>; Eric
>>>> Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo 
>>>> Abeni <pabeni@redhat.com>
>>>> Cc: Alexander Prutskov <alep@cypress.com>; Chi-Hsien Lin 
>>>> <chi-hsien.lin@cypress.com>; Wright Feng
>>>> <wright.feng@cypress.com>; Ian Lin <ian.lin@infineon.com>; Soontak Lee 
>>>> <soontak.lee@cypress.com>; Joseph
>>>> chuang <jiac@cypress.com>; Sven Peter <sven@svenpeter.dev>; Alyssa 
>>>> Rosenzweig <alyssa@rosenzweig.io>;
>>>> Aditya Garg <gargaditya08@live.com>; Jonas Gorski <jonas.gorski@gmail.com>; 
>>>> asahi@lists.linux.dev;
>>>> linux-wireless@vger.kernel.org; brcm80211-dev-list.pdl@broadcom.com; 
>>>> SHA-cyfmac-dev-list@infineon.com;
>>>> netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Hector Martin 
>>>> <marcan@marcan.st>; Arend van Spriel
>>>> <arend.vanspriel@broadcom.com>
>>>> Subject: [PATCH v3 1/4] wifi: brcmfmac: Rename Cypress 89459 to BCM4355
>>>>
>>>> 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).
>>>>
>>>> v2: Since Cypress added this part and will presumably be providing
>>>> its supported firmware, we keep the CYW designation for this device.
>>>>
>>>> v3: Drop the RAW device ID in this commit. We don't do this for the
>>>> other chips since apparently some devices with them exist in the wild,
>>>> but there is already a 4355 entry with the Broadcom subvendor and WCC
>>>> firmware vendor, so adding a generic fallback to Cypress seems
>>>> redundant (no reason why a device would have the raw device ID *and* an
>>>> explicitly programmed subvendor).
>>>
>>> Do you really want to add changes of v2 and v3 to commit message? Or,
>>> just want to let reviewers know that? If latter one is what you want,
>>> move them after s-o-b with delimiter ---
>>
>> Both; I thought those things were worth mentioning in the commit message
>> as it stands on its own, and left the version tags in so reviewers know
>> when they were introduced.
> 
> The commit message is documenting what we end up with post reviewing so 
> patch versions are meaningless there. Of course useful information that 
> came up in review cycles should end up in the commit message.
> 

Do you really want me to respin this again just to remove 8 characters
from the commit message? I know it doesn't have much meaning post review
but it's not unheard of either, grep git logs and you'll find plenty of
examples.

- Hector
Aditya Garg Feb. 11, 2023, 12:49 p.m. UTC | #5 
> On 11-Feb-2023, at 6:16 PM, Hector Martin <marcan@marcan.st> wrote:
> 
> On 11/02/2023 20.23, Arend Van Spriel wrote:
>>> On February 11, 2023 11:09:02 AM Hector Martin <marcan@marcan.st> wrote:
>>> 
>>> On 10/02/2023 12.42, Ping-Ke Shih wrote:
>>>> 
>>>> 
>>>>> -----Original Message-----
>>>>> From: Hector Martin <marcan@marcan.st>
>>>>> Sent: Friday, February 10, 2023 10:50 AM
>>>>> To: Arend van Spriel <aspriel@gmail.com>; Franky Lin 
>>>>> <franky.lin@broadcom.com>; Hante Meuleman
>>>>> <hante.meuleman@broadcom.com>; Kalle Valo <kvalo@kernel.org>; David S. 
>>>>> Miller <davem@davemloft.net>; Eric
>>>>> Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo 
>>>>> Abeni <pabeni@redhat.com>
>>>>> Cc: Alexander Prutskov <alep@cypress.com>; Chi-Hsien Lin 
>>>>> <chi-hsien.lin@cypress.com>; Wright Feng
>>>>> <wright.feng@cypress.com>; Ian Lin <ian.lin@infineon.com>; Soontak Lee 
>>>>> <soontak.lee@cypress.com>; Joseph
>>>>> chuang <jiac@cypress.com>; Sven Peter <sven@svenpeter.dev>; Alyssa 
>>>>> Rosenzweig <alyssa@rosenzweig.io>;
>>>>> Aditya Garg <gargaditya08@live.com>; Jonas Gorski <jonas.gorski@gmail.com>; 
>>>>> asahi@lists.linux.dev;
>>>>> linux-wireless@vger.kernel.org; brcm80211-dev-list.pdl@broadcom.com; 
>>>>> SHA-cyfmac-dev-list@infineon.com;
>>>>> netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Hector Martin 
>>>>> <marcan@marcan.st>; Arend van Spriel
>>>>> <arend.vanspriel@broadcom.com>
>>>>> Subject: [PATCH v3 1/4] wifi: brcmfmac: Rename Cypress 89459 to BCM4355
>>>>> 
>>>>> 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).
>>>>> 
>>>>> v2: Since Cypress added this part and will presumably be providing
>>>>> its supported firmware, we keep the CYW designation for this device.
>>>>> 
>>>>> v3: Drop the RAW device ID in this commit. We don't do this for the
>>>>> other chips since apparently some devices with them exist in the wild,
>>>>> but there is already a 4355 entry with the Broadcom subvendor and WCC
>>>>> firmware vendor, so adding a generic fallback to Cypress seems
>>>>> redundant (no reason why a device would have the raw device ID *and* an
>>>>> explicitly programmed subvendor).
>>>> 
>>>> Do you really want to add changes of v2 and v3 to commit message? Or,
>>>> just want to let reviewers know that? If latter one is what you want,
>>>> move them after s-o-b with delimiter ---
>>> 
>>> Both; I thought those things were worth mentioning in the commit message
>>> as it stands on its own, and left the version tags in so reviewers know
>>> when they were introduced.
>> 
>> The commit message is documenting what we end up with post reviewing so 
>> patch versions are meaningless there. Of course useful information that 
>> came up in review cycles should end up in the commit message.
>> 
> 
> Do you really want me to respin this again just to remove 8 characters
> from the commit message? I know it doesn't have much meaning post review
> but it's not unheard of either, grep git logs and you'll find plenty of
> examples.
> 
> - Hector

Adding to that, I guess the maintainers can do a bit on their part. Imao it’s
really frustrating preparing the same patch again and again, especially for
bits like these.
Arend van Spriel Feb. 11, 2023, 2 p.m. UTC | #6 
On February 11, 2023 1:50:00 PM Aditya Garg <gargaditya08@live.com> wrote:

>> On 11-Feb-2023, at 6:16 PM, Hector Martin <marcan@marcan.st> wrote:
>>
>> On 11/02/2023 20.23, Arend Van Spriel wrote:
>>>> On February 11, 2023 11:09:02 AM Hector Martin <marcan@marcan.st> wrote:
>>>>
>>>> On 10/02/2023 12.42, Ping-Ke Shih wrote:
>>>>>
>>>>>
>>>>>> -----Original Message-----
>>>>>> From: Hector Martin <marcan@marcan.st>
>>>>>> Sent: Friday, February 10, 2023 10:50 AM
>>>>>> To: Arend van Spriel <aspriel@gmail.com>; Franky Lin
>>>>>> <franky.lin@broadcom.com>; Hante Meuleman
>>>>>> <hante.meuleman@broadcom.com>; Kalle Valo <kvalo@kernel.org>; David S.
>>>>>> Miller <davem@davemloft.net>; Eric
>>>>>> Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo
>>>>>> Abeni <pabeni@redhat.com>
>>>>>> Cc: Alexander Prutskov <alep@cypress.com>; Chi-Hsien Lin
>>>>>> <chi-hsien.lin@cypress.com>; Wright Feng
>>>>>> <wright.feng@cypress.com>; Ian Lin <ian.lin@infineon.com>; Soontak Lee
>>>>>> <soontak.lee@cypress.com>; Joseph
>>>>>> chuang <jiac@cypress.com>; Sven Peter <sven@svenpeter.dev>; Alyssa
>>>>>> Rosenzweig <alyssa@rosenzweig.io>;
>>>>>> Aditya Garg <gargaditya08@live.com>; Jonas Gorski <jonas.gorski@gmail.com>;
>>>>>> asahi@lists.linux.dev;
>>>>>> linux-wireless@vger.kernel.org; brcm80211-dev-list.pdl@broadcom.com;
>>>>>> SHA-cyfmac-dev-list@infineon.com;
>>>>>> netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Hector Martin
>>>>>> <marcan@marcan.st>; Arend van Spriel
>>>>>> <arend.vanspriel@broadcom.com>
>>>>>> Subject: [PATCH v3 1/4] wifi: brcmfmac: Rename Cypress 89459 to BCM4355
>>>>>>
>>>>>> 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).
>>>>>>
>>>>>> v2: Since Cypress added this part and will presumably be providing
>>>>>> its supported firmware, we keep the CYW designation for this device.
>>>>>>
>>>>>> v3: Drop the RAW device ID in this commit. We don't do this for the
>>>>>> other chips since apparently some devices with them exist in the wild,
>>>>>> but there is already a 4355 entry with the Broadcom subvendor and WCC
>>>>>> firmware vendor, so adding a generic fallback to Cypress seems
>>>>>> redundant (no reason why a device would have the raw device ID *and* an
>>>>>> explicitly programmed subvendor).
>>>>>
>>>>> Do you really want to add changes of v2 and v3 to commit message? Or,
>>>>> just want to let reviewers know that? If latter one is what you want,
>>>>> move them after s-o-b with delimiter ---
>>>>
>>>> Both; I thought those things were worth mentioning in the commit message
>>>> as it stands on its own, and left the version tags in so reviewers know
>>>> when they were introduced.
>>>
>>> The commit message is documenting what we end up with post reviewing so
>>> patch versions are meaningless there. Of course useful information that
>>> came up in review cycles should end up in the commit message.
>>
>> Do you really want me to respin this again just to remove 8 characters
>> from the commit message? I know it doesn't have much meaning post review
>> but it's not unheard of either, grep git logs and you'll find plenty of
>> examples.
>>
>> - Hector
>
> Adding to that, I guess the maintainers can do a bit on their part. Imao it’s
> really frustrating preparing the same patch again and again, especially for
> bits like these.

Frustrating? I am sure that maintainers have another view on that when they 
have to mention the same type of submission errors again and again. That's 
why there is a wireless wiki page on the subject:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

If Kalle is willing to cleanup the commit message in the current patch you 
are lucky. You are free to ask. Otherwise it should be not too much trouble 
resubmitting it.

Regards,
Arend
Hector Martin Feb. 11, 2023, 7:15 p.m. UTC | #7 
On 11/02/2023 23.00, Arend Van Spriel wrote:
> On February 11, 2023 1:50:00 PM Aditya Garg <gargaditya08@live.com> wrote:
> 
>>> On 11-Feb-2023, at 6:16 PM, Hector Martin <marcan@marcan.st> wrote:
>>>
>>> On 11/02/2023 20.23, Arend Van Spriel wrote:
>>>>> On February 11, 2023 11:09:02 AM Hector Martin <marcan@marcan.st> wrote:
>>>>>
>>>>> On 10/02/2023 12.42, Ping-Ke Shih wrote:
>>>>>>
>>>>>>
>>>>>>> -----Original Message-----
>>>>>>> From: Hector Martin <marcan@marcan.st>
>>>>>>> Sent: Friday, February 10, 2023 10:50 AM
>>>>>>> To: Arend van Spriel <aspriel@gmail.com>; Franky Lin
>>>>>>> <franky.lin@broadcom.com>; Hante Meuleman
>>>>>>> <hante.meuleman@broadcom.com>; Kalle Valo <kvalo@kernel.org>; David S.
>>>>>>> Miller <davem@davemloft.net>; Eric
>>>>>>> Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo
>>>>>>> Abeni <pabeni@redhat.com>
>>>>>>> Cc: Alexander Prutskov <alep@cypress.com>; Chi-Hsien Lin
>>>>>>> <chi-hsien.lin@cypress.com>; Wright Feng
>>>>>>> <wright.feng@cypress.com>; Ian Lin <ian.lin@infineon.com>; Soontak Lee
>>>>>>> <soontak.lee@cypress.com>; Joseph
>>>>>>> chuang <jiac@cypress.com>; Sven Peter <sven@svenpeter.dev>; Alyssa
>>>>>>> Rosenzweig <alyssa@rosenzweig.io>;
>>>>>>> Aditya Garg <gargaditya08@live.com>; Jonas Gorski <jonas.gorski@gmail.com>;
>>>>>>> asahi@lists.linux.dev;
>>>>>>> linux-wireless@vger.kernel.org; brcm80211-dev-list.pdl@broadcom.com;
>>>>>>> SHA-cyfmac-dev-list@infineon.com;
>>>>>>> netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Hector Martin
>>>>>>> <marcan@marcan.st>; Arend van Spriel
>>>>>>> <arend.vanspriel@broadcom.com>
>>>>>>> Subject: [PATCH v3 1/4] wifi: brcmfmac: Rename Cypress 89459 to BCM4355
>>>>>>>
>>>>>>> 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).
>>>>>>>
>>>>>>> v2: Since Cypress added this part and will presumably be providing
>>>>>>> its supported firmware, we keep the CYW designation for this device.
>>>>>>>
>>>>>>> v3: Drop the RAW device ID in this commit. We don't do this for the
>>>>>>> other chips since apparently some devices with them exist in the wild,
>>>>>>> but there is already a 4355 entry with the Broadcom subvendor and WCC
>>>>>>> firmware vendor, so adding a generic fallback to Cypress seems
>>>>>>> redundant (no reason why a device would have the raw device ID *and* an
>>>>>>> explicitly programmed subvendor).
>>>>>>
>>>>>> Do you really want to add changes of v2 and v3 to commit message? Or,
>>>>>> just want to let reviewers know that? If latter one is what you want,
>>>>>> move them after s-o-b with delimiter ---
>>>>>
>>>>> Both; I thought those things were worth mentioning in the commit message
>>>>> as it stands on its own, and left the version tags in so reviewers know
>>>>> when they were introduced.
>>>>
>>>> The commit message is documenting what we end up with post reviewing so
>>>> patch versions are meaningless there. Of course useful information that
>>>> came up in review cycles should end up in the commit message.
>>>
>>> Do you really want me to respin this again just to remove 8 characters
>>> from the commit message? I know it doesn't have much meaning post review
>>> but it's not unheard of either, grep git logs and you'll find plenty of
>>> examples.
>>>
>>> - Hector
>>
>> Adding to that, I guess the maintainers can do a bit on their part. Imao it’s
>> really frustrating preparing the same patch again and again, especially for
>> bits like these.
> 
> Frustrating? I am sure that maintainers have another view on that when they 
> have to mention the same type of submission errors again and again. That's 
> why there is a wireless wiki page on the subject:
> 
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Which does not mention this particular issue as far as I can tell. How
exactly is this a "submission error"? Neither you nor Kalle pointed it
out through two revisions, only a drive-by reviewer did.

> If Kalle is willing to cleanup the commit message in the current patch you 
> are lucky. You are free to ask. Otherwise it should be not too much trouble 
> resubmitting it.

It's even less trouble to just take it as is, since an extra "v2: " in
the commit message doesn't hurt anyone other than those who choose to be
hurt by it. And as I said there's *tons* of commits with a changelog
like this in Linux. It's not uncommon.

I swear, some maintainers seem to take a perverse delight in making
things as painful as possible for submitters, even when there is
approximately zero benefit to the end result. And I say this as a
maintainer myself.

Maybe y'all should be the ones feeling lucky that so many people are
willing to put up with all this bullshit to get things upstreamed to
Linux. It's literally the worst open source project to upstream things
to, by a *very long* shot. I'll respin a v4 if I must, but but it's.
Just. This. Kind. Of. Nonsense. Every. Single. Time. And. Every. Single.
Time. It's. Something. Different. This stuff burns people out and
discourages submissions and turns huge numbers of people off from ever
contributing to Linux, and you all need to seriously be aware of that.

- Hector
Arend van Spriel Feb. 11, 2023, 8:15 p.m. UTC | #8 
On 2/11/2023 8:15 PM, Hector Martin wrote:
> On 11/02/2023 23.00, Arend Van Spriel wrote:
>> On February 11, 2023 1:50:00 PM Aditya Garg <gargaditya08@live.com> wrote:
>>
>>>> On 11-Feb-2023, at 6:16 PM, Hector Martin <marcan@marcan.st> wrote:
>>>>
>>>> On 11/02/2023 20.23, Arend Van Spriel wrote:
>>>>>> On February 11, 2023 11:09:02 AM Hector Martin <marcan@marcan.st> wrote:
>>>>>>
>>>>>> On 10/02/2023 12.42, Ping-Ke Shih wrote:
>>>>>>>
>>>>>>>
>>>>>>>> -----Original Message-----
>>>>>>>> From: Hector Martin <marcan@marcan.st>
>>>>>>>> Sent: Friday, February 10, 2023 10:50 AM
>>>>>>>> To: Arend van Spriel <aspriel@gmail.com>; Franky Lin
>>>>>>>> <franky.lin@broadcom.com>; Hante Meuleman
>>>>>>>> <hante.meuleman@broadcom.com>; Kalle Valo <kvalo@kernel.org>; David S.
>>>>>>>> Miller <davem@davemloft.net>; Eric
>>>>>>>> Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo
>>>>>>>> Abeni <pabeni@redhat.com>
>>>>>>>> Cc: Alexander Prutskov <alep@cypress.com>; Chi-Hsien Lin
>>>>>>>> <chi-hsien.lin@cypress.com>; Wright Feng
>>>>>>>> <wright.feng@cypress.com>; Ian Lin <ian.lin@infineon.com>; Soontak Lee
>>>>>>>> <soontak.lee@cypress.com>; Joseph
>>>>>>>> chuang <jiac@cypress.com>; Sven Peter <sven@svenpeter.dev>; Alyssa
>>>>>>>> Rosenzweig <alyssa@rosenzweig.io>;
>>>>>>>> Aditya Garg <gargaditya08@live.com>; Jonas Gorski <jonas.gorski@gmail.com>;
>>>>>>>> asahi@lists.linux.dev;
>>>>>>>> linux-wireless@vger.kernel.org; brcm80211-dev-list.pdl@broadcom.com;
>>>>>>>> SHA-cyfmac-dev-list@infineon.com;
>>>>>>>> netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Hector Martin
>>>>>>>> <marcan@marcan.st>; Arend van Spriel
>>>>>>>> <arend.vanspriel@broadcom.com>
>>>>>>>> Subject: [PATCH v3 1/4] wifi: brcmfmac: Rename Cypress 89459 to BCM4355
>>>>>>>>
>>>>>>>> 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).
>>>>>>>>
>>>>>>>> v2: Since Cypress added this part and will presumably be providing
>>>>>>>> its supported firmware, we keep the CYW designation for this device.
>>>>>>>>
>>>>>>>> v3: Drop the RAW device ID in this commit. We don't do this for the
>>>>>>>> other chips since apparently some devices with them exist in the wild,
>>>>>>>> but there is already a 4355 entry with the Broadcom subvendor and WCC
>>>>>>>> firmware vendor, so adding a generic fallback to Cypress seems
>>>>>>>> redundant (no reason why a device would have the raw device ID *and* an
>>>>>>>> explicitly programmed subvendor).
>>>>>>>
>>>>>>> Do you really want to add changes of v2 and v3 to commit message? Or,
>>>>>>> just want to let reviewers know that? If latter one is what you want,
>>>>>>> move them after s-o-b with delimiter ---
>>>>>>
>>>>>> Both; I thought those things were worth mentioning in the commit message
>>>>>> as it stands on its own, and left the version tags in so reviewers know
>>>>>> when they were introduced.
>>>>>
>>>>> The commit message is documenting what we end up with post reviewing so
>>>>> patch versions are meaningless there. Of course useful information that
>>>>> came up in review cycles should end up in the commit message.
>>>>
>>>> Do you really want me to respin this again just to remove 8 characters
>>>> from the commit message? I know it doesn't have much meaning post review
>>>> but it's not unheard of either, grep git logs and you'll find plenty of
>>>> examples.
>>>>
>>>> - Hector
>>>
>>> Adding to that, I guess the maintainers can do a bit on their part. Imao it’s
>>> really frustrating preparing the same patch again and again, especially for
>>> bits like these.
>>
>> Frustrating? I am sure that maintainers have another view on that when they
>> have to mention the same type of submission errors again and again. That's
>> why there is a wireless wiki page on the subject:
>>
>> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
> 
> Which does not mention this particular issue as far as I can tell. How
> exactly is this a "submission error"? Neither you nor Kalle pointed it
> out through two revisions, only a drive-by reviewer did.

It does mention how to provide the changelog and I would have guessed 
you were smart enough to see the reason behind it. It is a bit lame to 
say it is not mentioned.

>> If Kalle is willing to cleanup the commit message in the current patch you
>> are lucky. You are free to ask. Otherwise it should be not too much trouble
>> resubmitting it.
> 
> It's even less trouble to just take it as is, since an extra "v2: " in
> the commit message doesn't hurt anyone other than those who choose to be
> hurt by it. And as I said there's *tons* of commits with a changelog
> like this in Linux. It's not uncommon.
> 
> I swear, some maintainers seem to take a perverse delight in making
> things as painful as possible for submitters, even when there is
> approximately zero benefit to the end result. And I say this as a
> maintainer myself.
> 
> Maybe y'all should be the ones feeling lucky that so many people are
> willing to put up with all this bullshit to get things upstreamed to
> Linux. It's literally the worst open source project to upstream things
> to, by a *very long* shot. I'll respin a v4 if I must, but but it's.
> Just. This. Kind. Of. Nonsense. Every. Single. Time. And. Every. Single.
> Time. It's. Something. Different. This stuff burns people out and
> discourages submissions and turns huge numbers of people off from ever
> contributing to Linux, and you all need to seriously be aware of that.

I leave this to Kalle. Personally I do not have a problem with it, but 
the drive-by reviewer, Ping-Ke Shih, did have a point and respinning a 
patch series really is not a big effort. In 30+ years of programming I 
have been annoyed many times about seemingly trivial review comments or 
straight bullshit remarks or even solid remarks, but you learn to 
swallow that, make the changes, and move forward. Don't get discouraged.

Regards,
Arend
Ping-Ke Shih Feb. 13, 2023, 12:31 a.m. UTC | #9 
> -----Original Message-----
> From: Hector Martin <marcan@marcan.st>
> Sent: Saturday, February 11, 2023 6:09 PM
> To: Ping-Ke Shih <pkshih@realtek.com>; Arend van Spriel <aspriel@gmail.com>; Franky Lin
> <franky.lin@broadcom.com>; Hante Meuleman <hante.meuleman@broadcom.com>; Kalle Valo <kvalo@kernel.org>;
> David S. Miller <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub Kicinski
> <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>
> Cc: Alexander Prutskov <alep@cypress.com>; Chi-Hsien Lin <chi-hsien.lin@cypress.com>; Wright Feng
> <wright.feng@cypress.com>; Ian Lin <ian.lin@infineon.com>; Soontak Lee <soontak.lee@cypress.com>; Joseph
> chuang <jiac@cypress.com>; Sven Peter <sven@svenpeter.dev>; Alyssa Rosenzweig <alyssa@rosenzweig.io>;
> Aditya Garg <gargaditya08@live.com>; Jonas Gorski <jonas.gorski@gmail.com>; asahi@lists.linux.dev;
> linux-wireless@vger.kernel.org; brcm80211-dev-list.pdl@broadcom.com; SHA-cyfmac-dev-list@infineon.com;
> netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Arend van Spriel <arend.vanspriel@broadcom.com>
> Subject: Re: [PATCH v3 1/4] wifi: brcmfmac: Rename Cypress 89459 to BCM4355
> 
> On 10/02/2023 12.42, Ping-Ke Shih wrote:
> >
> >
> >> -----Original Message-----
> >> From: Hector Martin <marcan@marcan.st>
> >> Sent: Friday, February 10, 2023 10:50 AM
> >> To: Arend van Spriel <aspriel@gmail.com>; Franky Lin <franky.lin@broadcom.com>; Hante Meuleman
> >> <hante.meuleman@broadcom.com>; Kalle Valo <kvalo@kernel.org>; David S. Miller <davem@davemloft.net>;
> Eric
> >> Dumazet <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>
> >> Cc: Alexander Prutskov <alep@cypress.com>; Chi-Hsien Lin <chi-hsien.lin@cypress.com>; Wright Feng
> >> <wright.feng@cypress.com>; Ian Lin <ian.lin@infineon.com>; Soontak Lee <soontak.lee@cypress.com>;
> Joseph
> >> chuang <jiac@cypress.com>; Sven Peter <sven@svenpeter.dev>; Alyssa Rosenzweig <alyssa@rosenzweig.io>;
> >> Aditya Garg <gargaditya08@live.com>; Jonas Gorski <jonas.gorski@gmail.com>; asahi@lists.linux.dev;
> >> linux-wireless@vger.kernel.org; brcm80211-dev-list.pdl@broadcom.com;
> SHA-cyfmac-dev-list@infineon.com;
> >> netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Hector Martin <marcan@marcan.st>; Arend van
> Spriel
> >> <arend.vanspriel@broadcom.com>
> >> Subject: [PATCH v3 1/4] wifi: brcmfmac: Rename Cypress 89459 to BCM4355
> >>
> >> 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).
> >>
> >> v2: Since Cypress added this part and will presumably be providing
> >> its supported firmware, we keep the CYW designation for this device.
> >>
> >> v3: Drop the RAW device ID in this commit. We don't do this for the
> >> other chips since apparently some devices with them exist in the wild,
> >> but there is already a 4355 entry with the Broadcom subvendor and WCC
> >> firmware vendor, so adding a generic fallback to Cypress seems
> >> redundant (no reason why a device would have the raw device ID *and* an
> >> explicitly programmed subvendor).
> >
> > Do you really want to add changes of v2 and v3 to commit message? Or,
> > just want to let reviewers know that? If latter one is what you want,
> > move them after s-o-b with delimiter ---
> 
> Both; I thought those things were worth mentioning in the commit message
> as it stands on its own, and left the version tags in so reviewers know
> when they were introduced.
> 

With this reply, it is clear that you did those intentionally, not forgot
something, so things are clear to me. The further discussion in different
aspects of view in thread are also helpful for me to get much.

Ping-Ke
Kalle Valo Feb. 13, 2023, 1:45 p.m. UTC | #10 
Hector Martin <marcan@marcan.st> writes:

>> If Kalle is willing to cleanup the commit message in the current patch you 
>> are lucky. You are free to ask. Otherwise it should be not too much trouble 
>> resubmitting it.

FWIW I can edit commit logs as long as the changes are simple and the
edit instructions are clear, ie. it takes no more than a minute for me
to do the edit.

> It's even less trouble to just take it as is, since an extra "v2: " in
> the commit message doesn't hurt anyone other than those who choose to be
> hurt by it. And as I said there's *tons* of commits with a changelog
> like this in Linux. It's not uncommon.
>
> I swear, some maintainers seem to take a perverse delight in making
> things as painful as possible for submitters, even when there is
> approximately zero benefit to the end result. And I say this as a
> maintainer myself.
>
> Maybe y'all should be the ones feeling lucky that so many people are
> willing to put up with all this bullshit to get things upstreamed to
> Linux. It's literally the worst open source project to upstream things
> to, by a *very long* shot. I'll respin a v4 if I must, but but it's.
> Just. This. Kind. Of. Nonsense. Every. Single. Time. And. Every. Single.
> Time. It's. Something. Different. This stuff burns people out and
> discourages submissions and turns huge numbers of people off from ever
> contributing to Linux, and you all need to seriously be aware of that.

I understand it's frustrating but please also try understand us
maintainers. For example, I have 150 patches in patchwork right now. So
it's not easy for us maintainers either, far from it.
Eric Curtin Feb. 13, 2023, 4:39 p.m. UTC | #11 
On Fri, 10 Feb 2023 at 02:59, Hector Martin <marcan@marcan.st> 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).
>
> v2: Since Cypress added this part and will presumably be providing
> its supported firmware, we keep the CYW designation for this device.
>
> v3: Drop the RAW device ID in this commit. We don't do this for the
> other chips since apparently some devices with them exist in the wild,
> but there is already a 4355 entry with the Broadcom subvendor and WCC
> firmware vendor, so adding a generic fallback to Cypress seems
> redundant (no reason why a device would have the raw device ID *and* an
> explicitly programmed subvendor).
>
> Fixes: dce45ded7619 ("brcmfmac: Support 89459 pcie")
> Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Hector Martin <marcan@marcan.st>

LGTM

Reviewed-by: Eric Curtin <ecurtin@redhat.com>

Is mise le meas/Regards,

Eric Curtin

> ---
>  drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c    | 5 ++---
>  drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c    | 7 +++----
>  .../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h  | 5 ++---
>  3 files changed, 7 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
> @@ -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..96608174a123 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 */
> @@ -2609,9 +2609,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, CYW),
>         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..28b6cf8ff286 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
> @@ -90,9 +90,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 */
> --
> 2.35.1
>
>
diff mbox series

Patch

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..96608174a123 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 */
@@ -2609,9 +2609,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, CYW),
 	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..28b6cf8ff286 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
@@ -90,9 +90,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 */