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

Commit e43d15c8 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 2016-04-05

This series contains updates to i40e and i40evf only.

Stefan converts dev_close() to ndo_stop() for ethtool offline self test,
since dev_close() causes IFF_UP to be cleared which will remove the
interface routes and addresses.

Alex bumps up the size of the transmit data buffer to 12K rather than 8K,
which provides a gain in throughput and a reduction in overhead for
putting together the frame.  Fixed an issue in the polling routines where
we were using bitwise operators to avoid the side effects of the
logical operators.  Then added support for bulk transmit clean for skbs.

Jesse fixed a sparse issue in the type casting in the transmit code and
fixed i40e_aq_set_phy_debug() to use i40e_status as a return code.

Catherine cleans up duplicated code.

Shannon fixed the cleaning up of the interrupt handling to clean up the
IRQs only if we actually got them set up.  Also fixed up the error
scenarios where we were trying to remove a non-existent timer or
worktask, which causes the kernel heartburn.

Mitch changes the notification of resets to the reset interrupt handler,
instead of the actual reset initiation code.  This allows the VFs to get
properly notified for all resets, including resets initiated by different
PFs on the same physical device.  Also moved the clearing of VFLR bit
after reset processing, instead of before which could lead to double
resets on VF init.  Fixed code comment to match the actual function name.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f1cc8094 50f26a50

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

+1 −2
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ struct i40e_fdir_filter { 
#define I40E_DCB_PRIO_TYPE_STRICT	0

#define I40E_DCB_PRIO_TYPE_ETS		1

#define I40E_DCB_STRICT_PRIO_CREDITS	127

#define I40E_MAX_USER_PRIORITY	8

/* DCB per TC information data structure */

struct i40e_tc_info {

	u16	qoffset;	/* Queue offset from base queue */
@@ -811,6 +810,7 @@ int i40e_vlan_rx_kill_vid(struct net_device *netdev, 
			  __always_unused __be16 proto, u16 vid);

#endif

int i40e_open(struct net_device *netdev);

int i40e_close(struct net_device *netdev);

int i40e_vsi_open(struct i40e_vsi *vsi);

void i40e_vlan_stripping_disable(struct i40e_vsi *vsi);

int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid);
@@ -823,7 +823,6 @@ bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi); 
struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, u8 *macaddr,

				      bool is_vf, bool is_netdev);

#ifdef I40E_FCOE

int i40e_close(struct net_device *netdev);

int __i40e_setup_tc(struct net_device *netdev, u32 handle, __be16 proto,

		    struct tc_to_netdev *tc);

void i40e_netpoll(struct net_device *netdev);

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

