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

Commit 3a6f7892 authored by David S. Miller's avatar David S. Miller
Browse files

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



Jeff Kirsher says:

====================
40GbE Intel Wired LAN Driver Updates 2019-04-16

This series contains updates to i40e driver only.

Adam fixes i40e so that queues can be restored to its original value if
configuring queue channels fails.  Bumped the maximum API version
supported and added the API version to error messages to clarify
supported firmware API versions.  Fixed the problem with the driver
being able to add only 7 multicast MAC address filters instead of 16.

Aleksandr adds support for Dynamic Device Personalization (DDP) which
allows loading profiles that change the way internal parser interprets
processed frames.

Nick fixes an issue where if we modify the VLAN stripping options when a
port VLAN is configured, it will break traffic for the VSI, so prevent
changes from being made.

Jake fixes an issue where a device reset can mess up the clock time
because we reset the clock time based on the kernel time every reset.
This causes us to potentially completely reset the PTP time, and can
cause unexpected behavior in programs like ptp4l.

Piotr fixes an LED blink issue with the 'ethtool -p' command, so that
identification blinking will work on all hardware.

Chinh fixed the error returned to correctly reflect the current state
when LLDP or DCBx is not in an operational state.

Grzegorz cleans up a misleading error message when untrusted VF tries to
exceed addresses beyond the NIC limit.

Carolyn fixes the error return code to correctly reflect the error case.

v2: updated the URL provided in the DDP patch (#2)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e77b8ba6 6e114deb

drivers/net/ethernet/intel/i40e/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ i40e-objs := i40e_main.o \ 
	i40e_diag.o	\

	i40e_txrx.o	\

	i40e_ptp.o	\

	i40e_ddp.o \

	i40e_client.o   \

	i40e_virtchnl_pf.o \

	i40e_xsk.o

drivers/net/ethernet/intel/i40e/i40e.h

+29 −0
Original line number Diff line number Diff line
@@ -321,6 +321,29 @@ struct i40e_udp_port_config { 
	u8 filter_index;

};



#define I40_DDP_FLASH_REGION 100

#define I40E_PROFILE_INFO_SIZE 48

#define I40E_MAX_PROFILE_NUM 16

#define I40E_PROFILE_LIST_SIZE \

	(I40E_PROFILE_INFO_SIZE * I40E_MAX_PROFILE_NUM + 4)

#define I40E_DDP_PROFILE_PATH "intel/i40e/ddp/"

#define I40E_DDP_PROFILE_NAME_MAX 64



int i40e_ddp_load(struct net_device *netdev, const u8 *data, size_t size,

		  bool is_add);

int i40e_ddp_flash(struct net_device *netdev, struct ethtool_flash *flash);



struct i40e_ddp_profile_list {

	u32 p_count;

	struct i40e_profile_info p_info[0];

};



struct i40e_ddp_old_profile_list {

	struct list_head list;

	size_t old_ddp_size;

	u8 old_ddp_buf[0];

};



/* macros related to FLX_PIT */

#define I40E_FLEX_SET_FSIZE(fsize) (((fsize) << \

				    I40E_PRTQF_FLX_PIT_FSIZE_SHIFT) & \
@@ -589,6 +612,8 @@ struct i40e_pf { 
	struct sk_buff *ptp_tx_skb;

	unsigned long ptp_tx_start;

	struct hwtstamp_config tstamp_config;

	struct timespec64 ptp_prev_hw_time;

	ktime_t ptp_reset_start;

	struct mutex tmreg_lock; /* Used to protect the SYSTIME registers. */

	u32 ptp_adj_mult;

	u32 tx_hwtstamp_timeouts;
@@ -610,6 +635,8 @@ struct i40e_pf { 
	u16 override_q_count;

	u16 last_sw_conf_flags;

	u16 last_sw_conf_valid_flags;

	/* List to keep previous DDP profiles to be rolled back in the future */

	struct list_head ddp_old_prof;

};



/**
@@ -1083,6 +1110,8 @@ void i40e_ptp_rx_hwtstamp(struct i40e_pf *pf, struct sk_buff *skb, u8 index); 
void i40e_ptp_set_increment(struct i40e_pf *pf);

int i40e_ptp_set_ts_config(struct i40e_pf *pf, struct ifreq *ifr);

int i40e_ptp_get_ts_config(struct i40e_pf *pf, struct ifreq *ifr);

void i40e_ptp_save_hw_time(struct i40e_pf *pf);

void i40e_ptp_restore_hw_time(struct i40e_pf *pf);

void i40e_ptp_init(struct i40e_pf *pf);

void i40e_ptp_stop(struct i40e_pf *pf);

int i40e_is_vsi_uplink_mode_veb(struct i40e_vsi *vsi);

drivers/net/ethernet/intel/i40e/i40e_adminq.c

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw, 
	if (val >= hw->aq.num_asq_entries) {

		i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,

			   "AQTX: head overrun at %d\n", val);

		status = I40E_ERR_QUEUE_EMPTY;

		status = I40E_ERR_ADMIN_QUEUE_FULL;

		goto asq_send_command_error;

	}

drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
 */



#define I40E_FW_API_VERSION_MAJOR	0x0001

#define I40E_FW_API_VERSION_MINOR_X722	0x0006

#define I40E_FW_API_VERSION_MINOR_X710	0x0007

#define I40E_FW_API_VERSION_MINOR_X722	0x0008

#define I40E_FW_API_VERSION_MINOR_X710	0x0008



#define I40E_FW_MINOR_VERSION(_h) ((_h)->mac.type == I40E_MAC_XL710 ? \

					I40E_FW_API_VERSION_MINOR_X710 : \

drivers/net/ethernet/intel/i40e/i40e_common.c

+231 −55
Original line number Diff line number Diff line
@@ -1466,7 +1466,6 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx) 
 **/

