Skip to content

L
linux
Commit c44ade9e authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Garzik
Browse files
Options

ixgbe: update to latest common code module 

This is a massive update that includes infrastructure for further patches
where we will add support for more phy types and eeprom types.

This code is shared as much as possible with other drivers, so the code may
seem a little obtuse at times but wherever possible we keep to the linux
style and methods.
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent f0848276
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1700 additions and 814 deletions
drivers/net/ixgbe/ixgbe.h
View file @ c44ade9e
...@@ -41,8 +41,6 @@ ...@@ -41,8 +41,6 @@
#include <linux/dca.h> #include <linux/dca.h>
#endif #endif
#define IXGBE_ERR(args...) printk(KERN_ERR "ixgbe: " args)
#define PFX "ixgbe: " #define PFX "ixgbe: "
#define DPRINTK(nlevel, klevel, fmt, args...) \ #define DPRINTK(nlevel, klevel, fmt, args...) \
((void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \ ((void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \
......
drivers/net/ixgbe/ixgbe_82598.c
View file @ c44ade9e
This diff is collapsed.
drivers/net/ixgbe/ixgbe_common.c
View file @ c44ade9e
This diff is collapsed.
drivers/net/ixgbe/ixgbe_common.h
View file @ c44ade9e
...@@ -31,36 +31,45 @@ ...@@ -31,36 +31,45 @@
#include "ixgbe_type.h" #include "ixgbe_type.h"
s32 ixgbe_init_hw(struct ixgbe_hw *hw); s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw);
s32 ixgbe_start_hw(struct ixgbe_hw *hw); s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw);
s32 ixgbe_get_mac_addr(struct ixgbe_hw *hw, u8 *mac_addr); s32 ixgbe_start_hw_generic(struct ixgbe_hw *hw);
s32 ixgbe_stop_adapter(struct ixgbe_hw *hw); s32 ixgbe_clear_hw_cntrs_generic(struct ixgbe_hw *hw);
s32 ixgbe_read_part_num(struct ixgbe_hw *hw, u32 *part_num); s32 ixgbe_read_pba_num_generic(struct ixgbe_hw *hw, u32 *pba_num);
s32 ixgbe_get_mac_addr_generic(struct ixgbe_hw *hw, u8 *mac_addr);
s32 ixgbe_led_on(struct ixgbe_hw *hw, u32 index); s32 ixgbe_get_bus_info_generic(struct ixgbe_hw *hw);
s32 ixgbe_led_off(struct ixgbe_hw *hw, u32 index); s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw);
s32 ixgbe_init_eeprom(struct ixgbe_hw *hw); s32 ixgbe_led_on_generic(struct ixgbe_hw *hw, u32 index);
s32 ixgbe_read_eeprom(struct ixgbe_hw *hw, u16 offset, u16 *data); s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index);
s32 ixgbe_validate_eeprom_checksum(struct ixgbe_hw *hw, u16 *checksum_val);
s32 ixgbe_init_eeprom_params_generic(struct ixgbe_hw *hw);
s32 ixgbe_set_rar(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vind, s32 ixgbe_read_eeprom_generic(struct ixgbe_hw *hw, u16 offset, u16 *data);
s32 ixgbe_read_eeprom_bit_bang_generic(struct ixgbe_hw *hw, u16 offset,
u16 *data);
s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw,
u16 *checksum_val);
s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw);
s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
u32 enable_addr); u32 enable_addr);
s32 ixgbe_update_mc_addr_list(struct ixgbe_hw *hw, u8 *mc_addr_list, s32 ixgbe_clear_rar_generic(struct ixgbe_hw *hw, u32 index);
u32 mc_addr_count, ixgbe_mc_addr_itr next); s32 ixgbe_init_rx_addrs_generic(struct ixgbe_hw *hw);
s32 ixgbe_update_uc_addr_list(struct ixgbe_hw *hw, u8 *uc_addr_list, s32 ixgbe_update_mc_addr_list_generic(struct ixgbe_hw *hw, u8 *mc_addr_list,
u32 mc_addr_count, ixgbe_mc_addr_itr next); u32 mc_addr_count,
s32 ixgbe_set_vfta(struct ixgbe_hw *hw, u32 vlan, u32 vind, bool vlan_on); ixgbe_mc_addr_itr func);
s32 ixgbe_validate_mac_addr(u8 *mac_addr); s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw, u8 *addr_list,
u32 addr_count, ixgbe_mc_addr_itr func);
s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packtetbuf_num); s32 ixgbe_enable_mc_generic(struct ixgbe_hw *hw);
s32 ixgbe_disable_mc_generic(struct ixgbe_hw *hw);
s32 ixgbe_validate_mac_addr(u8 *mac_addr);
s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask); s32 ixgbe_acquire_swfw_sync(struct ixgbe_hw *hw, u16 mask);
void ixgbe_release_swfw_sync(struct ixgbe_hw *hw, u16 mask); void ixgbe_release_swfw_sync(struct ixgbe_hw *hw, u16 mask);
s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw); s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw);
s32 ixgbe_read_analog_reg8(struct ixgbe_hw *hw, u32 reg, u8 *val); s32 ixgbe_read_analog_reg8_generic(struct ixgbe_hw *hw, u32 reg, u8 *val);
s32 ixgbe_write_analog_reg8(struct ixgbe_hw *hw, u32 reg, u8 val); s32 ixgbe_write_analog_reg8_generic(struct ixgbe_hw *hw, u32 reg, u8 val);
#define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg))) #define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg)))
......
drivers/net/ixgbe/ixgbe_ethtool.c
View file @ c44ade9e
...@@ -128,9 +128,10 @@ static int ixgbe_get_settings(struct net_device *netdev, ...@@ -128,9 +128,10 @@ static int ixgbe_get_settings(struct net_device *netdev,
ecmd->advertising = (ADVERTISED_10000baseT_Full | ecmd->advertising = (ADVERTISED_10000baseT_Full |
ADVERTISED_FIBRE); ADVERTISED_FIBRE);
ecmd->port = PORT_FIBRE; ecmd->port = PORT_FIBRE;
ecmd->autoneg = AUTONEG_DISABLE;
} }
adapter->hw.mac.ops.check_link(hw, &(link_speed), &link_up, false); hw->mac.ops.check_link(hw, &link_speed, &link_up, false);
if (link_up) { if (link_up) {
ecmd->speed = (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ? ecmd->speed = (link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
SPEED_10000 : SPEED_1000; SPEED_10000 : SPEED_1000;
...@@ -327,7 +328,7 @@ static void ixgbe_get_regs(struct net_device *netdev, ...@@ -327,7 +328,7 @@ static void ixgbe_get_regs(struct net_device *netdev,
regs_buff[25] = IXGBE_READ_REG(hw, IXGBE_IVAR(0)); regs_buff[25] = IXGBE_READ_REG(hw, IXGBE_IVAR(0));
regs_buff[26] = IXGBE_READ_REG(hw, IXGBE_MSIXT); regs_buff[26] = IXGBE_READ_REG(hw, IXGBE_MSIXT);
regs_buff[27] = IXGBE_READ_REG(hw, IXGBE_MSIXPBA); regs_buff[27] = IXGBE_READ_REG(hw, IXGBE_MSIXPBA);
regs_buff[28] = IXGBE_READ_REG(hw, IXGBE_PBACL); regs_buff[28] = IXGBE_READ_REG(hw, IXGBE_PBACL(0));
regs_buff[29] = IXGBE_READ_REG(hw, IXGBE_GPIE); regs_buff[29] = IXGBE_READ_REG(hw, IXGBE_GPIE);
/* Flow Control */ /* Flow Control */
...@@ -373,7 +374,7 @@ static void ixgbe_get_regs(struct net_device *netdev, ...@@ -373,7 +374,7 @@ static void ixgbe_get_regs(struct net_device *netdev,
regs_buff[482 + i] = IXGBE_READ_REG(hw, IXGBE_RAL(i)); regs_buff[482 + i] = IXGBE_READ_REG(hw, IXGBE_RAL(i));
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
regs_buff[498 + i] = IXGBE_READ_REG(hw, IXGBE_RAH(i)); regs_buff[498 + i] = IXGBE_READ_REG(hw, IXGBE_RAH(i));
regs_buff[514] = IXGBE_READ_REG(hw, IXGBE_PSRTYPE); regs_buff[514] = IXGBE_READ_REG(hw, IXGBE_PSRTYPE(0));
regs_buff[515] = IXGBE_READ_REG(hw, IXGBE_FCTRL); regs_buff[515] = IXGBE_READ_REG(hw, IXGBE_FCTRL);
regs_buff[516] = IXGBE_READ_REG(hw, IXGBE_VLNCTRL); regs_buff[516] = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
regs_buff[517] = IXGBE_READ_REG(hw, IXGBE_MCSTCTRL); regs_buff[517] = IXGBE_READ_REG(hw, IXGBE_MCSTCTRL);
...@@ -605,7 +606,7 @@ static int ixgbe_get_eeprom(struct net_device *netdev, ...@@ -605,7 +606,7 @@ static int ixgbe_get_eeprom(struct net_device *netdev,
return -ENOMEM; return -ENOMEM;
for (i = 0; i < eeprom_len; i++) { for (i = 0; i < eeprom_len; i++) {
if ((ret_val = ixgbe_read_eeprom(hw, first_word + i, if ((ret_val = hw->eeprom.ops.read(hw, first_word + i,
&eeprom_buff[i]))) &eeprom_buff[i])))
break; break;
} }
...@@ -807,7 +808,7 @@ static void ixgbe_get_strings(struct net_device *netdev, u32 stringset, ...@@ -807,7 +808,7 @@ static void ixgbe_get_strings(struct net_device *netdev, u32 stringset,
u8 *data) u8 *data)
{ {
struct ixgbe_adapter *adapter = netdev_priv(netdev); struct ixgbe_adapter *adapter = netdev_priv(netdev);
u8 *p = data; char *p = (char *)data;
int i; int i;
switch (stringset) { switch (stringset) {
...@@ -857,16 +858,17 @@ static int ixgbe_nway_reset(struct net_device *netdev) ...@@ -857,16 +858,17 @@ static int ixgbe_nway_reset(struct net_device *netdev)
static int ixgbe_phys_id(struct net_device *netdev, u32 data) static int ixgbe_phys_id(struct net_device *netdev, u32 data)
{ {
struct ixgbe_adapter *adapter = netdev_priv(netdev); struct ixgbe_adapter *adapter = netdev_priv(netdev);
u32 led_reg = IXGBE_READ_REG(&adapter->hw, IXGBE_LEDCTL); struct ixgbe_hw *hw = &adapter->hw;
u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
u32 i; u32 i;
if (!data || data > 300) if (!data || data > 300)
data = 300; data = 300;
for (i = 0; i < (data * 1000); i += 400) { for (i = 0; i < (data * 1000); i += 400) {
ixgbe_led_on(&adapter->hw, IXGBE_LED_ON); hw->mac.ops.led_on(hw, IXGBE_LED_ON);
msleep_interruptible(200); msleep_interruptible(200);
ixgbe_led_off(&adapter->hw, IXGBE_LED_ON); hw->mac.ops.led_off(hw, IXGBE_LED_ON);
msleep_interruptible(200); msleep_interruptible(200);
} }
......
drivers/net/ixgbe/ixgbe_main.c
View file @ c44ade9e
...@@ -1749,14 +1749,16 @@ static void ixgbe_vlan_rx_register(struct net_device *netdev, ...@@ -1749,14 +1749,16 @@ static void ixgbe_vlan_rx_register(struct net_device *netdev,
static void ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid) static void ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
{ {
struct ixgbe_adapter *adapter = netdev_priv(netdev); struct ixgbe_adapter *adapter = netdev_priv(netdev);
struct ixgbe_hw *hw = &adapter->hw;
/* add VID to filter table */ /* add VID to filter table */
ixgbe_set_vfta(&adapter->hw, vid, 0, true); hw->mac.ops.set_vfta(&adapter->hw, vid, 0, true);
} }
static void ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) static void ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
{ {
struct ixgbe_adapter *adapter = netdev_priv(netdev); struct ixgbe_adapter *adapter = netdev_priv(netdev);
struct ixgbe_hw *hw = &adapter->hw;
if (!test_bit(__IXGBE_DOWN, &adapter->state)) if (!test_bit(__IXGBE_DOWN, &adapter->state))
ixgbe_irq_disable(adapter); ixgbe_irq_disable(adapter);
...@@ -1767,7 +1769,7 @@ static void ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) ...@@ -1767,7 +1769,7 @@ static void ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
ixgbe_irq_enable(adapter); ixgbe_irq_enable(adapter);
/* remove VID from filter table */ /* remove VID from filter table */
ixgbe_set_vfta(&adapter->hw, vid, 0, false); hw->mac.ops.set_vfta(&adapter->hw, vid, 0, false);
} }
static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter) static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)
...@@ -1843,14 +1845,14 @@ static void ixgbe_set_rx_mode(struct net_device *netdev) ...@@ -1843,14 +1845,14 @@ static void ixgbe_set_rx_mode(struct net_device *netdev)
addr_count = netdev->uc_count; addr_count = netdev->uc_count;
if (addr_count) if (addr_count)
addr_list = netdev->uc_list->dmi_addr; addr_list = netdev->uc_list->dmi_addr;
ixgbe_update_uc_addr_list(hw, addr_list, addr_count, hw->mac.ops.update_uc_addr_list(hw, addr_list, addr_count,
ixgbe_addr_list_itr); ixgbe_addr_list_itr);
/* reprogram multicast list */ /* reprogram multicast list */
addr_count = netdev->mc_count; addr_count = netdev->mc_count;
if (addr_count) if (addr_count)
addr_list = netdev->mc_list->dmi_addr; addr_list = netdev->mc_list->dmi_addr;
ixgbe_update_mc_addr_list(hw, addr_list, addr_count, hw->mac.ops.update_mc_addr_list(hw, addr_list, addr_count,
ixgbe_addr_list_itr); ixgbe_addr_list_itr);
} }
...@@ -2016,11 +2018,12 @@ int ixgbe_up(struct ixgbe_adapter *adapter) ...@@ -2016,11 +2018,12 @@ int ixgbe_up(struct ixgbe_adapter *adapter)
void ixgbe_reset(struct ixgbe_adapter *adapter) void ixgbe_reset(struct ixgbe_adapter *adapter)
{ {
if (ixgbe_init_hw(&adapter->hw)) struct ixgbe_hw *hw = &adapter->hw;
DPRINTK(PROBE, ERR, "Hardware Error\n"); if (hw->mac.ops.init_hw(hw))
dev_err(&adapter->pdev->dev, "Hardware Error\n");
/* reprogram the RAR[0] in case user changed it. */ /* reprogram the RAR[0] in case user changed it. */
ixgbe_set_rar(&adapter->hw, 0, adapter->hw.mac.addr, 0, IXGBE_RAH_AV); hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0, IXGBE_RAH_AV);
} }
...@@ -2637,6 +2640,14 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) ...@@ -2637,6 +2640,14 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;
unsigned int rss; unsigned int rss;
/* PCI config space info */
hw->vendor_id = pdev->vendor;
hw->device_id = pdev->device;
hw->revision_id = pdev->revision;
hw->subsystem_vendor_id = pdev->subsystem_vendor;
hw->subsystem_device_id = pdev->subsystem_device;
/* Set capability flags */ /* Set capability flags */
rss = min(IXGBE_MAX_RSS_INDICES, (int)num_online_cpus()); rss = min(IXGBE_MAX_RSS_INDICES, (int)num_online_cpus());
adapter->ring_feature[RING_F_RSS].indices = rss; adapter->ring_feature[RING_F_RSS].indices = rss;
...@@ -2652,15 +2663,6 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) ...@@ -2652,15 +2663,6 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
/* select 10G link by default */ /* select 10G link by default */
hw->mac.link_mode_select = IXGBE_AUTOC_LMS_10G_LINK_NO_AN; hw->mac.link_mode_select = IXGBE_AUTOC_LMS_10G_LINK_NO_AN;
if (hw->mac.ops.reset(hw)) {
dev_err(&pdev->dev, "HW Init failed\n");
return -EIO;
}
if (hw->mac.ops.setup_link_speed(hw, IXGBE_LINK_SPEED_10GB_FULL, true,
false)) {
dev_err(&pdev->dev, "Link Speed setup failed\n");
return -EIO;
}
/* enable itr by default in dynamic mode */ /* enable itr by default in dynamic mode */
adapter->itr_setting = 1; adapter->itr_setting = 1;
...@@ -2675,7 +2677,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) ...@@ -2675,7 +2677,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
adapter->rx_ring_count = IXGBE_DEFAULT_RXD; adapter->rx_ring_count = IXGBE_DEFAULT_RXD;
/* initialize eeprom parameters */ /* initialize eeprom parameters */
if (ixgbe_init_eeprom(hw)) { if (ixgbe_init_eeprom_params_generic(hw)) {
dev_err(&pdev->dev, "EEPROM initialization failed\n"); dev_err(&pdev->dev, "EEPROM initialization failed\n");
return -EIO; return -EIO;
} }
...@@ -3622,7 +3624,7 @@ static int ixgbe_set_mac(struct net_device *netdev, void *p) ...@@ -3622,7 +3624,7 @@ static int ixgbe_set_mac(struct net_device *netdev, void *p)
memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
memcpy(adapter->hw.mac.addr, addr->sa_data, netdev->addr_len); memcpy(adapter->hw.mac.addr, addr->sa_data, netdev->addr_len);
ixgbe_set_rar(&adapter->hw, 0, adapter->hw.mac.addr, 0, IXGBE_RAH_AV); adapter->hw.mac.ops.set_rar(&adapter->hw, 0, adapter->hw.mac.addr, 0, IXGBE_RAH_AV);
return 0; return 0;
} }
...@@ -3645,6 +3647,22 @@ static void ixgbe_netpoll(struct net_device *netdev) ...@@ -3645,6 +3647,22 @@ static void ixgbe_netpoll(struct net_device *netdev)
} }
#endif #endif
/**
* ixgbe_link_config - set up initial link with default speed and duplex
* @hw: pointer to private hardware struct
*
* Returns 0 on success, negative on failure
**/
static int ixgbe_link_config(struct ixgbe_hw *hw)
{
u32 autoneg = IXGBE_LINK_SPEED_10GB_FULL;
/* must always autoneg for both 1G and 10G link */
hw->mac.autoneg = true;
return hw->mac.ops.setup_link_speed(hw, autoneg, true, true);
}
/** /**
* ixgbe_napi_add_all - prep napi structs for use * ixgbe_napi_add_all - prep napi structs for use
* @adapter: private struct * @adapter: private struct
...@@ -3691,7 +3709,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, ...@@ -3691,7 +3709,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
static int cards_found; static int cards_found;
int i, err, pci_using_dac; int i, err, pci_using_dac;
u16 link_status, link_speed, link_width; u16 link_status, link_speed, link_width;
u32 part_num; u32 part_num, eec;
err = pci_enable_device(pdev); err = pci_enable_device(pdev);
if (err) if (err)
...@@ -3705,8 +3723,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, ...@@ -3705,8 +3723,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
if (err) { if (err) {
err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
if (err) { if (err) {
dev_err(&pdev->dev, "No usable DMA " dev_err(&pdev->dev, "No usable DMA configuration, "
"configuration, aborting\n"); "aborting\n");
goto err_dma; goto err_dma;
} }
} }
...@@ -3772,17 +3790,21 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, ...@@ -3772,17 +3790,21 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
adapter->bd_number = cards_found; adapter->bd_number = cards_found;
/* PCI config space info */
hw->vendor_id = pdev->vendor;
hw->device_id = pdev->device;
hw->revision_id = pdev->revision;
hw->subsystem_vendor_id = pdev->subsystem_vendor;
hw->subsystem_device_id = pdev->subsystem_device;
/* Setup hw api */ /* Setup hw api */
memcpy(&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops)); memcpy(&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops));
hw->mac.type = ii->mac; hw->mac.type = ii->mac;
/* EEPROM */
memcpy(&hw->eeprom.ops, ii->eeprom_ops, sizeof(hw->eeprom.ops));
eec = IXGBE_READ_REG(hw, IXGBE_EEC);
/* If EEPROM is valid (bit 8 = 1), use default otherwise use bit bang */
if (!(eec & (1 << 8)))
hw->eeprom.ops.read = &ixgbe_read_eeprom_bit_bang_generic;
/* PHY */
memcpy(&hw->phy.ops, ii->phy_ops, sizeof(hw->phy.ops));
/* phy->sfp_type = ixgbe_sfp_type_unknown; */
err = ii->get_invariants(hw); err = ii->get_invariants(hw);
if (err) if (err)
goto err_hw_init; goto err_hw_init;
...@@ -3792,6 +3814,13 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, ...@@ -3792,6 +3814,13 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
if (err) if (err)
goto err_sw_init; goto err_sw_init;
/* reset_hw fills in the perm_addr as well */
err = hw->mac.ops.reset_hw(hw);
if (err) {
dev_err(&adapter->pdev->dev, "HW Init failed: %d\n", err);
goto err_sw_init;
}
netdev->features = NETIF_F_SG | netdev->features = NETIF_F_SG |
NETIF_F_IP_CSUM | NETIF_F_IP_CSUM |
NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_TX |
...@@ -3812,7 +3841,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, ...@@ -3812,7 +3841,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
netdev->features |= NETIF_F_HIGHDMA; netdev->features |= NETIF_F_HIGHDMA;
/* make sure the EEPROM is good */ /* make sure the EEPROM is good */
if (ixgbe_validate_eeprom_checksum(hw, NULL) < 0) { if (hw->eeprom.ops.validate_checksum(hw, NULL) < 0) {
dev_err(&pdev->dev, "The EEPROM Checksum Is Not Valid\n"); dev_err(&pdev->dev, "The EEPROM Checksum Is Not Valid\n");
err = -EIO; err = -EIO;
goto err_eeprom; goto err_eeprom;
...@@ -3821,7 +3850,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, ...@@ -3821,7 +3850,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
memcpy(netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len); memcpy(netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len);
memcpy(netdev->perm_addr, hw->mac.perm_addr, netdev->addr_len); memcpy(netdev->perm_addr, hw->mac.perm_addr, netdev->addr_len);
if (ixgbe_validate_mac_addr(netdev->dev_addr)) { if (ixgbe_validate_mac_addr(netdev->perm_addr)) {
dev_err(&pdev->dev, "invalid MAC address\n");
err = -EIO; err = -EIO;
goto err_eeprom; goto err_eeprom;
} }
...@@ -3853,7 +3883,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, ...@@ -3853,7 +3883,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
"Unknown"), "Unknown"),
netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2], netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]); netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
ixgbe_read_part_num(hw, &part_num); ixgbe_read_pba_num_generic(hw, &part_num);
dev_info(&pdev->dev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n", dev_info(&pdev->dev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n",
hw->mac.type, hw->phy.type, hw->mac.type, hw->phy.type,
(part_num >> 8), (part_num & 0xff)); (part_num >> 8), (part_num & 0xff));
...@@ -3867,7 +3897,14 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, ...@@ -3867,7 +3897,14 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
} }
/* reset the hardware with the new settings */ /* reset the hardware with the new settings */
ixgbe_start_hw(hw); hw->mac.ops.start_hw(hw);
/* link_config depends on start_hw being called at least once */
err = ixgbe_link_config(hw);
if (err) {
dev_err(&pdev->dev, "setup_link_speed FAILED %d\n", err);
goto err_register;
}
netif_carrier_off(netdev); netif_carrier_off(netdev);
netif_tx_stop_all_queues(netdev); netif_tx_stop_all_queues(netdev);
......
drivers/net/ixgbe/ixgbe_phy.c
View file @ c44ade9e
This diff is collapsed.
drivers/net/ixgbe/ixgbe_phy.h
View file @ c44ade9e
...@@ -30,20 +30,52 @@ ...@@ -30,20 +30,52 @@
#define _IXGBE_PHY_H_ #define _IXGBE_PHY_H_
#include "ixgbe_type.h" #include "ixgbe_type.h"
#define IXGBE_I2C_EEPROM_DEV_ADDR 0xA0
s32 ixgbe_setup_phy_link(struct ixgbe_hw *hw); /* EEPROM byte offsets */
s32 ixgbe_check_phy_link(struct ixgbe_hw *hw, u32 *speed, bool *link_up); #define IXGBE_SFF_IDENTIFIER 0x0
s32 ixgbe_setup_phy_link_speed(struct ixgbe_hw *hw, u32 speed, bool autoneg, #define IXGBE_SFF_IDENTIFIER_SFP 0x3
bool autoneg_wait_to_complete); #define IXGBE_SFF_VENDOR_OUI_BYTE0 0x25
s32 ixgbe_identify_phy(struct ixgbe_hw *hw); #define IXGBE_SFF_VENDOR_OUI_BYTE1 0x26
s32 ixgbe_reset_phy(struct ixgbe_hw *hw); #define IXGBE_SFF_VENDOR_OUI_BYTE2 0x27
s32 ixgbe_read_phy_reg(struct ixgbe_hw *hw, u32 reg_addr, #define IXGBE_SFF_1GBE_COMP_CODES 0x6
u32 device_type, u16 *phy_data); #define IXGBE_SFF_10GBE_COMP_CODES 0x3
#define IXGBE_SFF_TRANSMISSION_MEDIA 0x9
/* Bitmasks */
#define IXGBE_SFF_TWIN_AX_CAPABLE 0x80
#define IXGBE_SFF_1GBASESX_CAPABLE 0x1
#define IXGBE_SFF_10GBASESR_CAPABLE 0x10
#define IXGBE_SFF_10GBASELR_CAPABLE 0x20
#define IXGBE_I2C_EEPROM_READ_MASK 0x100
#define IXGBE_I2C_EEPROM_STATUS_MASK 0x3
#define IXGBE_I2C_EEPROM_STATUS_NO_OPERATION 0x0
#define IXGBE_I2C_EEPROM_STATUS_PASS 0x1
#define IXGBE_I2C_EEPROM_STATUS_FAIL 0x2
#define IXGBE_I2C_EEPROM_STATUS_IN_PROGRESS 0x3
/* Bit-shift macros */
#define IXGBE_SFF_VENDOR_OUI_BYTE0_SHIFT 12
#define IXGBE_SFF_VENDOR_OUI_BYTE1_SHIFT 8
#define IXGBE_SFF_VENDOR_OUI_BYTE2_SHIFT 4
/* PHY specific */ /* Vendor OUIs: format of OUI is 0x[byte0][byte1][byte2][00] */
s32 ixgbe_setup_tnx_phy_link(struct ixgbe_hw *hw); #define IXGBE_SFF_VENDOR_OUI_TYCO 0x00407600
s32 ixgbe_check_tnx_phy_link(struct ixgbe_hw *hw, u32 *speed, bool *link_up); #define IXGBE_SFF_VENDOR_OUI_FTL 0x00906500
s32 ixgbe_setup_tnx_phy_link_speed(struct ixgbe_hw *hw, u32 speed, bool autoneg, #define IXGBE_SFF_VENDOR_OUI_AVAGO 0x00176A00
s32 ixgbe_init_phy_ops_generic(struct ixgbe_hw *hw);
s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw);
s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw);
s32 ixgbe_read_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
u32 device_type, u16 *phy_data);
s32 ixgbe_write_phy_reg_generic(struct ixgbe_hw *hw, u32 reg_addr,
u32 device_type, u16 phy_data);
s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw);
s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,
ixgbe_link_speed speed,
bool autoneg,
bool autoneg_wait_to_complete); bool autoneg_wait_to_complete);
#endif /* _IXGBE_PHY_H_ */ #endif /* _IXGBE_PHY_H_ */
drivers/net/ixgbe/ixgbe_type.h
View file @ c44ade9e
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7