Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f3ebb04 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/jkirsher/net-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Fixes 2018-10-24

This series contains fixes for the ice driver.

Anirudh fixes a namespace issue which was introduced with a previous
patch to remove ice_netpoll.  Fixed up the device ID define names to
align with the branding string names.  Use the capability count returned
by the firmware, instead of calculating the count.  Introduced driver
workarounds due to current firmware limitations.  Fixed the queue
mapping for a VF, which needs to be set in the config and scatter queue
modes.  Fixed the driver which is setup to handle link status events
(LSE), even though the firmware does not have this feature yet, so add
the ability to poll for link status changes while we wait for updated
firmware.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4ed591c8 4f4be03b

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

+21 −31
Original line number Diff line number Diff line
@@ -42,6 +42,23 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw) 
	return 0;

}



/**

 * ice_dev_onetime_setup - Temporary HW/FW workarounds

 * @hw: pointer to the HW structure

 *

 * This function provides temporary workarounds for certain issues

 * that are expected to be fixed in the HW/FW.

 */

void ice_dev_onetime_setup(struct ice_hw *hw)

{

	/* configure Rx - set non pxe mode */

	wr32(hw, GLLAN_RCTL_0, 0x1);



#define MBX_PF_VT_PFALLOC	0x00231E80

	/* set VFs per PF */

	wr32(hw, MBX_PF_VT_PFALLOC, rd32(hw, PF_VT_PFALLOC_HIF));

}



/**

 * ice_clear_pf_cfg - Clear PF configuration

 * @hw: pointer to the hardware structure
@@ -218,7 +235,7 @@ static enum ice_media_type ice_get_media_type(struct ice_port_info *pi) 
 *

 * Get Link Status (0x607). Returns the link status of the adapter.

 */

enum ice_status

static enum ice_status

ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse,

		     struct ice_link_status *link, struct ice_sq_cd *cd)

{
@@ -740,6 +757,8 @@ enum ice_status ice_init_hw(struct ice_hw *hw) 
	if (status)

		goto err_unroll_sched;



	ice_dev_onetime_setup(hw);



	/* Get MAC information */

	/* A single port can report up to two (LAN and WoL) addresses */

	mac_buf = devm_kcalloc(ice_hw_to_dev(hw), 2,
@@ -1531,9 +1550,7 @@ ice_aq_discover_caps(struct ice_hw *hw, void *buf, u16 buf_size, u32 *cap_count, 
	if (!status)

		ice_parse_caps(hw, buf, le32_to_cpu(cmd->count), opc);

	else if (hw->adminq.sq_last_status == ICE_AQ_RC_ENOMEM)

		*cap_count =

			DIV_ROUND_UP(le16_to_cpu(desc.datalen),

				     sizeof(struct ice_aqc_list_caps_elem));

		*cap_count = le32_to_cpu(cmd->count);

	return status;

}
@@ -1987,33 +2004,6 @@ ice_aq_set_link_restart_an(struct ice_port_info *pi, bool ena_link, 
	return ice_aq_send_cmd(pi->hw, &desc, NULL, 0, cd);

}



/**

 * ice_aq_set_event_mask

 * @hw: pointer to the hw struct

 * @port_num: port number of the physical function

 * @mask: event mask to be set

 * @cd: pointer to command details structure or NULL

 *

 * Set event mask (0x0613)

 */

enum ice_status

ice_aq_set_event_mask(struct ice_hw *hw, u8 port_num, u16 mask,

		      struct ice_sq_cd *cd)

{

	struct ice_aqc_set_event_mask *cmd;

	struct ice_aq_desc desc;



	cmd = &desc.params.set_event_mask;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_set_event_mask);



	cmd->lport_num = port_num;



	cmd->event_mask = cpu_to_le16(mask);



	return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);

}



