From: Vladimir Oltean <olteanv@gmail.com> To: Michael Walle <michael@walle.cc> Cc: Heiner Kallweit <hkallweit1@gmail.com>, Russell King <linux@armlinux.org.uk>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Jose Abreu <Jose.Abreu@synopsys.com>, Sergey Shtylyov <s.shtylyov@omp.ru>, Wei Fang <wei.fang@nxp.com>, Shenwei Wang <shenwei.wang@nxp.com>, Clark Wang <xiaoning.wang@nxp.com>, NXP Linux Team <linux-imx@nxp.com>, Sean Wang <sean.wang@mediatek.com>, Landen Chao <Landen.Chao@mediatek.com>, DENG Qingfang <dqfext@gmail.com>, Florian Fainelli <f.fainelli@gmail.com>, Matthias Brugger <matthias.bgg@gmail.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Andrew Lunn <andrew@lunn.ch>, Geert Uytterhoeven <geert+renesas@glider.be> Subject: Re: [PATCH RFC net-next v2 06/12] net: mdio: mdio-bitbang: Separate C22 and C45 transactions Date: Tue, 3 Jan 2023 15:15:55 +0200 [thread overview] Message-ID: <20230103131555.5i4tj7sk72gmed5d@skbuf> (raw) In-Reply-To: <20221227-v6-2-rc1-c45-seperation-v2-6-ddb37710e5a7@walle.cc> On Wed, Dec 28, 2022 at 12:07:22AM +0100, Michael Walle wrote: > From: Andrew Lunn <andrew@lunn.ch> > > The bitbbanging bus driver can perform both C22 and C45 transfers. > Create separate functions for each and register the C45 versions using > the new driver API calls. > > The SH Ethernet driver places wrappers around these functions. In > order to not break boards which might be using C45, add similar > wrappers for C45 operations. > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > Signed-off-by: Andrew Lunn <andrew@lunn.ch> > Signed-off-by: Michael Walle <michael@walle.cc> > --- Incomplete conversion, this breaks the build. Need to update all users of the bitbang driver (also davinci_mdio). Something like the diff below fixes that, but it leaves the davinci_mdio driver in a partially converted state (if data->manual_mode is true, new API is used, otherwise old API is used). So another patch to convert the other case will likely be needed. diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c index 946b9753ccfb..23169e36a3d4 100644 --- a/drivers/net/ethernet/ti/davinci_mdio.c +++ b/drivers/net/ethernet/ti/davinci_mdio.c @@ -225,7 +225,7 @@ static int davinci_get_mdio_data(struct mdiobb_ctrl *ctrl) return test_bit(MDIO_PIN, ®); } -static int davinci_mdiobb_read(struct mii_bus *bus, int phy, int reg) +static int davinci_mdiobb_read_c22(struct mii_bus *bus, int phy, int reg) { int ret; @@ -233,7 +233,7 @@ static int davinci_mdiobb_read(struct mii_bus *bus, int phy, int reg) if (ret < 0) return ret; - ret = mdiobb_read(bus, phy, reg); + ret = mdiobb_read_c22(bus, phy, reg); pm_runtime_mark_last_busy(bus->parent); pm_runtime_put_autosuspend(bus->parent); @@ -241,8 +241,8 @@ static int davinci_mdiobb_read(struct mii_bus *bus, int phy, int reg) return ret; } -static int davinci_mdiobb_write(struct mii_bus *bus, int phy, int reg, - u16 val) +static int davinci_mdiobb_write_c22(struct mii_bus *bus, int phy, int reg, + u16 val) { int ret; @@ -250,7 +250,41 @@ static int davinci_mdiobb_write(struct mii_bus *bus, int phy, int reg, if (ret < 0) return ret; - ret = mdiobb_write(bus, phy, reg, val); + ret = mdiobb_write_c22(bus, phy, reg, val); + + pm_runtime_mark_last_busy(bus->parent); + pm_runtime_put_autosuspend(bus->parent); + + return ret; +} + +static int davinci_mdiobb_read_c45(struct mii_bus *bus, int phy, int devad, + int reg) +{ + int ret; + + ret = pm_runtime_resume_and_get(bus->parent); + if (ret < 0) + return ret; + + ret = mdiobb_read_c45(bus, phy, devad, reg); + + pm_runtime_mark_last_busy(bus->parent); + pm_runtime_put_autosuspend(bus->parent); + + return ret; +} + +static int davinci_mdiobb_write_c45(struct mii_bus *bus, int phy, int devad, + int reg, u16 val) +{ + int ret; + + ret = pm_runtime_resume_and_get(bus->parent); + if (ret < 0) + return ret; + + ret = mdiobb_write_c45(bus, phy, devad, reg, val); pm_runtime_mark_last_busy(bus->parent); pm_runtime_put_autosuspend(bus->parent); @@ -573,8 +607,10 @@ static int davinci_mdio_probe(struct platform_device *pdev) data->bus->name = dev_name(dev); if (data->manual_mode) { - data->bus->read = davinci_mdiobb_read; - data->bus->write = davinci_mdiobb_write; + data->bus->read = davinci_mdiobb_read_c22; + data->bus->write = davinci_mdiobb_write_c22; + data->bus->read_c45 = davinci_mdiobb_read_c45; + data->bus->write_c45 = davinci_mdiobb_write_c45; data->bus->reset = davinci_mdiobb_reset; dev_info(dev, "Configuring MDIO in manual mode\n");
WARNING: multiple messages have this Message-ID (diff)
From: Vladimir Oltean <olteanv@gmail.com> To: Michael Walle <michael@walle.cc> Cc: Heiner Kallweit <hkallweit1@gmail.com>, Russell King <linux@armlinux.org.uk>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Jose Abreu <Jose.Abreu@synopsys.com>, Sergey Shtylyov <s.shtylyov@omp.ru>, Wei Fang <wei.fang@nxp.com>, Shenwei Wang <shenwei.wang@nxp.com>, Clark Wang <xiaoning.wang@nxp.com>, NXP Linux Team <linux-imx@nxp.com>, Sean Wang <sean.wang@mediatek.com>, Landen Chao <Landen.Chao@mediatek.com>, DENG Qingfang <dqfext@gmail.com>, Florian Fainelli <f.fainelli@gmail.com>, Matthias Brugger <matthias.bgg@gmail.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Andrew Lunn <andrew@lunn.ch>, Geert Uytterhoeven <geert+renesas@glider.be> Subject: Re: [PATCH RFC net-next v2 06/12] net: mdio: mdio-bitbang: Separate C22 and C45 transactions Date: Tue, 3 Jan 2023 15:15:55 +0200 [thread overview] Message-ID: <20230103131555.5i4tj7sk72gmed5d@skbuf> (raw) In-Reply-To: <20221227-v6-2-rc1-c45-seperation-v2-6-ddb37710e5a7@walle.cc> On Wed, Dec 28, 2022 at 12:07:22AM +0100, Michael Walle wrote: > From: Andrew Lunn <andrew@lunn.ch> > > The bitbbanging bus driver can perform both C22 and C45 transfers. > Create separate functions for each and register the C45 versions using > the new driver API calls. > > The SH Ethernet driver places wrappers around these functions. In > order to not break boards which might be using C45, add similar > wrappers for C45 operations. > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > Signed-off-by: Andrew Lunn <andrew@lunn.ch> > Signed-off-by: Michael Walle <michael@walle.cc> > --- Incomplete conversion, this breaks the build. Need to update all users of the bitbang driver (also davinci_mdio). Something like the diff below fixes that, but it leaves the davinci_mdio driver in a partially converted state (if data->manual_mode is true, new API is used, otherwise old API is used). So another patch to convert the other case will likely be needed. diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c index 946b9753ccfb..23169e36a3d4 100644 --- a/drivers/net/ethernet/ti/davinci_mdio.c +++ b/drivers/net/ethernet/ti/davinci_mdio.c @@ -225,7 +225,7 @@ static int davinci_get_mdio_data(struct mdiobb_ctrl *ctrl) return test_bit(MDIO_PIN, ®); } -static int davinci_mdiobb_read(struct mii_bus *bus, int phy, int reg) +static int davinci_mdiobb_read_c22(struct mii_bus *bus, int phy, int reg) { int ret; @@ -233,7 +233,7 @@ static int davinci_mdiobb_read(struct mii_bus *bus, int phy, int reg) if (ret < 0) return ret; - ret = mdiobb_read(bus, phy, reg); + ret = mdiobb_read_c22(bus, phy, reg); pm_runtime_mark_last_busy(bus->parent); pm_runtime_put_autosuspend(bus->parent); @@ -241,8 +241,8 @@ static int davinci_mdiobb_read(struct mii_bus *bus, int phy, int reg) return ret; } -static int davinci_mdiobb_write(struct mii_bus *bus, int phy, int reg, - u16 val) +static int davinci_mdiobb_write_c22(struct mii_bus *bus, int phy, int reg, + u16 val) { int ret; @@ -250,7 +250,41 @@ static int davinci_mdiobb_write(struct mii_bus *bus, int phy, int reg, if (ret < 0) return ret; - ret = mdiobb_write(bus, phy, reg, val); + ret = mdiobb_write_c22(bus, phy, reg, val); + + pm_runtime_mark_last_busy(bus->parent); + pm_runtime_put_autosuspend(bus->parent); + + return ret; +} + +static int davinci_mdiobb_read_c45(struct mii_bus *bus, int phy, int devad, + int reg) +{ + int ret; + + ret = pm_runtime_resume_and_get(bus->parent); + if (ret < 0) + return ret; + + ret = mdiobb_read_c45(bus, phy, devad, reg); + + pm_runtime_mark_last_busy(bus->parent); + pm_runtime_put_autosuspend(bus->parent); + + return ret; +} + +static int davinci_mdiobb_write_c45(struct mii_bus *bus, int phy, int devad, + int reg, u16 val) +{ + int ret; + + ret = pm_runtime_resume_and_get(bus->parent); + if (ret < 0) + return ret; + + ret = mdiobb_write_c45(bus, phy, devad, reg, val); pm_runtime_mark_last_busy(bus->parent); pm_runtime_put_autosuspend(bus->parent); @@ -573,8 +607,10 @@ static int davinci_mdio_probe(struct platform_device *pdev) data->bus->name = dev_name(dev); if (data->manual_mode) { - data->bus->read = davinci_mdiobb_read; - data->bus->write = davinci_mdiobb_write; + data->bus->read = davinci_mdiobb_read_c22; + data->bus->write = davinci_mdiobb_write_c22; + data->bus->read_c45 = davinci_mdiobb_read_c45; + data->bus->write_c45 = davinci_mdiobb_write_c45; data->bus->reset = davinci_mdiobb_reset; dev_info(dev, "Configuring MDIO in manual mode\n"); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-01-03 13:17 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-12-27 23:07 [PATCH RFC net-next v2 00/12] net: mdio: Start separating C22 and C45 Michael Walle 2022-12-27 23:07 ` Michael Walle 2022-12-27 23:07 ` [PATCH RFC net-next v2 01/12] net: mdio: Add dedicated C45 API to MDIO bus drivers Michael Walle 2022-12-27 23:07 ` Michael Walle 2022-12-27 23:07 ` [PATCH RFC net-next v2 02/12] net: pcs: pcs-xpcs: Use C45 MDIO API Michael Walle 2022-12-27 23:07 ` Michael Walle 2023-01-03 13:28 ` Vladimir Oltean 2023-01-03 13:28 ` Vladimir Oltean 2022-12-27 23:07 ` [PATCH RFC net-next v2 03/12] net: mdio: mdiobus_register: update validation test Michael Walle 2022-12-27 23:07 ` Michael Walle 2023-01-03 10:13 ` Russell King (Oracle) 2023-01-03 10:13 ` Russell King (Oracle) 2023-01-03 10:21 ` Michael Walle 2023-01-03 10:21 ` Michael Walle 2023-01-03 22:19 ` Russell King (Oracle) 2023-01-03 22:19 ` Russell King (Oracle) 2023-01-09 12:35 ` Michael Walle 2023-01-09 12:35 ` Michael Walle 2023-01-09 12:41 ` Vladimir Oltean 2023-01-09 12:41 ` Vladimir Oltean 2022-12-27 23:07 ` [PATCH RFC net-next v2 04/12] net: mdio: C22 is now optional, EOPNOTSUPP if not provided Michael Walle 2022-12-27 23:07 ` Michael Walle 2022-12-27 23:07 ` [PATCH RFC net-next v2 05/12] net: mdio: Move mdiobus_c45_addr() next to users Michael Walle 2022-12-27 23:07 ` Michael Walle 2022-12-27 23:07 ` [PATCH RFC net-next v2 06/12] net: mdio: mdio-bitbang: Separate C22 and C45 transactions Michael Walle 2022-12-27 23:07 ` Michael Walle 2022-12-28 5:46 ` kernel test robot 2022-12-28 5:46 ` kernel test robot 2023-01-03 13:15 ` Vladimir Oltean [this message] 2023-01-03 13:15 ` Vladimir Oltean 2023-01-03 13:27 ` Michael Walle 2023-01-03 13:27 ` Michael Walle 2022-12-27 23:07 ` [PATCH RFC net-next v2 07/12] net: mdio: mvmdio: Convert XSMI bus to new API Michael Walle 2022-12-27 23:07 ` Michael Walle 2022-12-27 23:07 ` [PATCH RFC net-next v2 08/12] net: ethernet: freescale: xgmac: Separate C22 and C45 transactions for xgmac Michael Walle 2022-12-27 23:07 ` Michael Walle 2023-01-03 13:55 ` Vladimir Oltean 2023-01-03 13:55 ` Vladimir Oltean 2022-12-27 23:07 ` [PATCH RFC net-next v2 09/12] net: ethernet: freescale: fec: " Michael Walle 2022-12-27 23:07 ` Michael Walle 2022-12-28 3:31 ` Wei Fang 2022-12-28 3:31 ` Wei Fang 2023-01-03 13:57 ` Vladimir Oltean 2023-01-03 13:57 ` Vladimir Oltean 2022-12-27 23:07 ` [PATCH RFC net-next v2 10/12] net: mdio: add mdiobus_c45_read/write_nested helpers Michael Walle 2022-12-27 23:07 ` Michael Walle 2022-12-27 23:07 ` [PATCH RFC net-next v2 11/12] net: dsa: Separate C22 and C45 MDIO bus transaction methods Michael Walle 2022-12-27 23:07 ` Michael Walle 2023-01-03 15:31 ` Vladimir Oltean 2023-01-03 15:31 ` Vladimir Oltean 2023-01-03 15:48 ` Andrew Lunn 2023-01-03 15:48 ` Andrew Lunn 2023-01-03 15:56 ` Vladimir Oltean 2023-01-03 15:56 ` Vladimir Oltean 2023-01-16 7:51 ` Michael Walle 2023-01-16 7:51 ` Michael Walle 2023-01-16 19:28 ` Vladimir Oltean 2023-01-16 19:28 ` Vladimir Oltean 2022-12-27 23:07 ` [PATCH RFC net-next v2 12/12] net: dsa: mv88e6xxx: Separate C22 and C45 transactions Michael Walle 2022-12-27 23:07 ` Michael Walle 2023-01-03 16:20 ` Vladimir Oltean 2023-01-03 16:20 ` Vladimir Oltean
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230103131555.5i4tj7sk72gmed5d@skbuf \ --to=olteanv@gmail.com \ --cc=Jose.Abreu@synopsys.com \ --cc=Landen.Chao@mediatek.com \ --cc=andrew@lunn.ch \ --cc=davem@davemloft.net \ --cc=dqfext@gmail.com \ --cc=edumazet@google.com \ --cc=f.fainelli@gmail.com \ --cc=geert+renesas@glider.be \ --cc=hkallweit1@gmail.com \ --cc=kuba@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=matthias.bgg@gmail.com \ --cc=michael@walle.cc \ --cc=netdev@vger.kernel.org \ --cc=pabeni@redhat.com \ --cc=s.shtylyov@omp.ru \ --cc=sean.wang@mediatek.com \ --cc=shenwei.wang@nxp.com \ --cc=wei.fang@nxp.com \ --cc=xiaoning.wang@nxp.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.