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

Commit 6f63db82 authored by David S. Miller's avatar David S. Miller
Browse files

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



Jeff Kirsher says:

====================
10GbE Intel Wired LAN Driver Updates 2017-01-03

This series contains updates to ixgbe and ixgbevf only.

Emil fixes ixgbe to use the NVM settings for FEC, so do not override the
settings.  Fixed the indirection table for x550, where newer devices can
support up to 64 RSS queues.  Extends the rtnl_lock() to protect the call
to netif_device_detach() and ixgbe_clear_interrupt_scheme() to avoid
against a double free WARN and/or a BUG in free_msi_irqs().  Fixed AER
error handling by making sure that the driver frees the IRQs in
ixgbe_io_error_detected() when responding to a PCIe AER error, and to
restore them when the interface recovers.

Tony updates the driver to report the driver version to the firmware using
the host interface command for x550 devices.  Fixed the PHY reset check
for x550em_ext_t PHY type.  Fixed bounds checking for x540 devices to
ensure the index is valid for the LED function.  Fixed the BaseT adapters
which support 100Mb capability and were not reporting the capability.

Ken Cox adds a missing check for the trusted bit before trying to set the
MACVLAN MAC address.

Yusuke Suzuki fixes an issue with 82599 and x540 devices where receive
timestamps were not working becase the bitwise operation for RX_HWSTAMP
falg was incorrect.

Don ensures that x553 KR/KX devices correctly advertise link speeds.
Adds the mailbox message to allow for VF promiscuous mode support.

Mark fixes two issues with EEPROM access, where the semaphore was not
being held until the entire response was read and the acquiring/releasing
of the semaphore is slow.  Cleaned up firmware version method and
functions which are no longer used.  Added new interfaces for firmware
commands to access some new PHYs.

v2: fixed tab indentation in patch 12 and mis-spelled words in patch 15
    based on feedback from Sergei Shtylyov and Rami Rosen.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a88eb6be 07eea570

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+5 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ enum ixgbevf_xcast_modes { 
	IXGBEVF_XCAST_MODE_NONE = 0,

	IXGBEVF_XCAST_MODE_MULTI,

	IXGBEVF_XCAST_MODE_ALLMULTI,

	IXGBEVF_XCAST_MODE_PROMISC,

};



struct vf_macvlans {
@@ -661,6 +662,8 @@ struct ixgbe_adapter { 
#define IXGBE_FLAG2_PHY_INTERRUPT		BIT(11)

#define IXGBE_FLAG2_UDP_TUN_REREG_NEEDED	BIT(12)

#define IXGBE_FLAG2_VLAN_PROMISC		BIT(13)

#define IXGBE_FLAG2_EEE_CAPABLE			BIT(14)

#define IXGBE_FLAG2_EEE_ENABLED			BIT(15)



	/* Tx fast path data */

	int num_tx_queues;
@@ -862,6 +865,7 @@ enum ixgbe_boards { 
	board_X550,

	board_X550EM_x,

	board_x550em_a,

	board_x550em_a_fw,

};



extern const struct ixgbe_info ixgbe_82598_info;
@@ -870,6 +874,7 @@ extern const struct ixgbe_info ixgbe_X540_info; 
extern const struct ixgbe_info ixgbe_X550_info;

extern const struct ixgbe_info ixgbe_X550EM_x_info;

extern const struct ixgbe_info ixgbe_x550em_a_info;

extern const struct ixgbe_info ixgbe_x550em_a_fw_info;

#ifdef CONFIG_IXGBE_DCB

extern const struct dcbnl_rtnl_ops dcbnl_ops;

#endif

drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c

+0 −2
Original line number Diff line number Diff line
@@ -139,8 +139,6 @@ static s32 ixgbe_init_phy_ops_82598(struct ixgbe_hw *hw) 
	case ixgbe_phy_tn:

		phy->ops.setup_link = &ixgbe_setup_phy_link_tnx;

		phy->ops.check_link = &ixgbe_check_phy_link_tnx;

		phy->ops.get_firmware_version =

			     &ixgbe_get_phy_firmware_version_tnx;

		break;

	case ixgbe_phy_nl:

		phy->ops.reset = &ixgbe_reset_phy_nl;

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+0 −2
Original line number Diff line number Diff line
@@ -331,8 +331,6 @@ static s32 ixgbe_init_phy_ops_82599(struct ixgbe_hw *hw) 
	case ixgbe_phy_tn:

		phy->ops.check_link = &ixgbe_check_phy_link_tnx;

		phy->ops.setup_link = &ixgbe_setup_phy_link_tnx;

		phy->ops.get_firmware_version =

			     &ixgbe_get_phy_firmware_version_tnx;

		break;

	default:

		break;

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

+76 −37
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ bool ixgbe_device_supports_autoneg_fc(struct ixgbe_hw *hw) 
		case IXGBE_DEV_ID_X550T1:

		case IXGBE_DEV_ID_X550EM_X_10G_T:

		case IXGBE_DEV_ID_X550EM_A_10G_T:

		case IXGBE_DEV_ID_X550EM_A_1G_T:

		case IXGBE_DEV_ID_X550EM_A_1G_T_L:

			supported = true;

			break;

		default:
@@ -3382,6 +3384,13 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, ixgbe_link_speed *speed, 
		else

			*speed = IXGBE_LINK_SPEED_100_FULL;

		break;

	case IXGBE_LINKS_SPEED_10_X550EM_A:

		*speed = IXGBE_LINK_SPEED_UNKNOWN;

		if (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T ||

		    hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L) {

			*speed = IXGBE_LINK_SPEED_10_FULL;

		}

		break;

	default:

		*speed = IXGBE_LINK_SPEED_UNKNOWN;

	}
@@ -3578,7 +3587,7 @@ void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw, 
 *  Calculates the checksum for some buffer on a specified length.  The

