bnxt_en: add .get_module_eeprom_by_page() support

Add support for .get_module_eeprom_by_page() callback which
implements generic solution for module`s eeprom access.

v3: Add bnxt_get_module_status() to get a more specific extack error
    string.
    Return -EINVAL from bnxt_get_module_eeprom_by_page() when we
    don't want to fallback to old method.
v2: Simplification suggested by Ido Schimmel

Link: https://lore.kernel.org/netdev/YzVJ%2FvKJugoz15yV@shredder/
Signed-off-by: Vikas Gupta <vikas.gupta@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index b1b17f911300636983455eb11c6f50116c3c583b..91a1ba0a914d37a821966e0cab6151bdefc00c71 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -2116,6 +2116,7 @@ struct bnxt {
 #define BNXT_PHY_FL_NO_FCS             PORT_PHY_QCAPS_RESP_FLAGS_NO_FCS
 #define BNXT_PHY_FL_NO_PAUSE           (PORT_PHY_QCAPS_RESP_FLAGS2_PAUSE_UNSUPPORTED << 8)
 #define BNXT_PHY_FL_NO_PFC             (PORT_PHY_QCAPS_RESP_FLAGS2_PFC_UNSUPPORTED << 8)
+#define BNXT_PHY_FL_BANK_SEL           (PORT_PHY_QCAPS_RESP_FLAGS2_BANK_ADDR_SUPPORTED << 8)
 
        u8                      num_tests;
        struct bnxt_test_info   *test_info;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index f57e524c7e30b981a17697c875bb73e70038efd5..44b715c4e19ebbf4650284d3dd4645badaa831df 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -3146,8 +3146,9 @@ static int bnxt_get_eee(struct net_device *dev, struct ethtool_eee *edata)
 }
 
 static int bnxt_read_sfp_module_eeprom_info(struct bnxt *bp, u16 i2c_addr,
-                                           u16 page_number, u16 start_addr,
-                                           u16 data_length, u8 *buf)
+                                           u16 page_number, u8 bank,
+                                           u16 start_addr, u16 data_length,
+                                           u8 *buf)
 {
        struct hwrm_port_phy_i2c_read_output *output;
        struct hwrm_port_phy_i2c_read_input *req;
@@ -3168,8 +3169,13 @@ static int bnxt_read_sfp_module_eeprom_info(struct bnxt *bp, u16 i2c_addr,
                data_length -= xfer_size;
                req->page_offset = cpu_to_le16(start_addr + byte_offset);
                req->data_length = xfer_size;
-               req->enables = cpu_to_le32(start_addr + byte_offset ?
-                                PORT_PHY_I2C_READ_REQ_ENABLES_PAGE_OFFSET : 0);
+               req->enables =
+                       cpu_to_le32((start_addr + byte_offset ?
+                                    PORT_PHY_I2C_READ_REQ_ENABLES_PAGE_OFFSET :
+                                    0) |
+                                   (bank ?
+                                    PORT_PHY_I2C_READ_REQ_ENABLES_BANK_NUMBER :
+                                    0));
                rc = hwrm_req_send(bp, req);
                if (!rc)
                        memcpy(buf + byte_offset, output->data, xfer_size);
@@ -3199,7 +3205,7 @@ static int bnxt_get_module_info(struct net_device *dev,
        if (bp->hwrm_spec_code < 0x10202)
                return -EOPNOTSUPP;
 
-       rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0, 0,
+       rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0, 0, 0,
                                              SFF_DIAG_SUPPORT_OFFSET + 1,
                                              data);
        if (!rc) {
@@ -3244,7 +3250,7 @@ static int bnxt_get_module_eeprom(struct net_device *dev,
        if (start < ETH_MODULE_SFF_8436_LEN) {
                if (start + eeprom->len > ETH_MODULE_SFF_8436_LEN)
                        length = ETH_MODULE_SFF_8436_LEN - start;
-               rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0,
+               rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A0, 0, 0,
                                                      start, length, data);
                if (rc)
                        return rc;
@@ -3256,12 +3262,68 @@ static int bnxt_get_module_eeprom(struct net_device *dev,
        /* Read A2 portion of the EEPROM */
        if (length) {
                start -= ETH_MODULE_SFF_8436_LEN;
-               rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A2, 0,
+               rc = bnxt_read_sfp_module_eeprom_info(bp, I2C_DEV_ADDR_A2, 0, 0,
                                                      start, length, data);
        }
        return rc;
 }
 
+static int bnxt_get_module_status(struct bnxt *bp, struct netlink_ext_ack *extack)
+{
+       if (bp->link_info.module_status <=
+           PORT_PHY_QCFG_RESP_MODULE_STATUS_WARNINGMSG)
+               return 0;
+
+       switch (bp->link_info.module_status) {
+       case PORT_PHY_QCFG_RESP_MODULE_STATUS_PWRDOWN:
+               NL_SET_ERR_MSG_MOD(extack, "Transceiver module is powering down");
+               break;
+       case PORT_PHY_QCFG_RESP_MODULE_STATUS_NOTINSERTED:
+               NL_SET_ERR_MSG_MOD(extack, "Transceiver module not inserted");
+               break;
+       case PORT_PHY_QCFG_RESP_MODULE_STATUS_CURRENTFAULT:
+               NL_SET_ERR_MSG_MOD(extack, "Transceiver module disabled due to current fault");
+               break;
+       default:
+               NL_SET_ERR_MSG_MOD(extack, "Unknown error");
+               break;
+       }
+       return -EINVAL;
+}
+
+static int bnxt_get_module_eeprom_by_page(struct net_device *dev,
+                                         const struct ethtool_module_eeprom *page_data,
+                                         struct netlink_ext_ack *extack)
+{
+       struct bnxt *bp = netdev_priv(dev);
+       int rc;
+
+       rc = bnxt_get_module_status(bp, extack);
+       if (rc)
+               return rc;
+
+       if (bp->hwrm_spec_code < 0x10202) {
+               NL_SET_ERR_MSG_MOD(extack, "Firmware version too old");
+               return -EINVAL;
+       }
+
+       if (page_data->bank && !(bp->phy_flags & BNXT_PHY_FL_BANK_SEL)) {
+               NL_SET_ERR_MSG_MOD(extack, "Firmware not capable for bank selection");
+               return -EINVAL;
+       }
+
+       rc = bnxt_read_sfp_module_eeprom_info(bp, page_data->i2c_address << 1,
+                                             page_data->page, page_data->bank,
+                                             page_data->offset,
+                                             page_data->length,
+                                             page_data->data);
+       if (rc) {
+               NL_SET_ERR_MSG_MOD(extack, "Module`s eeprom read failed");
+               return rc;
+       }
+       return page_data->length;
+}
+
 static int bnxt_nway_reset(struct net_device *dev)
 {
        int rc = 0;
@@ -4071,6 +4133,7 @@ const struct ethtool_ops bnxt_ethtool_ops = {
        .set_eee                = bnxt_set_eee,
        .get_module_info        = bnxt_get_module_info,
        .get_module_eeprom      = bnxt_get_module_eeprom,
+       .get_module_eeprom_by_page = bnxt_get_module_eeprom_by_page,
        .nway_reset             = bnxt_nway_reset,
        .set_phys_id            = bnxt_set_phys_id,
        .self_test              = bnxt_self_test,