+9 −3
Original line number Diff line number Diff line
@@ -1901,13 +1901,13 @@ i40e_status i40e_aq_set_phy_int_mask(struct i40e_hw *hw, 
 *

 * Reset the external PHY.

 **/

enum i40e_status_code i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags,

i40e_status i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags,

				  struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

	struct i40e_aqc_set_phy_debug *cmd =

		(struct i40e_aqc_set_phy_debug *)&desc.params.raw;

	enum i40e_status_code status;

	i40e_status status;



	i40e_fill_default_direct_cmd_desc(&desc,

					  i40e_aqc_opc_set_phy_debug);
@@ -2157,6 +2157,9 @@ i40e_status i40e_aq_update_vsi_params(struct i40e_hw *hw, 
	struct i40e_aq_desc desc;

	struct i40e_aqc_add_get_update_vsi *cmd =

		(struct i40e_aqc_add_get_update_vsi *)&desc.params.raw;

	struct i40e_aqc_add_get_update_vsi_completion *resp =

		(struct i40e_aqc_add_get_update_vsi_completion *)

		&desc.params.raw;

	i40e_status status;



	i40e_fill_default_direct_cmd_desc(&desc,
@@ -2168,6 +2171,9 @@ i40e_status i40e_aq_update_vsi_params(struct i40e_hw *hw, 
	status = i40e_asq_send_command(hw, &desc, &vsi_ctx->info,

				    sizeof(vsi_ctx->info), cmd_details);



	vsi_ctx->vsis_allocated = le16_to_cpu(resp->vsi_used);

	vsi_ctx->vsis_unallocated = le16_to_cpu(resp->vsi_free);



	return status;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -1714,7 +1714,7 @@ static void i40e_diag_test(struct net_device *netdev, 
		/* If the device is online then take it offline */

		if (if_running)

			/* indicate we're in test mode */

			dev_close(netdev);

			i40e_close(netdev);

		else

			/* This reset does not affect link - if it is

			 * changed to a type of reset that does affect
@@ -1743,7 +1743,7 @@ static void i40e_diag_test(struct net_device *netdev, 
		i40e_do_reset(pf, BIT(__I40E_PF_RESET_REQUESTED));



		if (if_running)

			dev_open(netdev);

			i40e_open(netdev);

	} else {

		/* Online tests */

		netif_info(pf, drv, netdev, "online testing starting\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -1371,7 +1371,7 @@ static netdev_tx_t i40e_fcoe_xmit_frame(struct sk_buff *skb, 
	if (i40e_chk_linearize(skb, count)) {

		if (__skb_linearize(skb))

			goto out_drop;

		count = TXD_USE_COUNT(skb->len);

		count = i40e_txd_use_count(skb->len);

		tx_ring->tx_stats.tx_linearize++;

	}

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

+16 −19
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ static const char i40e_driver_string[] = 
#define DRV_KERN "-k"



#define DRV_VERSION_MAJOR 1

#define DRV_VERSION_MINOR 4

#define DRV_VERSION_BUILD 25

#define DRV_VERSION_MINOR 5

#define DRV_VERSION_BUILD 1

#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \

	     __stringify(DRV_VERSION_MINOR) "." \

	     __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -4164,7 +4164,7 @@ static void i40e_clear_interrupt_scheme(struct i40e_pf *pf) 
	int i;



	i40e_stop_misc_vector(pf);

	if (pf->flags & I40E_FLAG_MSIX_ENABLED) {

	if (pf->flags & I40E_FLAG_MSIX_ENABLED && pf->msix_entries) {

		synchronize_irq(pf->msix_entries[0].vector);

		free_irq(pf->msix_entries[0].vector, pf);

	}
@@ -5509,11 +5509,7 @@ static void i40e_fdir_filter_exit(struct i40e_pf *pf) 
 *

 * Returns 0, this is not allowed to fail

 **/

#ifdef I40E_FCOE

int i40e_close(struct net_device *netdev)

#else

static int i40e_close(struct net_device *netdev)

#endif

{

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_vsi *vsi = np->vsi;
@@ -5538,8 +5534,6 @@ void i40e_do_reset(struct i40e_pf *pf, u32 reset_flags) 


	WARN_ON(in_interrupt());



	if (i40e_check_asq_alive(&pf->hw))

		i40e_vc_notify_reset(pf);



	/* do the biggest reset indicated */

	if (reset_flags & BIT_ULL(__I40E_GLOBAL_RESET_REQUESTED)) {
@@ -6377,7 +6371,7 @@ static void i40e_clean_adminq_subtask(struct i40e_pf *pf) 
			break;

		default:

			dev_info(&pf->pdev->dev,

				 "ARQ Error: Unknown event 0x%04x received\n",

				 "ARQ: Unknown event 0x%04x ignored\n",

				 opcode);

			break;

		}
@@ -6742,6 +6736,8 @@ static void i40e_prep_for_reset(struct i40e_pf *pf) 
	clear_bit(__I40E_RESET_INTR_RECEIVED, &pf->state);

	if (test_and_set_bit(__I40E_RESET_RECOVERY_PENDING, &pf->state))

		return;

	if (i40e_check_asq_alive(&pf->hw))

		i40e_vc_notify_reset(pf);



	dev_dbg(&pf->pdev->dev, "Tearing down internal switch for reset\n");
@@ -10826,6 +10822,12 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	hw->bus.func = PCI_FUNC(pdev->devfn);

	pf->instance = pfs_found;



	/* set up the locks for the AQ, do this only once in probe

	 * and destroy them only once in remove

	 */

	mutex_init(&hw->aq.asq_mutex);

	mutex_init(&hw->aq.arq_mutex);



	if (debug != -1) {

		pf->msg_enable = pf->hw.debug_mask;

		pf->msg_enable = debug;
@@ -10871,12 +10873,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* set up a default setting for link flow control */

	pf->hw.fc.requested_mode = I40E_FC_NONE;



	/* set up the locks for the AQ, do this only once in probe

	 * and destroy them only once in remove

	 */

	mutex_init(&hw->aq.asq_mutex);

	mutex_init(&hw->aq.arq_mutex);



	err = i40e_init_adminq(hw);

	if (err) {

		if (err == I40E_ERR_FIRMWARE_API_VERSION)
@@ -11269,7 +11265,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	kfree(pf->qp_pile);

err_sw_init:

err_adminq_setup:

	(void)i40e_shutdown_adminq(hw);

err_pf_reset:

	iounmap(hw->hw_addr);

err_ioremap:
@@ -11311,7 +11306,9 @@ static void i40e_remove(struct pci_dev *pdev) 
	/* no more scheduling of any task */

	set_bit(__I40E_SUSPENDED, &pf->state);

	set_bit(__I40E_DOWN, &pf->state);

	if (pf->service_timer.data)

		del_timer_sync(&pf->service_timer);

	if (pf->service_task.func)

		cancel_work_sync(&pf->service_task);



	if (pf->flags & I40E_FLAG_SRIOV_ENABLED) {