 *  checksum calculated is returned.

 **/

static u8 ixgbe_calculate_checksum(u8 *buffer, u32 length)

u8 ixgbe_calculate_checksum(u8 *buffer, u32 length)

{

	u32 i;

	u8 sum = 0;
@@ -3593,43 +3602,29 @@ static u8 ixgbe_calculate_checksum(u8 *buffer, u32 length) 
}



/**

 *  ixgbe_host_interface_command - Issue command to manageability block

 *  ixgbe_hic_unlocked - Issue command to manageability block unlocked

 *  @hw: pointer to the HW structure

 *  @buffer: contains the command to write and where the return status will

 *           be placed

 *  @buffer: command to write and where the return status will be placed

 *  @length: length of buffer, must be multiple of 4 bytes

 *  @timeout: time in ms to wait for command completion

 *  @return_data: read and return data from the buffer (true) or not (false)

 *  Needed because FW structures are big endian and decoding of

 *  these fields can be 8 bit or 16 bit based on command. Decoding

 *  is not easily understood without making a table of commands.

 *  So we will leave this up to the caller to read back the data

 *  in these cases.

 *

 *  Communicates with the manageability block. On success return 0

 *  else return IXGBE_ERR_HOST_INTERFACE_COMMAND.

 *  else returns semaphore error when encountering an error acquiring

 *  semaphore or IXGBE_ERR_HOST_INTERFACE_COMMAND when command fails.

 *

 *  This function assumes that the IXGBE_GSSR_SW_MNG_SM semaphore is held

 *  by the caller.

 **/

s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, void *buffer,

				 u32 length, u32 timeout,

				 bool return_data)

s32 ixgbe_hic_unlocked(struct ixgbe_hw *hw, u32 *buffer, u32 length,

		       u32 timeout)

{

	u32 hdr_size = sizeof(struct ixgbe_hic_hdr);

	u32 hicr, i, bi, fwsts;

	u16 buf_len, dword_len;

	union {

		struct ixgbe_hic_hdr hdr;

		u32 u32arr[1];

	} *bp = buffer;

	s32 status;

	u32 hicr, i, fwsts;

	u16 dword_len;



	if (!length || length > IXGBE_HI_MAX_BLOCK_BYTE_LENGTH) {

		hw_dbg(hw, "Buffer length failure buffersize-%d.\n", length);

		return IXGBE_ERR_HOST_INTERFACE_COMMAND;

	}

	/* Take management host interface semaphore */

	status = hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_SW_MNG_SM);

	if (status)

		return status;



	/* Set bit 9 of FWSTS clearing FW reset indication */

	fwsts = IXGBE_READ_REG(hw, IXGBE_FWSTS);
@@ -3639,15 +3634,13 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, void *buffer, 
	hicr = IXGBE_READ_REG(hw, IXGBE_HICR);

	if (!(hicr & IXGBE_HICR_EN)) {

		hw_dbg(hw, "IXGBE_HOST_EN bit disabled.\n");

		status = IXGBE_ERR_HOST_INTERFACE_COMMAND;

		goto rel_out;

		return IXGBE_ERR_HOST_INTERFACE_COMMAND;

	}



	/* Calculate length in DWORDs. We must be DWORD aligned */

	if (length % sizeof(u32)) {

		hw_dbg(hw, "Buffer length failure, not aligned to dword");

		status = IXGBE_ERR_INVALID_ARGUMENT;

		goto rel_out;

		return IXGBE_ERR_INVALID_ARGUMENT;

	}



	dword_len = length >> 2;
