Commit 6e2e59ea authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ionic-driver-updates' 

Shannon Nelson says:

====================
ionic: driver updates

These are a couple of checkpatch cleanup patches, a bug fix,
and something to alleviate memory pressure in tight places.
====================

Link: https://lore.kernel.org/r/20220217220252.52293-1-snelson@pensando.io


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 86213f80 ecea8bb4

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

+2 −2
Original line number Diff line number Diff line
@@ -206,6 +206,8 @@ int ionic_heartbeat_check(struct ionic *ionic) 
	if (fw_status_ready != idev->fw_status_ready) {

		bool trigger = false;



		idev->fw_status_ready = fw_status_ready;



		if (!fw_status_ready && lif &&

		    !test_bit(IONIC_LIF_F_FW_RESET, lif->state) &&

		    !test_and_set_bit(IONIC_LIF_F_FW_STOPPING, lif->state)) {
@@ -222,8 +224,6 @@ int ionic_heartbeat_check(struct ionic *ionic) 
		if (trigger) {

			struct ionic_deferred_work *work;



			idev->fw_status_ready = fw_status_ready;



			work = kzalloc(sizeof(*work), GFP_ATOMIC);

			if (work) {

				work->type = IONIC_DW_TYPE_LIF_RESET;

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

+3 −3
Original line number Diff line number Diff line
@@ -74,10 +74,10 @@ static void ionic_get_drvinfo(struct net_device *netdev, 
	struct ionic_lif *lif = netdev_priv(netdev);

	struct ionic *ionic = lif->ionic;



	strlcpy(drvinfo->driver, IONIC_DRV_NAME, sizeof(drvinfo->driver));

	strlcpy(drvinfo->fw_version, ionic->idev.dev_info.fw_version,

	strscpy(drvinfo->driver, IONIC_DRV_NAME, sizeof(drvinfo->driver));

	strscpy(drvinfo->fw_version, ionic->idev.dev_info.fw_version,

		sizeof(drvinfo->fw_version));

	strlcpy(drvinfo->bus_info, ionic_bus_info(ionic),

	strscpy(drvinfo->bus_info, ionic_bus_info(ionic),

		sizeof(drvinfo->bus_info));

}

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

+3 −3
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ enum ionic_txq_desc_opcode { 
 *                   IONIC_TXQ_DESC_OPCODE_CSUM_HW:

 *                      Offload 16-bit checksum computation to hardware.

 *                      If @csum_l3 is set then the packet's L3 checksum is

 *                      updated. Similarly, if @csum_l4 is set the the L4

 *                      updated. Similarly, if @csum_l4 is set the L4

 *                      checksum is updated. If @encap is set then encap header

 *                      checksums are also updated.

 *
@@ -1368,9 +1368,9 @@ union ionic_port_config { 
 * @status:             link status (enum ionic_port_oper_status)

 * @id:                 port id

 * @speed:              link speed (in Mbps)

 * @link_down_count:    number of times link went from from up to down

 * @link_down_count:    number of times link went from up to down

 * @fec_type:           fec type (enum ionic_port_fec_type)

 * @xcvr:               tranceiver status

 * @xcvr:               transceiver status

 */

struct ionic_port_status {

	__le32 id;

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

+7 −9
Original line number Diff line number Diff line
@@ -393,11 +393,11 @@ static void ionic_qcq_free(struct ionic_lif *lif, struct ionic_qcq *qcq) 
	ionic_qcq_intr_free(lif, qcq);



	if (qcq->cq.info) {

		devm_kfree(dev, qcq->cq.info);

		vfree(qcq->cq.info);

		qcq->cq.info = NULL;

	}

	if (qcq->q.info) {

		devm_kfree(dev, qcq->q.info);

		vfree(qcq->q.info);

		qcq->q.info = NULL;

	}

}
@@ -528,8 +528,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type, 
	new->q.dev = dev;

	new->flags = flags;



	new->q.info = devm_kcalloc(dev, num_descs, sizeof(*new->q.info),

				   GFP_KERNEL);

	new->q.info = vzalloc(num_descs * sizeof(*new->q.info));

	if (!new->q.info) {

		netdev_err(lif->netdev, "Cannot allocate queue info\n");

		err = -ENOMEM;
@@ -550,8 +549,7 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type, 
	if (err)

		goto err_out;



	new->cq.info = devm_kcalloc(dev, num_descs, sizeof(*new->cq.info),

				    GFP_KERNEL);

	new->cq.info = vzalloc(num_descs * sizeof(*new->cq.info));

	if (!new->cq.info) {

		netdev_err(lif->netdev, "Cannot allocate completion queue info\n");

		err = -ENOMEM;
@@ -640,14 +638,14 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type, 
err_out_free_q:

	dma_free_coherent(dev, new->q_size, new->q_base, new->q_base_pa);

err_out_free_cq_info:

	devm_kfree(dev, new->cq.info);

	vfree(new->cq.info);

err_out_free_irq:

	if (flags & IONIC_QCQ_F_INTR) {

		devm_free_irq(dev, new->intr.vector, &new->napi);

		ionic_intr_free(lif->ionic, new->intr.index);

	}

err_out_free_q_info:

	devm_kfree(dev, new->q.info);

	vfree(new->q.info);

err_out_free_qcq:

	devm_kfree(dev, new);

err_out:
@@ -3303,7 +3301,7 @@ static void ionic_lif_set_netdev_info(struct ionic_lif *lif) 
		},

	};



	strlcpy(ctx.cmd.lif_setattr.name, lif->netdev->name,

	strscpy(ctx.cmd.lif_setattr.name, lif->netdev->name,

		sizeof(ctx.cmd.lif_setattr.name));



	ionic_adminq_post_wait(lif, &ctx);

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

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ static const struct ionic_stat_desc ionic_rx_stats_desc[] = { 
	IONIC_RX_STAT_DESC(vlan_stripped),

};





#define IONIC_NUM_LIF_STATS ARRAY_SIZE(ionic_lif_stats_desc)

#define IONIC_NUM_PORT_STATS ARRAY_SIZE(ionic_port_stats_desc)

#define IONIC_NUM_TX_STATS ARRAY_SIZE(ionic_tx_stats_desc)