From nobody Fri Sep 20 01:32:25 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45AA454FAB; Thu, 18 Apr 2024 05:35:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713418559; cv=none; b=Fb7KjZ5rLoICszR0Ok+nP2kJZFRsbyBt21jmOeFB84l1CtrNK6GZJtnLFg5OAnL/0657dKIzs8edrBsLzDheE8fZGk5Z/QWs3nfxDpfCPMr/o8LacqVUQmdNHaS8/+l5/FBDMonn3SEvapYp08L3v42dlq2Rt7mIYtK7yFdFGWI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713418559; c=relaxed/simple; bh=FwspoTJL4qnz8lghVRQpWEqD16KSgylJszCn6f5o6KI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dj5TSX9oF10EO5knlWJSGo6W8WZbWtpz/qeop2iuG1jDkowDXkO6zvGUbXPnrlN4PcFF/WIClvhjhmJCZDbTc59nIor54fUasfBoZ9EcapUPmb8wP8mPVcSKH967n6lMVlWB0jyG9OQdp2kNVenFPWVHf3Y/BAePixQKcfY+I5M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sK2A1AU6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sK2A1AU6" Received: by smtp.kernel.org (Postfix) with ESMTPS id DBE2AC3277B; Thu, 18 Apr 2024 05:35:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713418558; bh=FwspoTJL4qnz8lghVRQpWEqD16KSgylJszCn6f5o6KI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=sK2A1AU68cFIw0Dt3NNRggP5dkupS6uun6VH5A7ydB7FfHso01bJq4fZMEccfWlVx zfwS8rJXl/lCaYZjJSmiK6EjgslwkoGfb5wBWdVb5RPCuHsH86D+l4RihHZgO0UCCR AgpVpAQTQM4fBEPLlkdWyUibxmY/YJl/0C0X0yebATto+FWjgRhQf2oZ9f144EkN40 Ozc5wW2+scY9uSK55OvPN05Maiff/hRTT8LAhBOzrtgM3G/jo53iKkWQsxFLtsO7/D lNl3nfmlVhTQ6TiLka9aPx6/PnkxIsjVmmPqpv/xM5GibGp5QqjxE63qYIRn/iokbl 1ufp2Ik79OnmA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8EF6C04FF8; Thu, 18 Apr 2024 05:35:58 +0000 (UTC) From: =?utf-8?q?Ar=C4=B1n=C3=A7_=C3=9CNAL_via_B4_Relay?= Date: Thu, 18 Apr 2024 08:35:30 +0300 Subject: [PATCH net-next v3 1/2] net: dsa: mt7530-mdio: read PHY address of switch from device tree Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240418-b4-for-netnext-mt7530-phy-addr-from-dt-and-simplify-core-ops-v3-1-3b5fb249b004@arinc9.com> References: <20240418-b4-for-netnext-mt7530-phy-addr-from-dt-and-simplify-core-ops-v3-0-3b5fb249b004@arinc9.com> In-Reply-To: <20240418-b4-for-netnext-mt7530-phy-addr-from-dt-and-simplify-core-ops-v3-0-3b5fb249b004@arinc9.com> To: Daniel Golle , DENG Qingfang , Sean Wang , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno Cc: Bartel Eerdekens , mithat.guner@xeront.com, erkin.bozoglu@xeront.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, =?utf-8?q?Ar=C4=B1n=C3=A7_=C3=9CNAL?= , Florian Fainelli X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1713418557; l=8508; i=arinc.unal@arinc9.com; s=arinc9-Xeront; h=from:subject:message-id; bh=f840NL3mtHDaLfTcf2L4c4lah+jWpXKRJ/NVpYmtufU=; b=tzGiGLShqtbmKi9MM/Ka/t4t7c7xGnkjSz/0ha3P2puTFWsYFrzZtHGw2VWUZbBwxOb+9YyGy RS5X2gPROqBCM3J29e3T+q5TXwwHJAA9OKTcgWdfsYjCG58aXrmRnET X-Developer-Key: i=arinc.unal@arinc9.com; a=ed25519; pk=z49tLn29CyiL4uwBTrqH9HO1Wu3sZIuRp4DaLZvtP9M= X-Endpoint-Received: by B4 Relay for arinc.unal@arinc9.com/arinc9-Xeront with auth_id=137 X-Original-From: =?utf-8?q?Ar=C4=B1n=C3=A7_=C3=9CNAL?= Reply-To: arinc.unal@arinc9.com From: Ar=C4=B1n=C3=A7 =C3=9CNAL Read the PHY address the switch listens on from the reg property of the switch node on the device tree. This change brings support for MT7530 switches on boards with such bootstrapping configuration where the switch listens on a different PHY address than the hardcoded PHY address on the driver, 31. As described on the "MT7621 Programming Guide v0.4" document, the MT7530 switch and its PHYs can be configured to listen on the range of 7-12, 15-20, 23-28, and 31 and 0-4 PHY addresses. There are operations where the switch PHY registers are used. For the PHY address of the control PHY, transform the MT753X_CTRL_PHY_ADDR constant into a macro and use it. The PHY address for the control PHY is 0 when the switch listens on 31. In any other case, it is one greater than the PHY address the switch listens on. Reviewed-by: Daniel Golle Tested-by: Daniel Golle Reviewed-by: Florian Fainelli Signed-off-by: Ar=C4=B1n=C3=A7 =C3=9CNAL --- drivers/net/dsa/mt7530-mdio.c | 28 ++++++++++++++-------------- drivers/net/dsa/mt7530.c | 37 ++++++++++++++++++++++++------------- drivers/net/dsa/mt7530.h | 4 +++- 3 files changed, 41 insertions(+), 28 deletions(-) diff --git a/drivers/net/dsa/mt7530-mdio.c b/drivers/net/dsa/mt7530-mdio.c index fa3ee85a99c1..51df42ccdbe6 100644 --- a/drivers/net/dsa/mt7530-mdio.c +++ b/drivers/net/dsa/mt7530-mdio.c @@ -18,7 +18,8 @@ static int mt7530_regmap_write(void *context, unsigned int reg, unsigned int val) { - struct mii_bus *bus =3D context; + struct mt7530_priv *priv =3D context; + struct mii_bus *bus =3D priv->bus; u16 page, r, lo, hi; int ret; =20 @@ -27,36 +28,35 @@ mt7530_regmap_write(void *context, unsigned int reg, un= signed int val) lo =3D val & 0xffff; hi =3D val >> 16; =20 - /* MT7530 uses 31 as the pseudo port */ - ret =3D bus->write(bus, 0x1f, 0x1f, page); + ret =3D bus->write(bus, priv->mdiodev->addr, 0x1f, page); if (ret < 0) return ret; =20 - ret =3D bus->write(bus, 0x1f, r, lo); + ret =3D bus->write(bus, priv->mdiodev->addr, r, lo); if (ret < 0) return ret; =20 - ret =3D bus->write(bus, 0x1f, 0x10, hi); + ret =3D bus->write(bus, priv->mdiodev->addr, 0x10, hi); return ret; } =20 static int mt7530_regmap_read(void *context, unsigned int reg, unsigned int *val) { - struct mii_bus *bus =3D context; + struct mt7530_priv *priv =3D context; + struct mii_bus *bus =3D priv->bus; u16 page, r, lo, hi; int ret; =20 page =3D (reg >> 6) & 0x3ff; r =3D (reg >> 2) & 0xf; =20 - /* MT7530 uses 31 as the pseudo port */ - ret =3D bus->write(bus, 0x1f, 0x1f, page); + ret =3D bus->write(bus, priv->mdiodev->addr, 0x1f, page); if (ret < 0) return ret; =20 - lo =3D bus->read(bus, 0x1f, r); - hi =3D bus->read(bus, 0x1f, 0x10); + lo =3D bus->read(bus, priv->mdiodev->addr, r); + hi =3D bus->read(bus, priv->mdiodev->addr, 0x10); =20 *val =3D (hi << 16) | (lo & 0xffff); =20 @@ -107,8 +107,7 @@ mt7531_create_sgmii(struct mt7530_priv *priv) mt7531_pcs_config[i]->unlock =3D mt7530_mdio_regmap_unlock; mt7531_pcs_config[i]->lock_arg =3D &priv->bus->mdio_lock; =20 - regmap =3D devm_regmap_init(priv->dev, - &mt7530_regmap_bus, priv->bus, + regmap =3D devm_regmap_init(priv->dev, &mt7530_regmap_bus, priv, mt7531_pcs_config[i]); if (IS_ERR(regmap)) { ret =3D PTR_ERR(regmap); @@ -153,6 +152,7 @@ mt7530_probe(struct mdio_device *mdiodev) =20 priv->bus =3D mdiodev->bus; priv->dev =3D &mdiodev->dev; + priv->mdiodev =3D mdiodev; =20 ret =3D mt7530_probe_common(priv); if (ret) @@ -203,8 +203,8 @@ mt7530_probe(struct mdio_device *mdiodev) regmap_config->reg_stride =3D 4; regmap_config->max_register =3D MT7530_CREV; regmap_config->disable_locking =3D true; - priv->regmap =3D devm_regmap_init(priv->dev, &mt7530_regmap_bus, - priv->bus, regmap_config); + priv->regmap =3D devm_regmap_init(priv->dev, &mt7530_regmap_bus, priv, + regmap_config); if (IS_ERR(priv->regmap)) return PTR_ERR(priv->regmap); =20 diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 84eec7de9b03..64b1f6320b9a 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -86,22 +86,26 @@ core_read_mmd_indirect(struct mt7530_priv *priv, int pr= tad, int devad) int value, ret; =20 /* Write the desired MMD Devad */ - ret =3D bus->write(bus, 0, MII_MMD_CTRL, devad); + ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->mdiodev->addr), + MII_MMD_CTRL, devad); if (ret < 0) goto err; =20 /* Write the desired MMD register address */ - ret =3D bus->write(bus, 0, MII_MMD_DATA, prtad); + ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->mdiodev->addr), + MII_MMD_DATA, prtad); if (ret < 0) goto err; =20 /* Select the Function : DATA with no post increment */ - ret =3D bus->write(bus, 0, MII_MMD_CTRL, (devad | MII_MMD_CTRL_NOINCR)); + ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->mdiodev->addr), + MII_MMD_CTRL, devad | MII_MMD_CTRL_NOINCR); if (ret < 0) goto err; =20 /* Read the content of the MMD's selected register */ - value =3D bus->read(bus, 0, MII_MMD_DATA); + value =3D bus->read(bus, MT753X_CTRL_PHY_ADDR(priv->mdiodev->addr), + MII_MMD_DATA); =20 return value; err: @@ -118,22 +122,26 @@ core_write_mmd_indirect(struct mt7530_priv *priv, int= prtad, int ret; =20 /* Write the desired MMD Devad */ - ret =3D bus->write(bus, 0, MII_MMD_CTRL, devad); + ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->mdiodev->addr), + MII_MMD_CTRL, devad); if (ret < 0) goto err; =20 /* Write the desired MMD register address */ - ret =3D bus->write(bus, 0, MII_MMD_DATA, prtad); + ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->mdiodev->addr), + MII_MMD_DATA, prtad); if (ret < 0) goto err; =20 /* Select the Function : DATA with no post increment */ - ret =3D bus->write(bus, 0, MII_MMD_CTRL, (devad | MII_MMD_CTRL_NOINCR)); + ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->mdiodev->addr), + MII_MMD_CTRL, devad | MII_MMD_CTRL_NOINCR); if (ret < 0) goto err; =20 /* Write the data into MMD's selected register */ - ret =3D bus->write(bus, 0, MII_MMD_DATA, data); + ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->mdiodev->addr), + MII_MMD_DATA, data); err: if (ret < 0) dev_err(&bus->dev, @@ -2671,16 +2679,19 @@ mt7531_setup(struct dsa_switch *ds) * phy_[read,write]_mmd_indirect is called, we provide our own * mt7531_ind_mmd_phy_[read,write] to complete this function. */ - val =3D mt7531_ind_c45_phy_read(priv, MT753X_CTRL_PHY_ADDR, + val =3D mt7531_ind_c45_phy_read(priv, + MT753X_CTRL_PHY_ADDR(priv->mdiodev->addr), MDIO_MMD_VEND2, CORE_PLL_GROUP4); val |=3D MT7531_RG_SYSPLL_DMY2 | MT7531_PHY_PLL_BYPASS_MODE; val &=3D ~MT7531_PHY_PLL_OFF; - mt7531_ind_c45_phy_write(priv, MT753X_CTRL_PHY_ADDR, MDIO_MMD_VEND2, - CORE_PLL_GROUP4, val); + mt7531_ind_c45_phy_write(priv, + MT753X_CTRL_PHY_ADDR(priv->mdiodev->addr), + MDIO_MMD_VEND2, CORE_PLL_GROUP4, val); =20 /* Disable EEE advertisement on the switch PHYs. */ - for (i =3D MT753X_CTRL_PHY_ADDR; - i < MT753X_CTRL_PHY_ADDR + MT7530_NUM_PHYS; i++) { + for (i =3D MT753X_CTRL_PHY_ADDR(priv->mdiodev->addr); + i < MT753X_CTRL_PHY_ADDR(priv->mdiodev->addr) + MT7530_NUM_PHYS; + i++) { mt7531_ind_c45_phy_write(priv, i, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0); } diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h index 585db03c0548..f96c613738a7 100644 --- a/drivers/net/dsa/mt7530.h +++ b/drivers/net/dsa/mt7530.h @@ -625,7 +625,7 @@ enum mt7531_clk_skew { #define MT7531_PHY_PLL_OFF BIT(5) #define MT7531_PHY_PLL_BYPASS_MODE BIT(4) =20 -#define MT753X_CTRL_PHY_ADDR 0 +#define MT753X_CTRL_PHY_ADDR(addr) ((addr + 1) & 0x1f) =20 #define CORE_PLL_GROUP5 0x404 #define RG_LCDDS_PCW_NCPO1(x) ((x) & 0xffff) @@ -774,6 +774,7 @@ struct mt753x_info { * @irq_enable: IRQ enable bits, synced to SYS_INT_EN * @create_sgmii: Pointer to function creating SGMII PCS instance(s) * @active_cpu_ports: Holding the active CPU ports + * @mdiodev: The pointer to the MDIO device structure */ struct mt7530_priv { struct device *dev; @@ -800,6 +801,7 @@ struct mt7530_priv { u32 irq_enable; int (*create_sgmii)(struct mt7530_priv *priv); u8 active_cpu_ports; + struct mdio_device *mdiodev; }; =20 struct mt7530_hw_vlan_entry { --=20 2.40.1