Commit da0262c2 authored by Brett Creeley's avatar Brett Creeley Committed by Jakub Kicinski
Browse files

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: default avatarBrett Creeley <brett.creeley@amd.com>
Signed-off-by: default avatarShannon Nelson <shannon.nelson@amd.com>
Link: https://lore.kernel.org/r/20240619003257.6138-9-shannon.nelson@amd.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent f703d56c

drivers/net/ethernet/pensando/ionic/ionic.h

+4 −0
Original line number Diff line number Diff line
@@ -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_ */

drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c

+2 −1
Original line number Diff line number Diff line
@@ -412,6 +412,7 @@ 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);



		if (ionic->lif->doorbell_wa)

			cancel_delayed_work_sync(&ionic->doorbell_check_dwork);

		ionic_lif_unregister(ionic->lif);

		ionic_devlink_unregister(ionic);

drivers/net/ethernet/pensando/ionic/ionic_dev.c

+14 −2
Original line number Diff line number Diff line
@@ -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,6 +158,8 @@ static int ionic_watchdog_init(struct ionic *ionic) 
		dev_err(ionic->dev, "alloc_workqueue failed");

		return -ENOMEM;

	}



	if (ionic_doorbell_wa(ionic))

		INIT_DELAYED_WORK(&ionic->doorbell_check_dwork,

				  ionic_doorbell_check_dwork);
@@ -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);

drivers/net/ethernet/pensando/ionic/ionic_lif.c

+13 −8
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ 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;



		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,
@@ -691,6 +692,7 @@ 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;

	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 (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);

drivers/net/ethernet/pensando/ionic/ionic_lif.h

+1 −0
Original line number Diff line number Diff line
@@ -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;