@@ -3657,7 +3650,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, void *buffer, 
	 */

	for (i = 0; i < dword_len; i++)

		IXGBE_WRITE_REG_ARRAY(hw, IXGBE_FLEX_MNG,

				      i, cpu_to_le32(bp->u32arr[i]));

				      i, cpu_to_le32(buffer[i]));



	/* Setting this bit tells the ARC that a new command is pending. */

	IXGBE_WRITE_REG(hw, IXGBE_HICR, hicr | IXGBE_HICR_C);
@@ -3671,11 +3664,54 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, void *buffer, 


	/* Check command successful completion. */

	if ((timeout && i == timeout) ||

	    !(IXGBE_READ_REG(hw, IXGBE_HICR) & IXGBE_HICR_SV)) {

		hw_dbg(hw, "Command has failed with no status valid.\n");

		status = IXGBE_ERR_HOST_INTERFACE_COMMAND;

		goto rel_out;

	    !(IXGBE_READ_REG(hw, IXGBE_HICR) & IXGBE_HICR_SV))

		return IXGBE_ERR_HOST_INTERFACE_COMMAND;



	return 0;

}



/**

 *  ixgbe_host_interface_command - Issue command to manageability block

 *  @hw: pointer to the HW structure

 *  @buffer: contains the command to write and where the return status will

 *           be placed

 *  @length: length of buffer, must be multiple of 4 bytes

 *  @timeout: time in ms to wait for command completion

 *  @return_data: read and return data from the buffer (true) or not (false)

 *  Needed because FW structures are big endian and decoding of

 *  these fields can be 8 bit or 16 bit based on command. Decoding

 *  is not easily understood without making a table of commands.

 *  So we will leave this up to the caller to read back the data

 *  in these cases.

 *

 *  Communicates with the manageability block.  On success return 0

 *  else return IXGBE_ERR_HOST_INTERFACE_COMMAND.

 **/

s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, void *buffer,

				 u32 length, u32 timeout,

				 bool return_data)

{

	u32 hdr_size = sizeof(struct ixgbe_hic_hdr);

	union {

		struct ixgbe_hic_hdr hdr;

		u32 u32arr[1];

	} *bp = buffer;

	u16 buf_len, dword_len;

	s32 status;

	u32 bi;



	if (!length || length > IXGBE_HI_MAX_BLOCK_BYTE_LENGTH) {

		hw_dbg(hw, "Buffer length failure buffersize-%d.\n", length);

		return IXGBE_ERR_HOST_INTERFACE_COMMAND;

	}

	/* Take management host interface semaphore */

	status = hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_SW_MNG_SM);

	if (status)

		return status;



	status = ixgbe_hic_unlocked(hw, buffer, length, timeout);

	if (status)

		goto rel_out;



	if (!return_data)

		goto rel_out;
@@ -3722,6 +3758,8 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, void *buffer, 
 *  @min: driver version minor number

 *  @build: driver version build number

 *  @sub: driver version sub build number

 *  @len: length of driver_ver string

 *  @driver_ver: driver string

 *

 *  Sends driver version number to firmware through the manageability

 *  block.  On success return 0
@@ -3729,7 +3767,8 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, void *buffer, 
 *  semaphore or IXGBE_ERR_HOST_INTERFACE_COMMAND when command fails.

 **/

s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,

				 u8 build, u8 sub)

				 u8 build, u8 sub, __always_unused u16 len,

				 __always_unused const char *driver_ver)

{

	struct ixgbe_hic_drv_info fw_cmd;

	int i;

drivers/net/ethernet/intel/ixgbe/ixgbe_common.h

+5 −1
Original line number Diff line number Diff line
@@ -111,9 +111,13 @@ void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf); 
void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf);

s32 ixgbe_get_device_caps_generic(struct ixgbe_hw *hw, u16 *device_caps);

s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,

				 u8 build, u8 ver);

				 u8 build, u8 ver, u16 len, const char *str);

u8 ixgbe_calculate_checksum(u8 *buffer, u32 length);

s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, void *, u32 length,

				 u32 timeout, bool return_data);

s32 ixgbe_hic_unlocked(struct ixgbe_hw *hw, u32 *buffer, u32 len, u32 timeout);

s32 ixgbe_fw_phy_activity(struct ixgbe_hw *hw, u16 activity,

			  u32 (*data)[FW_PHY_ACT_DATA_COUNT]);

void ixgbe_clear_tx_pending(struct ixgbe_hw *hw);

bool ixgbe_mng_present(struct ixgbe_hw *hw);

bool ixgbe_mng_enabled(struct ixgbe_hw *hw);