Skip to content

Commit b45a850

Browse files
Michael Chankuba-moo
authored andcommitted
bnxt_en: Skip MAC loopback selftest if it is unsupported by FW
Call the new HWRM_PORT_MAC_QCAPS to check if mac loopback is supported. Skip the MAC loopback ethtool self test if it is not supported. Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com> Reviewed-by: Andy Gospodarek <andrew.gospodarek@broadcom.com> Signed-off-by: Michael Chan <michael.chan@broadcom.com> Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> Link: https://patch.msgid.link/20241217182620.2454075-5-michael.chan@broadcom.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 36d1e70 commit b45a850

File tree

3 files changed

+36
-4
lines changed

3 files changed

+36
-4
lines changed

drivers/net/ethernet/broadcom/bnxt/bnxt.c

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11551,6 +11551,26 @@ static int bnxt_hwrm_phy_qcaps(struct bnxt *bp)
1155111551
return rc;
1155211552
}
1155311553

11554+
static void bnxt_hwrm_mac_qcaps(struct bnxt *bp)
11555+
{
11556+
struct hwrm_port_mac_qcaps_output *resp;
11557+
struct hwrm_port_mac_qcaps_input *req;
11558+
int rc;
11559+
11560+
if (bp->hwrm_spec_code < 0x10a03)
11561+
return;
11562+
11563+
rc = hwrm_req_init(bp, req, HWRM_PORT_MAC_QCAPS);
11564+
if (rc)
11565+
return;
11566+
11567+
resp = hwrm_req_hold(bp, req);
11568+
rc = hwrm_req_send_silent(bp, req);
11569+
if (!rc)
11570+
bp->mac_flags = resp->flags;
11571+
hwrm_req_drop(bp, req);
11572+
}
11573+
1155411574
static bool bnxt_support_dropped(u16 advertising, u16 supported)
1155511575
{
1155611576
u16 diff = advertising ^ supported;
@@ -15679,6 +15699,10 @@ static int bnxt_probe_phy(struct bnxt *bp, bool fw_dflt)
1567915699
bp->dev->priv_flags |= IFF_SUPP_NOFCS;
1568015700
else
1568115701
bp->dev->priv_flags &= ~IFF_SUPP_NOFCS;
15702+
15703+
bp->mac_flags = 0;
15704+
bnxt_hwrm_mac_qcaps(bp);
15705+
1568215706
if (!fw_dflt)
1568315707
return 0;
1568415708

drivers/net/ethernet/broadcom/bnxt/bnxt.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2668,6 +2668,11 @@ struct bnxt {
26682668
#define BNXT_PHY_FL_BANK_SEL (PORT_PHY_QCAPS_RESP_FLAGS2_BANK_ADDR_SUPPORTED << 8)
26692669
#define BNXT_PHY_FL_SPEEDS2 (PORT_PHY_QCAPS_RESP_FLAGS2_SPEEDS2_SUPPORTED << 8)
26702670

2671+
/* copied from flags in hwrm_port_mac_qcaps_output */
2672+
u8 mac_flags;
2673+
#define BNXT_MAC_FL_NO_MAC_LPBK \
2674+
PORT_MAC_QCAPS_RESP_FLAGS_LOCAL_LPBK_NOT_SUPPORTED
2675+
26712676
u8 num_tests;
26722677
struct bnxt_test_info *test_info;
26732678

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4899,21 +4899,24 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest,
48994899
bnxt_close_nic(bp, true, false);
49004900
bnxt_run_fw_tests(bp, test_mask, &test_results);
49014901

4902-
buf[BNXT_MACLPBK_TEST_IDX] = 1;
4903-
bnxt_hwrm_mac_loopback(bp, true);
4904-
msleep(250);
49054902
rc = bnxt_half_open_nic(bp);
49064903
if (rc) {
4907-
bnxt_hwrm_mac_loopback(bp, false);
49084904
etest->flags |= ETH_TEST_FL_FAILED;
49094905
return;
49104906
}
4907+
buf[BNXT_MACLPBK_TEST_IDX] = 1;
4908+
if (bp->mac_flags & BNXT_MAC_FL_NO_MAC_LPBK)
4909+
goto skip_mac_loopback;
4910+
4911+
bnxt_hwrm_mac_loopback(bp, true);
4912+
msleep(250);
49114913
if (bnxt_run_loopback(bp))
49124914
etest->flags |= ETH_TEST_FL_FAILED;
49134915
else
49144916
buf[BNXT_MACLPBK_TEST_IDX] = 0;
49154917

49164918
bnxt_hwrm_mac_loopback(bp, false);
4919+
skip_mac_loopback:
49174920
buf[BNXT_PHYLPBK_TEST_IDX] = 1;
49184921
if (bp->phy_flags & BNXT_PHY_FL_NO_PHY_LPBK)
49194922
goto skip_phy_loopback;

0 commit comments

Comments
 (0)