ionic bits and bytes
Subsystems (3)
v3 cover ionic bits and bytes
These are a few little updates to the ionic driver while we are in between other feature work. While these are mostly Fixes, they are almost all low priority and needn't be promoted to net. The one higher need is patch 1, but it is fixing something that hasn't made it out of net-next yet.
v3: allow decode of unknown transciever and use type
codes from sfp.h
v2: add Fixes tags to patches 1-4, and a little
description for patch 5
Shannon Nelson (5):
ionic: stop devlink warn on mgmt device
ionic: deinit rss only if selected
ionic: remove adminq napi instance
ionic: print data for unknown xcvr type
ionic: add decode for IONIC_RC_ENOSUPP
drivers/net/ethernet/pensando/ionic/ionic_devlink.c | 9 +++++++-- drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 13 +++++++++---- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +++- drivers/net/ethernet/pensando/ionic/ionic_main.c | 3 +++ 4 files changed, 22 insertions(+), 7 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/5 ionic: stop devlink warn on mgmt device
If we don't set a port type, the devlink code will eventually print a WARN in the kernel log. Because the mgmt device is not really a useful port, don't register it as a devlink port.
--- drivers/net/ethernet/pensando/ionic/ionic_devlink.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_devlink.c +7 -2
@@ -77,12 +77,16 @@ int ionic_devlink_register(struct ionic *ionic)return err; } +/* don't register the mgmt_nic as a port */ +if (ionic->is_mgmt_nic) +return 0 ; +devlink_port_attrs_set (&ionic->dl_port,DEVLINK_PORT_FLAVOUR_PHYSICAL ,0 , false,0 ,NULL ,0 ); err =devlink_port_register (dl, &ionic->dl_port,0 );if (err)dev_err (ionic->dev,"devlink_port_register failed: %d\n" , err); -else if (!ionic->is_mgmt_nic) +else devlink_port_type_eth_set (&ionic->dl_port, ionic->master_lif->netdev);
@@ -93,6 +97,7 @@ void ionic_devlink_unregister(struct ionic *ionic) {struct devlink *dl =priv_to_devlink (ionic); -devlink_port_unregister (&ionic->dl_port); +if (ionic->dl_port.registered) +devlink_port_unregister (&ionic->dl_port);devlink_unregister (dl); }
Signature · 1 line
2.17.1
PATCH v3 2/5 ionic: deinit rss only if selected
In reply to Shannon NelsonDon't bother de-initing RSS if it wasn't selected.
--- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +2 -1
@@ -2066,7 +2066,8 @@ static void ionic_lif_deinit(struct ionic_lif *lif)clear_bit (IONIC_LIF_F_INITED , lif->state);ionic_rx_filters_deinit (lif); -ionic_lif_rss_deinit (lif); +if (lif->netdev->features &NETIF_F_RXHASH ) +ionic_lif_rss_deinit (lif);napi_disable (&lif->adminqcq->napi);ionic_lif_qcq_deinit (lif, lif->notifyqcq);
Signature · 1 line
2.17.1
PATCH v3 3/5 ionic: remove adminq napi instance
In reply to Shannon NelsonRemove the adminq's napi struct when tearing down
the adminq.
--- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +1 -0
@@ -2070,6 +2070,7 @@ static void ionic_lif_deinit(struct ionic_lif *lif)ionic_lif_rss_deinit (lif);napi_disable (&lif->adminqcq->napi); +netif_napi_del (&lif->adminqcq->napi);ionic_lif_qcq_deinit (lif, lif->notifyqcq);ionic_lif_qcq_deinit (lif, lif->adminqcq);
Signature · 1 line
2.17.1
PATCH v3 4/5 ionic: print data for unknown xcvr type
In reply to Shannon NelsonIf we don't recognize the transceiver type, set the xcvr type and data length such that ethtool can at least print the first 256 bytes and the reader can figure out why the transceiver is not recognized.
While we're here, we can update the phy_id type values to use the enum values in sfp.h.
--- drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +9 -4
@@ -3,6 +3,7 @@#include <linux/module.h> #include <linux/netdevice.h> +#include <linux/sfp.h> #include "ionic.h" #include "ionic_bus.h"
@@ -677,23 +678,27 @@ static int ionic_get_module_info(struct net_device *netdev,struct ionic_lif *lif =netdev_priv (netdev);struct ionic_dev *idev = &lif->ionic->idev;struct ionic_xcvr_status *xcvr; +struct sfp_eeprom_base *sfp; xcvr = &idev->port_info->status.xcvr; + sfp = (struct sfp_eeprom_base *) xcvr->sprom;/* report the module data type and length */ -switch (xcvr->sprom[0 ]) { -case 0x03 :/* SFP */ +switch (sfp->phys_id) { +case SFF8024_ID_SFP : modinfo->type =ETH_MODULE_SFF_8079 ; modinfo->eeprom_len =ETH_MODULE_SFF_8079_LEN ;break ; -case 0x0D :/* QSFP */ -case 0x11 :/* QSFP28 */ +case SFF8024_ID_QSFP_8436_8636 : +case SFF8024_ID_QSFP28_8636 : modinfo->type =ETH_MODULE_SFF_8436 ; modinfo->eeprom_len =ETH_MODULE_SFF_8436_LEN ;break ;default :netdev_info (netdev,"unknown xcvr type 0x%02x\n" , xcvr->sprom[0 ]); + modinfo->type =0 ; + modinfo->eeprom_len =ETH_MODULE_SFF_8079_LEN ;break ; }
Signature · 1 line
2.17.1
PATCH v3 5/5 ionic: add decode for IONIC_RC_ENOSUPP
In reply to Shannon NelsonAdd decoding for a new firmware error code.
--- drivers/net/ethernet/pensando/ionic/ionic_main.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/pensando/ionic/ionic_main.c +3 -0
@@ -58,6 +58,8 @@ static const char *ionic_error_to_str(enum ionic_status_code code)return "IONIC_RC_BAD_ADDR" ;case IONIC_RC_DEV_CMD :return "IONIC_RC_DEV_CMD" ; +case IONIC_RC_ENOSUPP : +return "IONIC_RC_ENOSUPP" ;case IONIC_RC_ERROR :return "IONIC_RC_ERROR" ;case IONIC_RC_ERDMA :
@@ -76,6 +78,7 @@ static int ionic_error_to_errno(enum ionic_status_code code)case IONIC_RC_EQTYPE :case IONIC_RC_EQID :case IONIC_RC_EINVAL : +case IONIC_RC_ENOSUPP :return -EINVAL ;case IONIC_RC_EPERM :return -EPERM ;
Signature · 1 line
2.17.1
Quoted 9 lines · On Mon, 16 Mar 2020 20:22:05 -0700 Shannon Nelson wrote:
These are a few little updates to the ionic driver while we are in between other feature work. While these are mostly Fixes, they are almost all low priority and needn't be promoted to net. The one higher need is patch 1, but it is fixing something that hasn't made it out of net-next yet.
v3: allow decode of unknown transciever and use type
codes fromsfp.h
v2: add Fixes tags to patches 1-4, and a little
description for patch 5
David Miller
maintainerFrom: Shannon Nelson <[email protected]>
Date: Mon, 16 Mar 2020 20:22:05 -0700
Quoted 9 lines
These are a few little updates to the ionic driver while we are in between other feature work. While these are mostly Fixes, they are almost all low priority and needn't be promoted to net. The one higher need is patch 1, but it is fixing something that hasn't made it out of net-next yet.
v3: allow decode of unknown transciever and use type
codes fromsfp.h
v2: add Fixes tags to patches 1-4, and a little
description for patch 5
Series applied to net-next.