* [PATCH net 0/3] bnxt_en: 3 Bug fixes
@ 2023-03-29 1:30 Michael Chan
2023-03-29 1:30 ` [PATCH net 1/3] bnxt_en: Fix reporting of test result in ethtool selftest Michael Chan
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Michael Chan @ 2023-03-29 1:30 UTC (permalink / raw)
To: davem; +Cc: netdev, edumazet, kuba, pabeni, gospo
[-- Attachment #1: Type: text/plain, Size: 601 bytes --]
This series contains 3 small bug fixes covering ethtool self test, PCI
ID string typos, and some missing 200G link speed ethtool reporting logic.
Kalesh AP (2):
bnxt_en: Fix reporting of test result in ethtool selftest
bnxt_en: Fix typo in PCI id to device description string mapping
Michael Chan (1):
bnxt_en: Add missing 200G link speed reporting
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 ++++----
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 +
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 3 +++
3 files changed, 8 insertions(+), 4 deletions(-)
--
2.18.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH net 1/3] bnxt_en: Fix reporting of test result in ethtool selftest
2023-03-29 1:30 [PATCH net 0/3] bnxt_en: 3 Bug fixes Michael Chan
@ 2023-03-29 1:30 ` Michael Chan
2023-03-29 13:08 ` Simon Horman
2023-03-29 1:30 ` [PATCH net 2/3] bnxt_en: Fix typo in PCI id to device description string mapping Michael Chan
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Michael Chan @ 2023-03-29 1:30 UTC (permalink / raw)
To: davem
Cc: netdev, edumazet, kuba, pabeni, gospo, Kalesh AP, Pavan Chebbi,
Somnath Kotur
[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]
From: Kalesh AP <kalesh-anakkur.purayil@broadcom•com>
When the selftest command fails, driver is not reporting the failure
by updating the "test->flags" when bnxt_close_nic() fails.
Fixes: eb51365846bc ("bnxt_en: Add basic ethtool -t selftest support.")
Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom•com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom•com>
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom•com>
Signed-off-by: Michael Chan <michael.chan@broadcom•com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index ec573127b707..7658a06b8d05 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -3738,6 +3738,7 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest,
bnxt_ulp_stop(bp);
rc = bnxt_close_nic(bp, true, false);
if (rc) {
+ etest->flags |= ETH_TEST_FL_FAILED;
bnxt_ulp_start(bp, rc);
return;
}
--
2.18.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net 2/3] bnxt_en: Fix typo in PCI id to device description string mapping
2023-03-29 1:30 [PATCH net 0/3] bnxt_en: 3 Bug fixes Michael Chan
2023-03-29 1:30 ` [PATCH net 1/3] bnxt_en: Fix reporting of test result in ethtool selftest Michael Chan
@ 2023-03-29 1:30 ` Michael Chan
2023-03-29 13:08 ` Simon Horman
2023-03-29 1:30 ` [PATCH net 3/3] bnxt_en: Add missing 200G link speed reporting Michael Chan
2023-03-30 4:50 ` [PATCH net 0/3] bnxt_en: 3 Bug fixes patchwork-bot+netdevbpf
3 siblings, 1 reply; 9+ messages in thread
From: Michael Chan @ 2023-03-29 1:30 UTC (permalink / raw)
To: davem; +Cc: netdev, edumazet, kuba, pabeni, gospo, Kalesh AP, Pavan Chebbi
[-- Attachment #1: Type: text/plain, Size: 1863 bytes --]
From: Kalesh AP <kalesh-anakkur.purayil@broadcom•com>
Fix 57502 and 57508 NPAR description string entries. The typos
caused these devices to not match up with lspci output.
Fixes: 49c98421e6ab ("bnxt_en: Add PCI IDs for 57500 series NPAR devices.")
Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom•com>
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom•com>
Signed-off-by: Michael Chan <michael.chan@broadcom•com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index e2e2c986c82b..c23e3b397bcf 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -175,12 +175,12 @@ static const struct pci_device_id bnxt_pci_tbl[] = {
{ PCI_VDEVICE(BROADCOM, 0x1750), .driver_data = BCM57508 },
{ PCI_VDEVICE(BROADCOM, 0x1751), .driver_data = BCM57504 },
{ PCI_VDEVICE(BROADCOM, 0x1752), .driver_data = BCM57502 },
- { PCI_VDEVICE(BROADCOM, 0x1800), .driver_data = BCM57508_NPAR },
+ { PCI_VDEVICE(BROADCOM, 0x1800), .driver_data = BCM57502_NPAR },
{ PCI_VDEVICE(BROADCOM, 0x1801), .driver_data = BCM57504_NPAR },
- { PCI_VDEVICE(BROADCOM, 0x1802), .driver_data = BCM57502_NPAR },
- { PCI_VDEVICE(BROADCOM, 0x1803), .driver_data = BCM57508_NPAR },
+ { PCI_VDEVICE(BROADCOM, 0x1802), .driver_data = BCM57508_NPAR },
+ { PCI_VDEVICE(BROADCOM, 0x1803), .driver_data = BCM57502_NPAR },
{ PCI_VDEVICE(BROADCOM, 0x1804), .driver_data = BCM57504_NPAR },
- { PCI_VDEVICE(BROADCOM, 0x1805), .driver_data = BCM57502_NPAR },
+ { PCI_VDEVICE(BROADCOM, 0x1805), .driver_data = BCM57508_NPAR },
{ PCI_VDEVICE(BROADCOM, 0xd802), .driver_data = BCM58802 },
{ PCI_VDEVICE(BROADCOM, 0xd804), .driver_data = BCM58804 },
#ifdef CONFIG_BNXT_SRIOV
--
2.18.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH net 3/3] bnxt_en: Add missing 200G link speed reporting
2023-03-29 1:30 [PATCH net 0/3] bnxt_en: 3 Bug fixes Michael Chan
2023-03-29 1:30 ` [PATCH net 1/3] bnxt_en: Fix reporting of test result in ethtool selftest Michael Chan
2023-03-29 1:30 ` [PATCH net 2/3] bnxt_en: Fix typo in PCI id to device description string mapping Michael Chan
@ 2023-03-29 1:30 ` Michael Chan
2023-03-29 13:19 ` Simon Horman
2023-03-30 4:50 ` [PATCH net 0/3] bnxt_en: 3 Bug fixes patchwork-bot+netdevbpf
3 siblings, 1 reply; 9+ messages in thread
From: Michael Chan @ 2023-03-29 1:30 UTC (permalink / raw)
To: davem; +Cc: netdev, edumazet, kuba, pabeni, gospo
[-- Attachment #1: Type: text/plain, Size: 1644 bytes --]
bnxt_fw_to_ethtool_speed() is missing the case statement for 200G
link speed reported by firmware. As a result, ethtool will report
unknown speed when the firmware reports 200G link speed.
Fixes: 532262ba3b84 ("bnxt_en: ethtool: support PAM4 link speeds up to 200G")
Signed-off-by: Michael Chan <michael.chan@broadcom•com>
---
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 +
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index c0628ac1b798..5928430f6f51 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1226,6 +1226,7 @@ struct bnxt_link_info {
#define BNXT_LINK_SPEED_40GB PORT_PHY_QCFG_RESP_LINK_SPEED_40GB
#define BNXT_LINK_SPEED_50GB PORT_PHY_QCFG_RESP_LINK_SPEED_50GB
#define BNXT_LINK_SPEED_100GB PORT_PHY_QCFG_RESP_LINK_SPEED_100GB
+#define BNXT_LINK_SPEED_200GB PORT_PHY_QCFG_RESP_LINK_SPEED_200GB
u16 support_speeds;
u16 support_pam4_speeds;
u16 auto_link_speeds; /* fw adv setting */
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 7658a06b8d05..6bd18eb5137f 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -1714,6 +1714,8 @@ u32 bnxt_fw_to_ethtool_speed(u16 fw_link_speed)
return SPEED_50000;
case BNXT_LINK_SPEED_100GB:
return SPEED_100000;
+ case BNXT_LINK_SPEED_200GB:
+ return SPEED_200000;
default:
return SPEED_UNKNOWN;
}
--
2.18.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH net 1/3] bnxt_en: Fix reporting of test result in ethtool selftest
2023-03-29 1:30 ` [PATCH net 1/3] bnxt_en: Fix reporting of test result in ethtool selftest Michael Chan
@ 2023-03-29 13:08 ` Simon Horman
2023-03-29 17:34 ` Michael Chan
0 siblings, 1 reply; 9+ messages in thread
From: Simon Horman @ 2023-03-29 13:08 UTC (permalink / raw)
To: Michael Chan
Cc: davem, netdev, edumazet, kuba, pabeni, gospo, Kalesh AP,
Pavan Chebbi, Somnath Kotur
On Tue, Mar 28, 2023 at 06:30:19PM -0700, Michael Chan wrote:
> From: Kalesh AP <kalesh-anakkur.purayil@broadcom•com>
>
> When the selftest command fails, driver is not reporting the failure
> by updating the "test->flags" when bnxt_close_nic() fails.
>
> Fixes: eb51365846bc ("bnxt_en: Add basic ethtool -t selftest support.")
> Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom•com>
> Reviewed-by: Somnath Kotur <somnath.kotur@broadcom•com>
> Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom•com>
> Signed-off-by: Michael Chan <michael.chan@broadcom•com>
Reviewed-by: Simon Horman <simon.horman@corigine•com>
Note: I think this will require a manual backport to get
all the way back to the above referenced commit (v4.12).
I'm unsure if that will need to be addressed in practice.
> ---
> drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
> index ec573127b707..7658a06b8d05 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
> @@ -3738,6 +3738,7 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest,
> bnxt_ulp_stop(bp);
> rc = bnxt_close_nic(bp, true, false);
> if (rc) {
> + etest->flags |= ETH_TEST_FL_FAILED;
> bnxt_ulp_start(bp, rc);
> return;
> }
> --
> 2.18.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net 2/3] bnxt_en: Fix typo in PCI id to device description string mapping
2023-03-29 1:30 ` [PATCH net 2/3] bnxt_en: Fix typo in PCI id to device description string mapping Michael Chan
@ 2023-03-29 13:08 ` Simon Horman
0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2023-03-29 13:08 UTC (permalink / raw)
To: Michael Chan
Cc: davem, netdev, edumazet, kuba, pabeni, gospo, Kalesh AP,
Pavan Chebbi
On Tue, Mar 28, 2023 at 06:30:20PM -0700, Michael Chan wrote:
> From: Kalesh AP <kalesh-anakkur.purayil@broadcom•com>
>
> Fix 57502 and 57508 NPAR description string entries. The typos
> caused these devices to not match up with lspci output.
>
> Fixes: 49c98421e6ab ("bnxt_en: Add PCI IDs for 57500 series NPAR devices.")
> Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom•com>
> Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom•com>
> Signed-off-by: Michael Chan <michael.chan@broadcom•com>
Reviewed-by: Simon Horman <simon.horman@corigine•com>
Note: I checked that this corresponds to
https://pci-ids.ucw.cz/read/PC/14e4
> ---
> drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> index e2e2c986c82b..c23e3b397bcf 100644
> --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
> @@ -175,12 +175,12 @@ static const struct pci_device_id bnxt_pci_tbl[] = {
> { PCI_VDEVICE(BROADCOM, 0x1750), .driver_data = BCM57508 },
> { PCI_VDEVICE(BROADCOM, 0x1751), .driver_data = BCM57504 },
> { PCI_VDEVICE(BROADCOM, 0x1752), .driver_data = BCM57502 },
> - { PCI_VDEVICE(BROADCOM, 0x1800), .driver_data = BCM57508_NPAR },
> + { PCI_VDEVICE(BROADCOM, 0x1800), .driver_data = BCM57502_NPAR },
> { PCI_VDEVICE(BROADCOM, 0x1801), .driver_data = BCM57504_NPAR },
> - { PCI_VDEVICE(BROADCOM, 0x1802), .driver_data = BCM57502_NPAR },
> - { PCI_VDEVICE(BROADCOM, 0x1803), .driver_data = BCM57508_NPAR },
> + { PCI_VDEVICE(BROADCOM, 0x1802), .driver_data = BCM57508_NPAR },
> + { PCI_VDEVICE(BROADCOM, 0x1803), .driver_data = BCM57502_NPAR },
> { PCI_VDEVICE(BROADCOM, 0x1804), .driver_data = BCM57504_NPAR },
> - { PCI_VDEVICE(BROADCOM, 0x1805), .driver_data = BCM57502_NPAR },
> + { PCI_VDEVICE(BROADCOM, 0x1805), .driver_data = BCM57508_NPAR },
> { PCI_VDEVICE(BROADCOM, 0xd802), .driver_data = BCM58802 },
> { PCI_VDEVICE(BROADCOM, 0xd804), .driver_data = BCM58804 },
> #ifdef CONFIG_BNXT_SRIOV
> --
> 2.18.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net 3/3] bnxt_en: Add missing 200G link speed reporting
2023-03-29 1:30 ` [PATCH net 3/3] bnxt_en: Add missing 200G link speed reporting Michael Chan
@ 2023-03-29 13:19 ` Simon Horman
0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2023-03-29 13:19 UTC (permalink / raw)
To: Michael Chan; +Cc: davem, netdev, edumazet, kuba, pabeni, gospo
On Tue, Mar 28, 2023 at 06:30:21PM -0700, Michael Chan wrote:
> bnxt_fw_to_ethtool_speed() is missing the case statement for 200G
> link speed reported by firmware. As a result, ethtool will report
> unknown speed when the firmware reports 200G link speed.
>
> Fixes: 532262ba3b84 ("bnxt_en: ethtool: support PAM4 link speeds up to 200G")
> Signed-off-by: Michael Chan <michael.chan@broadcom•com>
Reviewed-by: Simon Horman <simon.horman@corigine•com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net 1/3] bnxt_en: Fix reporting of test result in ethtool selftest
2023-03-29 13:08 ` Simon Horman
@ 2023-03-29 17:34 ` Michael Chan
0 siblings, 0 replies; 9+ messages in thread
From: Michael Chan @ 2023-03-29 17:34 UTC (permalink / raw)
To: Simon Horman
Cc: davem, netdev, edumazet, kuba, pabeni, gospo, Kalesh AP,
Pavan Chebbi, Somnath Kotur
[-- Attachment #1: Type: text/plain, Size: 1112 bytes --]
On Wed, Mar 29, 2023 at 6:08 AM Simon Horman <simon.horman@corigine•com> wrote:
>
> On Tue, Mar 28, 2023 at 06:30:19PM -0700, Michael Chan wrote:
> > From: Kalesh AP <kalesh-anakkur.purayil@broadcom•com>
> >
> > When the selftest command fails, driver is not reporting the failure
> > by updating the "test->flags" when bnxt_close_nic() fails.
> >
> > Fixes: eb51365846bc ("bnxt_en: Add basic ethtool -t selftest support.")
> > Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom•com>
> > Reviewed-by: Somnath Kotur <somnath.kotur@broadcom•com>
> > Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom•com>
> > Signed-off-by: Michael Chan <michael.chan@broadcom•com>
>
> Reviewed-by: Simon Horman <simon.horman@corigine•com>
>
> Note: I think this will require a manual backport to get
> all the way back to the above referenced commit (v4.12).
> I'm unsure if that will need to be addressed in practice.
Thanks for the review. The manual backport should be relatively
trivial. But I agree that it may not be necessary to backport all the
way back for this minor issue.
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4209 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH net 0/3] bnxt_en: 3 Bug fixes
2023-03-29 1:30 [PATCH net 0/3] bnxt_en: 3 Bug fixes Michael Chan
` (2 preceding siblings ...)
2023-03-29 1:30 ` [PATCH net 3/3] bnxt_en: Add missing 200G link speed reporting Michael Chan
@ 2023-03-30 4:50 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 9+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-03-30 4:50 UTC (permalink / raw)
To: Michael Chan; +Cc: davem, netdev, edumazet, kuba, pabeni, gospo
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel•org>:
On Tue, 28 Mar 2023 18:30:18 -0700 you wrote:
> This series contains 3 small bug fixes covering ethtool self test, PCI
> ID string typos, and some missing 200G link speed ethtool reporting logic.
>
> Kalesh AP (2):
> bnxt_en: Fix reporting of test result in ethtool selftest
> bnxt_en: Fix typo in PCI id to device description string mapping
>
> [...]
Here is the summary with links:
- [net,1/3] bnxt_en: Fix reporting of test result in ethtool selftest
https://git.kernel.org/netdev/net/c/83714dc3db0e
- [net,2/3] bnxt_en: Fix typo in PCI id to device description string mapping
https://git.kernel.org/netdev/net/c/62aad36ed31a
- [net,3/3] bnxt_en: Add missing 200G link speed reporting
https://git.kernel.org/netdev/net/c/581bce7bcb7e
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-03-30 4:50 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-29 1:30 [PATCH net 0/3] bnxt_en: 3 Bug fixes Michael Chan
2023-03-29 1:30 ` [PATCH net 1/3] bnxt_en: Fix reporting of test result in ethtool selftest Michael Chan
2023-03-29 13:08 ` Simon Horman
2023-03-29 17:34 ` Michael Chan
2023-03-29 1:30 ` [PATCH net 2/3] bnxt_en: Fix typo in PCI id to device description string mapping Michael Chan
2023-03-29 13:08 ` Simon Horman
2023-03-29 1:30 ` [PATCH net 3/3] bnxt_en: Add missing 200G link speed reporting Michael Chan
2023-03-29 13:19 ` Simon Horman
2023-03-30 4:50 ` [PATCH net 0/3] bnxt_en: 3 Bug fixes patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox