ionic: Only run the doorbell workaround for certain asic_type

If the doorbell workaround isn't required for a certain
asic_type then there is no need to run the associated
code. Since newer FW versions are finally reporting their
asic_type we can use a flag to determine whether or not to
do the workaround.

Signed-off-by: Brett Creeley <brett.creeley@amd.com>
Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Link: https://lore.kernel.org/r/20240619003257.6138-9-shannon.nelson@amd.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h
index 106ee5b2cefffe6cd2c654579ce6f29bd3fdd676..1c61390677f7a396e650f1d5c56b689508153afd 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic.h
@@ -18,6 +18,8 @@ struct ionic_lif;
 #define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_PF    0x1002
 #define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF    0x1003
 
+#define IONIC_ASIC_TYPE_ELBA   2
+
 #define DEVCMD_TIMEOUT                 5
 #define IONIC_ADMINQ_TIME_SLICE                msecs_to_jiffies(100)
 
@@ -96,4 +98,6 @@ int ionic_port_identify(struct ionic *ionic);
 int ionic_port_init(struct ionic *ionic);
 int ionic_port_reset(struct ionic *ionic);
 
+bool ionic_doorbell_wa(struct ionic *ionic);
+
 #endif /* _IONIC_H_ */

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
index f362e76756dffe892c1db69e2a7fd0416fafae93..b93791d6b59332f100a8078949a3f8e3ce71a12e 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c
@@ -412,7 +412,8 @@ static void ionic_remove(struct pci_dev *pdev)
                if (test_and_clear_bit(IONIC_LIF_F_FW_RESET, ionic->lif->state))
                        set_bit(IONIC_LIF_F_FW_STOPPING, ionic->lif->state);
 
-               cancel_delayed_work_sync(&ionic->doorbell_check_dwork);
+               if (ionic->lif->doorbell_wa)
+                       cancel_delayed_work_sync(&ionic->doorbell_check_dwork);
                ionic_lif_unregister(ionic->lif);
                ionic_devlink_unregister(ionic);
                ionic_lif_deinit(ionic->lif);

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_dev.c b/drivers/net/ethernet/pensando/ionic/ionic_dev.c
index ec36ace6d0103cec7a393dc29e1ba06c5b833a19..9e42d599840ded0c05013280a8f0dc138258ccec 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_dev.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_dev.c
@@ -128,6 +128,13 @@ static void ionic_doorbell_check_dwork(struct work_struct *work)
        ionic_queue_doorbell_check(ionic, IONIC_NAPI_DEADLINE);
 }
 
+bool ionic_doorbell_wa(struct ionic *ionic)
+{
+       u8 asic_type = ionic->idev.dev_info.asic_type;
+
+       return !asic_type || asic_type == IONIC_ASIC_TYPE_ELBA;
+}
+
 static int ionic_watchdog_init(struct ionic *ionic)
 {
        struct ionic_dev *idev = &ionic->idev;
@@ -151,8 +158,10 @@ static int ionic_watchdog_init(struct ionic *ionic)
                dev_err(ionic->dev, "alloc_workqueue failed");
                return -ENOMEM;
        }
-       INIT_DELAYED_WORK(&ionic->doorbell_check_dwork,
-                         ionic_doorbell_check_dwork);
+
+       if (ionic_doorbell_wa(ionic))
+               INIT_DELAYED_WORK(&ionic->doorbell_check_dwork,
+                                 ionic_doorbell_check_dwork);
 
        return 0;
 }
