ionic updates
Subsystems (3)
cover ionic updates
This is a set of small updates for the Pensando ionic driver, some from internal work, some a result of mailing list discussions.
Shannon Nelson (8):
ionic: keep ionic dev on lif init fail
ionic: remove pragma packed
ionic: improve irq numa locality
ionic: clean up bitflag usage
ionic: support ethtool rxhash disable
ionic: print pci bus lane info
ionic: add support for device id 0x1004
ionic: drop ethtool driver version
drivers/net/ethernet/pensando/ionic/ionic.h | 2 +- .../ethernet/pensando/ionic/ionic_bus_pci.c | 10 +++++ .../ethernet/pensando/ionic/ionic_ethtool.c | 25 +++++------ .../net/ethernet/pensando/ionic/ionic_if.h | 38 ++++++++-------- .../net/ethernet/pensando/ionic/ionic_lif.c | 43 ++++++++++++------- .../net/ethernet/pensando/ionic/ionic_lif.h | 15 +++---- .../net/ethernet/pensando/ionic/ionic_main.c | 7 ++- .../net/ethernet/pensando/ionic/ionic_stats.c | 20 ++++----- .../net/ethernet/pensando/ionic/ionic_txrx.c | 4 +- 9 files changed, 87 insertions(+), 77 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/8 ionic: keep ionic dev on lif init fail
If the basic ionic interface works but the lif creation fails, don't fail the probe. This will allow us to use the driver to help inspect the hw/fw/pci interface for debugging purposes.
--- drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 8 ++++++++ drivers/net/ethernet/pensando/ionic/ionic_lif.c | 3 +++ 2 files changed, 11 insertions(+)
drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c +8 -0
@@ -37,6 +37,9 @@ int ionic_bus_alloc_irq_vectors(struct ionic *ionic, unsigned int nintrs)void ionic_bus_free_irq_vectors (struct ionic *ionic) { +if (!ionic->nintrs) +return ; +pci_free_irq_vectors (ionic->pdev); }
@@ -346,6 +349,11 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)ionic_reset (ionic); err_out_teardown:ionic_dev_teardown (ionic); +/* Don't fail the probe for these errors, keep +* the hw interface around for inspection +*/ +return 0 ; + err_out_unmap_bars:ionic_unmap_bars (ionic);pci_release_regions (pdev);
drivers/net/ethernet/pensando/ionic/ionic_lif.c +3 -0
@@ -2408,6 +2408,9 @@ void ionic_lifs_unregister(struct ionic *ionic)* current model, so don't bother searching the * ionic->lif for candidates to unregister */ +if (!ionic->master_lif) +return ; +cancel_work_sync (&ionic->master_lif->deferred.work);cancel_work_sync (&ionic->master_lif->tx_timeout_work);if (ionic->master_lif->netdev->reg_state ==NETREG_REGISTERED )
Signature · 1 line
2.17.1
PATCH 2/8 ionic: remove pragma packed
In reply to Shannon NelsonReplace the misguided "#pragma packed" with tags on each struct/union definition that actually needs it. This is safer and more efficient on the various compilers and architectures.
--- .../net/ethernet/pensando/ionic/ionic_if.h | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_if.h +17 -21
@@ -4,8 +4,6 @@#ifndef _IONIC_IF_H_#define _IONIC_IF_H_ -#pragma pack(push, 1) -#define IONIC_DEV_INFO_SIGNATURE 0x44455649/* 'DEVI' */ #define IONIC_DEV_INFO_VERSION 1#define IONIC_IFNAMSIZ 16
@@ -366,7 +364,7 @@ union ionic_lif_config {u8 rsvd2[2 ];__le64 features;__le32 queue_count[IONIC_QTYPE_MAX ]; - }; + } __attribute__((packed));__le32 words[64 ]; };
@@ -417,7 +415,7 @@ union ionic_lif_identity {__le32 max_frame_size;u8 rsvd2[106 ];union ionic_lif_config config; - } eth; + } __attribute__((packed)) eth;struct {u8 version;
@@ -439,8 +437,8 @@ union ionic_lif_identity {struct ionic_lif_logical_qtype rq_qtype;struct ionic_lif_logical_qtype cq_qtype;struct ionic_lif_logical_qtype eq_qtype; - } rdma; - }; + } __attribute((packed)) rdma; + } __attribute((packed));__le32 words[512 ]; };
@@ -526,7 +524,7 @@ struct ionic_q_init_cmd {__le64 sg_ring_base;__le32 eq_index;u8 rsvd2[16 ]; -}; +} __attribute__((packed));/** * struct ionic_q_init_comp - Queue init command completion
@@ -1095,7 +1093,7 @@ struct ionic_port_status {u8 status;u8 rsvd[51 ];struct ionic_xcvr_status xcvr; -}; +} __attribute((packed));/** * struct ionic_port_identify_cmd - Port identify command
@@ -1251,7 +1249,7 @@ struct ionic_port_getattr_comp {u8 pause_type;u8 loopback_mode;u8 rsvd2[11 ]; - }; + } __attribute__((packed));u8 color; };
@@ -1319,7 +1317,7 @@ struct ionic_dev_setattr_cmd {char name[IONIC_IFNAMSIZ ];__le64 features;u8 rsvd2[60 ]; - }; + } __attribute__((packed)); };/**
@@ -1334,7 +1332,7 @@ struct ionic_dev_setattr_comp {union {__le64 features;u8 rsvd2[11 ]; - }; + } __attribute__((packed));u8 color; };
@@ -1361,7 +1359,7 @@ struct ionic_dev_getattr_comp {union {__le64 features;u8 rsvd2[11 ]; - }; + } __attribute__((packed));u8 color; };
@@ -1426,7 +1424,7 @@ struct ionic_lif_setattr_cmd { } rss;u8 stats_ctl;u8 rsvd[60 ]; - }; + } __attribute__((packed)); };/**
@@ -1444,7 +1442,7 @@ struct ionic_lif_setattr_comp {union {__le64 features;u8 rsvd2[11 ]; - }; + } __attribute__((packed));u8 color; };
@@ -1483,7 +1481,7 @@ struct ionic_lif_getattr_comp {u8 mac[6 ];__le64 features;u8 rsvd2[11 ]; - }; + } __attribute__((packed));u8 color; };
@@ -1688,7 +1686,7 @@ struct ionic_vf_setattr_cmd {u8 linkstate;__le64 stats_pa;u8 pad[60 ]; - }; + } __attribute__((packed)); };struct ionic_vf_setattr_comp {
@@ -1726,7 +1724,7 @@ struct ionic_vf_getattr_comp {u8 linkstate;__le64 stats_pa;u8 pad[11 ]; - }; + } __attribute__((packed));u8 color; };
@@ -2471,7 +2469,7 @@ union ionic_dev_cmd_regs {union ionic_dev_cmd_comp comp;u8 rsvd[48 ];u32 data[478 ]; - }; + } __attribute__((packed));u32 words[512 ]; };
@@ -2484,7 +2482,7 @@ union ionic_dev_regs {struct {union ionic_dev_info_regs info;union ionic_dev_cmd_regs devcmd; - }; + } __attribute__((packed));__le32 words[1024 ]; };
@@ -2574,6 +2572,4 @@ struct ionic_identity { union ionic_qos_identity qos; }; -#pragma pack(pop) -#endif /* _IONIC_IF_H_ */
Signature · 1 line
2.17.1
PATCH 3/8 ionic: improve irq numa locality
In reply to Shannon NelsonSpreading the interrupts across the CPU cores is good for load balancing, but not necessarily as good when using a CPU/core that is not part of the NUMA local CPU. If it can be localized, the kernel's cpumask_local_spread() service will pick a core that is on the node close to the PCI device.
--- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +3 -2
@@ -424,8 +424,9 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type,ionic_intr_mask_assert (idev->intr_ctrl, new->intr.index,IONIC_INTR_MASK_SET ); - new->intr.cpu = new->intr.index %num_online_cpus (); -if (cpu_online (new->intr.cpu)) + new->intr.cpu =cpumask_local_spread (new->intr.index, +dev_to_node (dev)); +if (new->intr.cpu !=-1 )cpumask_set_cpu (new->intr.cpu, &new->intr.affinity_mask); }else {
Signature · 1 line
2.17.1
PATCH 4/8 ionic: clean up bitflag usage
In reply to Shannon NelsonRemove the unused flags field and and fix the bitflag names to include the _F_ flag hint.
--- .../ethernet/pensando/ionic/ionic_ethtool.c | 24 ++++++++----------- .../net/ethernet/pensando/ionic/ionic_lif.c | 24 +++++++++---------- .../net/ethernet/pensando/ionic/ionic_lif.h | 15 ++++++------ .../net/ethernet/pensando/ionic/ionic_stats.c | 20 ++++++++-------- .../net/ethernet/pensando/ionic/ionic_txrx.c | 4 ++-- 5 files changed, 41 insertions(+), 46 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +10 -14
@@ -462,7 +462,7 @@ static int ionic_set_coalesce(struct net_device *netdev,if (coal != lif->rx_coalesce_hw) { lif->rx_coalesce_hw = coal; -if (test_bit (IONIC_LIF_UP , lif->state)) { +if (test_bit (IONIC_LIF_F_UP , lif->state)) {for (i =0 ; i < lif->nxqs; i++) { qcq = lif->rxqcqs[i].qcq; ionic_intr_coal_init(lif->ionic->idev.intr_ctrl,
@@ -509,11 +509,11 @@ static int ionic_set_ringparam(struct net_device *netdev, ring->rx_pending == lif->nrxq_descs)return 0 ; - err =ionic_wait_for_bit (lif,IONIC_LIF_QUEUE_RESET ); + err =ionic_wait_for_bit (lif,IONIC_LIF_F_QUEUE_RESET );if (err)return err; - running =test_bit (IONIC_LIF_UP , lif->state); + running =test_bit (IONIC_LIF_F_UP , lif->state);if (running)ionic_stop (netdev);
@@ -522,7 +522,7 @@ static int ionic_set_ringparam(struct net_device *netdev,if (running)ionic_open (netdev); -clear_bit (IONIC_LIF_QUEUE_RESET , lif->state); +clear_bit (IONIC_LIF_F_QUEUE_RESET , lif->state);return 0 ; }
@@ -553,11 +553,11 @@ static int ionic_set_channels(struct net_device *netdev,if (ch->combined_count == lif->nxqs)return 0 ; - err =ionic_wait_for_bit (lif,IONIC_LIF_QUEUE_RESET ); + err =ionic_wait_for_bit (lif,IONIC_LIF_F_QUEUE_RESET );if (err)return err; - running =test_bit (IONIC_LIF_UP , lif->state); + running =test_bit (IONIC_LIF_F_UP , lif->state);if (running)ionic_stop (netdev);
@@ -565,7 +565,7 @@ static int ionic_set_channels(struct net_device *netdev,if (running)ionic_open (netdev); -clear_bit (IONIC_LIF_QUEUE_RESET , lif->state); +clear_bit (IONIC_LIF_F_QUEUE_RESET , lif->state);return 0 ; }
@@ -575,7 +575,7 @@ static u32 ionic_get_priv_flags(struct net_device *netdev)struct ionic_lif *lif =netdev_priv (netdev);u32 priv_flags =0 ; -if (test_bit (IONIC_LIF_SW_DEBUG_STATS , lif->state)) +if (test_bit (IONIC_LIF_F_SW_DEBUG_STATS , lif->state)) priv_flags |=PRIV_F_SW_DBG_STATS ;return priv_flags;
@@ -584,14 +584,10 @@ static u32 ionic_get_priv_flags(struct net_device *netdev)static int ionic_set_priv_flags (struct net_device *netdev,u32 priv_flags) {struct ionic_lif *lif =netdev_priv (netdev); -u32 flags = lif->flags; -clear_bit (IONIC_LIF_SW_DEBUG_STATS , lif->state); +clear_bit (IONIC_LIF_F_SW_DEBUG_STATS , lif->state);if (priv_flags &PRIV_F_SW_DBG_STATS ) -set_bit (IONIC_LIF_SW_DEBUG_STATS , lif->state); - -if (flags != lif->flags) - lif->flags = flags; +set_bit (IONIC_LIF_F_SW_DEBUG_STATS , lif->state);return 0 ; }
drivers/net/ethernet/pensando/ionic/ionic_lif.c +12 -12
@@ -84,7 +84,7 @@ static void ionic_link_status_check(struct ionic_lif *lif)netdev_info (netdev,"Link up - %d Gbps\n" ,le32_to_cpu (lif->info->status.link_speed) /1000 ); -if (test_bit (IONIC_LIF_UP , lif->state)) { +if (test_bit (IONIC_LIF_F_UP , lif->state)) {netif_tx_wake_all_queues (lif->netdev);netif_carrier_on (netdev); }
@@ -93,12 +93,12 @@ static void ionic_link_status_check(struct ionic_lif *lif)/* carrier off first to avoid watchdog timeout */ netif_carrier_off (netdev); -if (test_bit (IONIC_LIF_UP , lif->state)) +if (test_bit (IONIC_LIF_F_UP , lif->state))netif_tx_stop_all_queues (netdev); } link_out: -clear_bit (IONIC_LIF_LINK_CHECK_REQUESTED , lif->state); +clear_bit (IONIC_LIF_F_LINK_CHECK_REQUESTED , lif->state); }static void ionic_link_status_check_request (struct ionic_lif *lif)
@@ -106,7 +106,7 @@ static void ionic_link_status_check_request(struct ionic_lif *lif)struct ionic_deferred_work *work;/* we only need one request outstanding at a time */ -if (test_and_set_bit (IONIC_LIF_LINK_CHECK_REQUESTED , lif->state)) +if (test_and_set_bit (IONIC_LIF_F_LINK_CHECK_REQUESTED , lif->state))return ;if (in_interrupt ()) {
@@ -1579,7 +1579,7 @@ int ionic_open(struct net_device *netdev)netif_set_real_num_tx_queues (netdev, lif->nxqs);netif_set_real_num_rx_queues (netdev, lif->nxqs); -set_bit (IONIC_LIF_UP , lif->state); +set_bit (IONIC_LIF_F_UP , lif->state);ionic_link_status_check_request (lif);if (netif_carrier_ok (netdev))
@@ -1599,13 +1599,13 @@ int ionic_stop(struct net_device *netdev)struct ionic_lif *lif =netdev_priv (netdev);int err =0 ; -if (!test_bit (IONIC_LIF_UP , lif->state)) { +if (!test_bit (IONIC_LIF_F_UP , lif->state)) {dev_dbg (lif->ionic->dev,"%s: %s state=DOWN\n" , __func__, lif->name);return 0 ; }dev_dbg (lif->ionic->dev,"%s: %s state=UP\n" , __func__, lif->name); -clear_bit (IONIC_LIF_UP , lif->state); +clear_bit (IONIC_LIF_F_UP , lif->state);/* carrier off before disabling queues to avoid watchdog timeout */ netif_carrier_off (netdev);
@@ -1872,7 +1872,7 @@ int ionic_reset_queues(struct ionic_lif *lif)/* Put off the next watchdog timeout */ netif_trans_update (lif->netdev); - err =ionic_wait_for_bit (lif,IONIC_LIF_QUEUE_RESET ); + err =ionic_wait_for_bit (lif,IONIC_LIF_F_QUEUE_RESET );if (err)return err;
@@ -1882,7 +1882,7 @@ int ionic_reset_queues(struct ionic_lif *lif)if (!err && running)ionic_open (lif->netdev); -clear_bit (IONIC_LIF_QUEUE_RESET , lif->state); +clear_bit (IONIC_LIF_F_QUEUE_RESET , lif->state);return err; }
@@ -2049,10 +2049,10 @@ void ionic_lifs_free(struct ionic *ionic)static void ionic_lif_deinit (struct ionic_lif *lif) { -if (!test_bit (IONIC_LIF_INITED , lif->state)) +if (!test_bit (IONIC_LIF_F_INITED , lif->state))return ; -clear_bit (IONIC_LIF_INITED , lif->state); +clear_bit (IONIC_LIF_F_INITED , lif->state);ionic_rx_filters_deinit (lif);ionic_lif_rss_deinit (lif);
@@ -2288,7 +2288,7 @@ static int ionic_lif_init(struct ionic_lif *lif) lif->rx_copybreak =IONIC_RX_COPYBREAK_DEFAULT ; -set_bit (IONIC_LIF_INITED , lif->state); +set_bit (IONIC_LIF_F_INITED , lif->state);INIT_WORK (&lif->tx_timeout_work, ionic_tx_timeout_work);
drivers/net/ethernet/pensando/ionic/ionic_lif.h +7 -8
@@ -121,14 +121,14 @@ struct ionic_lif_sw_stats { };enum ionic_lif_state_flags { -IONIC_LIF_INITED , -IONIC_LIF_SW_DEBUG_STATS , -IONIC_LIF_UP , -IONIC_LIF_LINK_CHECK_REQUESTED , -IONIC_LIF_QUEUE_RESET , +IONIC_LIF_F_INITED , +IONIC_LIF_F_SW_DEBUG_STATS , +IONIC_LIF_F_UP , +IONIC_LIF_F_LINK_CHECK_REQUESTED , +IONIC_LIF_F_QUEUE_RESET ,/* leave this as last */ -IONIC_LIF_STATE_SIZE +IONIC_LIF_F_STATE_SIZE };#define IONIC_LIF_NAME_MAX_SZ 32
@@ -136,7 +136,7 @@ struct ionic_lif {char name[IONIC_LIF_NAME_MAX_SZ ];struct list_head list;struct net_device *netdev; -DECLARE_BITMAP (state,IONIC_LIF_STATE_SIZE ); +DECLARE_BITMAP (state,IONIC_LIF_F_STATE_SIZE );struct ionic *ionic;bool registered;unsigned int index;
@@ -179,7 +179,6 @@ struct ionic_lif {u32 rx_coalesce_usecs;/* what the user asked for */ u32 rx_coalesce_hw;/* what the hw is using */ -u32 flags;struct work_struct tx_timeout_work; };
drivers/net/ethernet/pensando/ionic/ionic_stats.c +10 -10
@@ -118,8 +118,8 @@ static u64 ionic_sw_stats_get_count(struct ionic_lif *lif)/* rx stats */ total +=MAX_Q (lif) *IONIC_NUM_RX_STATS ; -if (test_bit (IONIC_LIF_UP , lif->state) && -test_bit (IONIC_LIF_SW_DEBUG_STATS , lif->state)) { +if (test_bit (IONIC_LIF_F_UP , lif->state) && +test_bit (IONIC_LIF_F_SW_DEBUG_STATS , lif->state)) {/* tx debug stats */ total += MAX_Q(lif) * (IONIC_NUM_DBG_CQ_STATS + IONIC_NUM_TX_Q_STATS +
@@ -151,8 +151,8 @@ static void ionic_sw_stats_get_strings(struct ionic_lif *lif, u8 **buf) *buf +=ETH_GSTRING_LEN ; } -if (test_bit (IONIC_LIF_UP , lif->state) && -test_bit (IONIC_LIF_SW_DEBUG_STATS , lif->state)) { +if (test_bit (IONIC_LIF_F_UP , lif->state) && +test_bit (IONIC_LIF_F_SW_DEBUG_STATS , lif->state)) {for (i =0 ; i <IONIC_NUM_TX_Q_STATS ; i++) { snprintf(*buf, ETH_GSTRING_LEN, "txq_%d_%s",
@@ -190,8 +190,8 @@ static void ionic_sw_stats_get_strings(struct ionic_lif *lif, u8 **buf) *buf +=ETH_GSTRING_LEN ; } -if (test_bit (IONIC_LIF_UP , lif->state) && -test_bit (IONIC_LIF_SW_DEBUG_STATS , lif->state)) { +if (test_bit (IONIC_LIF_F_UP , lif->state) && +test_bit (IONIC_LIF_F_SW_DEBUG_STATS , lif->state)) {for (i =0 ; i <IONIC_NUM_DBG_CQ_STATS ; i++) { snprintf(*buf, ETH_GSTRING_LEN, "rxq_%d_cq_%s",
@@ -247,8 +247,8 @@ static void ionic_sw_stats_get_values(struct ionic_lif *lif, u64 **buf) (*buf)++; } -if (test_bit (IONIC_LIF_UP , lif->state) && -test_bit (IONIC_LIF_SW_DEBUG_STATS , lif->state)) { +if (test_bit (IONIC_LIF_F_UP , lif->state) && +test_bit (IONIC_LIF_F_SW_DEBUG_STATS , lif->state)) { txqcq =lif_to_txqcq (lif, q_num);for (i =0 ; i <IONIC_NUM_TX_Q_STATS ; i++) { **buf = IONIC_READ_STAT64(&txqcq->q,
@@ -281,8 +281,8 @@ static void ionic_sw_stats_get_values(struct ionic_lif *lif, u64 **buf) (*buf)++; } -if (test_bit (IONIC_LIF_UP , lif->state) && -test_bit (IONIC_LIF_SW_DEBUG_STATS , lif->state)) { +if (test_bit (IONIC_LIF_F_UP , lif->state) && +test_bit (IONIC_LIF_F_SW_DEBUG_STATS , lif->state)) { rxqcq =lif_to_rxqcq (lif, q_num);for (i =0 ; i <IONIC_NUM_DBG_CQ_STATS ; i++) { **buf = IONIC_READ_STAT64(&rxqcq->cq,
drivers/net/ethernet/pensando/ionic/ionic_txrx.c +2 -2
@@ -158,7 +158,7 @@ static void ionic_rx_clean(struct ionic_queue *q, struct ionic_desc_info *desc_i }/* no packet processing while resetting */ -if (unlikely (test_bit (IONIC_LIF_QUEUE_RESET , q->lif->state))) { +if (unlikely (test_bit (IONIC_LIF_F_QUEUE_RESET , q->lif->state))) { stats->dropped++;return ; }
@@ -1026,7 +1026,7 @@ netdev_tx_t ionic_start_xmit(struct sk_buff *skb, struct net_device *netdev)int ndescs;int err; -if (unlikely (!test_bit (IONIC_LIF_UP , lif->state))) { +if (unlikely (!test_bit (IONIC_LIF_F_UP , lif->state))) {dev_kfree_skb (skb);return NETDEV_TX_OK ; }
Signature · 1 line
2.17.1
PATCH 5/8 ionic: support ethtool rxhash disable
In reply to Shannon NelsonWe can disable rxhashing by setting rss_types to 0. The user can toggle this with "ethtool -K <ethX> rxhash off|on", which calls into the .ndo_set_features callback with the NETIF_F_RXHASH feature bit set or cleared. This patch adds a check for that bit and updates the FW if necessary.
--- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +9 -2
@@ -1094,6 +1094,7 @@ static int ionic_set_nic_features(struct ionic_lif *lif,u64 vlan_flags =IONIC_ETH_HW_VLAN_TX_TAG |IONIC_ETH_HW_VLAN_RX_STRIP |IONIC_ETH_HW_VLAN_RX_FILTER ; +u64 old_hw_features;int err; ctx.cmd.lif_setattr.features =ionic_netdev_features_to_nic (features);
@@ -1101,9 +1102,13 @@ static int ionic_set_nic_features(struct ionic_lif *lif,if (err)return err; + old_hw_features = lif->hw_features; lif->hw_features =le64_to_cpu (ctx.cmd.lif_setattr.features & ctx.comp.lif_setattr.features); +if ((old_hw_features ^ lif->hw_features) &IONIC_ETH_HW_RX_HASH ) +ionic_lif_rss_config (lif, lif->rss_types,NULL ,NULL ); +if ((vlan_flags & features) && !(vlan_flags &le64_to_cpu (ctx.comp.lif_setattr.features)))dev_info_once (lif->ionic->dev,"NIC is not supporting vlan offload, likely in SmartNIC mode\n" );
@@ -1357,13 +1362,15 @@ int ionic_lif_rss_config(struct ionic_lif *lif, const u16 types, .cmd.lif_setattr = { .opcode = IONIC_CMD_LIF_SETATTR, .attr = IONIC_LIF_ATTR_RSS, - .rss.types = cpu_to_le16(types), .rss.addr = cpu_to_le64(lif->rss_ind_tbl_pa), }, };unsigned int i, tbl_sz; - lif->rss_types = types; +if (lif->hw_features &IONIC_ETH_HW_RX_HASH ) { + lif->rss_types = types; + ctx.cmd.lif_setattr.rss.types =cpu_to_le16 (types); + }if (key)memcpy (lif->rss_hash_key, key,IONIC_RSS_HASH_KEY_SIZE );
Signature · 1 line
2.17.1
PATCH 6/8 ionic: print pci bus lane info
In reply to Shannon NelsonPrint the PCI bus lane information so people can keep an eye out for poor configurations that might not support the advertised speed.
--- drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c +1 -0
@@ -248,6 +248,7 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) }pci_set_master (pdev); +pcie_print_link_status (pdev); err =ionic_map_bars (ionic);if (err)
Signature · 1 line
2.17.1
PATCH 7/8 ionic: add support for device id 0x1004
In reply to Shannon NelsonAdd support for an additional device id.
--- drivers/net/ethernet/pensando/ionic/ionic.h | 1 + drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 1 + 2 files changed, 2 insertions(+)
drivers/net/ethernet/pensando/ionic/ionic.h +1 -0
@@ -18,6 +18,7 @@ struct ionic_lif;#define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_PF 0x1002#define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF 0x1003 +#define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_MGMT 0x1004#define DEVCMD_TIMEOUT 10
drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c +1 -0
@@ -15,6 +15,7 @@static const struct pci_device_id ionic_id_table[] = { {PCI_VDEVICE (PENSANDO ,PCI_DEVICE_ID_PENSANDO_IONIC_ETH_PF ) }, {PCI_VDEVICE (PENSANDO ,PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF ) }, + {PCI_VDEVICE (PENSANDO ,PCI_DEVICE_ID_PENSANDO_IONIC_ETH_MGMT ) }, {0 , }/* end of table */ };MODULE_DEVICE_TABLE (pci, ionic_id_table);
Signature · 1 line
2.17.1
PATCH 8/8 ionic: drop ethtool driver version
In reply to Shannon NelsonUse the default kernel version in ethtool drv_info output and drop the module version.
--- drivers/net/ethernet/pensando/ionic/ionic.h | 1 - drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 1 - drivers/net/ethernet/pensando/ionic/ionic_main.c | 7 +++---- 3 files changed, 3 insertions(+), 6 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic.h +0 -1
@@ -12,7 +12,6 @@ struct ionic_lif;#define IONIC_DRV_NAME "ionic"#define IONIC_DRV_DESCRIPTION "Pensando Ethernet NIC Driver" -#define IONIC_DRV_VERSION "0.20.0-k"#define PCI_VENDOR_ID_PENSANDO 0x1dd8
drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +0 -1
@@ -86,7 +86,6 @@ static void ionic_get_drvinfo(struct net_device *netdev,struct ionic *ionic = lif->ionic;strlcpy (drvinfo->driver,IONIC_DRV_NAME ,sizeof (drvinfo->driver)); -strlcpy (drvinfo->version,IONIC_DRV_VERSION ,sizeof (drvinfo->version));strlcpy (drvinfo->fw_version, ionic->idev.dev_info.fw_version,sizeof (drvinfo->fw_version)); strlcpy(drvinfo->bus_info, ionic_bus_info(ionic),
drivers/net/ethernet/pensando/ionic/ionic_main.c +3 -4
@@ -6,6 +6,7 @@#include <linux/module.h> #include <linux/netdevice.h> #include <linux/utsname.h> +#include <linux/vermagic.h> #include "ionic.h" #include "ionic_bus.h"
@@ -15,7 +16,6 @@MODULE_DESCRIPTION (IONIC_DRV_DESCRIPTION );MODULE_AUTHOR ("Pensando Systems, Inc" );MODULE_LICENSE ("GPL" ); -MODULE_VERSION (IONIC_DRV_VERSION );static const char *ionic_error_to_str (enum ionic_status_code code) {
@@ -414,7 +414,7 @@ int ionic_identify(struct ionic *ionic)memset (ident,0 ,sizeof (*ident)); ident->drv.os_type =cpu_to_le32 (IONIC_OS_TYPE_LINUX ); -strncpy (ident->drv.driver_ver_str,IONIC_DRV_VERSION , +strncpy (ident->drv.driver_ver_str,UTS_RELEASE ,sizeof (ident->drv.driver_ver_str) -1 );mutex_lock (&ionic->dev_cmd_lock);
@@ -558,8 +558,7 @@ int ionic_port_reset(struct ionic *ionic)static int __init ionic_init_module (void ) { -pr_info ("%s %s, ver %s\n" , -IONIC_DRV_NAME ,IONIC_DRV_DESCRIPTION ,IONIC_DRV_VERSION ); +pr_info ("%s %s\n" ,IONIC_DRV_NAME ,IONIC_DRV_DESCRIPTION );ionic_debugfs_create ();return ionic_bus_register_driver (); }
Signature · 1 line
2.17.1
Re: [PATCH net-next 8/8] ionic: drop ethtool driver version
Quoted 56 lines · Shannon Nelson
Use the default kernel version in ethtool
drv_infooutput and drop the module version.Cc Leon Romanovsky <[email protected]>Signed-off-by Shannon Nelson <[email protected]>--- drivers/net/ethernet/pensando/ionic/ionic.h | 1 - drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 1 - drivers/net/ethernet/pensando/ionic/ionic_main.c | 7 +++---- 3 files changed, 3 insertions(+), 6 deletions(-)drivers/net/ethernet/pensando/ionic/ionic.h +0
-1@@ -12,7 +12,6 @@ struct ionic_lif;#define IONIC_DRV_NAME "ionic"#define IONIC_DRV_DESCRIPTION "Pensando Ethernet NIC Driver" -#define IONIC_DRV_VERSION "0.20.0-k"#define PCI_VENDOR_ID_PENSANDO 0x1dd8drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +0
-1@@ -86,7 +86,6 @@ static void ionic_get_drvinfo(struct net_device *netdev,struct ionic *ionic = lif->ionic;strlcpy (drvinfo->driver,IONIC_DRV_NAME ,sizeof (drvinfo->driver)); -strlcpy (drvinfo->version,IONIC_DRV_VERSION ,sizeof (drvinfo->version));strlcpy (drvinfo->fw_version, ionic->idev.dev_info.fw_version,sizeof (drvinfo->fw_version)); strlcpy(drvinfo->bus_info, ionic_bus_info(ionic),drivers/net/ethernet/pensando/ionic/ionic_main.c +1
-1@@ -6,6 +6,7 @@#include <linux/module.h> #include <linux/netdevice.h> #include <linux/utsname.h> +#include <linux/vermagic.h> #include "ionic.h" #include "ionic_bus.h" @@ -15,7 +16,6 @@MODULE_DESCRIPTION (IONIC_DRV_DESCRIPTION );MODULE_AUTHOR ("Pensando Systems, Inc" );MODULE_LICENSE ("GPL" ); -MODULE_VERSION (IONIC_DRV_VERSION );static const char *ionic_error_to_str (enum ionic_status_code code) {
drivers/net/ethernet/pensando/ionic/ionic_main.c int ionic_identify(struct ionic *ionic) · line 418
Quoted 6 lines
drivers/net/ethernet/pensando/ionic/ionic_main.c +1
-1@@ -414,7 +414,7 @@ int ionic_identify(struct ionic *ionic)memset (ident,0 ,sizeof (*ident)); ident->drv.os_type =cpu_to_le32 (IONIC_OS_TYPE_LINUX ); -strncpy (ident->drv.driver_ver_str,IONIC_DRV_VERSION , +strncpy (ident->drv.driver_ver_str,UTS_RELEASE ,sizeof (ident->drv.driver_ver_str) -1 );
Strange, I see that you are issuing command IONIC_CMD_IDENTIFY with this data, doesn't the other side expect specific format? Can I send any string here? and what will be result?
drivers/net/ethernet/pensando/ionic/ionic_main.c int ionic_port_reset(struct ionic *ionic) · line 561
Quoted 9 lines
drivers/net/ethernet/pensando/ionic/ionic_main.c +1
-2mutex_lock (&ionic->dev_cmd_lock);@@ -558,8 +558,7 @@ int ionic_port_reset(struct ionic *ionic)static int __init ionic_init_module (void ) { -pr_info ("%s %s, ver %s\n" , -IONIC_DRV_NAME ,IONIC_DRV_DESCRIPTION ,IONIC_DRV_VERSION ); +pr_info ("%s %s\n" ,IONIC_DRV_NAME ,IONIC_DRV_DESCRIPTION );
While cleaning from driver versions, we are removing such code too. It is done for three reasons:
1. In case of success, there is no need in dmesg to know about the fact that driver is going to be up.
2. In case of failure, there will/should be error prints.
3. There are so many options to know about execution of every function and module init/exit that extra print is definitely useless.
Thanks
Quoted 6 lines
drivers/net/ethernet/pensando/ionic/ionic_main.c +0
-1ionic_debugfs_create ();return ionic_bus_register_driver (); } --2.17.1
Re: [PATCH net-next 8/8] ionic: drop ethtool driver version
Quoted 59 lines · Leon Romanovsky
Quoted 58 lines · Shannon Nelson
Use the default kernel version in ethtool
drv_infooutput and drop the module version.Cc Leon Romanovsky <[email protected]>Signed-off-by Shannon Nelson <[email protected]>--- drivers/net/ethernet/pensando/ionic/ionic.h | 1 - drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 1 - drivers/net/ethernet/pensando/ionic/ionic_main.c | 7 +++---- 3 files changed, 3 insertions(+), 6 deletions(-)drivers/net/ethernet/pensando/ionic/ionic.h +0
-1@@ -12,7 +12,6 @@ struct ionic_lif;#define IONIC_DRV_NAME "ionic"#define IONIC_DRV_DESCRIPTION "Pensando Ethernet NIC Driver" -#define IONIC_DRV_VERSION "0.20.0-k"#define PCI_VENDOR_ID_PENSANDO 0x1dd8drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +0
-1@@ -86,7 +86,6 @@ static void ionic_get_drvinfo(struct net_device *netdev,struct ionic *ionic = lif->ionic;strlcpy (drvinfo->driver,IONIC_DRV_NAME ,sizeof (drvinfo->driver)); -strlcpy (drvinfo->version,IONIC_DRV_VERSION ,sizeof (drvinfo->version));strlcpy (drvinfo->fw_version, ionic->idev.dev_info.fw_version,sizeof (drvinfo->fw_version)); strlcpy(drvinfo->bus_info, ionic_bus_info(ionic),drivers/net/ethernet/pensando/ionic/ionic_main.c +1
-1@@ -6,6 +6,7 @@#include <linux/module.h> #include <linux/netdevice.h> #include <linux/utsname.h> +#include <linux/vermagic.h> #include "ionic.h" #include "ionic_bus.h" @@ -15,7 +16,6 @@MODULE_DESCRIPTION (IONIC_DRV_DESCRIPTION );MODULE_AUTHOR ("Pensando Systems, Inc" );MODULE_LICENSE ("GPL" ); -MODULE_VERSION (IONIC_DRV_VERSION );static const char *ionic_error_to_str (enum ionic_status_code code) {@@ -414,7 +414,7 @@ int ionic_identify(struct ionic *ionic)memset (ident,0 ,sizeof (*ident));
Quoted 7 lines
drivers/net/ethernet/pensando/ionic/ionic_main.c int ionic_identify(struct ionic *ionic) · line 418
Quoted 4 lines
drivers/net/ethernet/pensando/ionic/ionic_main.c +1
-1ident->drv.os_type =cpu_to_le32 (IONIC_OS_TYPE_LINUX ); -strncpy (ident->drv.driver_ver_str,IONIC_DRV_VERSION , +strncpy (ident->drv.driver_ver_str,UTS_RELEASE ,sizeof (ident->drv.driver_ver_str) -1 );Strange, I see that you are issuing command
IONIC_CMD_IDENTIFYwith this data, doesn't the other side expect specific format? Can I send any string here? and what will be result?
There is no expected format - this is a simple string.
Nothing happens with the string other than to end up in a logfile on the device as context for a potential support debugging session.
Quoted 4 lines
Quoted 4 lines
drivers/net/ethernet/pensando/ionic/ionic_main.c +0
-0mutex_lock (&ionic->dev_cmd_lock);@@ -558,8 +558,7 @@ int ionic_port_reset(struct ionic *ionic)
Quoted 12 lines
drivers/net/ethernet/pensando/ionic/ionic_main.c int ionic_port_reset(struct ionic *ionic) · line 561
Quoted 5 lines
drivers/net/ethernet/pensando/ionic/ionic_main.c +1
-2static int __init ionic_init_module (void ) { -pr_info ("%s %s, ver %s\n" , -IONIC_DRV_NAME ,IONIC_DRV_DESCRIPTION ,IONIC_DRV_VERSION ); +pr_info ("%s %s\n" ,IONIC_DRV_NAME ,IONIC_DRV_DESCRIPTION );While cleaning from driver versions, we are removing such code too. It is done for three reasons:
1. In case of success, there is no need in dmesg to know about the fact that driver is going to be up.
2. In case of failure, there will/should be error prints.
3. There are so many options to know about execution of every function and module init/exit that extra print is definitely useless.
Sure, I'll remove this in the next patchset, or in v2 of this if there are other changes needed.
sln
Quoted 9 lines
Thanks
Quoted 6 lines
drivers/net/ethernet/pensando/ionic/ionic_main.c +0
-1ionic_debugfs_create ();return ionic_bus_register_driver (); } --2.17.1
David Miller
maintainerFrom: Shannon Nelson <[email protected]>
Date: Mon, 2 Mar 2020 20:15:37 -0800
Quoted 2 lines
This is a set of small updates for the Pensando ionic driver, some from internal work, some a result of mailing list discussions.
Please use __packed and follow up on the driver version feedback.
Thank you.