/**

 * __ice_aq_get_set_rss_lut

 * @hw: pointer to the hardware structure

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

+3 −6
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq, 
		struct ice_sq_cd *cd);

void ice_clear_pxe_mode(struct ice_hw *hw);

enum ice_status ice_get_caps(struct ice_hw *hw);



void ice_dev_onetime_setup(struct ice_hw *hw);



enum ice_status

ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx,

		  u32 rxq_index);
@@ -83,12 +86,6 @@ enum ice_status 
ice_aq_set_link_restart_an(struct ice_port_info *pi, bool ena_link,

			   struct ice_sq_cd *cd);

enum ice_status

ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse,

		     struct ice_link_status *link, struct ice_sq_cd *cd);

enum ice_status

ice_aq_set_event_mask(struct ice_hw *hw, u8 port_num, u16 mask,

		      struct ice_sq_cd *cd);

enum ice_status

ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,

		u32 *q_teids, enum ice_disq_rst_src rst_src, u16 vmvf_num,

		struct ice_sq_cd *cmd_details);

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

+2 −3
Original line number Diff line number Diff line
@@ -19,11 +19,10 @@ 


/* Defines that help manage the driver vs FW API checks.

 * Take a look at ice_aq_ver_check in ice_controlq.c for actual usage.

 *

 */

#define EXP_FW_API_VER_BRANCH		0x00

#define EXP_FW_API_VER_MAJOR		0x00

#define EXP_FW_API_VER_MINOR		0x01

#define EXP_FW_API_VER_MAJOR		0x01

#define EXP_FW_API_VER_MINOR		0x03



/* Different control queue types: These are mainly for SW consumption. */

enum ice_ctl_q {

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

+3 −3
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ 


/* Device IDs */

/* Intel(R) Ethernet Controller E810-C for backplane */

#define ICE_DEV_ID_C810_BACKPLANE	0x1591

#define ICE_DEV_ID_E810C_BACKPLANE	0x1591

/* Intel(R) Ethernet Controller E810-C for QSFP */

#define ICE_DEV_ID_C810_QSFP		0x1592

#define ICE_DEV_ID_E810C_QSFP		0x1592

/* Intel(R) Ethernet Controller E810-C for SFP */

#define ICE_DEV_ID_C810_SFP		0x1593

#define ICE_DEV_ID_E810C_SFP		0x1593



#endif /* _ICE_DEVIDS_H_ */

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

+8 −0
Original line number Diff line number Diff line
@@ -157,6 +157,13 @@ 
#define VPINT_ALLOC_LAST_S			12

#define VPINT_ALLOC_LAST_M			ICE_M(0x7FF, 12)

#define VPINT_ALLOC_VALID_M			BIT(31)

#define VPINT_ALLOC_PCI(_VF)			(0x0009D000 + ((_VF) * 4))

#define VPINT_ALLOC_PCI_FIRST_S			0

#define VPINT_ALLOC_PCI_FIRST_M			ICE_M(0x7FF, 0)

#define VPINT_ALLOC_PCI_LAST_S			12

#define VPINT_ALLOC_PCI_LAST_M			ICE_M(0x7FF, 12)

#define VPINT_ALLOC_PCI_VALID_M			BIT(31)

#define GLLAN_RCTL_0				0x002941F8

#define QRX_CONTEXT(_i, _QRX)			(0x00280000 + ((_i) * 8192 + (_QRX) * 4))

#define QRX_CTRL(_QRX)				(0x00120000 + ((_QRX) * 4))

#define QRX_CTRL_MAX_INDEX			2047
@@ -320,6 +327,7 @@ 
#define GLV_UPRCL(_i)				(0x003B2000 + ((_i) * 8))

#define GLV_UPTCH(_i)				(0x0030A004 + ((_i) * 8))

#define GLV_UPTCL(_i)				(0x0030A000 + ((_i) * 8))

#define PF_VT_PFALLOC_HIF			0x0009DD80

#define VSIQF_HKEY_MAX_INDEX			12

#define VSIQF_HLUT_MAX_INDEX			15

#define VFINT_DYN_CTLN(_i)			(0x00003800 + ((_i) * 4))