@@ -161,6 +170,9 @@ void ionic_queue_doorbell_check(struct ionic *ionic, int delay)
 {
        int cpu;
 
+       if (!ionic->lif->doorbell_wa)
+               return;
+
        cpu = ionic_get_preferred_cpu(ionic, &ionic->lif->adminqcq->intr);
        queue_delayed_work_on(cpu, ionic->wq, &ionic->doorbell_check_dwork,
                              delay);

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
index 8a97199452400cd1e9087f1e430651b496164d75..38ce35462737a820b7f6528030415b4ec7571a88 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -344,7 +344,8 @@ static int ionic_qcq_disable(struct ionic_lif *lif, struct ionic_qcq *qcq, int f
        if (qcq->flags & IONIC_QCQ_F_INTR) {
                struct ionic_dev *idev = &lif->ionic->idev;
 
-               cancel_work_sync(&qcq->doorbell_napi_work);
+               if (lif->doorbell_wa)
+                       cancel_work_sync(&qcq->doorbell_napi_work);
                cancel_work_sync(&qcq->dim.work);
                ionic_intr_mask(idev->intr_ctrl, qcq->intr.index,
                                IONIC_INTR_MASK_SET);
@@ -691,7 +692,8 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type,
 
        INIT_WORK(&new->dim.work, ionic_dim_work);
        new->dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_CQE;
-       INIT_WORK(&new->doorbell_napi_work, ionic_doorbell_napi_work);
+       if (lif->doorbell_wa)
+               INIT_WORK(&new->doorbell_napi_work, ionic_doorbell_napi_work);
 
        *qcq = new;
 
@@ -1215,12 +1217,14 @@ static int ionic_adminq_napi(struct napi_struct *napi, int budget)
                ionic_intr_credits(idev->intr_ctrl, intr->index, credits, flags);
        }
 
-       if (!a_work)
-               ionic_adminq_poke_doorbell(&lif->adminqcq->q);
-       if (lif->hwstamp_rxq && !rx_work)
-               ionic_rxq_poke_doorbell(&lif->hwstamp_rxq->q);
-       if (lif->hwstamp_txq && !tx_work)
-               ionic_txq_poke_doorbell(&lif->hwstamp_txq->q);
+       if (lif->doorbell_wa) {
+               if (!a_work)
+                       ionic_adminq_poke_doorbell(&lif->adminqcq->q);
+               if (lif->hwstamp_rxq && !rx_work)
+                       ionic_rxq_poke_doorbell(&lif->hwstamp_rxq->q);
+               if (lif->hwstamp_txq && !tx_work)
+                       ionic_txq_poke_doorbell(&lif->hwstamp_txq->q);
+       }
 
        return work_done;
 }
@@ -3749,6 +3753,7 @@ int ionic_lif_init(struct ionic_lif *lif)
                goto err_out_notifyq_deinit;
 
        lif->rx_copybreak = IONIC_RX_COPYBREAK_DEFAULT;
+       lif->doorbell_wa = ionic_doorbell_wa(lif->ionic);
 
        set_bit(IONIC_LIF_F_INITED, lif->state);
 

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.h b/drivers/net/ethernet/pensando/ionic/ionic_lif.h
index 5bd5013556700f258ad229f949c6046d530935a0..3e1005293c4a1ea0b29a023f12c342ea04ecb115 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.h
@@ -211,6 +211,7 @@ struct ionic_lif {
        u16 rx_copybreak;
        u16 rx_mode;
        bool registered;
+       bool doorbell_wa;
        u16 lif_type;
        unsigned int link_down_count;
        unsigned int nmcast;

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
index a4e9233764842adc8dec90cd2b07064b248d0310..5bf13a5d411ce61616f3451b729325ad47fe9928 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
@@ -950,7 +950,7 @@ int ionic_tx_napi(struct napi_struct *napi, int budget)
                                   work_done, flags);
        }
 
-       if (!work_done)
+       if (!work_done && cq->bound_q->lif->doorbell_wa)
                ionic_txq_poke_doorbell(&qcq->q);
 
        return work_done;
@@ -993,7 +993,7 @@ int ionic_rx_napi(struct napi_struct *napi, int budget)
                                   work_done, flags);
        }
 
-       if (!work_done)
+       if (!work_done && cq->bound_q->lif->doorbell_wa)
                ionic_rxq_poke_doorbell(&qcq->q);
 
        return work_done;
@@ -1038,10 +1038,12 @@ int ionic_txrx_napi(struct napi_struct *napi, int budget)
                                   tx_work_done + rx_work_done, flags);
        }
 
-       if (!rx_work_done)
-               ionic_rxq_poke_doorbell(&rxqcq->q);
-       if (!tx_work_done)
-               ionic_txq_poke_doorbell(&txqcq->q);
+       if (lif->doorbell_wa) {
+               if (!rx_work_done)
+                       ionic_rxq_poke_doorbell(&rxqcq->q);
+               if (!tx_work_done)
+                       ionic_txq_poke_doorbell(&txqcq->q);
+       }
 
        return rx_work_done;
 }