From: "Ardelean, Alexandru" <alexandru.Ardelean@analog.com>
To: "andrew@lunn.ch" <andrew@lunn.ch>
Cc: "davem@davemloft.net" <davem@davemloft.net>,
"hkallweit1@gmail.com" <hkallweit1@gmail.com>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"mark.rutland@arm.com" <mark.rutland@arm.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"f.fainelli@gmail.com" <f.fainelli@gmail.com>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"robh+dt@kernel.org" <robh+dt@kernel.org>
Subject: Re: [PATCH 05/16] net: phy: adin: configure RGMII/RMII/MII modes on config
Date: Tue, 6 Aug 2019 06:43:50 +0000 [thread overview]
Message-ID: <9e87a6c32b0426c66ba9fb7181083fab38f0b12f.camel@analog.com> (raw)
In-Reply-To: <20190805143935.GM24275@lunn.ch>
On Mon, 2019-08-05 at 16:39 +0200, Andrew Lunn wrote:
> [External]
>
> On Mon, Aug 05, 2019 at 07:54:42PM +0300, Alexandru Ardelean wrote:
> > The ADIN1300 chip supports RGMII, RMII & MII modes. Default (if
> > unconfigured) is RGMII.
> > This change adds support for configuring these modes via the device
> > registers.
> >
> > For RGMII with internal delays (modes RGMII_ID,RGMII_TXID, RGMII_RXID),
>
> It would be nice to add the missing space.
>
> > the default delay is 2 ns. This can be configurable and will be done in
> > a subsequent change.
> >
> > Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
> > ---
> > drivers/net/phy/adin.c | 79 +++++++++++++++++++++++++++++++++++++++++-
> > 1 file changed, 78 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c
> > index 3dd9fe50f4c8..dbdb8f60741c 100644
> > --- a/drivers/net/phy/adin.c
> > +++ b/drivers/net/phy/adin.c
> > @@ -33,14 +33,91 @@
> > ADIN1300_INT_HW_IRQ_EN)
> > #define ADIN1300_INT_STATUS_REG 0x0019
> >
> > +#define ADIN1300_GE_RGMII_CFG_REG 0xff23
> > +#define ADIN1300_GE_RGMII_RXID_EN BIT(2)
> > +#define ADIN1300_GE_RGMII_TXID_EN BIT(1)
> > +#define ADIN1300_GE_RGMII_EN BIT(0)
> > +
> > +#define ADIN1300_GE_RMII_CFG_REG 0xff24
> > +#define ADIN1300_GE_RMII_EN BIT(0)
> > +
> > +static int adin_config_rgmii_mode(struct phy_device *phydev,
> > + phy_interface_t intf)
> > +{
> > + int reg;
> > +
> > + reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_RGMII_CFG_REG);
> > + if (reg < 0)
> > + return reg;
> > +
> > + if (!phy_interface_mode_is_rgmii(intf)) {
> > + reg &= ~ADIN1300_GE_RGMII_EN;
> > + goto write;
> > + }
> > +
> > + reg |= ADIN1300_GE_RGMII_EN;
> > +
> > + if (intf == PHY_INTERFACE_MODE_RGMII_ID ||
> > + intf == PHY_INTERFACE_MODE_RGMII_RXID) {
> > + reg |= ADIN1300_GE_RGMII_RXID_EN;
> > + } else {
> > + reg &= ~ADIN1300_GE_RGMII_RXID_EN;
> > + }
> > +
> > + if (intf == PHY_INTERFACE_MODE_RGMII_ID ||
> > + intf == PHY_INTERFACE_MODE_RGMII_TXID) {
> > + reg |= ADIN1300_GE_RGMII_TXID_EN;
> > + } else {
> > + reg &= ~ADIN1300_GE_RGMII_TXID_EN;
> > + }
>
> Nice. Often driver writers forget to clear the delay, they only set
> it. Not so here.
>
> However, is checkpatch happy with this? Each half of the if/else is a
> single statement, so the {} are not needed.
it did not complain;
this whole series is checkpatch friendly [with the version of checkpatch in net-next]
i think it complained about un-balanced if-block; something like:
```
if () {
} else
single-statement
```
but checkpatch is also a moving target;
so ¯\_(ツ)_/¯
>
> > +
> > +write:
> > + return phy_write_mmd(phydev, MDIO_MMD_VEND1,
> > + ADIN1300_GE_RGMII_CFG_REG, reg);
> > +}
> > +
> > +static int adin_config_rmii_mode(struct phy_device *phydev,
> > + phy_interface_t intf)
> > +{
> > + int reg;
> > +
> > + reg = phy_read_mmd(phydev, MDIO_MMD_VEND1, ADIN1300_GE_RMII_CFG_REG);
> > + if (reg < 0)
> > + return reg;
> > +
> > + if (intf != PHY_INTERFACE_MODE_RMII) {
> > + reg &= ~ADIN1300_GE_RMII_EN;
> > + goto write;
>
> goto? Really?
yep;
personally, i used to not like it all that much up until a few years, but sometimes it feels it can help with creating
cleaner patches in certain contexts;
i'll re-spin without it;
>
> > + }
> > +
> > + reg |= ADIN1300_GE_RMII_EN;
> > +
> > +write:
> > + return phy_write_mmd(phydev, MDIO_MMD_VEND1,
> > + ADIN1300_GE_RMII_CFG_REG, reg);
> > +}
> > +
> > static int adin_config_init(struct phy_device *phydev)
> > {
> > - int rc;
> > + phy_interface_t interface, rc;
>
> genphy_config_init() does not return a phy_interface_t!
good point;
will check;
>
> >
> > rc = genphy_config_init(phydev);
> > if (rc < 0)
> > return rc;
> >
> > + interface = phydev->interface;
> > +
> > + rc = adin_config_rgmii_mode(phydev, interface);
> > + if (rc < 0)
> > + return rc;
> > +
> > + rc = adin_config_rmii_mode(phydev, interface);
> > + if (rc < 0)
> > + return rc;
> > +
> > + dev_info(&phydev->mdio.dev, "PHY is using mode '%s'\n",
> > + phy_modes(phydev->interface));
>
> phydev_dbg(), or not at all.
ack
>
> Andrew
next prev parent reply other threads:[~2019-08-06 6:44 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-05 16:54 [PATCH 00/16] net: phy: adin: add support for Analog Devices PHYs Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 01/16] " Alexandru Ardelean
2019-08-05 14:16 ` Andrew Lunn
2019-08-06 6:32 ` Ardelean, Alexandru
2019-08-05 15:17 ` Andrew Lunn
2019-08-06 6:35 ` Ardelean, Alexandru
2019-08-05 20:54 ` Heiner Kallweit
2019-08-06 6:35 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 02/16] net: phy: adin: hook genphy_{suspend,resume} into the driver Alexandru Ardelean
2019-08-05 14:17 ` Andrew Lunn
2019-08-05 16:54 ` [PATCH 03/16] net: phy: adin: add support for interrupts Alexandru Ardelean
2019-08-05 14:21 ` Andrew Lunn
2019-08-06 6:37 ` Ardelean, Alexandru
2019-08-05 21:02 ` Heiner Kallweit
2019-08-06 6:38 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 04/16] net: phy: adin: add {write,read}_mmd hooks Alexandru Ardelean
2019-08-05 14:25 ` Andrew Lunn
2019-08-06 6:38 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 05/16] net: phy: adin: configure RGMII/RMII/MII modes on config Alexandru Ardelean
2019-08-05 14:39 ` Andrew Lunn
2019-08-06 6:43 ` Ardelean, Alexandru [this message]
2019-08-05 16:54 ` [PATCH 06/16] net: phy: adin: support PHY mode converters Alexandru Ardelean
2019-08-05 14:51 ` Andrew Lunn
2019-08-06 6:47 ` Ardelean, Alexandru
2019-08-06 15:39 ` Andrew Lunn
2019-08-07 8:00 ` Ardelean, Alexandru
2019-08-07 13:20 ` Andrew Lunn
2019-08-05 16:54 ` [PATCH 07/16] net: phy: adin: make RGMII internal delays configurable Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 08/16] net: phy: adin: make RMII fifo depth configurable Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 09/16] net: phy: adin: add support MDI/MDIX/Auto-MDI selection Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 10/16] net: phy: adin: add EEE translation layer for Clause 22 Alexandru Ardelean
2019-08-05 22:11 ` Andrew Lunn
2019-08-06 6:47 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 11/16] net: phy: adin: PHY reset mechanisms Alexandru Ardelean
2019-08-05 15:15 ` Andrew Lunn
2019-08-06 6:50 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 12/16] net: phy: adin: read EEE setting from device-tree Alexandru Ardelean
2019-08-05 15:19 ` Andrew Lunn
2019-08-06 6:52 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 13/16] net: phy: adin: implement Energy Detect Powerdown mode Alexandru Ardelean
2019-08-05 16:54 ` [PATCH 14/16] net: phy: adin: make sure down-speed auto-neg is enabled Alexandru Ardelean
2019-08-05 15:22 ` Andrew Lunn
2019-08-06 6:53 ` Ardelean, Alexandru
2019-08-06 5:52 ` Heiner Kallweit
2019-08-06 6:53 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 15/16] net: phy: adin: add ethtool get_stats support Alexandru Ardelean
2019-08-05 15:28 ` Andrew Lunn
2019-08-06 7:11 ` Ardelean, Alexandru
2019-08-06 15:46 ` Andrew Lunn
2019-08-07 7:52 ` Ardelean, Alexandru
2019-08-05 15:30 ` Andrew Lunn
2019-08-06 7:18 ` Ardelean, Alexandru
2019-08-05 16:54 ` [PATCH 16/16] dt-bindings: net: add bindings for ADIN PHY driver Alexandru Ardelean
2019-08-05 14:11 ` Andrew Lunn
2019-08-06 7:03 ` Ardelean, Alexandru
2019-08-06 11:47 ` Ardelean, Alexandru
2019-08-05 14:27 ` Andrew Lunn
2019-08-06 6:57 ` Ardelean, Alexandru
2019-08-06 15:04 ` Rob Herring
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=9e87a6c32b0426c66ba9fb7181083fab38f0b12f.camel@analog.com \
--to=alexandru.ardelean@analog.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=netdev@vger.kernel.org \
--cc=robh+dt@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).