u32 i40e_led_get(struct i40e_hw *hw)

{

	u32 current_mode = 0;

	u32 mode = 0;

	int i;
@@ -1479,21 +1478,6 @@ u32 i40e_led_get(struct i40e_hw *hw) 
		if (!gpio_val)

			continue;



		/* ignore gpio LED src mode entries related to the activity

		 * LEDs

		 */

		current_mode = ((gpio_val & I40E_GLGEN_GPIO_CTL_LED_MODE_MASK)

				>> I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT);

		switch (current_mode) {

		case I40E_COMBINED_ACTIVITY:

		case I40E_FILTER_ACTIVITY:

		case I40E_MAC_ACTIVITY:

		case I40E_LINK_ACTIVITY:

			continue;

		default:

			break;

		}



		mode = (gpio_val & I40E_GLGEN_GPIO_CTL_LED_MODE_MASK) >>

			I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT;

		break;
@@ -1513,7 +1497,6 @@ u32 i40e_led_get(struct i40e_hw *hw) 
 **/

void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)

{

	u32 current_mode = 0;

	int i;



	if (mode & 0xfffffff0)
@@ -1527,22 +1510,6 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) 


		if (!gpio_val)

			continue;



		/* ignore gpio LED src mode entries related to the activity

		 * LEDs

		 */

		current_mode = ((gpio_val & I40E_GLGEN_GPIO_CTL_LED_MODE_MASK)

				>> I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT);

		switch (current_mode) {

		case I40E_COMBINED_ACTIVITY:

		case I40E_FILTER_ACTIVITY:

		case I40E_MAC_ACTIVITY:

		case I40E_LINK_ACTIVITY:

			continue;

		default:

			break;

		}



		gpio_val &= ~I40E_GLGEN_GPIO_CTL_LED_MODE_MASK;

		/* this & is a bit of paranoia, but serves as a range check */

		gpio_val |= ((mode << I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) &
@@ -5448,6 +5415,163 @@ i40e_find_segment_in_package(u32 segment_type, 
	return NULL;

}



/* Get section table in profile */

#define I40E_SECTION_TABLE(profile, sec_tbl)				\

	do {								\

		struct i40e_profile_segment *p = (profile);		\

		u32 count;						\

		u32 *nvm;						\

		count = p->device_table_count;				\

		nvm = (u32 *)&p->device_table[count];			\

		sec_tbl = (struct i40e_section_table *)&nvm[nvm[0] + 1]; \

	} while (0)



/* Get section header in profile */

#define I40E_SECTION_HEADER(profile, offset)				\

	(struct i40e_profile_section_header *)((u8 *)(profile) + (offset))



/**

 * i40e_find_section_in_profile

 * @section_type: the section type to search for (i.e., SECTION_TYPE_NOTE)

 * @profile: pointer to the i40e segment header to be searched

 *

 * This function searches i40e segment for a particular section type. On

 * success it returns a pointer to the section header, otherwise it will

 * return NULL.

 **/

struct i40e_profile_section_header *

i40e_find_section_in_profile(u32 section_type,

			     struct i40e_profile_segment *profile)

{

	struct i40e_profile_section_header *sec;

	struct i40e_section_table *sec_tbl;

	u32 sec_off;

	u32 i;



	if (profile->header.type != SEGMENT_TYPE_I40E)

		return NULL;



	I40E_SECTION_TABLE(profile, sec_tbl);



	for (i = 0; i < sec_tbl->section_count; i++) {

		sec_off = sec_tbl->section_offset[i];

		sec = I40E_SECTION_HEADER(profile, sec_off);

		if (sec->section.type == section_type)

			return sec;

	}



	return NULL;

}



/**

 * i40e_ddp_exec_aq_section - Execute generic AQ for DDP

 * @hw: pointer to the hw struct

 * @aq: command buffer containing all data to execute AQ

 **/

static enum

i40e_status_code i40e_ddp_exec_aq_section(struct i40e_hw *hw,

					  struct i40e_profile_aq_section *aq)

{

	i40e_status status;

	struct i40e_aq_desc desc;

	u8 *msg = NULL;

	u16 msglen;



	i40e_fill_default_direct_cmd_desc(&desc, aq->opcode);

	desc.flags |= cpu_to_le16(aq->flags);

	memcpy(desc.params.raw, aq->param, sizeof(desc.params.raw));



	msglen = aq->datalen;

	if (msglen) {

		desc.flags |= cpu_to_le16((u16)(I40E_AQ_FLAG_BUF |

						I40E_AQ_FLAG_RD));

		if (msglen > I40E_AQ_LARGE_BUF)

			desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_LB);

		desc.datalen = cpu_to_le16(msglen);

		msg = &aq->data[0];

	}



	status = i40e_asq_send_command(hw, &desc, msg, msglen, NULL);



	if (status) {

		i40e_debug(hw, I40E_DEBUG_PACKAGE,

			   "unable to exec DDP AQ opcode %u, error %d\n",

			   aq->opcode, status);

		return status;

	}



	/* copy returned desc to aq_buf */

	memcpy(aq->param, desc.params.raw, sizeof(desc.params.raw));



	return 0;

}



