| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20240213182415.17223-2-ansuelsmth@gmail.com>
Date: Tue, 13 Feb 2024 19:24:11 +0100
From: Christian Marangi <ansuelsmth@...il.com>
To: Andrew Lunn <andrew@...n.ch>,
Heiner Kallweit <hkallweit1@...il.com>,
Russell King <linux@...linux.org.uk>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Christian Marangi <ansuelsmth@...il.com>,
Robert Marko <robimarko@...il.com>,
"Russell King (Oracle)" <rmk+kernel@...linux.org.uk>,
netdev@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [net-next RFC PATCH 1/2] net: phy: aquantia: setup interface protocols for AQR112
Aquantia Gen3 PHYs require additional regs to be set to correctly work
and communicate with the MAC.
For each rate, the startup rate needs to be set and the required global
cfg needs to be set.
The global cfg are per Rate and require different configuration based on
the requested interface mode.
Some FW might apply the correct values by default but some OEM might
provide generic FW that require additional fixup at runtime as the FW
doesn't correctly provison the PHY for the attached MAC interface mode.
The default values are taken from various source and SDK and all use the
same values for SGMII, 2500BASEX, 10GBASER and USXGMII.
One common problem that this handle is case where the FW provision for
10BASER but USXGMII is actually requested, hance runtime fixup is
required.
Signed-off-by: Christian Marangi <ansuelsmth@...il.com>
---
drivers/net/phy/aquantia/aquantia.h | 17 ++++
drivers/net/phy/aquantia/aquantia_main.c | 110 +++++++++++++++++++++++
2 files changed, 127 insertions(+)
diff --git a/drivers/net/phy/aquantia/aquantia.h b/drivers/net/phy/aquantia/aquantia.h
index 1c19ae74ad2b..019528c536c7 100644
--- a/drivers/net/phy/aquantia/aquantia.h
+++ b/drivers/net/phy/aquantia/aquantia.h
@@ -39,6 +39,15 @@
#define VEND1_GLOBAL_MAILBOX_INTERFACE6_LSW_DATA_MASK GENMASK(15, 0)
#define VEND1_GLOBAL_MAILBOX_INTERFACE6_LSW_DATA(x) FIELD_PREP(VEND1_GLOBAL_MAILBOX_INTERFACE6_LSW_DATA_MASK, (u16)(x))
+#define VEND1_GLOBAL_STARTUP_RATE 0x031a
+#define VEND1_GLOBAL_STARTUP_RATE_MASK GENMASK(3, 0)
+#define VEND1_GLOBAL_STARTUP_RATE_LOW_POWER 0
+#define VEND1_GLOBAL_STARTUP_RATE_100M 1
+#define VEND1_GLOBAL_STARTUP_RATE_1G 2
+#define VEND1_GLOBAL_STARTUP_RATE_10G 3
+#define VEND1_GLOBAL_STARTUP_RATE_2_5G 4
+#define VEND1_GLOBAL_STARTUP_RATE_5G 5
+
/* The following registers all have similar layouts; first the registers... */
#define VEND1_GLOBAL_CFG_10M 0x0310
#define VEND1_GLOBAL_CFG_100M 0x031b
@@ -52,6 +61,14 @@
#define VEND1_GLOBAL_CFG_SERDES_MODE_SGMII 3
#define VEND1_GLOBAL_CFG_SERDES_MODE_OCSGMII 4
#define VEND1_GLOBAL_CFG_SERDES_MODE_XFI5G 6
+/* Enable System Interface Autonegotiation */
+#define VEND1_GLOBAL_CFG_AUTONEG_EN BIT(3)
+/* Enable System Interface Training */
+#define VEND1_GLOBAL_CFG_TRAINING_EN BIT(4)
+/* Reset System Interface For Every Transition */
+#define VEND1_GLOBAL_CFG_RESET_ON_TRANSITION_EN BIT(5)
+/* Keep SERDES Silent During Transition */
+#define VEND1_GLOBAL_CFG_SERDES_SILENCE_EN BIT(6)
#define VEND1_GLOBAL_CFG_RATE_ADAPT GENMASK(8, 7)
#define VEND1_GLOBAL_CFG_RATE_ADAPT_NONE 0
#define VEND1_GLOBAL_CFG_RATE_ADAPT_USX 1
diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
index 97a2fafa15ca..6ee1a134bc60 100644
--- a/drivers/net/phy/aquantia/aquantia_main.c
+++ b/drivers/net/phy/aquantia/aquantia_main.c
@@ -746,6 +746,114 @@ static int aqr107_probe(struct phy_device *phydev)
return aqr_hwmon_probe(phydev);
}
+static int aqr112_setup_interface_protocols(struct phy_device *phydev)
+{
+ phy_interface_t iface = phydev->interface;
+ u16 startup_rate, global_cfg_val;
+ int i, ret;
+
+ /* Default global cfg are taken from Aquantia UBoot Source and various
+ * source and all makes use of the following reference values.
+ */
+ switch (iface) {
+ case PHY_INTERFACE_MODE_SGMII:
+ startup_rate = VEND1_GLOBAL_STARTUP_RATE_1G;
+ global_cfg_val = FIELD_PREP(VEND1_GLOBAL_CFG_SERDES_MODE,
+ VEND1_GLOBAL_CFG_SERDES_MODE_SGMII) |
+ VEND1_GLOBAL_CFG_AUTONEG_EN |
+ VEND1_GLOBAL_CFG_SERDES_SILENCE_EN;
+ break;
+ case PHY_INTERFACE_MODE_2500BASEX:
+ startup_rate = VEND1_GLOBAL_STARTUP_RATE_2_5G;
+ global_cfg_val = FIELD_PREP(VEND1_GLOBAL_CFG_SERDES_MODE,
+ VEND1_GLOBAL_CFG_SERDES_MODE_OCSGMII) |
+ VEND1_GLOBAL_CFG_SERDES_SILENCE_EN |
+ FIELD_PREP(VEND1_GLOBAL_CFG_RATE_ADAPT,
+ VEND1_GLOBAL_CFG_RATE_ADAPT_PAUSE);
+ break;
+ case PHY_INTERFACE_MODE_5GBASER:
+ startup_rate = VEND1_GLOBAL_STARTUP_RATE_5G;
+ global_cfg_val = FIELD_PREP(VEND1_GLOBAL_CFG_SERDES_MODE,
+ VEND1_GLOBAL_CFG_SERDES_MODE_XFI5G) |
+ FIELD_PREP(VEND1_GLOBAL_CFG_RATE_ADAPT,
+ VEND1_GLOBAL_CFG_RATE_ADAPT_PAUSE);
+ break;
+ case PHY_INTERFACE_MODE_10GBASER:
+ case PHY_INTERFACE_MODE_USXGMII:
+ startup_rate = VEND1_GLOBAL_STARTUP_RATE_10G;
+ global_cfg_val = FIELD_PREP(VEND1_GLOBAL_CFG_SERDES_MODE,
+ VEND1_GLOBAL_CFG_SERDES_MODE_XFI);
+ if (iface == PHY_INTERFACE_MODE_USXGMII)
+ global_cfg_val |= FIELD_PREP(VEND1_GLOBAL_CFG_RATE_ADAPT,
+ VEND1_GLOBAL_CFG_RATE_ADAPT_USX);
+ else
+ global_cfg_val |= FIELD_PREP(VEND1_GLOBAL_CFG_RATE_ADAPT,
+ VEND1_GLOBAL_CFG_RATE_ADAPT_PAUSE);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ /* set PHY in low power mode so we can configure protocols */
+ ret = phy_set_bits_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_SC,
+ VEND1_GLOBAL_SC_LOW_POWER);
+ if (ret)
+ return ret;
+
+ /* Some dalay is needed to put the chip in low-power */
+ mdelay(10);
+
+ /* Setup the SERDES interface link startup rate */
+ ret = phy_write_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_STARTUP_RATE,
+ FIELD_PREP(VEND1_GLOBAL_STARTUP_RATE_MASK, startup_rate));
+ if (ret)
+ return ret;
+
+ /* Walk the media-speed configuration registers to setup host-side
+ * serdes modes that may be used by the PHY depending on the
+ * negotiated media speed.
+ */
+ for (i = 0; i < ARRAY_SIZE(aqr_global_cfg_regs); i++) {
+ u16 reg = aqr_global_cfg_regs[i];
+ int val;
+
+ val = phy_read_mmd(phydev, MDIO_MMD_VEND1, reg);
+ if (val < 0)
+ return val;
+
+ /* If global_cfg is 0, rate is not supported by FW */
+ if (!val)
+ continue;
+
+ ret = phy_write_mmd(phydev, MDIO_MMD_VEND1, reg,
+ global_cfg_val);
+ if (ret)
+ return ret;
+ }
+
+ /* set PHY out of low power mode */
+ ret = phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_SC,
+ VEND1_GLOBAL_SC_LOW_POWER);
+ if (ret)
+ return ret;
+
+ /* Some dalay is needed to put the chip out of low-power */
+ mdelay(10);
+
+ return 0;
+}
+
+static int aqr112_config_init(struct phy_device *phydev)
+{
+ int ret;
+
+ ret = aqr112_setup_interface_protocols(phydev);
+ if (ret)
+ return ret;
+
+ return aqr107_fill_interface_modes(phydev);
+}
+
static struct phy_driver aqr_driver[] = {
{
PHY_ID_MATCH_MODEL(PHY_ID_AQ1202),
@@ -831,6 +939,7 @@ static struct phy_driver aqr_driver[] = {
PHY_ID_MATCH_MODEL(PHY_ID_AQR112),
.name = "Aquantia AQR112",
.probe = aqr107_probe,
+ .config_init = aqr112_config_init,
.config_aneg = aqr_config_aneg,
.config_intr = aqr_config_intr,
.handle_interrupt = aqr_handle_interrupt,
@@ -849,6 +958,7 @@ static struct phy_driver aqr_driver[] = {
PHY_ID_MATCH_MODEL(PHY_ID_AQR412),
.name = "Aquantia AQR412",
.probe = aqr107_probe,
+ .config_init = aqr112_config_init,
.config_aneg = aqr_config_aneg,
.config_intr = aqr_config_intr,
.handle_interrupt = aqr_handle_interrupt,
--
2.43.0
Powered by blists - more mailing lists