Commit f05d9ab0 authored by Ganesh Venkatesan's avatar Ganesh Venkatesan Committed by Jeff Garzik

[PATCH] e1000: New bit definitions, fix comments on loadtime parameters

parent d97755e6
...@@ -369,6 +369,9 @@ int32_t e1000_set_d3_lplu_state(struct e1000_hw *hw, boolean_t active); ...@@ -369,6 +369,9 @@ int32_t e1000_set_d3_lplu_state(struct e1000_hw *hw, boolean_t active);
#define E1000_82542_2_0_REV_ID 2 #define E1000_82542_2_0_REV_ID 2
#define E1000_82542_2_1_REV_ID 3 #define E1000_82542_2_1_REV_ID 3
#define E1000_REVISION_0 0
#define E1000_REVISION_1 1
#define E1000_REVISION_2 2
#define SPEED_10 10 #define SPEED_10 10
#define SPEED_100 100 #define SPEED_100 100
...@@ -763,6 +766,7 @@ struct e1000_ffvt_entry { ...@@ -763,6 +766,7 @@ struct e1000_ffvt_entry {
#define E1000_WUPL 0x05900 /* Wakeup Packet Length - RW */ #define E1000_WUPL 0x05900 /* Wakeup Packet Length - RW */
#define E1000_WUPM 0x05A00 /* Wakeup Packet Memory - RO A */ #define E1000_WUPM 0x05A00 /* Wakeup Packet Memory - RO A */
#define E1000_FFLT 0x05F00 /* Flexible Filter Length Table - RW Array */ #define E1000_FFLT 0x05F00 /* Flexible Filter Length Table - RW Array */
#define E1000_HOST_IF 0x08800 /* Host Interface */
#define E1000_FFMT 0x09000 /* Flexible Filter Mask Table - RW Array */ #define E1000_FFMT 0x09000 /* Flexible Filter Mask Table - RW Array */
#define E1000_FFVT 0x09800 /* Flexible Filter Value Table - RW Array */ #define E1000_FFVT 0x09800 /* Flexible Filter Value Table - RW Array */
...@@ -899,6 +903,7 @@ struct e1000_ffvt_entry { ...@@ -899,6 +903,7 @@ struct e1000_ffvt_entry {
#define E1000_82542_TDFT 0x08018 #define E1000_82542_TDFT 0x08018
#define E1000_82542_FFMT E1000_FFMT #define E1000_82542_FFMT E1000_FFMT
#define E1000_82542_FFVT E1000_FFVT #define E1000_82542_FFVT E1000_FFVT
#define E1000_82542_HOST_IF E1000_HOST_IF
/* Statistics counters collected by the MAC */ /* Statistics counters collected by the MAC */
struct e1000_hw_stats { struct e1000_hw_stats {
...@@ -1434,6 +1439,10 @@ struct e1000_hw { ...@@ -1434,6 +1439,10 @@ struct e1000_hw {
#define E1000_MANC_TCO_RESET 0x00010000 /* TCO Reset Occurred */ #define E1000_MANC_TCO_RESET 0x00010000 /* TCO Reset Occurred */
#define E1000_MANC_RCV_TCO_EN 0x00020000 /* Receive TCO Packets Enabled */ #define E1000_MANC_RCV_TCO_EN 0x00020000 /* Receive TCO Packets Enabled */
#define E1000_MANC_REPORT_STATUS 0x00040000 /* Status Reporting Enabled */ #define E1000_MANC_REPORT_STATUS 0x00040000 /* Status Reporting Enabled */
#define E1000_MANC_EN_MAC_ADDR_FILTER 0x00100000 /* Enable MAC address
* filtering */
#define E1000_MANC_EN_MNG2HOST 0x00200000 /* Enable MNG packets to host
* memory */
#define E1000_MANC_SMB_REQ 0x01000000 /* SMBus Request */ #define E1000_MANC_SMB_REQ 0x01000000 /* SMBus Request */
#define E1000_MANC_SMB_GNT 0x02000000 /* SMBus Grant */ #define E1000_MANC_SMB_GNT 0x02000000 /* SMBus Grant */
#define E1000_MANC_SMB_CLK_IN 0x04000000 /* SMBus Clock In */ #define E1000_MANC_SMB_CLK_IN 0x04000000 /* SMBus Clock In */
......
...@@ -107,7 +107,7 @@ E1000_PARAM(Duplex, "Duplex setting"); ...@@ -107,7 +107,7 @@ E1000_PARAM(Duplex, "Duplex setting");
/* Auto-negotiation Advertisement Override /* Auto-negotiation Advertisement Override
* *
* Valid Range: 0x01-0x0F, 0x20-0x2F * Valid Range: 0x01-0x0F, 0x20-0x2F (copper); 0x20 (fiber)
* *
* The AutoNeg value is a bit mask describing which speed and duplex * The AutoNeg value is a bit mask describing which speed and duplex
* combinations should be advertised during auto-negotiation. * combinations should be advertised during auto-negotiation.
...@@ -117,7 +117,7 @@ E1000_PARAM(Duplex, "Duplex setting"); ...@@ -117,7 +117,7 @@ E1000_PARAM(Duplex, "Duplex setting");
* Speed (Mbps) N/A N/A 1000 N/A 100 100 10 10 * Speed (Mbps) N/A N/A 1000 N/A 100 100 10 10
* Duplex Full Full Half Full Half * Duplex Full Full Half Full Half
* *
* Default Value: 0x2F * Default Value: 0x2F (copper); 0x20 (fiber)
*/ */
E1000_PARAM(AutoNeg, "Advertised auto-negotiation setting"); E1000_PARAM(AutoNeg, "Advertised auto-negotiation setting");
......
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