History

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

Jeff Kirsher says: ==================== Intel Wired LAN Driver Updates 2019-06-26 This series contains updates to ixgbe and i40e only. Mauro S. M. Rodrigues update the ixgbe driver to handle transceivers who comply with SFF-8472 but do not implement the Digital Diagnostic Monitoring (DOM) interface. Update the driver to check the necessary bits to see if DOM is implemented before trying to read the additional 256 bytes in the EEPROM for DOM data. Young Xiao fixes a potential divide by zero issue in ixgbe driver. Aleksandr fixes i40e to recognize 2.5 and 5.0 GbE link speeds so that it is not reported as "Unknown bps". Fixes the driver to read the firmware LLDP agent status during DCB initialization, and to properly log the LLDP agent status to help with debugging when DCB fails to initialize. Martyna fixes i40e for the missing supported and advertised link modes information in ethtool. Jake fixes a function header comment that was incorrect for a PTP function in i40e. Maciej fixes an issue for i40e when a XDP program is loaded the descriptor count gets reset to the default value, resolve the issue by making the current descriptor count persistent across resets. Alice corrects a copyright date which she found to be incorrect. Piotr adds a log entry when the traffic class 0 is added or deleted, which was not being logged previously. Gustavo A. R. Silva updates i40e to use struct_size() where possible. ====================

David S. Miller committed 7 years ago

Commit 0b58f642 parents 096cc49 fae6cad12 files · +115 −32Browse files

Showing the changes to include/linux (1 of 12 files). Show all

Unified · Split

include/linux/avf/virtchnl.h+4−0
@@ -61,12 +61,14 @@ enum virtchnl_status_code { · 60 unmodified lines
61#define VIRTCHNL_ERR_PARAM VIRTCHNL_STATUS_ERR_PARAM61#define VIRTCHNL_ERR_PARAM VIRTCHNL_STATUS_ERR_PARAM
62#define VIRTCHNL_STATUS_NOT_SUPPORTED VIRTCHNL_STATUS_ERR_NOT_SUPPORTED62#define VIRTCHNL_STATUS_NOT_SUPPORTED VIRTCHNL_STATUS_ERR_NOT_SUPPORTED
63 63
64#define VIRTCHNL_LINK_SPEED_2_5GB_SHIFT 0x0
64#define VIRTCHNL_LINK_SPEED_100MB_SHIFT 0x165#define VIRTCHNL_LINK_SPEED_100MB_SHIFT 0x1
65#define VIRTCHNL_LINK_SPEED_1000MB_SHIFT 0x266#define VIRTCHNL_LINK_SPEED_1000MB_SHIFT 0x2
66#define VIRTCHNL_LINK_SPEED_10GB_SHIFT 0x367#define VIRTCHNL_LINK_SPEED_10GB_SHIFT 0x3
67#define VIRTCHNL_LINK_SPEED_40GB_SHIFT 0x468#define VIRTCHNL_LINK_SPEED_40GB_SHIFT 0x4
68#define VIRTCHNL_LINK_SPEED_20GB_SHIFT 0x569#define VIRTCHNL_LINK_SPEED_20GB_SHIFT 0x5
69#define VIRTCHNL_LINK_SPEED_25GB_SHIFT 0x670#define VIRTCHNL_LINK_SPEED_25GB_SHIFT 0x6
71#define VIRTCHNL_LINK_SPEED_5GB_SHIFT 0x7
70 72
71enum virtchnl_link_speed {73enum virtchnl_link_speed {
72 VIRTCHNL_LINK_SPEED_UNKNOWN = 0,74 VIRTCHNL_LINK_SPEED_UNKNOWN = 0,
@@ -76,6 +78,8 @@ enum virtchnl_link_speed { · 3 unmodified lines
76 VIRTCHNL_LINK_SPEED_40GB = BIT(VIRTCHNL_LINK_SPEED_40GB_SHIFT),78 VIRTCHNL_LINK_SPEED_40GB = BIT(VIRTCHNL_LINK_SPEED_40GB_SHIFT),
77 VIRTCHNL_LINK_SPEED_20GB = BIT(VIRTCHNL_LINK_SPEED_20GB_SHIFT),79 VIRTCHNL_LINK_SPEED_20GB = BIT(VIRTCHNL_LINK_SPEED_20GB_SHIFT),
78 VIRTCHNL_LINK_SPEED_25GB = BIT(VIRTCHNL_LINK_SPEED_25GB_SHIFT),80 VIRTCHNL_LINK_SPEED_25GB = BIT(VIRTCHNL_LINK_SPEED_25GB_SHIFT),
81 VIRTCHNL_LINK_SPEED_2_5GB = BIT(VIRTCHNL_LINK_SPEED_2_5GB_SHIFT),
82 VIRTCHNL_LINK_SPEED_5GB = BIT(VIRTCHNL_LINK_SPEED_5GB_SHIFT),
79};83};
80 84
81/* for hsplit_0 field of Rx HMC context */85/* for hsplit_0 field of Rx HMC context */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t