diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/701-net-0378-mii-Add-helpers-for-parsing-SGMII-auto-negotiation.patch | |
parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
download | upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2 upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip |
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release
which was tagged LSDK-20.04-V5.4.
https://source.codeaurora.org/external/qoriq/qoriq-components/linux/
For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in
LSDK, port the dts patches from 4.14.
The patches are sorted into the following categories:
301-arch-xxxx
302-dts-xxxx
303-core-xxxx
701-net-xxxx
801-audio-xxxx
802-can-xxxx
803-clock-xxxx
804-crypto-xxxx
805-display-xxxx
806-dma-xxxx
807-gpio-xxxx
808-i2c-xxxx
809-jailhouse-xxxx
810-keys-xxxx
811-kvm-xxxx
812-pcie-xxxx
813-pm-xxxx
814-qe-xxxx
815-sata-xxxx
816-sdhc-xxxx
817-spi-xxxx
818-thermal-xxxx
819-uart-xxxx
820-usb-xxxx
821-vfio-xxxx
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0378-mii-Add-helpers-for-parsing-SGMII-auto-negotiation.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0378-mii-Add-helpers-for-parsing-SGMII-auto-negotiation.patch | 105 |
1 files changed, 105 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0378-mii-Add-helpers-for-parsing-SGMII-auto-negotiation.patch b/target/linux/layerscape/patches-5.4/701-net-0378-mii-Add-helpers-for-parsing-SGMII-auto-negotiation.patch new file mode 100644 index 0000000000..3aeda2a057 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/701-net-0378-mii-Add-helpers-for-parsing-SGMII-auto-negotiation.patch @@ -0,0 +1,105 @@ +From 4f3ba90c37ec5aedd2227beb013bab59035fbb57 Mon Sep 17 00:00:00 2001 +From: Vladimir Oltean <vladimir.oltean@nxp.com> +Date: Mon, 30 Sep 2019 19:20:26 +0300 +Subject: [PATCH] mii: Add helpers for parsing SGMII auto-negotiation + +Typically a MAC PCS auto-configures itself after it receives the +negotiated copper-side link settings from the PHY, but some MAC devices +are more special and need manual interpretation of the SGMII AN result. + +In other cases, the PCS exposes the entire tx_config_reg base page as it +is transmitted on the wire during auto-negotiation, so it makes sense to +be able to decode the equivalent lp_advertised bit mask from the raw u16 +(of course, "lp" considering the PCS to be the local PHY). + +Therefore, add the bit definitions for the SGMII registers 4 and 5 +(local device ability, link partner ability), as well as a link_mode +conversion helper that can be used to feed the AN results into +phy_resolve_aneg_linkmode. + +Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> +--- + include/linux/mii.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ + include/uapi/linux/mii.h | 12 ++++++++++++ + 2 files changed, 62 insertions(+) + +--- a/include/linux/mii.h ++++ b/include/linux/mii.h +@@ -373,6 +373,56 @@ 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 +@@ -131,6 +131,18 @@ + #define NWAYTEST_LOOPBACK 0x0100 /* Enable loopback for N-way */ + #define NWAYTEST_RESV2 0xfe00 /* Unused... */ + ++/* MAC and PHY tx_config_Reg[15:0] for SGMII in-band auto-negotiation.*/ ++#define ADVERTISE_SGMII 0x0001 /* MAC can do SGMII */ ++#define LPA_SGMII 0x0001 /* PHY can do SGMII */ ++#define LPA_SGMII_DPX_SPD_MASK 0x1C00 /* SGMII duplex and speed bits */ ++#define LPA_SGMII_10HALF 0x0000 /* Can do 10mbps half-duplex */ ++#define LPA_SGMII_10FULL 0x1000 /* Can do 10mbps full-duplex */ ++#define LPA_SGMII_100HALF 0x0400 /* Can do 100mbps half-duplex */ ++#define LPA_SGMII_100FULL 0x1400 /* Can do 100mbps full-duplex */ ++#define LPA_SGMII_1000HALF 0x0800 /* Can do 1000mbps half-duplex */ ++#define LPA_SGMII_1000FULL 0x1800 /* Can do 1000mbps full-duplex */ ++#define LPA_SGMII_LINK 0x8000 /* PHY link with copper-side partner */ ++ + /* 1000BASE-T Control register */ + #define ADVERTISE_1000FULL 0x0200 /* Advertise 1000BASE-T full duplex */ + #define ADVERTISE_1000HALF 0x0100 /* Advertise 1000BASE-T half duplex */ |