Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 (a45d49d1) · Commits · e / devices / android_kernel_teracube_emerald

drivers/net/igb/igb_ethtool.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -727,8 +727,9 @@ static void igb_get_drvinfo(struct net_device *netdev,
		char firmware_version[32];
		u16 eeprom_data;

		strncpy(drvinfo->driver, igb_driver_name, 32);
		strncpy(drvinfo->version, igb_driver_version, 32);
		strncpy(drvinfo->driver, igb_driver_name, sizeof(drvinfo->driver) - 1);
		strncpy(drvinfo->version, igb_driver_version,
		sizeof(drvinfo->version) - 1);

		/* EEPROM image version # is reported as firmware version # for
		* 82575 controllers */
		@@ -738,8 +739,10 @@ static void igb_get_drvinfo(struct net_device *netdev,
		(eeprom_data & 0x0FF0) >> 4,
		eeprom_data & 0x000F);

		strncpy(drvinfo->fw_version, firmware_version, 32);
		strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
		strncpy(drvinfo->fw_version, firmware_version,
		sizeof(drvinfo->fw_version) - 1);
		strncpy(drvinfo->bus_info, pci_name(adapter->pdev),
		sizeof(drvinfo->bus_info) - 1);
		drvinfo->n_stats = IGB_STATS_LEN;
		drvinfo->testinfo_len = IGB_TEST_LEN;
		drvinfo->regdump_len = igb_get_regs_len(netdev);
		@@ -1070,7 +1073,7 @@ static bool reg_pattern_test(struct igb_adapter adapter, u64 data,
		{0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF};
		for (pat = 0; pat < ARRAY_SIZE(_test); pat++) {
		wr32(reg, (_test[pat] & write));
		val = rd32(reg);
		val = rd32(reg) & mask;
		if (val != (_test[pat] & write & mask)) {
		dev_err(&adapter->pdev->dev, "pattern test reg %04X "
		"failed: got 0x%08X expected 0x%08X\n",

drivers/net/igb/igb_main.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -2291,7 +2291,12 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)
		switch (hw->mac.type) {
		case e1000_82576:
		case e1000_i350:
		adapter->vfs_allocated_count = (max_vfs > 7) ? 7 : max_vfs;
		if (max_vfs > 7) {
		dev_warn(&pdev->dev,
		"Maximum of 7 VFs per PF, using max\n");
		adapter->vfs_allocated_count = 7;
		} else
		adapter->vfs_allocated_count = max_vfs;
		break;
		default:
		break;

drivers/net/ixgbe/ixgbe.h

+1 −1

Original line number	Diff line number	Diff line
		/*******************************************************************************

		Intel 10 Gigabit PCI Express Linux driver
		Copyright(c) 1999 - 2010 Intel Corporation.
		Copyright(c) 1999 - 2011 Intel Corporation.

		This program is free software; you can redistribute it and/or modify it
		under the terms and conditions of the GNU General Public License,

drivers/net/ixgbe/ixgbe_82598.c

+40 −23

Original line number	Diff line number	Diff line
		/*******************************************************************************

		Intel 10 Gigabit PCI Express Linux driver
		Copyright(c) 1999 - 2010 Intel Corporation.
		Copyright(c) 1999 - 2011 Intel Corporation.

		This program is free software; you can redistribute it and/or modify it
		under the terms and conditions of the GNU General Public License,
		@@ -627,7 +627,6 @@ static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,
		return 0;
		}


		/**
		* ixgbe_setup_mac_link_82598 - Set MAC link speed
		* @hw: pointer to hardware structure
		@@ -698,7 +697,6 @@ static s32 ixgbe_setup_copper_link_82598(struct ixgbe_hw *hw,
		/* Setup the PHY according to input speed */
		status = hw->phy.ops.setup_link_speed(hw, speed, autoneg,
		autoneg_wait_to_complete);

		/* Set up MAC */
		ixgbe_start_mac_link_82598(hw, autoneg_wait_to_complete);

		@@ -770,7 +768,6 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)
		else if (phy_status == IXGBE_ERR_SFP_NOT_PRESENT)
		goto no_phy_reset;


		hw->phy.ops.reset(hw);
		}

		@@ -779,12 +776,9 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)
		* Prevent the PCI-E bus from from hanging by disabling PCI-E master
		* access and verify no pending requests before reset
		*/
		status = ixgbe_disable_pcie_master(hw);
		if (status != 0) {
		status = IXGBE_ERR_MASTER_REQUESTS_PENDING;
		hw_dbg(hw, "PCI-E Master disable polling has failed.\n");
		}
		ixgbe_disable_pcie_master(hw);

		mac_reset_top:
		/*
		* Issue global reset to the MAC. This needs to be a SW reset.
		* If link reset is used, it might reset the MAC when mng is using it
		@@ -805,6 +799,19 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)
		hw_dbg(hw, "Reset polling failed to complete.\n");
		}

		/*
		* Double resets are required for recovery from certain error
		* conditions. Between resets, it is necessary to stall to allow time
		* for any pending HW events to complete. We use 1usec since that is
		* what is needed for ixgbe_disable_pcie_master(). The second reset
		* then clears out any effects of those events.
		*/
		if (hw->mac.flags & IXGBE_FLAGS_DOUBLE_RESET_REQUIRED) {
		hw->mac.flags &= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
		udelay(1);
		goto mac_reset_top;
		}

		msleep(50);

		gheccr = IXGBE_READ_REG(hw, IXGBE_GHECCR);
		@@ -824,15 +831,15 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)
		IXGBE_WRITE_REG(hw, IXGBE_AUTOC, hw->mac.orig_autoc);
		}

		/* Store the permanent mac address */
		hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);

		/*
		* Store MAC address from RAR0, clear receive address registers, and
		* clear the multicast table
		*/
		hw->mac.ops.init_rx_addrs(hw);

		/* Store the permanent mac address */
		hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);

		reset_hw_out:
		if (phy_status)
		status = phy_status;
		@@ -849,6 +856,13 @@ static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw)
		static s32 ixgbe_set_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
		{
		u32 rar_high;
		u32 rar_entries = hw->mac.num_rar_entries;

		/* Make sure we are using a valid rar index range */
		if (rar >= rar_entries) {
		hw_dbg(hw, "RAR index %d is out of range.\n", rar);
		return IXGBE_ERR_INVALID_ARGUMENT;
		}

		rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));
		rar_high &= ~IXGBE_RAH_VIND_MASK;
		@@ -868,15 +882,18 @@ static s32 ixgbe_clear_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
		u32 rar_high;
		u32 rar_entries = hw->mac.num_rar_entries;

		if (rar < rar_entries) {

		/* Make sure we are using a valid rar index range */
		if (rar >= rar_entries) {
		hw_dbg(hw, "RAR index %d is out of range.\n", rar);
		return IXGBE_ERR_INVALID_ARGUMENT;
		}

		rar_high = IXGBE_READ_REG(hw, IXGBE_RAH(rar));
		if (rar_high & IXGBE_RAH_VIND_MASK) {
		rar_high &= ~IXGBE_RAH_VIND_MASK;
		IXGBE_WRITE_REG(hw, IXGBE_RAH(rar), rar_high);
		}
		} else {
		hw_dbg(hw, "RAR index %d is out of range.\n", rar);
		}

		return 0;
		}
		@@ -994,13 +1011,12 @@ static s32 ixgbe_write_analog_reg8_82598(struct ixgbe_hw *hw, u32 reg, u8 val)
		}

		/**
		* ixgbe_read_i2c_eeprom_82598 - Read 8 bit EEPROM word of an SFP+ module
		* over I2C interface through an intermediate phy.
		* ixgbe_read_i2c_eeprom_82598 - Reads 8 bit word over I2C interface.
		* @hw: pointer to hardware structure
		* @byte_offset: EEPROM byte offset to read
		* @eeprom_data: value read
		*
		* Performs byte read operation to SFP module's EEPROM over I2C interface.
		* Performs 8 byte read operation to SFP module's EEPROM over I2C interface.
		**/
		static s32 ixgbe_read_i2c_eeprom_82598(struct ixgbe_hw *hw, u8 byte_offset,
		u8 *eeprom_data)
		@@ -1179,13 +1195,14 @@ static struct ixgbe_mac_operations mac_ops_82598 = {
		.set_vmdq = &ixgbe_set_vmdq_82598,
		.clear_vmdq = &ixgbe_clear_vmdq_82598,
		.init_rx_addrs = &ixgbe_init_rx_addrs_generic,
		.update_uc_addr_list = &ixgbe_update_uc_addr_list_generic,
		.update_mc_addr_list = &ixgbe_update_mc_addr_list_generic,
		.enable_mc = &ixgbe_enable_mc_generic,
		.disable_mc = &ixgbe_disable_mc_generic,
		.clear_vfta = &ixgbe_clear_vfta_82598,
		.set_vfta = &ixgbe_set_vfta_82598,
		.fc_enable = &ixgbe_fc_enable_82598,
		.acquire_swfw_sync = &ixgbe_acquire_swfw_sync,
		.release_swfw_sync = &ixgbe_release_swfw_sync,
		};

		static struct ixgbe_eeprom_operations eeprom_ops_82598 = {

drivers/net/ixgbe/ixgbe_82599.c

+73 −31

Original line number	Diff line number	Diff line
		/*******************************************************************************

		Intel 10 Gigabit PCI Express Linux driver
		Copyright(c) 1999 - 2010 Intel Corporation.
		Copyright(c) 1999 - 2011 Intel Corporation.

		This program is free software; you can redistribute it and/or modify it
		under the terms and conditions of the GNU General Public License,
		@@ -112,7 +112,8 @@ static s32 ixgbe_setup_sfp_modules_82599(struct ixgbe_hw *hw)
		goto setup_sfp_out;

		/* PHY config will finish before releasing the semaphore */
		ret_val = ixgbe_acquire_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM);
		ret_val = hw->mac.ops.acquire_swfw_sync(hw,
		IXGBE_GSSR_MAC_CSR_SM);
		if (ret_val != 0) {
		ret_val = IXGBE_ERR_SWFW_SYNC;
		goto setup_sfp_out;
		@@ -329,11 +330,14 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
		enum ixgbe_media_type media_type;

		/* Detect if there is a copper PHY attached. */
		if (hw->phy.type == ixgbe_phy_cu_unknown \|\|
		hw->phy.type == ixgbe_phy_tn \|\|
		hw->phy.type == ixgbe_phy_aq) {
		switch (hw->phy.type) {
		case ixgbe_phy_cu_unknown:
		case ixgbe_phy_tn:
		case ixgbe_phy_aq:
		media_type = ixgbe_media_type_copper;
		goto out;
		default:
		break;
		}

		switch (hw->device_id) {
		@@ -354,6 +358,9 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)
		case IXGBE_DEV_ID_82599_CX4:
		media_type = ixgbe_media_type_cx4;
		break;
		case IXGBE_DEV_ID_82599_T3_LOM:
		media_type = ixgbe_media_type_copper;
		break;
		default:
		media_type = ixgbe_media_type_unknown;
		break;
		@@ -536,7 +543,6 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,
		* Section 73.10.2, we may have to wait up to 500ms if KR is
		* attempted. 82599 uses the same timing for 10g SFI.
		*/

		for (i = 0; i < 5; i++) {
		/* Wait for the link partner to also set speed */
		msleep(100);
		@@ -761,7 +767,6 @@ static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
		else
		orig_autoc = autoc;


		if (link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR \|\|
		link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_1G_AN \|\|
		link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
		@@ -898,12 +903,9 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
		* Prevent the PCI-E bus from from hanging by disabling PCI-E master
		* access and verify no pending requests before reset
		*/
		status = ixgbe_disable_pcie_master(hw);
		if (status != 0) {
		status = IXGBE_ERR_MASTER_REQUESTS_PENDING;
		hw_dbg(hw, "PCI-E Master disable polling has failed.\n");
		}
		ixgbe_disable_pcie_master(hw);

		mac_reset_top:
		/*
		* Issue global reset to the MAC. This needs to be a SW reset.
		* If link reset is used, it might reset the MAC when mng is using it
		@@ -924,6 +926,19 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
		hw_dbg(hw, "Reset polling failed to complete.\n");
		}

		/*
		* Double resets are required for recovery from certain error
		* conditions. Between resets, it is necessary to stall to allow time
		* for any pending HW events to complete. We use 1usec since that is
		* what is needed for ixgbe_disable_pcie_master(). The second reset
		* then clears out any effects of those events.
		*/
		if (hw->mac.flags & IXGBE_FLAGS_DOUBLE_RESET_REQUIRED) {
		hw->mac.flags &= ~IXGBE_FLAGS_DOUBLE_RESET_REQUIRED;
		udelay(1);
		goto mac_reset_top;
		}

		msleep(50);

		/*
		@@ -951,6 +966,9 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
		}
		}

		/* Store the permanent mac address */
		hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);

		/*
		* Store MAC address from RAR0, clear receive address registers, and
		* clear the multicast table. Also reset num_rar_entries to 128,
		@@ -959,9 +977,6 @@ static s32 ixgbe_reset_hw_82599(struct ixgbe_hw *hw)
		hw->mac.num_rar_entries = 128;
		hw->mac.ops.init_rx_addrs(hw);

		/* Store the permanent mac address */
		hw->mac.ops.get_mac_addr(hw, hw->mac.perm_addr);

		/* Store the permanent SAN mac address */
		hw->mac.ops.get_san_mac_addr(hw, hw->mac.san_addr);

		@@ -1733,13 +1748,34 @@ static s32 ixgbe_start_hw_82599(struct ixgbe_hw *hw)
		* @hw: pointer to hardware structure
		*
		* Determines the physical layer module found on the current adapter.
		* If PHY already detected, maintains current PHY type in hw struct,
		* otherwise executes the PHY detection routine.
		**/
		static s32 ixgbe_identify_phy_82599(struct ixgbe_hw *hw)
		s32 ixgbe_identify_phy_82599(struct ixgbe_hw *hw)
		{
		s32 status = IXGBE_ERR_PHY_ADDR_INVALID;

		/* Detect PHY if not unknown - returns success if already detected. */
		status = ixgbe_identify_phy_generic(hw);
		if (status != 0)
		if (status != 0) {
		/* 82599 10GBASE-T requires an external PHY */
		if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_copper)
		goto out;
		else
		status = ixgbe_identify_sfp_module_generic(hw);
		}

		/* Set PHY type none if no PHY detected */
		if (hw->phy.type == ixgbe_phy_unknown) {
		hw->phy.type = ixgbe_phy_none;
		status = 0;
		}

		/* Return error if SFP module has been detected but is not supported */
		if (hw->phy.type == ixgbe_phy_sfp_unsupported)
		status = IXGBE_ERR_SFP_NOT_SUPPORTED;

		out:
		return status;
		}

		@@ -1763,9 +1799,10 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)

		hw->phy.ops.identify(hw);

		if (hw->phy.type == ixgbe_phy_tn \|\|
		hw->phy.type == ixgbe_phy_aq \|\|
		hw->phy.type == ixgbe_phy_cu_unknown) {
		switch (hw->phy.type) {
		case ixgbe_phy_tn:
		case ixgbe_phy_aq:
		case ixgbe_phy_cu_unknown:
		hw->phy.ops.read_reg(hw, MDIO_PMA_EXTABLE, MDIO_MMD_PMAPMD,
		&ext_ability);
		if (ext_ability & MDIO_PMA_EXTABLE_10GBT)
		@@ -1775,6 +1812,8 @@ static u32 ixgbe_get_supported_physical_layer_82599(struct ixgbe_hw *hw)
		if (ext_ability & MDIO_PMA_EXTABLE_100BTX)
		physical_layer \|= IXGBE_PHYSICAL_LAYER_100BASE_TX;
		goto out;
		default:
		break;
		}

		switch (autoc & IXGBE_AUTOC_LMS_MASK) {
		@@ -1886,6 +1925,7 @@ static s32 ixgbe_enable_rx_dma_82599(struct ixgbe_hw *hw, u32 regval)
		if (secrxreg & IXGBE_SECRXSTAT_SECRX_RDY)
		break;
		else
		/* Use interrupt-safe sleep just in case */
		udelay(10);
		}

		@@ -1995,7 +2035,6 @@ static struct ixgbe_mac_operations mac_ops_82599 = {
		.set_vmdq = &ixgbe_set_vmdq_generic,
		.clear_vmdq = &ixgbe_clear_vmdq_generic,
		.init_rx_addrs = &ixgbe_init_rx_addrs_generic,
		.update_uc_addr_list = &ixgbe_update_uc_addr_list_generic,
		.update_mc_addr_list = &ixgbe_update_mc_addr_list_generic,
		.enable_mc = &ixgbe_enable_mc_generic,
		.disable_mc = &ixgbe_disable_mc_generic,
		@@ -2006,6 +2045,9 @@ static struct ixgbe_mac_operations mac_ops_82599 = {
		.setup_sfp = &ixgbe_setup_sfp_modules_82599,
		.set_mac_anti_spoofing = &ixgbe_set_mac_anti_spoofing,
		.set_vlan_anti_spoofing = &ixgbe_set_vlan_anti_spoofing,
		.acquire_swfw_sync = &ixgbe_acquire_swfw_sync,
		.release_swfw_sync = &ixgbe_release_swfw_sync,

		};

		static struct ixgbe_eeprom_operations eeprom_ops_82599 = {