From nobody Thu Sep 19 23:05:38 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 31E841BF35; Sun, 14 Apr 2024 06:08:04 +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=1713074885; cv=none; b=HiH1QIp3FP+Y1SshYsMQxirEhAGFo4+Ua88puRJ2qu7Zt8AchsXjdWkGDhRDrsqhArYiUNOi2VQdDR//MKf0vql6Wt15lH91nqXxAxmYpwo5Xrb6Y5dBB4NDBFXsw5fOVAEYkHxhjVz+qqoMsxudGFe1pS/qnudS1kTj+AYWDo0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713074885; c=relaxed/simple; bh=YQC7tIJqApyFyKNsmdhzWb9nxWLvyUKPAXMYvJOWBmw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=V11nY7TsbMJFnaoO60kbVaa8NUSvpsUL3eIXuBkAMqcFGSrzUIrMu8T55n4h8+VFPWo2ZZV78GIUfdDMfLUO7/u2buqs3wUxHzCBR0wiWkTjtrggweWt0hSNSkqt5BE7l7IPgFbgcOU9CCYb5pMyTAVHxtKmMg33ZsH5+CBwXSM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FHlJxQyu; 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="FHlJxQyu" Received: by smtp.kernel.org (Postfix) with ESMTPS id C5C89C32781; Sun, 14 Apr 2024 06:08:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713074884; bh=YQC7tIJqApyFyKNsmdhzWb9nxWLvyUKPAXMYvJOWBmw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=FHlJxQyu8FTYQ9i04/DWwOtkv2jY3O6nyN89jpGGfBzvu/xVVx4qZv+yuEO/Yi6Bs v460nMQGR+NT8eESH5Z0YTPgHguLt42QJq0jEiVF9SKzuPkwNq4MhIIdUsUQUfKXdS bz3lut+F62xh2Qdn7lCOnui2bI956FkX7o+wL0bIqTP1cP2wFrcAlbFu1NlqO2/Kd5 vWmG+XuvCoKFsD4OdtfB85wGrZGBI1j6PGfzrEaIQt8fXeEkA0b+XYho7OEhqqH4FU M2TWDyGAqK8272BtE1TMl6o5YoVzSlfMw46tWdjM42fIXz7EYS90urCZZ58j7wdM3f 9pjh872IF+WyA== 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 B17D9C04FFE; Sun, 14 Apr 2024 06:08:04 +0000 (UTC) From: =?utf-8?q?Ar=C4=B1n=C3=A7_=C3=9CNAL_via_B4_Relay?= Date: Sun, 14 Apr 2024 09:07:41 +0300 Subject: [PATCH net-next v2 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: <20240414-b4-for-netnext-mt7530-phy-addr-from-dt-and-simplify-core-ops-v2-1-1a7649c4d3b6@arinc9.com> References: <20240414-b4-for-netnext-mt7530-phy-addr-from-dt-and-simplify-core-ops-v2-0-1a7649c4d3b6@arinc9.com> In-Reply-To: <20240414-b4-for-netnext-mt7530-phy-addr-from-dt-and-simplify-core-ops-v2-0-1a7649c4d3b6@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?= X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1713074874; l=8342; i=arinc.unal@arinc9.com; s=arinc9-patatt; h=from:subject:message-id; bh=LJr+weQDs1gn0Ez7GnkPtUaVkB4Ioqodo2W/lus+HeU=; b=OR0HlKDRQqUwPstnz7eBxs2l0ZY5qApbFFUhvPYpZLquMp9Wlh1Yk2kmwEx3Qm7f2LrTMwPsG zdOSsmQg8piBObnv/xo4F5b09EJnAO0XxNj5ht1KKz4jEMZQbMBTCLI X-Developer-Key: i=arinc.unal@arinc9.com; a=ed25519; pk=VmvgMWwm73yVIrlyJYvGtnXkQJy9CvbaeEqPQO9Z4kA= X-Endpoint-Received: by B4 Relay for arinc.unal@arinc9.com/arinc9-patatt with auth_id=115 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 Signed-off-by: Ar=C4=B1n=C3=A7 =C3=9CNAL Reviewed-by: Florian Fainelli --- drivers/net/dsa/mt7530-mdio.c | 28 ++++++++++++++-------------- drivers/net/dsa/mt7530.c | 35 ++++++++++++++++++++++------------- drivers/net/dsa/mt7530.h | 4 +++- 3 files changed, 39 insertions(+), 28 deletions(-) diff --git a/drivers/net/dsa/mt7530-mdio.c b/drivers/net/dsa/mt7530-mdio.c index fa3ee85a99c1..599b28c8a340 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->phy_addr, 0x1f, page); if (ret < 0) return ret; =20 - ret =3D bus->write(bus, 0x1f, r, lo); + ret =3D bus->write(bus, priv->phy_addr, r, lo); if (ret < 0) return ret; =20 - ret =3D bus->write(bus, 0x1f, 0x10, hi); + ret =3D bus->write(bus, priv->phy_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->phy_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->phy_addr, r); + hi =3D bus->read(bus, priv->phy_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->phy_addr =3D mdiodev->addr; =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 c0d0bce0b594..fefa6dd151fa 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->phy_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->phy_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->phy_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->phy_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->phy_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->phy_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->phy_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->phy_addr), + MII_MMD_DATA, data); err: if (ret < 0) dev_err(&bus->dev, @@ -2671,16 +2679,17 @@ 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->phy_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->phy_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->phy_addr); + i < MT753X_CTRL_PHY_ADDR(priv->phy_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..dc48715f6534 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(phy_addr) (phy_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 + * @phy_addr: Holding the PHY address the switch listens on */ 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; + int phy_addr; }; =20 struct mt7530_hw_vlan_entry { --=20 2.40.1 From nobody Thu Sep 19 23:05:38 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 548F61BF3F; Sun, 14 Apr 2024 06:08:05 +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=1713074885; cv=none; b=fNRZFTrzEUvKvTLe7bIdQJZw8azVQRi0RQCQm80cMlgIsYHcu2xVBiiFIiCFDNX8RZCHv/vwrhaFm/ORS/BYoUjY6S5Fqwm1uShYomRG1dZlTPUUPZIH2WlyhIp6MOw4KkPBdhIVghDqM1D5N651LnFPwMB1/35r6zo5Ro/8iC8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713074885; c=relaxed/simple; bh=3CGbKm3wLsuS8GTsDospuYJBy6mOwEyYgj08AowXFJY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Go91m559zpfjX6zBaDMOLxoFK4UYfp17NDExYwUYBwSoOdA8PbZbi2g5asxuCI7lOD0zEHWYcdj1hSrmVKNwe8siquw5vp3vWZi3QEG26zaNkE+FkzVCXv/+3FzdUl3pchOXtPpdJv4dCjFs4hPkX415AW5mStQJw7RPIKYTdJI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=n9c12esV; 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="n9c12esV" Received: by smtp.kernel.org (Postfix) with ESMTPS id D2B81C2BD10; Sun, 14 Apr 2024 06:08:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713074884; bh=3CGbKm3wLsuS8GTsDospuYJBy6mOwEyYgj08AowXFJY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=n9c12esVWhQWw4tZ2XC5mWhXfgDHRiwJ5T8XHHySG6o8dbf4Oqv3R2OmxsG9cl6NT rRy0RB9F0SyE8fmj6+7nqmy5UnzNqerg3YDpiwoG5yRfF1NkDqSKCIPctSjIJMIwIB a/cb2L/ETjdjLZbMYO1DNJxFQPSmz8VxF4nn0q9UEzqzuzIQuveY/SQsY6QYr3MkuN dCKN9o5mXIUX7cwoZ5YFhoczOd3watdYucSg9wp7NJOfTmNowe2tBY5RlIAOQjGiuG 8UQb1LG1w0k9C4tX7/ftPqtwnD1ZPP1najQYk7G/n9Xyxa6LtIuV1XKwkesAjBFyy0 OY1HBzzJJVoog== 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 BDE86C04FFF; Sun, 14 Apr 2024 06:08:04 +0000 (UTC) From: =?utf-8?q?Ar=C4=B1n=C3=A7_=C3=9CNAL_via_B4_Relay?= Date: Sun, 14 Apr 2024 09:07:42 +0300 Subject: [PATCH net-next v2 2/2] net: dsa: mt7530: simplify core operations 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: <20240414-b4-for-netnext-mt7530-phy-addr-from-dt-and-simplify-core-ops-v2-2-1a7649c4d3b6@arinc9.com> References: <20240414-b4-for-netnext-mt7530-phy-addr-from-dt-and-simplify-core-ops-v2-0-1a7649c4d3b6@arinc9.com> In-Reply-To: <20240414-b4-for-netnext-mt7530-phy-addr-from-dt-and-simplify-core-ops-v2-0-1a7649c4d3b6@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?= X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1713074874; l=5238; i=arinc.unal@arinc9.com; s=arinc9-patatt; h=from:subject:message-id; bh=MN/y6Syx7BQudCat3jVuTgtlGZvuyR9wy1cv/kTixQo=; b=yZml79ewmSDr1F1tJP+dZjXpKov/rHFKteTyG1sPQL1UgI+5dKQzLKLtv7vD6UAjVTZqK9N48 cUl6IBBsYw0BT9KgWD4zOAxxSIa/Kqy9p/FsTkq+kJ0iV3BWYUQwdLH X-Developer-Key: i=arinc.unal@arinc9.com; a=ed25519; pk=VmvgMWwm73yVIrlyJYvGtnXkQJy9CvbaeEqPQO9Z4kA= X-Endpoint-Received: by B4 Relay for arinc.unal@arinc9.com/arinc9-patatt with auth_id=115 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 The core_rmw() function calls core_read_mmd_indirect() to read the requested register, and then calls core_write_mmd_indirect() to write the requested value to the register. Because Clause 22 is used to access Clause 45 registers, some operations on core_write_mmd_indirect() are unnecessarily run. Get rid of core_read_mmd_indirect() and core_write_mmd_indirect(), and run only the necessary operations on core_write() and core_rmw(). Reviewed-by: Daniel Golle Tested-by: Daniel Golle Signed-off-by: Ar=C4=B1n=C3=A7 =C3=9CNAL --- drivers/net/dsa/mt7530.c | 108 +++++++++++++++++++------------------------= ---- 1 file changed, 43 insertions(+), 65 deletions(-) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index fefa6dd151fa..2650eacf87a7 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -74,116 +74,94 @@ static const struct mt7530_mib_desc mt7530_mib[] =3D { MIB_DESC(1, 0xb8, "RxArlDrop"), }; =20 -/* Since phy_device has not yet been created and - * phy_{read,write}_mmd_indirect is not available, we provide our own - * core_{read,write}_mmd_indirect with core_{clear,write,set} wrappers - * to complete this function. - */ -static int -core_read_mmd_indirect(struct mt7530_priv *priv, int prtad, int devad) +static void +mt7530_mutex_lock(struct mt7530_priv *priv) +{ + if (priv->bus) + mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED); +} + +static void +mt7530_mutex_unlock(struct mt7530_priv *priv) +{ + if (priv->bus) + mutex_unlock(&priv->bus->mdio_lock); +} + +static void +core_write(struct mt7530_priv *priv, u32 reg, u32 val) { struct mii_bus *bus =3D priv->bus; - int value, ret; + int ret; + + mt7530_mutex_lock(priv); =20 /* Write the desired MMD Devad */ ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->phy_addr), - MII_MMD_CTRL, devad); + MII_MMD_CTRL, MDIO_MMD_VEND2); if (ret < 0) goto err; =20 /* Write the desired MMD register address */ ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->phy_addr), - MII_MMD_DATA, prtad); + MII_MMD_DATA, reg); if (ret < 0) goto err; =20 /* Select the Function : DATA with no post increment */ ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->phy_addr), - MII_MMD_CTRL, devad | MII_MMD_CTRL_NOINCR); + MII_MMD_CTRL, MDIO_MMD_VEND2 | MII_MMD_CTRL_NOINCR); if (ret < 0) goto err; =20 - /* Read the content of the MMD's selected register */ - value =3D bus->read(bus, MT753X_CTRL_PHY_ADDR(priv->phy_addr), - MII_MMD_DATA); - - return value; + /* Write the data into MMD's selected register */ + ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->phy_addr), + MII_MMD_DATA, val); err: - dev_err(&bus->dev, "failed to read mmd register\n"); + if (ret < 0) + dev_err(&bus->dev, "failed to write mmd register\n"); =20 - return ret; + mt7530_mutex_unlock(priv); } =20 -static int -core_write_mmd_indirect(struct mt7530_priv *priv, int prtad, - int devad, u32 data) +static void +core_rmw(struct mt7530_priv *priv, u32 reg, u32 mask, u32 set) { struct mii_bus *bus =3D priv->bus; + u32 val; int ret; =20 + mt7530_mutex_lock(priv); + /* Write the desired MMD Devad */ ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->phy_addr), - MII_MMD_CTRL, devad); + MII_MMD_CTRL, MDIO_MMD_VEND2); if (ret < 0) goto err; =20 /* Write the desired MMD register address */ ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->phy_addr), - MII_MMD_DATA, prtad); + MII_MMD_DATA, reg); if (ret < 0) goto err; =20 /* Select the Function : DATA with no post increment */ ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->phy_addr), - MII_MMD_CTRL, devad | MII_MMD_CTRL_NOINCR); + MII_MMD_CTRL, MDIO_MMD_VEND2 | MII_MMD_CTRL_NOINCR); if (ret < 0) goto err; =20 + /* Read the content of the MMD's selected register */ + val =3D bus->read(bus, MT753X_CTRL_PHY_ADDR(priv->phy_addr), + MII_MMD_DATA); + val &=3D ~mask; + val |=3D set; /* Write the data into MMD's selected register */ ret =3D bus->write(bus, MT753X_CTRL_PHY_ADDR(priv->phy_addr), - MII_MMD_DATA, data); + MII_MMD_DATA, val); err: if (ret < 0) - dev_err(&bus->dev, - "failed to write mmd register\n"); - return ret; -} - -static void -mt7530_mutex_lock(struct mt7530_priv *priv) -{ - if (priv->bus) - mutex_lock_nested(&priv->bus->mdio_lock, MDIO_MUTEX_NESTED); -} - -static void -mt7530_mutex_unlock(struct mt7530_priv *priv) -{ - if (priv->bus) - mutex_unlock(&priv->bus->mdio_lock); -} - -static void -core_write(struct mt7530_priv *priv, u32 reg, u32 val) -{ - mt7530_mutex_lock(priv); - - core_write_mmd_indirect(priv, reg, MDIO_MMD_VEND2, val); - - mt7530_mutex_unlock(priv); -} - -static void -core_rmw(struct mt7530_priv *priv, u32 reg, u32 mask, u32 set) -{ - u32 val; - - mt7530_mutex_lock(priv); - - val =3D core_read_mmd_indirect(priv, reg, MDIO_MMD_VEND2); - val &=3D ~mask; - val |=3D set; - core_write_mmd_indirect(priv, reg, MDIO_MMD_VEND2, val); + dev_err(&bus->dev, "failed to write mmd register\n"); =20 mt7530_mutex_unlock(priv); } --=20 2.40.1