Skip to content

L
linux
Commit f85fa279 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

parents 358b8382 ea99d832
Expand all Show whitespace changes
Inline Side-by-side
Showing with 340 additions and 299 deletions
drivers/net/ethernet/intel/e1000/e1000_hw.h
View file @ f85fa279
...@@ -448,7 +448,6 @@ void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value); ...@@ -448,7 +448,6 @@ void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value);
#define E1000_DEV_ID_INTEL_CE4100_GBE 0x2E6E #define E1000_DEV_ID_INTEL_CE4100_GBE 0x2E6E
#define NODE_ADDRESS_SIZE 6 #define NODE_ADDRESS_SIZE 6
#define ETH_LENGTH_OF_ADDRESS 6
/* MAC decode size is 128K - This is the size of BAR0 */ /* MAC decode size is 128K - This is the size of BAR0 */
#define MAC_DECODE_SIZE (128 * 1024) #define MAC_DECODE_SIZE (128 * 1024)
......
drivers/net/ethernet/intel/e1000e/netdev.c
View file @ f85fa279
This diff is collapsed.
drivers/net/ethernet/intel/igb/e1000_82575.c
View file @ f85fa279
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
* e1000_82576 * e1000_82576
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/types.h> #include <linux/types.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
...@@ -244,8 +246,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) ...@@ -244,8 +246,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
* Check for invalid size * Check for invalid size
*/ */
if ((hw->mac.type == e1000_82576) && (size > 15)) { if ((hw->mac.type == e1000_82576) && (size > 15)) {
printk("igb: The NVM size is not valid, " pr_notice("The NVM size is not valid, defaulting to 32K\n");
"defaulting to 32K.\n");
size = 15; size = 15;
} }
nvm->word_size = 1 << size; nvm->word_size = 1 << size;
......
drivers/net/ethernet/intel/igb/igb_main.c
View file @ f85fa279
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
*******************************************************************************/ *******************************************************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -325,16 +327,13 @@ static void igb_regdump(struct e1000_hw *hw, struct igb_reg_info *reginfo) ...@@ -325,16 +327,13 @@ static void igb_regdump(struct e1000_hw *hw, struct igb_reg_info *reginfo)
regs[n] = rd32(E1000_TXDCTL(n)); regs[n] = rd32(E1000_TXDCTL(n));
break; break;
default: default:
printk(KERN_INFO "%-15s %08x\n", pr_info("%-15s %08x\n", reginfo->name, rd32(reginfo->ofs));
reginfo->name, rd32(reginfo->ofs));
return; return;
} }
snprintf(rname, 16, "%s%s", reginfo->name, "[0-3]"); snprintf(rname, 16, "%s%s", reginfo->name, "[0-3]");
printk(KERN_INFO "%-15s ", rname); pr_info("%-15s %08x %08x %08x %08x\n", rname, regs[0], regs[1],
for (n = 0; n < 4; n++) regs[2], regs[3]);
printk(KERN_CONT "%08x ", regs[n]);
printk(KERN_CONT "\n");
} }
/* /*
...@@ -359,18 +358,15 @@ static void igb_dump(struct igb_adapter *adapter) ...@@ -359,18 +358,15 @@ static void igb_dump(struct igb_adapter *adapter)
/* Print netdevice Info */ /* Print netdevice Info */
if (netdev) { if (netdev) {
dev_info(&adapter->pdev->dev, "Net device Info\n"); dev_info(&adapter->pdev->dev, "Net device Info\n");
printk(KERN_INFO "Device Name state " pr_info("Device Name state trans_start "
"trans_start last_rx\n"); "last_rx\n");
printk(KERN_INFO "%-15s %016lX %016lX %016lX\n", pr_info("%-15s %016lX %016lX %016lX\n", netdev->name,
netdev->name, netdev->state, netdev->trans_start, netdev->last_rx);
netdev->state,
netdev->trans_start,
netdev->last_rx);
} }
/* Print Registers */ /* Print Registers */
dev_info(&adapter->pdev->dev, "Register Dump\n"); dev_info(&adapter->pdev->dev, "Register Dump\n");
printk(KERN_INFO " Register Name Value\n"); pr_info(" Register Name Value\n");
for (reginfo = (struct igb_reg_info *)igb_reg_info_tbl; for (reginfo = (struct igb_reg_info *)igb_reg_info_tbl;
reginfo->name; reginfo++) { reginfo->name; reginfo++) {
igb_regdump(hw, reginfo); igb_regdump(hw, reginfo);
...@@ -381,13 +377,12 @@ static void igb_dump(struct igb_adapter *adapter) ...@@ -381,13 +377,12 @@ static void igb_dump(struct igb_adapter *adapter)
goto exit; goto exit;
dev_info(&adapter->pdev->dev, "TX Rings Summary\n"); dev_info(&adapter->pdev->dev, "TX Rings Summary\n");
printk(KERN_INFO "Queue [NTU] [NTC] [bi(ntc)->dma ]" pr_info("Queue [NTU] [NTC] [bi(ntc)->dma ] leng ntw timestamp\n");
" leng ntw timestamp\n");
for (n = 0; n < adapter->num_tx_queues; n++) { for (n = 0; n < adapter->num_tx_queues; n++) {
struct igb_tx_buffer *buffer_info; struct igb_tx_buffer *buffer_info;
tx_ring = adapter->tx_ring[n]; tx_ring = adapter->tx_ring[n];
buffer_info = &tx_ring->tx_buffer_info[tx_ring->next_to_clean]; buffer_info = &tx_ring->tx_buffer_info[tx_ring->next_to_clean];
printk(KERN_INFO " %5d %5X %5X %016llX %04X %p %016llX\n", pr_info(" %5d %5X %5X %016llX %04X %p %016llX\n",
n, tx_ring->next_to_use, tx_ring->next_to_clean, n, tx_ring->next_to_use, tx_ring->next_to_clean,
(u64)buffer_info->dma, (u64)buffer_info->dma,
buffer_info->length, buffer_info->length,
...@@ -414,36 +409,38 @@ static void igb_dump(struct igb_adapter *adapter) ...@@ -414,36 +409,38 @@ static void igb_dump(struct igb_adapter *adapter)
for (n = 0; n < adapter->num_tx_queues; n++) { for (n = 0; n < adapter->num_tx_queues; n++) {
tx_ring = adapter->tx_ring[n]; tx_ring = adapter->tx_ring[n];
printk(KERN_INFO "------------------------------------\n"); pr_info("------------------------------------\n");
printk(KERN_INFO "TX QUEUE INDEX = %d\n", tx_ring->queue_index); pr_info("TX QUEUE INDEX = %d\n", tx_ring->queue_index);
printk(KERN_INFO "------------------------------------\n"); pr_info("------------------------------------\n");
printk(KERN_INFO "T [desc] [address 63:0 ] " pr_info("T [desc] [address 63:0 ] [PlPOCIStDDM Ln] "
"[PlPOCIStDDM Ln] [bi->dma ] " "[bi->dma ] leng ntw timestamp "
"leng ntw timestamp bi->skb\n"); "bi->skb\n");
for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) { for (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {
const char *next_desc;
struct igb_tx_buffer *buffer_info; struct igb_tx_buffer *buffer_info;
tx_desc = IGB_TX_DESC(tx_ring, i); tx_desc = IGB_TX_DESC(tx_ring, i);
buffer_info = &tx_ring->tx_buffer_info[i]; buffer_info = &tx_ring->tx_buffer_info[i];
u0 = (struct my_u0 *)tx_desc; u0 = (struct my_u0 *)tx_desc;
printk(KERN_INFO "T [0x%03X] %016llX %016llX %016llX" if (i == tx_ring->next_to_use &&
" %04X %p %016llX %p", i, i == tx_ring->next_to_clean)
next_desc = " NTC/U";
else if (i == tx_ring->next_to_use)
next_desc = " NTU";
else if (i == tx_ring->next_to_clean)
next_desc = " NTC";
else
next_desc = "";
pr_info("T [0x%03X] %016llX %016llX %016llX"
" %04X %p %016llX %p%s\n", i,
le64_to_cpu(u0->a), le64_to_cpu(u0->a),
le64_to_cpu(u0->b), le64_to_cpu(u0->b),
(u64)buffer_info->dma, (u64)buffer_info->dma,
buffer_info->length, buffer_info->length,
buffer_info->next_to_watch, buffer_info->next_to_watch,
(u64)buffer_info->time_stamp, (u64)buffer_info->time_stamp,
buffer_info->skb); buffer_info->skb, next_desc);
if (i == tx_ring->next_to_use &&
i == tx_ring->next_to_clean)
printk(KERN_CONT " NTC/U\n");
else if (i == tx_ring->next_to_use)
printk(KERN_CONT " NTU\n");
else if (i == tx_ring->next_to_clean)
printk(KERN_CONT " NTC\n");
else
printk(KERN_CONT "\n");
if (netif_msg_pktdata(adapter) && buffer_info->dma != 0) if (netif_msg_pktdata(adapter) && buffer_info->dma != 0)
print_hex_dump(KERN_INFO, "", print_hex_dump(KERN_INFO, "",
...@@ -456,11 +453,11 @@ static void igb_dump(struct igb_adapter *adapter) ...@@ -456,11 +453,11 @@ static void igb_dump(struct igb_adapter *adapter)
/* Print RX Rings Summary */ /* Print RX Rings Summary */
rx_ring_summary: rx_ring_summary:
dev_info(&adapter->pdev->dev, "RX Rings Summary\n"); dev_info(&adapter->pdev->dev, "RX Rings Summary\n");
printk(KERN_INFO "Queue [NTU] [NTC]\n"); pr_info("Queue [NTU] [NTC]\n");
for (n = 0; n < adapter->num_rx_queues; n++) { for (n = 0; n < adapter->num_rx_queues; n++) {
rx_ring = adapter->rx_ring[n]; rx_ring = adapter->rx_ring[n];
printk(KERN_INFO " %5d %5X %5X\n", n, pr_info(" %5d %5X %5X\n",
rx_ring->next_to_use, rx_ring->next_to_clean); n, rx_ring->next_to_use, rx_ring->next_to_clean);
} }
/* Print RX Rings */ /* Print RX Rings */
...@@ -492,36 +489,43 @@ static void igb_dump(struct igb_adapter *adapter) ...@@ -492,36 +489,43 @@ static void igb_dump(struct igb_adapter *adapter)
for (n = 0; n < adapter->num_rx_queues; n++) { for (n = 0; n < adapter->num_rx_queues; n++) {
rx_ring = adapter->rx_ring[n]; rx_ring = adapter->rx_ring[n];
printk(KERN_INFO "------------------------------------\n"); pr_info("------------------------------------\n");
printk(KERN_INFO "RX QUEUE INDEX = %d\n", rx_ring->queue_index); pr_info("RX QUEUE INDEX = %d\n", rx_ring->queue_index);
printk(KERN_INFO "------------------------------------\n"); pr_info("------------------------------------\n");
printk(KERN_INFO "R [desc] [ PktBuf A0] " pr_info("R [desc] [ PktBuf A0] [ HeadBuf DD] "
"[ HeadBuf DD] [bi->dma ] [bi->skb] " "[bi->dma ] [bi->skb] <-- Adv Rx Read format\n");
"<-- Adv Rx Read format\n"); pr_info("RWB[desc] [PcsmIpSHl PtRs] [vl er S cks ln] -----"
printk(KERN_INFO "RWB[desc] [PcsmIpSHl PtRs] " "----------- [bi->skb] <-- Adv Rx Write-Back format\n");
"[vl er S cks ln] ---------------- [bi->skb] "
"<-- Adv Rx Write-Back format\n");
for (i = 0; i < rx_ring->count; i++) { for (i = 0; i < rx_ring->count; i++) {
const char *next_desc;
struct igb_rx_buffer *buffer_info; struct igb_rx_buffer *buffer_info;
buffer_info = &rx_ring->rx_buffer_info[i]; buffer_info = &rx_ring->rx_buffer_info[i];
rx_desc = IGB_RX_DESC(rx_ring, i); rx_desc = IGB_RX_DESC(rx_ring, i);
u0 = (struct my_u0 *)rx_desc; u0 = (struct my_u0 *)rx_desc;
staterr = le32_to_cpu(rx_desc->wb.upper.status_error); staterr = le32_to_cpu(rx_desc->wb.upper.status_error);
if (i == rx_ring->next_to_use)
next_desc = " NTU";
else if (i == rx_ring->next_to_clean)
next_desc = " NTC";
else
next_desc = "";
if (staterr & E1000_RXD_STAT_DD) { if (staterr & E1000_RXD_STAT_DD) {
/* Descriptor Done */ /* Descriptor Done */
printk(KERN_INFO "RWB[0x%03X] %016llX " pr_info("%s[0x%03X] %016llX %016llX -------"
"%016llX ---------------- %p", i, "--------- %p%s\n", "RWB", i,
le64_to_cpu(u0->a), le64_to_cpu(u0->a),
le64_to_cpu(u0->b), le64_to_cpu(u0->b),
buffer_info->skb); buffer_info->skb, next_desc);
} else { } else {
printk(KERN_INFO "R [0x%03X] %016llX " pr_info("%s[0x%03X] %016llX %016llX %016llX"
"%016llX %016llX %p", i, " %p%s\n", "R ", i,
le64_to_cpu(u0->a), le64_to_cpu(u0->a),
le64_to_cpu(u0->b), le64_to_cpu(u0->b),
(u64)buffer_info->dma, (u64)buffer_info->dma,
buffer_info->skb); buffer_info->skb, next_desc);
if (netif_msg_pktdata(adapter)) { if (netif_msg_pktdata(adapter)) {
print_hex_dump(KERN_INFO, "", print_hex_dump(KERN_INFO, "",
...@@ -538,14 +542,6 @@ static void igb_dump(struct igb_adapter *adapter) ...@@ -538,14 +542,6 @@ static void igb_dump(struct igb_adapter *adapter)
PAGE_SIZE/2, true); PAGE_SIZE/2, true);
} }
} }
if (i == rx_ring->next_to_use)
printk(KERN_CONT " NTU\n");
else if (i == rx_ring->next_to_clean)
printk(KERN_CONT " NTC\n");
else
printk(KERN_CONT "\n");
} }
} }
...@@ -599,10 +595,10 @@ struct net_device *igb_get_hw_dev(struct e1000_hw *hw) ...@@ -599,10 +595,10 @@ struct net_device *igb_get_hw_dev(struct e1000_hw *hw)
static int __init igb_init_module(void) static int __init igb_init_module(void)
{ {
int ret; int ret;
printk(KERN_INFO "%s - version %s\n", pr_info("%s - version %s\n",
igb_driver_string, igb_driver_version); igb_driver_string, igb_driver_version);
printk(KERN_INFO "%s\n", igb_copyright); pr_info("%s\n", igb_copyright);
#ifdef CONFIG_IGB_DCA #ifdef CONFIG_IGB_DCA
dca_register_notify(&dca_notifier); dca_register_notify(&dca_notifier);
...@@ -3642,23 +3638,23 @@ static void igb_watchdog_task(struct work_struct *work) ...@@ -3642,23 +3638,23 @@ static void igb_watchdog_task(struct work_struct *work)
ctrl = rd32(E1000_CTRL); ctrl = rd32(E1000_CTRL);
/* Links status message must follow this format */ /* Links status message must follow this format */
printk(KERN_INFO "igb: %s NIC Link is Up %d Mbps %s, " printk(KERN_INFO "igb: %s NIC Link is Up %d Mbps %s "
"Flow Control: %s\n", "Duplex, Flow Control: %s\n",
netdev->name, netdev->name,
adapter->link_speed, adapter->link_speed,
adapter->link_duplex == FULL_DUPLEX ? adapter->link_duplex == FULL_DUPLEX ?
"Full Duplex" : "Half Duplex", "Full" : "Half",
((ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_TFCE) &&
(ctrl & E1000_CTRL_RFCE)) ? "RX/TX" : (ctrl & E1000_CTRL_RFCE) ? "RX/TX" :
((ctrl & E1000_CTRL_RFCE) ? "RX" : (ctrl & E1000_CTRL_RFCE) ? "RX" :
((ctrl & E1000_CTRL_TFCE) ? "TX" : "None"))); (ctrl & E1000_CTRL_TFCE) ? "TX" : "None");
/* check for thermal sensor event */ /* check for thermal sensor event */
if (igb_thermal_sensor_event(hw, E1000_THSTAT_LINK_THROTTLE)) { if (igb_thermal_sensor_event(hw,
printk(KERN_INFO "igb: %s The network adapter " E1000_THSTAT_LINK_THROTTLE)) {
"link speed was downshifted " netdev_info(netdev, "The network adapter link "
"because it overheated.\n", "speed was downshifted because it "
netdev->name); "overheated\n");
} }
/* adjust timeout factor according to speed/duplex */ /* adjust timeout factor according to speed/duplex */
...@@ -3688,11 +3684,10 @@ static void igb_watchdog_task(struct work_struct *work) ...@@ -3688,11 +3684,10 @@ static void igb_watchdog_task(struct work_struct *work)
adapter->link_duplex = 0; adapter->link_duplex = 0;
/* check for thermal sensor event */ /* check for thermal sensor event */
if (igb_thermal_sensor_event(hw, E1000_THSTAT_PWR_DOWN)) { if (igb_thermal_sensor_event(hw,
printk(KERN_ERR "igb: %s The network adapter " E1000_THSTAT_PWR_DOWN)) {
"was stopped because it " netdev_err(netdev, "The network adapter was "
"overheated.\n", "stopped because it overheated\n");
netdev->name);
} }
/* Links status message must follow this format */ /* Links status message must follow this format */
......
drivers/net/ethernet/intel/igbvf/netdev.c
View file @ f85fa279
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
*******************************************************************************/ *******************************************************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -1746,10 +1748,9 @@ void igbvf_update_stats(struct igbvf_adapter *adapter) ...@@ -1746,10 +1748,9 @@ void igbvf_update_stats(struct igbvf_adapter *adapter)
static void igbvf_print_link_info(struct igbvf_adapter *adapter) static void igbvf_print_link_info(struct igbvf_adapter *adapter)
{ {
dev_info(&adapter->pdev->dev, "Link is Up %d Mbps %s\n", dev_info(&adapter->pdev->dev, "Link is Up %d Mbps %s Duplex\n",
adapter->link_speed, adapter->link_speed,
((adapter->link_duplex == FULL_DUPLEX) ? adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half");
"Full Duplex" : "Half Duplex"));
} }
static bool igbvf_has_link(struct igbvf_adapter *adapter) static bool igbvf_has_link(struct igbvf_adapter *adapter)
...@@ -2843,9 +2844,8 @@ static struct pci_driver igbvf_driver = { ...@@ -2843,9 +2844,8 @@ static struct pci_driver igbvf_driver = {
static int __init igbvf_init_module(void) static int __init igbvf_init_module(void)
{ {
int ret; int ret;
printk(KERN_INFO "%s - version %s\n", pr_info("%s - version %s\n", igbvf_driver_string, igbvf_driver_version);
igbvf_driver_string, igbvf_driver_version); pr_info("%s\n", igbvf_copyright);
printk(KERN_INFO "%s\n", igbvf_copyright);
ret = pci_register_driver(&igbvf_driver); ret = pci_register_driver(&igbvf_driver);
......
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
View file @ f85fa279
...@@ -572,7 +572,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf) ...@@ -572,7 +572,7 @@ static int ixgbe_rcv_msg_from_vf(struct ixgbe_adapter *adapter, u32 vf)
/* reply to reset with ack and vf mac address */ /* reply to reset with ack and vf mac address */
msgbuf[0] = IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK; msgbuf[0] = IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK;
memcpy(new_mac, vf_mac, IXGBE_ETH_LENGTH_OF_ADDRESS); memcpy(new_mac, vf_mac, ETH_ALEN);
/* /*
* Piggyback the multicast filter type so VF can compute the * Piggyback the multicast filter type so VF can compute the
* correct vectors * correct vectors
......
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
View file @ f85fa279
...@@ -1710,8 +1710,6 @@ enum { ...@@ -1710,8 +1710,6 @@ enum {
#define IXGBE_NVM_POLL_WRITE 1 /* Flag for polling for write complete */ #define IXGBE_NVM_POLL_WRITE 1 /* Flag for polling for write complete */
#define IXGBE_NVM_POLL_READ 0 /* Flag for polling for read complete */ #define IXGBE_NVM_POLL_READ 0 /* Flag for polling for read complete */
#define IXGBE_ETH_LENGTH_OF_ADDRESS 6
#define IXGBE_EEPROM_PAGE_SIZE_MAX 128 #define IXGBE_EEPROM_PAGE_SIZE_MAX 128
#define IXGBE_EEPROM_RD_BUFFER_MAX_COUNT 512 /* EEPROM words # read in burst */ #define IXGBE_EEPROM_RD_BUFFER_MAX_COUNT 512 /* EEPROM words # read in burst */
#define IXGBE_EEPROM_WR_BUFFER_MAX_COUNT 256 /* EEPROM words # wr in burst */ #define IXGBE_EEPROM_WR_BUFFER_MAX_COUNT 256 /* EEPROM words # wr in burst */
...@@ -2802,9 +2800,9 @@ struct ixgbe_eeprom_info { ...@@ -2802,9 +2800,9 @@ struct ixgbe_eeprom_info {
struct ixgbe_mac_info { struct ixgbe_mac_info {
struct ixgbe_mac_operations ops; struct ixgbe_mac_operations ops;
enum ixgbe_mac_type type; enum ixgbe_mac_type type;
u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS]; u8 addr[ETH_ALEN];
u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS]; u8 perm_addr[ETH_ALEN];
u8 san_addr[IXGBE_ETH_LENGTH_OF_ADDRESS]; u8 san_addr[ETH_ALEN];
/* prefix for World Wide Node Name (WWNN) */ /* prefix for World Wide Node Name (WWNN) */
u16 wwnn_prefix; u16 wwnn_prefix;
/* prefix for World Wide Port Name (WWPN) */ /* prefix for World Wide Port Name (WWPN) */
......
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c
View file @ f85fa279
...@@ -751,16 +751,20 @@ static s32 ixgbe_blink_led_start_X540(struct ixgbe_hw *hw, u32 index) ...@@ -751,16 +751,20 @@ static s32 ixgbe_blink_led_start_X540(struct ixgbe_hw *hw, u32 index)
{ {
u32 macc_reg; u32 macc_reg;
u32 ledctl_reg; u32 ledctl_reg;
ixgbe_link_speed speed;
bool link_up;
/* /*
* In order for the blink bit in the LED control register * Link should be up in order for the blink bit in the LED control
* to work, link and speed must be forced in the MAC. We * register to work. Force link and speed in the MAC if link is down.
* will reverse this when we stop the blinking. * This will be reversed when we stop the blinking.
*/ */
hw->mac.ops.check_link(hw, &speed, &link_up, false);
if (link_up == false) {
macc_reg = IXGBE_READ_REG(hw, IXGBE_MACC); macc_reg = IXGBE_READ_REG(hw, IXGBE_MACC);
macc_reg |= IXGBE_MACC_FLU | IXGBE_MACC_FSV_10G | IXGBE_MACC_FS; macc_reg |= IXGBE_MACC_FLU | IXGBE_MACC_FSV_10G | IXGBE_MACC_FS;
IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg); IXGBE_WRITE_REG(hw, IXGBE_MACC, macc_reg);
}
/* Set the LED to LINK_UP + BLINK. */ /* Set the LED to LINK_UP + BLINK. */
ledctl_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL); ledctl_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
ledctl_reg &= ~IXGBE_LED_MODE_MASK(index); ledctl_reg &= ~IXGBE_LED_MODE_MASK(index);
......
drivers/net/ethernet/intel/ixgbevf/defines.h
View file @ f85fa279
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#define IXGBE_VF_IRQ_CLEAR_MASK 7 #define IXGBE_VF_IRQ_CLEAR_MASK 7
#define IXGBE_VF_MAX_TX_QUEUES 1 #define IXGBE_VF_MAX_TX_QUEUES 1
#define IXGBE_VF_MAX_RX_QUEUES 1 #define IXGBE_VF_MAX_RX_QUEUES 1
#define IXGBE_ETH_LENGTH_OF_ADDRESS 6
/* Link speed */ /* Link speed */
typedef u32 ixgbe_link_speed; typedef u32 ixgbe_link_speed;
......
drivers/net/ethernet/intel/ixgbevf/ethtool.c
View file @ f85fa279
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
/* ethtool support for ixgbevf */ /* ethtool support for ixgbevf */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/types.h> #include <linux/types.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -549,8 +551,8 @@ static const u32 register_test_patterns[] = { ...@@ -549,8 +551,8 @@ static const u32 register_test_patterns[] = {
writel((W & M), (adapter->hw.hw_addr + R)); \ writel((W & M), (adapter->hw.hw_addr + R)); \
val = readl(adapter->hw.hw_addr + R); \ val = readl(adapter->hw.hw_addr + R); \
if ((W & M) != (val & M)) { \ if ((W & M) != (val & M)) { \
printk(KERN_ERR "set/check reg %04X test failed: got 0x%08X " \ pr_err("set/check reg %04X test failed: got 0x%08X expected " \
"expected 0x%08X\n", R, (val & M), (W & M)); \ "0x%08X\n", R, (val & M), (W & M)); \
*data = R; \ *data = R; \
writel(before, (adapter->hw.hw_addr + R)); \ writel(before, (adapter->hw.hw_addr + R)); \
return 1; \ return 1; \
......
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
View file @ f85fa279
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
/****************************************************************************** /******************************************************************************
Copyright (c)2006 - 2007 Myricom, Inc. for some LRO specific code Copyright (c)2006 - 2007 Myricom, Inc. for some LRO specific code
******************************************************************************/ ******************************************************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/types.h> #include <linux/types.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -1437,7 +1440,7 @@ static int ixgbevf_write_uc_addr_list(struct net_device *netdev) ...@@ -1437,7 +1440,7 @@ static int ixgbevf_write_uc_addr_list(struct net_device *netdev)
int count = 0; int count = 0;
if ((netdev_uc_count(netdev)) > 10) { if ((netdev_uc_count(netdev)) > 10) {
printk(KERN_ERR "Too many unicast filters - No Space\n"); pr_err("Too many unicast filters - No Space\n");
return -ENOSPC; return -ENOSPC;
} }
...@@ -2135,7 +2138,7 @@ static int ixgbevf_init_interrupt_scheme(struct ixgbevf_adapter *adapter) ...@@ -2135,7 +2138,7 @@ static int ixgbevf_init_interrupt_scheme(struct ixgbevf_adapter *adapter)
err = ixgbevf_alloc_queues(adapter); err = ixgbevf_alloc_queues(adapter);
if (err) { if (err) {
printk(KERN_ERR "Unable to allocate memory for queues\n"); pr_err("Unable to allocate memory for queues\n");
goto err_alloc_queues; goto err_alloc_queues;
} }
...@@ -2189,7 +2192,7 @@ static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter) ...@@ -2189,7 +2192,7 @@ static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
} else { } else {
err = hw->mac.ops.init_hw(hw); err = hw->mac.ops.init_hw(hw);
if (err) { if (err) {
printk(KERN_ERR "init_shared_code failed: %d\n", err); pr_err("init_shared_code failed: %d\n", err);
goto out; goto out;
} }
} }
...@@ -2630,8 +2633,8 @@ static int ixgbevf_open(struct net_device *netdev) ...@@ -2630,8 +2633,8 @@ static int ixgbevf_open(struct net_device *netdev)
* the vf can't start. */ * the vf can't start. */
if (hw->adapter_stopped) { if (hw->adapter_stopped) {
err = IXGBE_ERR_MBX; err = IXGBE_ERR_MBX;
printk(KERN_ERR "Unable to start - perhaps the PF" pr_err("Unable to start - perhaps the PF Driver isn't "
" Driver isn't up yet\n"); "up yet\n");
goto err_setup_reset; goto err_setup_reset;
} }
} }
...@@ -2842,10 +2845,8 @@ static bool ixgbevf_tx_csum(struct ixgbevf_adapter *adapter, ...@@ -2842,10 +2845,8 @@ static bool ixgbevf_tx_csum(struct ixgbevf_adapter *adapter,
break; break;
default: default:
if (unlikely(net_ratelimit())) { if (unlikely(net_ratelimit())) {
printk(KERN_WARNING pr_warn("partial checksum but "
"partial checksum but " "proto=%x!\n", skb->protocol);
"proto=%x!\n",
skb->protocol);
} }
break; break;
} }
...@@ -3415,7 +3416,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev, ...@@ -3415,7 +3416,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev,
memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len); memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
if (!is_valid_ether_addr(netdev->dev_addr)) { if (!is_valid_ether_addr(netdev->dev_addr)) {
printk(KERN_ERR "invalid MAC address\n"); pr_err("invalid MAC address\n");
err = -EIO; err = -EIO;
goto err_sw_init; goto err_sw_init;
} }
...@@ -3536,10 +3537,10 @@ static struct pci_driver ixgbevf_driver = { ...@@ -3536,10 +3537,10 @@ static struct pci_driver ixgbevf_driver = {
static int __init ixgbevf_init_module(void) static int __init ixgbevf_init_module(void)
{ {
int ret; int ret;
printk(KERN_INFO "ixgbevf: %s - version %s\n", ixgbevf_driver_string, pr_info("%s - version %s\n", ixgbevf_driver_string,
ixgbevf_driver_version); ixgbevf_driver_version);
printk(KERN_INFO "%s\n", ixgbevf_copyright); pr_info("%s\n", ixgbevf_copyright);
ret = pci_register_driver(&ixgbevf_driver); ret = pci_register_driver(&ixgbevf_driver);
return ret; return ret;
......
drivers/net/ethernet/intel/ixgbevf/vf.c
View file @ f85fa279
...@@ -108,7 +108,7 @@ static s32 ixgbevf_reset_hw_vf(struct ixgbe_hw *hw) ...@@ -108,7 +108,7 @@ static s32 ixgbevf_reset_hw_vf(struct ixgbe_hw *hw)
if (msgbuf[0] != (IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK)) if (msgbuf[0] != (IXGBE_VF_RESET | IXGBE_VT_MSGTYPE_ACK))
return IXGBE_ERR_INVALID_MAC_ADDR; return IXGBE_ERR_INVALID_MAC_ADDR;
memcpy(hw->mac.perm_addr, addr, IXGBE_ETH_LENGTH_OF_ADDRESS); memcpy(hw->mac.perm_addr, addr, ETH_ALEN);
hw->mac.mc_filter_type = msgbuf[IXGBE_VF_MC_TYPE_WORD]; hw->mac.mc_filter_type = msgbuf[IXGBE_VF_MC_TYPE_WORD];
return 0; return 0;
...@@ -211,7 +211,7 @@ static s32 ixgbevf_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr) ...@@ -211,7 +211,7 @@ static s32 ixgbevf_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr)
**/ **/
static s32 ixgbevf_get_mac_addr_vf(struct ixgbe_hw *hw, u8 *mac_addr) static s32 ixgbevf_get_mac_addr_vf(struct ixgbe_hw *hw, u8 *mac_addr)
{ {
memcpy(mac_addr, hw->mac.perm_addr, IXGBE_ETH_LENGTH_OF_ADDRESS); memcpy(mac_addr, hw->mac.perm_addr, ETH_ALEN);
return 0; return 0;
} }
......
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