You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
111 lines
4.4 KiB
Diff
111 lines
4.4 KiB
Diff
From c6f9fb78b7534392d3be307e566d10c8525c7c9a Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Date: Mon, 6 Jan 2020 14:32:06 +0200
|
|
Subject: [PATCH] Revert "mii: Add helpers for parsing SGMII auto-negotiation"
|
|
|
|
This reverts commit de81e3c1ccbf27eda7584e23c713705a221a57da.
|
|
|
|
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
---
|
|
include/linux/mii.h | 50 ------------------------------------------------
|
|
include/uapi/linux/mii.h | 10 ----------
|
|
2 files changed, 60 deletions(-)
|
|
|
|
--- a/include/linux/mii.h
|
|
+++ b/include/linux/mii.h
|
|
@@ -373,56 +373,6 @@ static inline u32 mii_lpa_to_ethtool_lpa
|
|
}
|
|
|
|
/**
|
|
- * mii_lpa_mod_linkmode_adv_sgmii
|
|
- * @lp_advertising: pointer to destination link mode.
|
|
- * @lpa: value of the MII_LPA register
|
|
- *
|
|
- * A small helper function that translates MII_LPA bits to
|
|
- * linkmode advertisement settings for SGMII.
|
|
- * Leaves other bits unchanged.
|
|
- */
|
|
-static inline void
|
|
-mii_lpa_mod_linkmode_lpa_sgmii(unsigned long *lp_advertising, u32 lpa)
|
|
-{
|
|
- u32 speed_duplex = lpa & LPA_SGMII_DPX_SPD_MASK;
|
|
-
|
|
- linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, lp_advertising,
|
|
- speed_duplex == LPA_SGMII_1000HALF);
|
|
-
|
|
- linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, lp_advertising,
|
|
- speed_duplex == LPA_SGMII_1000FULL);
|
|
-
|
|
- linkmode_mod_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, lp_advertising,
|
|
- speed_duplex == LPA_SGMII_100HALF);
|
|
-
|
|
- linkmode_mod_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, lp_advertising,
|
|
- speed_duplex == LPA_SGMII_100FULL);
|
|
-
|
|
- linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, lp_advertising,
|
|
- speed_duplex == LPA_SGMII_10HALF);
|
|
-
|
|
- linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, lp_advertising,
|
|
- speed_duplex == LPA_SGMII_10FULL);
|
|
-}
|
|
-
|
|
-/**
|
|
- * mii_lpa_to_linkmode_adv_sgmii
|
|
- * @advertising: pointer to destination link mode.
|
|
- * @lpa: value of the MII_LPA register
|
|
- *
|
|
- * A small helper function that translates MII_ADVERTISE bits
|
|
- * to linkmode advertisement settings when in SGMII mode.
|
|
- * Clears the old value of advertising.
|
|
- */
|
|
-static inline void mii_lpa_to_linkmode_lpa_sgmii(unsigned long *lp_advertising,
|
|
- u32 lpa)
|
|
-{
|
|
- linkmode_zero(lp_advertising);
|
|
-
|
|
- mii_lpa_mod_linkmode_lpa_sgmii(lp_advertising, lpa);
|
|
-}
|
|
-
|
|
-/**
|
|
* mii_adv_mod_linkmode_adv_t
|
|
* @advertising:pointer to destination link mode.
|
|
* @adv: value of the MII_ADVERTISE register
|
|
--- a/include/uapi/linux/mii.h
|
|
+++ b/include/uapi/linux/mii.h
|
|
@@ -71,7 +71,6 @@
|
|
/* Advertisement control register. */
|
|
#define ADVERTISE_SLCT 0x001f /* Selector bits */
|
|
#define ADVERTISE_CSMA 0x0001 /* Only selector supported */
|
|
-#define ADVERTISE_SGMII 0x0001 /* Can do SGMII */
|
|
#define ADVERTISE_10HALF 0x0020 /* Try for 10mbps half-duplex */
|
|
#define ADVERTISE_1000XFULL 0x0020 /* Try for 1000BASE-X full-duplex */
|
|
#define ADVERTISE_10FULL 0x0040 /* Try for 10mbps full-duplex */
|
|
@@ -95,7 +94,6 @@
|
|
|
|
/* Link partner ability register. */
|
|
#define LPA_SLCT 0x001f /* Same as advertise selector */
|
|
-#define LPA_SGMII 0x0001 /* Can do SGMII */
|
|
#define LPA_10HALF 0x0020 /* Can do 10mbps half-duplex */
|
|
#define LPA_1000XFULL 0x0020 /* Can do 1000BASE-X full-duplex */
|
|
#define LPA_10FULL 0x0040 /* Can do 10mbps full-duplex */
|
|
@@ -106,19 +104,11 @@
|
|
#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_SGMII_DPX_SPD_MASK 0x1C00 /* SGMII duplex and speed bits */
|
|
-#define LPA_SGMII_10HALF 0x0000 /* Can do SGMII 10mbps half-duplex */
|
|
-#define LPA_SGMII_10FULL 0x1000 /* Can do SGMII 10mbps full-duplex */
|
|
-#define LPA_SGMII_100HALF 0x0400 /* Can do SGMII 100mbps half-duplex */
|
|
-#define LPA_SGMII_100FULL 0x1400 /* Can do SGMII 100mbps full-duplex */
|
|
#define LPA_PAUSE_ASYM 0x0800 /* Can pause asymetrically */
|
|
-#define LPA_SGMII_1000HALF 0x0800 /* Can do SGMII 1000mbps half-duplex */
|
|
-#define LPA_SGMII_1000FULL 0x1800 /* Can do SGMII 1000mbps full-duplex */
|
|
#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_SGMII_LINK 0x8000 /* Link partner has link */
|
|
|
|
#define LPA_DUPLEX (LPA_10FULL | LPA_100FULL)
|
|
#define LPA_100 (LPA_100FULL | LPA_100HALF | LPA_100BASE4)
|