From nobody Sat Sep 21 08:20:13 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96BEFC54EBE for ; Mon, 16 Jan 2023 23:54:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235517AbjAPXx6 (ORCPT ); Mon, 16 Jan 2023 18:53:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235068AbjAPXwy (ORCPT ); Mon, 16 Jan 2023 18:52:54 -0500 Received: from mail.3ffe.de (0001.3ffe.de [IPv6:2a01:4f8:c0c:9d57::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41F9E22DC8; Mon, 16 Jan 2023 15:52:52 -0800 (PST) Received: from mwalle01.sab.local (unknown [213.135.10.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.3ffe.de (Postfix) with ESMTPSA id 2B4AF1A07; Tue, 17 Jan 2023 00:52:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2022082101; t=1673913170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fRnrZfwUNJp2IC+ysULsHp9fJlB7cZ3Z/7z1oE7VHLk=; b=18nYmw1ZzKt9SdoRatWrAq/uSj+xNfpSivkKWAE1vnYD55Gox9PlHJPByiRafi31nONmSq 1X6VAdHXUfB0PVK0xVODgP6gShYhma8kU1cvmTbHg53jrqNYH3DyR4CKC/5/5AGMGd6DFS p/6ir9U0U0dEndLbublpwLroqVSb2iKvzWH1N57DgLDc2vo3JHrKfAkptS2Hojp+iUlYsE I0vkjOv5YBm6j3A1SwBdi8cT+qJ+ZYK3uRKOR5k7zDfeJ3wC0K2WzhFaYOnbXbFVC2cFor rf2CVH6+ys1lOBHLqhcM6INYECWdi5HgfRX4IucvCXb4PBzfMwS1MzgZ2AEHBg== From: Michael Walle Date: Tue, 17 Jan 2023 00:52:25 +0100 Subject: [PATCH net-next 10/12] net: dsa: sja1105: C45 only transactions for PCS MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230116-net-next-c45-seperation-part-3-v1-10-0c53afa56aad@walle.cc> References: <20230116-net-next-c45-seperation-part-3-v1-0-0c53afa56aad@walle.cc> In-Reply-To: <20230116-net-next-c45-seperation-part-3-v1-0-0c53afa56aad@walle.cc> To: Sean Wang , Landen Chao , DENG Qingfang , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , Russell King , Byungho An , Nicolas Ferre , Claudiu Beznea , Jesse Brandeburg , Tony Nguyen , Yisen Zhuang , Salil Mehta , Tom Lendacky , Shyam Sundar S K , Sergey Shtylyov Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-renesas-soc@vger.kernel.org, Andrew Lunn , Michael Walle X-Mailer: b4 0.11.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Lunn The sja1105 MDIO bus driver only supports C45 transfers. Update the function names to make this clear, pass the mmd as a parameter, and register the accessors to the _c45 ops of the bus driver structure. Signed-off-by: Andrew Lunn Signed-off-by: Michael Walle --- drivers/net/dsa/sja1105/sja1105.h | 16 ++++++++----- drivers/net/dsa/sja1105/sja1105_mdio.c | 44 ++++++++++--------------------= ---- drivers/net/dsa/sja1105/sja1105_spi.c | 24 +++++++++---------- 3 files changed, 35 insertions(+), 49 deletions(-) diff --git a/drivers/net/dsa/sja1105/sja1105.h b/drivers/net/dsa/sja1105/sj= a1105.h index 9ba2ec2b966d..fb1549a5fe32 100644 --- a/drivers/net/dsa/sja1105/sja1105.h +++ b/drivers/net/dsa/sja1105/sja1105.h @@ -149,8 +149,10 @@ struct sja1105_info { bool (*rxtstamp)(struct dsa_switch *ds, int port, struct sk_buff *skb); void (*txtstamp)(struct dsa_switch *ds, int port, struct sk_buff *skb); int (*clocking_setup)(struct sja1105_private *priv); - int (*pcs_mdio_read)(struct mii_bus *bus, int phy, int reg); - int (*pcs_mdio_write)(struct mii_bus *bus, int phy, int reg, u16 val); + int (*pcs_mdio_read_c45)(struct mii_bus *bus, int phy, int mmd, + int reg); + int (*pcs_mdio_write_c45)(struct mii_bus *bus, int phy, int mmd, + int reg, u16 val); int (*disable_microcontroller)(struct sja1105_private *priv); const char *name; bool supports_mii[SJA1105_MAX_NUM_PORTS]; @@ -303,10 +305,12 @@ void sja1105_frame_memory_partitioning(struct sja1105= _private *priv); /* From sja1105_mdio.c */ int sja1105_mdiobus_register(struct dsa_switch *ds); void sja1105_mdiobus_unregister(struct dsa_switch *ds); -int sja1105_pcs_mdio_read(struct mii_bus *bus, int phy, int reg); -int sja1105_pcs_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val); -int sja1110_pcs_mdio_read(struct mii_bus *bus, int phy, int reg); -int sja1110_pcs_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val); +int sja1105_pcs_mdio_read_c45(struct mii_bus *bus, int phy, int mmd, int r= eg); +int sja1105_pcs_mdio_write_c45(struct mii_bus *bus, int phy, int mmd, int = reg, + u16 val); +int sja1110_pcs_mdio_read_c45(struct mii_bus *bus, int phy, int mmd, int r= eg); +int sja1110_pcs_mdio_write_c45(struct mii_bus *bus, int phy, int mmd, int = reg, + u16 val); =20 /* From sja1105_devlink.c */ int sja1105_devlink_setup(struct dsa_switch *ds); diff --git a/drivers/net/dsa/sja1105/sja1105_mdio.c b/drivers/net/dsa/sja11= 05/sja1105_mdio.c index 4059fcc8c832..8f1fcaf8e1d9 100644 --- a/drivers/net/dsa/sja1105/sja1105_mdio.c +++ b/drivers/net/dsa/sja1105/sja1105_mdio.c @@ -7,20 +7,15 @@ =20 #define SJA1110_PCS_BANK_REG SJA1110_SPI_ADDR(0x3fc) =20 -int sja1105_pcs_mdio_read(struct mii_bus *bus, int phy, int reg) +int sja1105_pcs_mdio_read_c45(struct mii_bus *bus, int phy, int mmd, int r= eg) { struct sja1105_mdio_private *mdio_priv =3D bus->priv; struct sja1105_private *priv =3D mdio_priv->priv; u64 addr; u32 tmp; - u16 mmd; int rc; =20 - if (!(reg & MII_ADDR_C45)) - return -EINVAL; - - mmd =3D (reg >> MII_DEVADDR_C45_SHIFT) & 0x1f; - addr =3D (mmd << 16) | (reg & GENMASK(15, 0)); + addr =3D (mmd << 16) | reg; =20 if (mmd !=3D MDIO_MMD_VEND1 && mmd !=3D MDIO_MMD_VEND2) return 0xffff; @@ -37,19 +32,15 @@ int sja1105_pcs_mdio_read(struct mii_bus *bus, int phy,= int reg) return tmp & 0xffff; } =20 -int sja1105_pcs_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val) +int sja1105_pcs_mdio_write_c45(struct mii_bus *bus, int phy, int mmd, + int reg, u16 val) { struct sja1105_mdio_private *mdio_priv =3D bus->priv; struct sja1105_private *priv =3D mdio_priv->priv; u64 addr; u32 tmp; - u16 mmd; - - if (!(reg & MII_ADDR_C45)) - return -EINVAL; =20 - mmd =3D (reg >> MII_DEVADDR_C45_SHIFT) & 0x1f; - addr =3D (mmd << 16) | (reg & GENMASK(15, 0)); + addr =3D (mmd << 16) | reg; tmp =3D val; =20 if (mmd !=3D MDIO_MMD_VEND1 && mmd !=3D MDIO_MMD_VEND2) @@ -58,7 +49,7 @@ int sja1105_pcs_mdio_write(struct mii_bus *bus, int phy, = int reg, u16 val) return sja1105_xfer_u32(priv, SPI_WRITE, addr, &tmp, NULL); } =20 -int sja1110_pcs_mdio_read(struct mii_bus *bus, int phy, int reg) +int sja1110_pcs_mdio_read_c45(struct mii_bus *bus, int phy, int mmd, int r= eg) { struct sja1105_mdio_private *mdio_priv =3D bus->priv; struct sja1105_private *priv =3D mdio_priv->priv; @@ -66,17 +57,12 @@ int sja1110_pcs_mdio_read(struct mii_bus *bus, int phy,= int reg) int offset, bank; u64 addr; u32 tmp; - u16 mmd; int rc; =20 - if (!(reg & MII_ADDR_C45)) - return -EINVAL; - if (regs->pcs_base[phy] =3D=3D SJA1105_RSV_ADDR) return -ENODEV; =20 - mmd =3D (reg >> MII_DEVADDR_C45_SHIFT) & 0x1f; - addr =3D (mmd << 16) | (reg & GENMASK(15, 0)); + addr =3D (mmd << 16) | reg; =20 if (mmd =3D=3D MDIO_MMD_VEND2 && (reg & GENMASK(15, 0)) =3D=3D MII_PHYSID= 1) return NXP_SJA1110_XPCS_ID >> 16; @@ -108,7 +94,8 @@ int sja1110_pcs_mdio_read(struct mii_bus *bus, int phy, = int reg) return tmp & 0xffff; } =20 -int sja1110_pcs_mdio_write(struct mii_bus *bus, int phy, int reg, u16 val) +int sja1110_pcs_mdio_write_c45(struct mii_bus *bus, int phy, int reg, int = mmd, + u16 val) { struct sja1105_mdio_private *mdio_priv =3D bus->priv; struct sja1105_private *priv =3D mdio_priv->priv; @@ -116,17 +103,12 @@ int sja1110_pcs_mdio_write(struct mii_bus *bus, int p= hy, int reg, u16 val) int offset, bank; u64 addr; u32 tmp; - u16 mmd; int rc; =20 - if (!(reg & MII_ADDR_C45)) - return -EINVAL; - if (regs->pcs_base[phy] =3D=3D SJA1105_RSV_ADDR) return -ENODEV; =20 - mmd =3D (reg >> MII_DEVADDR_C45_SHIFT) & 0x1f; - addr =3D (mmd << 16) | (reg & GENMASK(15, 0)); + addr =3D (mmd << 16) | reg; =20 bank =3D addr >> 8; offset =3D addr & GENMASK(7, 0); @@ -398,7 +380,7 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_= private *priv) int rc =3D 0; int port; =20 - if (!priv->info->pcs_mdio_read || !priv->info->pcs_mdio_write) + if (!priv->info->pcs_mdio_read_c45 || !priv->info->pcs_mdio_write_c45) return 0; =20 bus =3D mdiobus_alloc_size(sizeof(*mdio_priv)); @@ -408,8 +390,8 @@ static int sja1105_mdiobus_pcs_register(struct sja1105_= private *priv) bus->name =3D "SJA1105 PCS MDIO bus"; snprintf(bus->id, MII_BUS_ID_SIZE, "%s-pcs", dev_name(ds->dev)); - bus->read =3D priv->info->pcs_mdio_read; - bus->write =3D priv->info->pcs_mdio_write; + bus->read_c45 =3D priv->info->pcs_mdio_read_c45; + bus->write_c45 =3D priv->info->pcs_mdio_write_c45; bus->parent =3D ds->dev; /* There is no PHY on this MDIO bus =3D> mask out all PHY addresses * from auto probing. diff --git a/drivers/net/dsa/sja1105/sja1105_spi.c b/drivers/net/dsa/sja110= 5/sja1105_spi.c index d3c9ad6d39d4..5ce29c8057a4 100644 --- a/drivers/net/dsa/sja1105/sja1105_spi.c +++ b/drivers/net/dsa/sja1105/sja1105_spi.c @@ -719,8 +719,8 @@ const struct sja1105_info sja1105r_info =3D { .ptp_cmd_packing =3D sja1105pqrs_ptp_cmd_packing, .rxtstamp =3D sja1105_rxtstamp, .clocking_setup =3D sja1105_clocking_setup, - .pcs_mdio_read =3D sja1105_pcs_mdio_read, - .pcs_mdio_write =3D sja1105_pcs_mdio_write, + .pcs_mdio_read_c45 =3D sja1105_pcs_mdio_read_c45, + .pcs_mdio_write_c45 =3D sja1105_pcs_mdio_write_c45, .regs =3D &sja1105pqrs_regs, .port_speed =3D { [SJA1105_SPEED_AUTO] =3D 0, @@ -756,8 +756,8 @@ const struct sja1105_info sja1105s_info =3D { .ptp_cmd_packing =3D sja1105pqrs_ptp_cmd_packing, .rxtstamp =3D sja1105_rxtstamp, .clocking_setup =3D sja1105_clocking_setup, - .pcs_mdio_read =3D sja1105_pcs_mdio_read, - .pcs_mdio_write =3D sja1105_pcs_mdio_write, + .pcs_mdio_read_c45 =3D sja1105_pcs_mdio_read_c45, + .pcs_mdio_write_c45 =3D sja1105_pcs_mdio_write_c45, .port_speed =3D { [SJA1105_SPEED_AUTO] =3D 0, [SJA1105_SPEED_10MBPS] =3D 3, @@ -794,8 +794,8 @@ const struct sja1105_info sja1110a_info =3D { .rxtstamp =3D sja1110_rxtstamp, .txtstamp =3D sja1110_txtstamp, .disable_microcontroller =3D sja1110_disable_microcontroller, - .pcs_mdio_read =3D sja1110_pcs_mdio_read, - .pcs_mdio_write =3D sja1110_pcs_mdio_write, + .pcs_mdio_read_c45 =3D sja1110_pcs_mdio_read_c45, + .pcs_mdio_write_c45 =3D sja1110_pcs_mdio_write_c45, .port_speed =3D { [SJA1105_SPEED_AUTO] =3D 0, [SJA1105_SPEED_10MBPS] =3D 4, @@ -844,8 +844,8 @@ const struct sja1105_info sja1110b_info =3D { .rxtstamp =3D sja1110_rxtstamp, .txtstamp =3D sja1110_txtstamp, .disable_microcontroller =3D sja1110_disable_microcontroller, - .pcs_mdio_read =3D sja1110_pcs_mdio_read, - .pcs_mdio_write =3D sja1110_pcs_mdio_write, + .pcs_mdio_read_c45 =3D sja1110_pcs_mdio_read_c45, + .pcs_mdio_write_c45 =3D sja1110_pcs_mdio_write_c45, .port_speed =3D { [SJA1105_SPEED_AUTO] =3D 0, [SJA1105_SPEED_10MBPS] =3D 4, @@ -894,8 +894,8 @@ const struct sja1105_info sja1110c_info =3D { .rxtstamp =3D sja1110_rxtstamp, .txtstamp =3D sja1110_txtstamp, .disable_microcontroller =3D sja1110_disable_microcontroller, - .pcs_mdio_read =3D sja1110_pcs_mdio_read, - .pcs_mdio_write =3D sja1110_pcs_mdio_write, + .pcs_mdio_read_c45 =3D sja1110_pcs_mdio_read_c45, + .pcs_mdio_write_c45 =3D sja1110_pcs_mdio_write_c45, .port_speed =3D { [SJA1105_SPEED_AUTO] =3D 0, [SJA1105_SPEED_10MBPS] =3D 4, @@ -944,8 +944,8 @@ const struct sja1105_info sja1110d_info =3D { .rxtstamp =3D sja1110_rxtstamp, .txtstamp =3D sja1110_txtstamp, .disable_microcontroller =3D sja1110_disable_microcontroller, - .pcs_mdio_read =3D sja1110_pcs_mdio_read, - .pcs_mdio_write =3D sja1110_pcs_mdio_write, + .pcs_mdio_read_c45 =3D sja1110_pcs_mdio_read_c45, + .pcs_mdio_write_c45 =3D sja1110_pcs_mdio_write_c45, .port_speed =3D { [SJA1105_SPEED_AUTO] =3D 0, [SJA1105_SPEED_10MBPS] =3D 4, --=20 2.30.2