linux/mii.h: Sync with Linux kernel v4.17
PATCH 1/2 linux/mii.h: Sync with Linux kernel v4.17
This syncs U-Boot's include/linux/mii.h with Linux kernel v4.17 include/uapi/linux/mii.h.
While we are here, this also fixes some style issues.
---
include/linux/mii.h | 126 ++++++++++++++++++++++++++++------------------------ 1 file changed, 69 insertions(+), 57 deletions(-)
include/linux/mii.h +69 -57
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * linux/mii.h: definitions for MII-compatible transceivers * Originally drivers/net/sunhme.h.
@@ -9,53 +10,55 @@#define __LINUX_MII_H__/* Generic MII registers. */ - -#define MII_BMCR 0x00/* Basic mode control register */ -#define MII_BMSR 0x01/* Basic mode status register */ -#define MII_PHYSID1 0x02/* PHYS ID 1 */ -#define MII_PHYSID2 0x03/* PHYS ID 2 */ -#define MII_ADVERTISE 0x04/* Advertisement control reg */ -#define MII_LPA 0x05/* Link partner ability reg */ -#define MII_EXPANSION 0x06/* Expansion register */ -#define MII_CTRL1000 0x09/* 1000BASE-T control */ -#define MII_STAT1000 0x0a/* 1000BASE-T status */ -#define MII_ESTATUS 0x0f/* Extended Status */ -#define MII_DCOUNTER 0x12/* Disconnect counter */ -#define MII_FCSCOUNTER 0x13/* False carrier counter */ -#define MII_NWAYTEST 0x14/* N-way auto-neg test reg */ -#define MII_RERRCOUNTER 0x15/* Receive error counter */ -#define MII_SREVISION 0x16/* Silicon revision */ -#define MII_RESV1 0x17/* Reserved... */ -#define MII_LBRERROR 0x18/* Lpback, rx, bypass error */ -#define MII_PHYADDR 0x19/* PHY address */ -#define MII_RESV2 0x1a/* Reserved... */ -#define MII_TPISTATUS 0x1b/* TPI status for 10mbps */ -#define MII_NCONFIG 0x1c/* Network interface config */ +#define MII_BMCR 0x00/* Basic mode control register */ +#define MII_BMSR 0x01/* Basic mode status register */ +#define MII_PHYSID1 0x02/* PHYS ID 1 */ +#define MII_PHYSID2 0x03/* PHYS ID 2 */ +#define MII_ADVERTISE 0x04/* Advertisement control reg */ +#define MII_LPA 0x05/* Link partner ability reg */ +#define MII_EXPANSION 0x06/* Expansion register */ +#define MII_CTRL1000 0x09/* 1000BASE-T control */ +#define MII_STAT1000 0x0a/* 1000BASE-T status */ +#define MII_MMD_CTRL 0x0d/* MMD Access Control Register */ +#define MII_MMD_DATA 0x0e/* MMD Access Data Register */ +#define MII_ESTATUS 0x0f/* Extended Status */ +#define MII_DCOUNTER 0x12/* Disconnect counter */ +#define MII_FCSCOUNTER 0x13/* False carrier counter */ +#define MII_NWAYTEST 0x14/* N-way auto-neg test reg */ +#define MII_RERRCOUNTER 0x15/* Receive error counter */ +#define MII_SREVISION 0x16/* Silicon revision */ +#define MII_RESV1 0x17/* Reserved... */ +#define MII_LBRERROR 0x18/* Lpback, rx, bypass error */ +#define MII_PHYADDR 0x19/* PHY address */ +#define MII_RESV2 0x1a/* Reserved... */ +#define MII_TPISTATUS 0x1b/* TPI status for 10mbps */ +#define MII_NCONFIG 0x1c/* Network interface config */ /* Basic mode control register. */ -#define BMCR_RESV 0x003f/* Unused... */ -#define BMCR_SPEED1000 0x0040/* MSB of Speed (1000) */ -#define BMCR_CTST 0x0080/* Collision test */ -#define BMCR_FULLDPLX 0x0100/* Full duplex */ +#define BMCR_RESV 0x003f/* Unused... */ +#define BMCR_SPEED1000 0x0040/* MSB of Speed (1000) */ +#define BMCR_CTST 0x0080/* Collision test */ +#define BMCR_FULLDPLX 0x0100/* Full duplex */ #define BMCR_ANRESTART 0x0200/* Auto negotiation restart */ -#define BMCR_ISOLATE 0x0400/* Disconnect DP83840 from MII */ -#define BMCR_PDOWN 0x0800/* Powerdown the DP83840 */ +#define BMCR_ISOLATE 0x0400/* Isolate data paths from MII */ +#define BMCR_PDOWN 0x0800/* Enable low power state */ #define BMCR_ANENABLE 0x1000/* Enable auto negotiation */ -#define BMCR_SPEED100 0x2000/* Select 100Mbps */ -#define BMCR_LOOPBACK 0x4000/* TXD loopback bits */ -#define BMCR_RESET 0x8000/* Reset the DP83840 */ +#define BMCR_SPEED100 0x2000/* Select 100Mbps */ +#define BMCR_LOOPBACK 0x4000/* TXD loopback bits */ +#define BMCR_RESET 0x8000/* Reset to default state */ +#define BMCR_SPEED10 0x0000/* Select 10Mbps */ /* Basic mode status register. */ -#define BMSR_ERCAP 0x0001/* Ext-reg capability */ -#define BMSR_JCD 0x0002/* Jabber detected */ -#define BMSR_LSTATUS 0x0004/* Link status */ +#define BMSR_ERCAP 0x0001/* Ext-reg capability */ +#define BMSR_JCD 0x0002/* Jabber detected */ +#define BMSR_LSTATUS 0x0004/* Link status */ #define BMSR_ANEGCAPABLE 0x0008/* Able to do auto-negotiation */ #define BMSR_RFAULT 0x0010/* Remote fault detected */ #define BMSR_ANEGCOMPLETE 0x0020/* Auto-negotiation complete */ -#define BMSR_RESV 0x00c0/* Unused... */ -#define BMSR_ESTATEN 0x0100/* Extended Status in R15 */ -#define BMSR_100HALF2 0x0200/* Can do 100BASE-T2 HDX */ -#define BMSR_100FULL2 0x0400/* Can do 100BASE-T2 FDX */ +#define BMSR_RESV 0x00c0/* Unused... */ +#define BMSR_ESTATEN 0x0100/* Extended Status in R15 */ +#define BMSR_100HALF2 0x0200/* Can do 100BASE-T2 HDX */ +#define BMSR_100FULL2 0x0400/* Can do 100BASE-T2 FDX */ #define BMSR_10HALF 0x0800/* Can do 10mbps, half-duplex */ #define BMSR_10FULL 0x1000/* Can do 10mbps, full-duplex */ #define BMSR_100HALF 0x2000/* Can do 100mbps, half-duplex */
@@ -63,7 +66,7 @@#define BMSR_100BASE4 0x8000/* Can do 100mbps, 4k packets */ /* Advertisement control register. */ -#define ADVERTISE_SLCT 0x001f/* Selector bits */ +#define ADVERTISE_SLCT 0x001f/* Selector bits */ #define ADVERTISE_CSMA 0x0001/* Only selector supported */ #define ADVERTISE_10HALF 0x0020/* Try for 10mbps half-duplex */ #define ADVERTISE_1000XFULL 0x0020/* Try for 1000BASE-X full-duplex */
@@ -72,19 +75,19 @@#define ADVERTISE_100HALF 0x0080/* Try for 100mbps half-duplex */ #define ADVERTISE_1000XPAUSE 0x0080/* Try for 1000BASE-X pause */ #define ADVERTISE_100FULL 0x0100/* Try for 100mbps full-duplex */ -#define ADVERTISE_1000XPSE_ASYM 0x0100/* Try for 1000BASE-X asym pause */ +#define ADVERTISE_1000XPSE_ASYM 0x0100/* Try for 1000BASE-X asym pause */ #define ADVERTISE_100BASE4 0x0200/* Try for 100mbps 4k packets */ -#define ADVERTISE_PAUSE_CAP 0x0400/* Try for pause */ +#define ADVERTISE_PAUSE_CAP 0x0400/* Try for pause */ #define ADVERTISE_PAUSE_ASYM 0x0800/* Try for asymetric pause */ -#define ADVERTISE_RESV 0x1000/* Unused... */ +#define ADVERTISE_RESV 0x1000/* Unused... */ #define ADVERTISE_RFAULT 0x2000/* Say we can detect faults */ #define ADVERTISE_LPACK 0x4000/* Ack link partners response */ -#define ADVERTISE_NPAGE 0x8000/* Next page bit */ +#define ADVERTISE_NPAGE 0x8000/* Next page bit */ -#define ADVERTISE_FULL (ADVERTISE_100FULL | ADVERTISE_10FULL | \ - ADVERTISE_CSMA) -#define ADVERTISE_ALL (ADVERTISE_10HALF | ADVERTISE_10FULL | \ - ADVERTISE_100HALF | ADVERTISE_100FULL) +#define ADVERTISE_FULL (ADVERTISE_100FULL | ADVERTISE_10FULL | \ + ADVERTISE_CSMA) +#define ADVERTISE_ALL (ADVERTISE_10HALF | ADVERTISE_10FULL | \ + ADVERTISE_100HALF | ADVERTISE_100FULL)/* Link partner ability register. */ #define LPA_SLCT 0x001f/* Same as advertise selector */
@@ -97,12 +100,12 @@#define LPA_100FULL 0x0100/* Can do 100mbps full-duplex */ #define LPA_1000XPAUSE_ASYM 0x0100/* Can do 1000BASE-X pause asym*/ #define LPA_100BASE4 0x0200/* Can do 100mbps 4k packets */ -#define LPA_PAUSE_CAP 0x0400/* Can pause */ +#define LPA_PAUSE_CAP 0x0400/* Can pause */ #define LPA_PAUSE_ASYM 0x0800/* Can pause asymetrically */ -#define LPA_RESV 0x1000/* Unused... */ +#define LPA_RESV 0x1000/* Unused... */ #define LPA_RFAULT 0x2000/* Link partner faulted */ #define LPA_LPACK 0x4000/* Link partner acked us */ -#define LPA_NPAGE 0x8000/* Next page bit */ +#define LPA_NPAGE 0x8000/* Next page bit */ #define LPA_DUPLEX (LPA_10FULL | LPA_100FULL)#define LPA_100 (LPA_100FULL | LPA_100HALF | LPA_100BASE4)
@@ -113,21 +116,23 @@#define EXPANSION_ENABLENPAGE 0x0004/* This enables npage words */ #define EXPANSION_NPCAPABLE 0x0008/* Link partner supports npage */ #define EXPANSION_MFAULTS 0x0010/* Multiple faults detected */ -#define EXPANSION_RESV 0xffe0/* Unused... */ +#define EXPANSION_RESV 0xffe0/* Unused... */ #define ESTATUS_1000_XFULL 0x8000/* Can do 1000BX Full */ #define ESTATUS_1000_XHALF 0x4000/* Can do 1000BX Half */ -#define ESTATUS_1000_TFULL 0x2000/* Can do 1000BT Full */ -#define ESTATUS_1000_THALF 0x1000/* Can do 1000BT Half */ +#define ESTATUS_1000_TFULL 0x2000/* Can do 1000BT Full */ +#define ESTATUS_1000_THALF 0x1000/* Can do 1000BT Half */ /* N-way test register. */ -#define NWAYTEST_RESV1 0x00ff/* Unused... */ +#define NWAYTEST_RESV1 0x00ff/* Unused... */ #define NWAYTEST_LOOPBACK 0x0100/* Enable loopback for N-way */ -#define NWAYTEST_RESV2 0xfe00/* Unused... */ +#define NWAYTEST_RESV2 0xfe00/* Unused... */ /* 1000BASE-T Control register */ -#define ADVERTISE_1000FULL 0x0200/* Advertise 1000BASE-T full duplex */ -#define ADVERTISE_1000HALF 0x0100/* Advertise 1000BASE-T half duplex */ +#define ADVERTISE_1000FULL 0x0200/* Advertise 1000BASE-T full duplex */ +#define ADVERTISE_1000HALF 0x0100/* Advertise 1000BASE-T half duplex */ +#define CTL1000_AS_MASTER 0x0800 +#define CTL1000_ENABLE_MASTER 0x1000/* 1000BASE-T Status register */ #define LPA_1000LOCALRXOK 0x2000/* Link partner local receiver status */
@@ -139,6 +144,13 @@#define FLOW_CTRL_TX 0x01#define FLOW_CTRL_RX 0x02 +/* MMD Access Control register fields */ +#define MII_MMD_CTRL_DEVAD_MASK 0x1f/* Mask MMD DEVAD*/ +#define MII_MMD_CTRL_ADDR 0x0000/* Address */ +#define MII_MMD_CTRL_NOINCR 0x4000/* no post increment */ +#define MII_MMD_CTRL_INCR_RDWT 0x8000/* post increment on reads & writes */ +#define MII_MMD_CTRL_INCR_ON_WT 0xC000/* post increment on writes only */ +/** * mii_nway_result * @negotiated: value of MII ANAR and'd with ANLPAR
Signature · 1 line
2.7.4
PATCH 2/2 linux/mdio.h: Sync with Linux kernel v4.17
This syncs U-Boot's include/linux/mdio.h with Linux kernel v4.17 include/uapi/linux/mdio.h.
---
include/linux/mdio.h | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-)
include/linux/mdio.h +30 -4
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * linux/mdio.h: definitions for MDIO (clause 45) transceivers * Copyright 2006-2009 Solarflare Communications Inc.
@@ -42,7 +43,11 @@#define MDIO_PKGID2 15#define MDIO_AN_ADVERTISE 16/* AN advertising (base page) */ #define MDIO_AN_LPA 19/* AN LP abilities (base page) */ +#define MDIO_PCS_EEE_ABLE 20/* EEE Capability register */ +#define MDIO_PCS_EEE_WK_ERR 22/* EEE wake error counter */ #define MDIO_PHYXS_LNSTAT 24/* PHY XGXS lane state */ +#define MDIO_AN_EEE_ADV 60/* EEE advertisement */ +#define MDIO_AN_EEE_LPABLE 61/* EEE link partner ability */ /* Media-dependent registers. */ #define MDIO_PMA_10GBT_SWAPPOL 130/* 10GBASE-T pair swap & polarity */
@@ -55,7 +60,6 @@#define MDIO_PCS_10GBRT_STAT2 33/* 10GBASE-R/-T PCS status 2 */ #define MDIO_AN_10GBT_CTRL 32/* 10GBASE-T auto-negotiation control */ #define MDIO_AN_10GBT_STAT 33/* 10GBASE-T auto-negotiation status */ -#define MDIO_AN_EEE_ADV 60/* EEE advertisement */ /* LASI (Link Alarm Status Interrupt) registers, defined by XENPAK MSA. */ #define MDIO_PMA_LASI_RXCTRL 0x9000/* RX_ALARM control */
@@ -81,6 +85,7 @@#define MDIO_AN_CTRL1_RESTART BMCR_ANRESTART#define MDIO_AN_CTRL1_ENABLE BMCR_ANENABLE#define MDIO_AN_CTRL1_XNP 0x2000/* Enable extended next page */ +#define MDIO_PCS_CTRL1_CLKSTOP_EN 0x400/* Stop the clock during LPI */ /* 10 Gb/s */ #define MDIO_CTRL1_SPEED10G (MDIO_CTRL1_SPEEDSELEXT | 0x00)
@@ -245,9 +250,25 @@#define MDIO_AN_10GBT_STAT_MS 0x4000/* Master/slave config */ #define MDIO_AN_10GBT_STAT_MSFLT 0x8000/* Master/slave config fault */ -/* AN EEE Advertisement register. */ -#define MDIO_AN_EEE_ADV_100TX 0x0002/* Advertise 100TX EEE cap */ -#define MDIO_AN_EEE_ADV_1000T 0x0004/* Advertise 1000T EEE cap */ +/* EEE Supported/Advertisement/LP Advertisement registers. +* +* EEE capability Register (3.20), Advertisement (7.60) and +* Link partner ability (7.61) registers have and can use the same identical +* bit masks. +*/ +#define MDIO_AN_EEE_ADV_100TX 0x0002/* Advertise 100TX EEE cap */ +#define MDIO_AN_EEE_ADV_1000T 0x0004/* Advertise 1000T EEE cap */ +/* Note: the two defines above can be potentially used by the user-land +* and cannot remove them now. +* So, we define the new generic MDIO_EEE_100TX and MDIO_EEE_1000T macros +* using the previous ones (that can be considered obsolete). +*/ +#define MDIO_EEE_100TX MDIO_AN_EEE_ADV_100TX/* 100TX EEE cap */ +#define MDIO_EEE_1000T MDIO_AN_EEE_ADV_1000T/* 1000T EEE cap */ +#define MDIO_EEE_10GT 0x0008/* 10GT EEE cap */ +#define MDIO_EEE_1000KX 0x0010/* 1000KX EEE cap */ +#define MDIO_EEE_10GKX4 0x0020/* 10G KX4 EEE cap */ +#define MDIO_EEE_10GKR 0x0040/* 10G KR EEE cap */ /* LASI RX_ALARM control/status registers. */ #define MDIO_PMA_LASI_RX_PHYXSLFLT 0x0001/* PHY XS RX local fault */
@@ -281,4 +302,9 @@#define MDIO_DEVAD_NONE (-1)#define MDIO_EMULATE_C22 4 +static inline __u16 mdio_phy_id_c45 (int prtad,int devad) +{ +return MDIO_PHY_ID_C45 | (prtad <<5 ) | devad; +} +#endif /* __LINUX_MDIO_H__ */
Signature · 1 line
2.7.4
PATCH 2/2 linux/mdio.h: Sync with Linux kernel v4.17
Quoted 4 lines · Bin Meng
This syncs U-Boot's
include/linux/mdio.hwith Linux kernel v4.17include/uapi/linux/mdio.h.Signed-off-by Bin Meng <[email protected]>
[U-Boot] linux/mdio.h: Sync with Linux kernel v4.17
In reply to Bin MengHi Bin,
https://patchwork.ozlabs.org/patch/949573/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe
PATCH 1/2 linux/mii.h: Sync with Linux kernel v4.17
In reply to Bin MengQuoted 6 lines · Bin Meng
This syncs U-Boot's
include/linux/mii.hwith Linux kernel v4.17include/uapi/linux/mii.h.While we are here, this also fixes some style issues.
Signed-off-by Bin Meng <[email protected]>
Hi Bin,
https://patchwork.ozlabs.org/patch/949572/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git
Thanks!
-Joe