/**

 * i40e_validate_profile

 * @hw: pointer to the hardware structure

 * @profile: pointer to the profile segment of the package to be validated

 * @track_id: package tracking id

 * @rollback: flag if the profile is for rollback.

 *

 * Validates supported devices and profile's sections.

 */

static enum i40e_status_code

i40e_validate_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile,

		      u32 track_id, bool rollback)

{

	struct i40e_profile_section_header *sec = NULL;

	i40e_status status = 0;

	struct i40e_section_table *sec_tbl;

	u32 vendor_dev_id;

	u32 dev_cnt;

	u32 sec_off;

	u32 i;



	if (track_id == I40E_DDP_TRACKID_INVALID) {

		i40e_debug(hw, I40E_DEBUG_PACKAGE, "Invalid track_id\n");

		return I40E_NOT_SUPPORTED;

	}



	dev_cnt = profile->device_table_count;

	for (i = 0; i < dev_cnt; i++) {

		vendor_dev_id = profile->device_table[i].vendor_dev_id;

		if ((vendor_dev_id >> 16) == PCI_VENDOR_ID_INTEL &&

		    hw->device_id == (vendor_dev_id & 0xFFFF))

			break;

	}

	if (dev_cnt && i == dev_cnt) {

		i40e_debug(hw, I40E_DEBUG_PACKAGE,

			   "Device doesn't support DDP\n");

		return I40E_ERR_DEVICE_NOT_SUPPORTED;

	}



	I40E_SECTION_TABLE(profile, sec_tbl);



	/* Validate sections types */

	for (i = 0; i < sec_tbl->section_count; i++) {

		sec_off = sec_tbl->section_offset[i];

		sec = I40E_SECTION_HEADER(profile, sec_off);

		if (rollback) {

			if (sec->section.type == SECTION_TYPE_MMIO ||

			    sec->section.type == SECTION_TYPE_AQ ||

			    sec->section.type == SECTION_TYPE_RB_AQ) {

				i40e_debug(hw, I40E_DEBUG_PACKAGE,

					   "Not a roll-back package\n");

				return I40E_NOT_SUPPORTED;

			}

		} else {

			if (sec->section.type == SECTION_TYPE_RB_AQ ||

			    sec->section.type == SECTION_TYPE_RB_MMIO) {

				i40e_debug(hw, I40E_DEBUG_PACKAGE,

					   "Not an original package\n");

				return I40E_NOT_SUPPORTED;

			}

		}

	}



	return status;

}



