Commit 76a84269 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 



Tony Nguyen says:

====================
100GbE Intel Wired LAN Driver Updates 2022-05-05
This series contains updates to ice driver only.

Wan Jiabing converts an open coded min selection to min_t().

Maciej commonizes on a single find VSI function and removes the
duplicated implementation.

Wojciech adjusts the return value when exceeding ICE_MAX_CHAIN_WORDS to,
a more appropriate, -ENOSPC and allows for the error to be propagated.

Michal adds support for ndo_get_devlink_port().

Jake does some cleanup related to virtualization code. Mainly involving
function header comments and wording changes. NULL checks are added to
ice_get_vf_vsi() calls in order to prevent static analysis tools from
complaining that a NULL value could be dereferenced.
---
v2: Dropped patch 1: "ice: Add support for classid based queue selection"
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 949dfdcf 4eaf1797

drivers/net/ethernet/intel/ice/ice.h

+15 −0
Original line number Diff line number Diff line
@@ -757,6 +757,21 @@ static inline struct ice_vsi *ice_get_ctrl_vsi(struct ice_pf *pf) 
	return pf->vsi[pf->ctrl_vsi_idx];

}



/**

 * ice_find_vsi - Find the VSI from VSI ID

 * @pf: The PF pointer to search in

 * @vsi_num: The VSI ID to search for

 */

static inline struct ice_vsi *ice_find_vsi(struct ice_pf *pf, u16 vsi_num)

{

	int i;



	ice_for_each_vsi(pf, i)

		if (pf->vsi[i] && pf->vsi[i]->vsi_num == vsi_num)

			return  pf->vsi[i];

	return NULL;

}



/**

 * ice_is_switchdev_running - check if switchdev is configured

 * @pf: pointer to PF structure

drivers/net/ethernet/intel/ice/ice_devlink.c

+26 −1
Original line number Diff line number Diff line
@@ -647,6 +647,23 @@ void ice_devlink_unregister(struct ice_pf *pf) 
	devlink_unregister(priv_to_devlink(pf));

}



/**

 * ice_devlink_set_switch_id - Set unique switch id based on pci dsn

 * @pf: the PF to create a devlink port for

 * @ppid: struct with switch id information

 */

static void

ice_devlink_set_switch_id(struct ice_pf *pf, struct netdev_phys_item_id *ppid)

{

	struct pci_dev *pdev = pf->pdev;

	u64 id;



	id = pci_get_dsn(pdev);



	ppid->id_len = sizeof(id);

	put_unaligned_be64(id, &ppid->id);

}



int ice_devlink_register_params(struct ice_pf *pf)

{

	struct devlink *devlink = priv_to_devlink(pf);
@@ -704,6 +721,9 @@ int ice_devlink_create_pf_port(struct ice_pf *pf) 


	attrs.flavour = DEVLINK_PORT_FLAVOUR_PHYSICAL;

	attrs.phys.port_number = pf->hw.bus.func;



	ice_devlink_set_switch_id(pf, &attrs.switch_id);



	devlink_port_attrs_set(devlink_port, &attrs);

	devlink = priv_to_devlink(pf);
@@ -753,13 +773,18 @@ int ice_devlink_create_vf_port(struct ice_vf *vf) 


	pf = vf->pf;

	dev = ice_pf_to_dev(pf);

	vsi = ice_get_vf_vsi(vf);

	devlink_port = &vf->devlink_port;



	vsi = ice_get_vf_vsi(vf);

	if (!vsi)

		return -EINVAL;



	attrs.flavour = DEVLINK_PORT_FLAVOUR_PCI_VF;

	attrs.pci_vf.pf = pf->hw.bus.func;

	attrs.pci_vf.vf = vf->vf_id;



	ice_devlink_set_switch_id(pf, &attrs.switch_id);



	devlink_port_attrs_set(devlink_port, &attrs);

	devlink = priv_to_devlink(pf);

drivers/net/ethernet/intel/ice/ice_gnss.c

+1 −2
Original line number Diff line number Diff line
@@ -76,8 +76,7 @@ static void ice_gnss_read(struct kthread_work *work) 
	for (i = 0; i < data_len; i += bytes_read) {

		u16 bytes_left = data_len - i;



		bytes_read = bytes_left < ICE_MAX_I2C_DATA_SIZE ? bytes_left :

					  ICE_MAX_I2C_DATA_SIZE;

		bytes_read = min_t(typeof(bytes_left), bytes_left, ICE_MAX_I2C_DATA_SIZE);



		err = ice_aq_read_i2c(hw, link_topo, ICE_GNSS_UBX_I2C_BUS_ADDR,

				      cpu_to_le16(ICE_GNSS_UBX_EMPTY_DATA),

drivers/net/ethernet/intel/ice/ice_idc.c

+0 −15
Original line number Diff line number Diff line
@@ -47,21 +47,6 @@ void ice_send_event_to_aux(struct ice_pf *pf, struct iidc_event *event) 
	device_unlock(&pf->adev->dev);

}



/**

 * ice_find_vsi - Find the VSI from VSI ID

 * @pf: The PF pointer to search in

 * @vsi_num: The VSI ID to search for

 */

static struct ice_vsi *ice_find_vsi(struct ice_pf *pf, u16 vsi_num)

{

	int i;



	ice_for_each_vsi(pf, i)

		if (pf->vsi[i] && pf->vsi[i]->vsi_num == vsi_num)

			return  pf->vsi[i];

	return NULL;

}



/**

 * ice_add_rdma_qset - Add Leaf Node for RDMA Qset

 * @pf: PF struct

drivers/net/ethernet/intel/ice/ice_main.c

+15 −0
Original line number Diff line number Diff line
@@ -296,6 +296,20 @@ static int ice_clear_promisc(struct ice_vsi *vsi, u8 promisc_m) 
	return status;

}



/**

 * ice_get_devlink_port - Get devlink port from netdev

 * @netdev: the netdevice structure

 */

static struct devlink_port *ice_get_devlink_port(struct net_device *netdev)

{

	struct ice_pf *pf = ice_netdev_to_pf(netdev);



	if (!ice_is_switchdev_running(pf))

		return NULL;



	return &pf->devlink_port;

}



/**

 * ice_vsi_sync_fltr - Update the VSI filter list to the HW

 * @vsi: ptr to the VSI
@@ -8926,4 +8940,5 @@ static const struct net_device_ops ice_netdev_ops = { 
	.ndo_bpf = ice_xdp,

	.ndo_xdp_xmit = ice_xdp_xmit,

	.ndo_xsk_wakeup = ice_xsk_wakeup,

	.ndo_get_devlink_port = ice_get_devlink_port,

};