ionic: extend the QSFP module sprom for more pages

Some QSFP modules have more eeprom to be read by ethtool than
the initial high and low page 0 that is currently available
in the DSC's ionic sprom[] buffer.  Since the current sprom[]
is baked into the middle of an existing API struct, to make
the high end of page 1 and page 2 available a block is carved
from a reserved space of the existing port_info struct and the
ionic_get_module_eeprom() service is taught how to get there.

Newer firmware writes the additional QSFP page info here,
yet this remains backward compatible because older firmware
sets this space to all 0 and older ionic drivers do not use
the reserved space.

Reviewed-by: Brett Creeley <brett.creeley@amd.com>
Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250415231317.40616-2-shannon.nelson@amd.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
index a2d4336d276621022d3c3270992a8db6915e7ee3..66f172e28f8b6c51275170b98abcb10e71d75f3e 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c
@@ -968,10 +968,13 @@ static int ionic_get_module_info(struct net_device *netdev,
                break;
        case SFF8024_ID_QSFP_8436_8636:
        case SFF8024_ID_QSFP28_8636:
-       case SFF8024_ID_QSFP_PLUS_CMIS:
                modinfo->type = ETH_MODULE_SFF_8436;
                modinfo->eeprom_len = ETH_MODULE_SFF_8436_LEN;
                break;
+       case SFF8024_ID_QSFP_PLUS_CMIS:
+               modinfo->type = ETH_MODULE_SFF_8472;
+               modinfo->eeprom_len = ETH_MODULE_SFF_8472_LEN;
+               break;
        default:
                netdev_info(netdev, "unknown xcvr type 0x%02x\n",
                            xcvr->sprom[0]);
@@ -983,29 +986,20 @@ static int ionic_get_module_info(struct net_device *netdev,
        return 0;
 }
 
-static int ionic_get_module_eeprom(struct net_device *netdev,
-                                  struct ethtool_eeprom *ee,
-                                  u8 *data)
+static int ionic_do_module_copy(u8 *dst, u8 *src, u32 len)
 {
-       struct ionic_lif *lif = netdev_priv(netdev);
-       struct ionic_dev *idev = &lif->ionic->idev;
-       struct ionic_xcvr_status *xcvr;
-       char tbuf[sizeof(xcvr->sprom)];
+       char tbuf[sizeof_field(struct ionic_xcvr_status, sprom)];
        int count = 10;
-       u32 len;
 
        /* The NIC keeps the module prom up-to-date in the DMA space
         * so we can simply copy the module bytes into the data buffer.
         */
-       xcvr = &idev->port_info->status.xcvr;
-       len = min_t(u32, sizeof(xcvr->sprom), ee->len);
-
        do {
-               memcpy(data, &xcvr->sprom[ee->offset], len);
-               memcpy(tbuf, &xcvr->sprom[ee->offset], len);
+               memcpy(dst, src, len);
+               memcpy(tbuf, src, len);
 
                /* Let's make sure we got a consistent copy */
-               if (!memcmp(data, tbuf, len))
+               if (!memcmp(dst, tbuf, len))
                        break;
 
        } while (--count);
@@ -1016,6 +1010,48 @@ static int ionic_get_module_eeprom(struct net_device *netdev,
        return 0;
 }
 
+static int ionic_get_module_eeprom(struct net_device *netdev,
+                                  struct ethtool_eeprom *ee,
+                                  u8 *data)
+{
+       struct ionic_lif *lif = netdev_priv(netdev);
+       struct ionic_dev *idev = &lif->ionic->idev;
+       u32 start = ee->offset;
+       u32 err = -EINVAL;
+       u32 size = 0;
+       u8 *src;
+
+       if (start < ETH_MODULE_SFF_8079_LEN) {
+               if (start + ee->len > ETH_MODULE_SFF_8079_LEN)
+                       size = ETH_MODULE_SFF_8079_LEN - start;
+               else
+                       size = ee->len;
+
+               src = &idev->port_info->status.xcvr.sprom[start];
+               err = ionic_do_module_copy(data, src, size);
+               if (err)
+                       return err;
+
+               data += size;
+               start += size;
+       }
+
+       if (start >= ETH_MODULE_SFF_8079_LEN &&
+           start < ETH_MODULE_SFF_8472_LEN) {
+               size = ee->len - size;
+               if (start + size > ETH_MODULE_SFF_8472_LEN)
+                       size = ETH_MODULE_SFF_8472_LEN - start;
+
+               start -= ETH_MODULE_SFF_8079_LEN;
+               src = &idev->port_info->sprom_epage[start];
+               err = ionic_do_module_copy(data, src, size);
+               if (err)
+                       return err;
+       }
+
+       return err;
+}
+
 static int ionic_get_ts_info(struct net_device *netdev,
                             struct kernel_ethtool_ts_info *info)
 {

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_if.h b/drivers/net/ethernet/pensando/ionic/ionic_if.h
index 830c8adbfbee0e299322a0df9e14bbb5bedbf23e..4943ebb27ab3d968a9b87f3ad23d02e817f36421 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_if.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic_if.h
@@ -2839,6 +2839,7 @@ union ionic_port_identity {
  * @status:          Port status data
  * @stats:           Port statistics data
  * @mgmt_stats:      Port management statistics data
+ * @sprom_epage:     Extended Transceiver sprom, high page 1 and 2
  * @rsvd:            reserved byte(s)
  * @pb_stats:        uplink pb drop stats
  */
@@ -2849,8 +2850,10 @@ struct ionic_port_info {
                struct ionic_port_stats      stats;
                struct ionic_mgmt_port_stats mgmt_stats;
        };
-       /* room for pb_stats to start at 2k offset */
-       u8                          rsvd[760];
+       u8     sprom_epage[256];
+       u8     rsvd[504];
+
+       /* pb_stats must start at 2k offset */
        struct ionic_port_pb_stats  pb_stats;
 };