/**

 * i40e_write_profile

 * @hw: pointer to the hardware structure
@@ -5463,47 +5587,99 @@ i40e_write_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile, 
	i40e_status status = 0;

	struct i40e_section_table *sec_tbl;

	struct i40e_profile_section_header *sec = NULL;

	u32 dev_cnt;

	u32 vendor_dev_id;

	u32 *nvm;

	struct i40e_profile_aq_section *ddp_aq;

	u32 section_size = 0;

	u32 offset = 0, info = 0;

	u32 sec_off;

	u32 i;



	dev_cnt = profile->device_table_count;

	status = i40e_validate_profile(hw, profile, track_id, false);

	if (status)

		return status;



	for (i = 0; i < dev_cnt; i++) {

		vendor_dev_id = profile->device_table[i].vendor_dev_id;

		if ((vendor_dev_id >> 16) == PCI_VENDOR_ID_INTEL)

			if (hw->device_id == (vendor_dev_id & 0xFFFF))

	I40E_SECTION_TABLE(profile, sec_tbl);



	for (i = 0; i < sec_tbl->section_count; i++) {

		sec_off = sec_tbl->section_offset[i];

		sec = I40E_SECTION_HEADER(profile, sec_off);

		/* Process generic admin command */

		if (sec->section.type == SECTION_TYPE_AQ) {

			ddp_aq = (struct i40e_profile_aq_section *)&sec[1];

			status = i40e_ddp_exec_aq_section(hw, ddp_aq);

			if (status) {

				i40e_debug(hw, I40E_DEBUG_PACKAGE,

					   "Failed to execute aq: section %d, opcode %u\n",

					   i, ddp_aq->opcode);

				break;

			}

	if (i == dev_cnt) {

		i40e_debug(hw, I40E_DEBUG_PACKAGE, "Device doesn't support DDP");

		return I40E_ERR_DEVICE_NOT_SUPPORTED;

			sec->section.type = SECTION_TYPE_RB_AQ;

		}



	nvm = (u32 *)&profile->device_table[dev_cnt];

	sec_tbl = (struct i40e_section_table *)&nvm[nvm[0] + 1];

		/* Skip any non-mmio sections */

		if (sec->section.type != SECTION_TYPE_MMIO)

			continue;



	for (i = 0; i < sec_tbl->section_count; i++) {

		sec = (struct i40e_profile_section_header *)((u8 *)profile +

					     sec_tbl->section_offset[i]);

		section_size = sec->section.size +

			sizeof(struct i40e_profile_section_header);



		/* Skip 'AQ', 'note' and 'name' sections */

		if (sec->section.type != SECTION_TYPE_MMIO)

		/* Write MMIO section */

		status = i40e_aq_write_ddp(hw, (void *)sec, (u16)section_size,

					   track_id, &offset, &info, NULL);

		if (status) {

			i40e_debug(hw, I40E_DEBUG_PACKAGE,

				   "Failed to write profile: section %d, offset %d, info %d\n",

				   i, offset, info);

			break;

		}

	}

	return status;

}



/**

 * i40e_rollback_profile

 * @hw: pointer to the hardware structure

 * @profile: pointer to the profile segment of the package to be removed

 * @track_id: package tracking id

 *

 * Rolls back previously loaded package.

 */

enum i40e_status_code

i40e_rollback_profile(struct i40e_hw *hw, struct i40e_profile_segment *profile,

		      u32 track_id)

{

	struct i40e_profile_section_header *sec = NULL;

	i40e_status status = 0;

	struct i40e_section_table *sec_tbl;

	u32 offset = 0, info = 0;

	u32 section_size = 0;

	u32 sec_off;

	int i;



	status = i40e_validate_profile(hw, profile, track_id, true);

	if (status)

		return status;



	I40E_SECTION_TABLE(profile, sec_tbl);



	/* For rollback write sections in reverse */

	for (i = sec_tbl->section_count - 1; i >= 0; i--) {

		sec_off = sec_tbl->section_offset[i];

		sec = I40E_SECTION_HEADER(profile, sec_off);



		/* Skip any non-rollback sections */

		if (sec->section.type != SECTION_TYPE_RB_MMIO)

			continue;



		section_size = sec->section.size +

			sizeof(struct i40e_profile_section_header);



		/* Write profile */

		/* Write roll-back MMIO section */

		status = i40e_aq_write_ddp(hw, (void *)sec, (u16)section_size,

					   track_id, &offset, &info, NULL);

		if (status) {

			i40e_debug(hw, I40E_DEBUG_PACKAGE,

				   "Failed to write profile: offset %d, info %d",

				   offset, info);

				   "Failed to write profile: section %d, offset %d, info %d\n",

				   i, offset, info);

			break;

		}

	}