| Message ID | 20200217104348.43164-1-alexandre.belloni@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [net] net: macb: Properly handle phylink on at91rm9200 | expand |
On Mon, Feb 17, 2020 at 11:43:48AM +0100, Alexandre Belloni wrote: > at91ether_init was handling the phy mode and speed but since the switch to > phylink, the NCFGR register got overwritten by macb_mac_config(). I don't think this actually explains anything - or at least I can't make sense of it with respect to your patch. You claim that the NCFGR register gets overwritten in macb_mac_config(), but I see that the NCFGR register is read-modify-write in there, whereas your new implementation below doesn't bother reading the present value. I think the issue you're referring to is the clearing of the PAE bit, which is also the RM9200_RMII for at91rm9200? Next, there's some duplication of code introduced here - it seems that the tail end of macb_mac_link_down() and at91ether_mac_link_down() are identical, as are the tail end of macb_mac_link_up() and at91ether_mac_link_up(). > Add new phylink callbacks to handle emac and at91rm9200 properly. > > Fixes: 7897b071ac3b ("net: macb: convert to phylink") > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- I posted a heads-up message last week about updates to phylink that I'll be submitting soon (most of the prerequisits have now been sent for review) which touch every phylink_mac_ops-using piece of code in the tree. Unfortunately, this patch introduces a new instance that likely isn't going to get my attention, so it's going to create a subtle merge conflict between net-next and net trees unless we work out some way to deal with it. I'm just mentioning that so that some thought can be applied now rather than when it actually happens - especially as I've no way to test the changes that will be necessary for this driver. > drivers/net/ethernet/cadence/macb.h | 1 + > drivers/net/ethernet/cadence/macb_main.c | 81 +++++++++++++++++++++--- > 2 files changed, 73 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h > index dbf7070fcdba..a3f0f27fc79a 100644 > --- a/drivers/net/ethernet/cadence/macb.h > +++ b/drivers/net/ethernet/cadence/macb.h > @@ -652,6 +652,7 @@ > #define MACB_CAPS_GEM_HAS_PTP 0x00000040 > #define MACB_CAPS_BD_RD_PREFETCH 0x00000080 > #define MACB_CAPS_NEEDS_RSTONUBR 0x00000100 > +#define MACB_CAPS_MACB_IS_EMAC 0x08000000 > #define MACB_CAPS_FIFO_MODE 0x10000000 > #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 > #define MACB_CAPS_SG_DISABLED 0x40000000 > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index def94e91883a..529a1d0d7dab 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -654,6 +654,72 @@ static const struct phylink_mac_ops macb_phylink_ops = { > .mac_link_up = macb_mac_link_up, > }; > > +static void at91ether_mac_config(struct phylink_config *config, > + unsigned int mode, > + const struct phylink_link_state *state) > +{ > + struct net_device *ndev = to_net_dev(config->dev); > + struct macb *bp = netdev_priv(ndev); > + unsigned long flags; > + u32 ctrl; > + > + spin_lock_irqsave(&bp->lock, flags); > + > + ctrl = MACB_BF(CLK, MACB_CLK_DIV32) | MACB_BIT(BIG); > + if (state->speed == SPEED_100) > + ctrl |= MACB_BIT(SPD); > + > + if (state->duplex) > + ctrl |= MACB_BIT(FD); > + > + if (state->interface == PHY_INTERFACE_MODE_RMII) > + ctrl |= MACB_BIT(RM9200_RMII); > + > + macb_writel(bp, NCFGR, ctrl); > + > + bp->speed = state->speed; > + > + spin_unlock_irqrestore(&bp->lock, flags); > +} > + > +static void at91ether_mac_link_down(struct phylink_config *config, > + unsigned int mode, > + phy_interface_t interface) > +{ > + struct net_device *ndev = to_net_dev(config->dev); > + struct macb *bp = netdev_priv(ndev); > + u32 ctrl; > + > + /* Disable Rx and Tx */ > + ctrl = macb_readl(bp, NCR) & ~(MACB_BIT(RE) | MACB_BIT(TE)); > + macb_writel(bp, NCR, ctrl); > + > + netif_tx_stop_all_queues(ndev); > +} > + > +static void at91ether_mac_link_up(struct phylink_config *config, > + unsigned int mode, > + phy_interface_t interface, > + struct phy_device *phy) > +{ > + struct net_device *ndev = to_net_dev(config->dev); > + struct macb *bp = netdev_priv(ndev); > + > + /* Enable Rx and Tx */ > + macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(RE) | MACB_BIT(TE)); > + > + netif_tx_wake_all_queues(ndev); > +} > + > +static const struct phylink_mac_ops at91ether_phylink_ops = { > + .validate = macb_validate, > + .mac_pcs_get_state = macb_mac_pcs_get_state, > + .mac_an_restart = macb_mac_an_restart, > + .mac_config = at91ether_mac_config, > + .mac_link_down = at91ether_mac_link_down, > + .mac_link_up = at91ether_mac_link_up, > +}; > + > static bool macb_phy_handle_exists(struct device_node *dn) > { > dn = of_parse_phandle(dn, "phy-handle", 0); > @@ -695,13 +761,17 @@ static int macb_phylink_connect(struct macb *bp) > /* based on au1000_eth. c*/ > static int macb_mii_probe(struct net_device *dev) > { > + const struct phylink_mac_ops *phylink_ops = &macb_phylink_ops; > struct macb *bp = netdev_priv(dev); > > + if (bp->caps & MACB_CAPS_MACB_IS_EMAC) > + phylink_ops = &at91ether_phylink_ops; > + > bp->phylink_config.dev = &dev->dev; > bp->phylink_config.type = PHYLINK_NETDEV; > > bp->phylink = phylink_create(&bp->phylink_config, bp->pdev->dev.fwnode, > - bp->phy_interface, &macb_phylink_ops); > + bp->phy_interface, phylink_ops); > if (IS_ERR(bp->phylink)) { > netdev_err(dev, "Could not create a phylink instance (%ld)\n", > PTR_ERR(bp->phylink)); > @@ -4041,7 +4111,6 @@ static int at91ether_init(struct platform_device *pdev) > struct net_device *dev = platform_get_drvdata(pdev); > struct macb *bp = netdev_priv(dev); > int err; > - u32 reg; > > bp->queues[0].bp = bp; > > @@ -4055,12 +4124,6 @@ static int at91ether_init(struct platform_device *pdev) > > macb_writel(bp, NCR, 0); > > - reg = MACB_BF(CLK, MACB_CLK_DIV32) | MACB_BIT(BIG); > - if (bp->phy_interface == PHY_INTERFACE_MODE_RMII) > - reg |= MACB_BIT(RM9200_RMII); > - > - macb_writel(bp, NCFGR, reg); > - > return 0; > } > > @@ -4218,7 +4281,7 @@ static const struct macb_config sama5d4_config = { > }; > > static const struct macb_config emac_config = { > - .caps = MACB_CAPS_NEEDS_RSTONUBR, > + .caps = MACB_CAPS_NEEDS_RSTONUBR | MACB_CAPS_MACB_IS_EMAC, > .clk_init = at91ether_clk_init, > .init = at91ether_init, > }; > -- > 2.24.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
On Mon, Feb 17, 2020 at 04:56:44PM +0000, Russell King - ARM Linux admin wrote: > On Mon, Feb 17, 2020 at 11:43:48AM +0100, Alexandre Belloni wrote: > > at91ether_init was handling the phy mode and speed but since the switch to > > phylink, the NCFGR register got overwritten by macb_mac_config(). > > I don't think this actually explains anything - or at least I can't > make sense of it with respect to your patch. > > You claim that the NCFGR register gets overwritten in macb_mac_config(), > but I see that the NCFGR register is read-modify-write in there, > whereas your new implementation below doesn't bother reading the > present value. > > I think the issue you're referring to is the clearing of the PAE bit, > which is also the RM9200_RMII for at91rm9200? > > Next, there's some duplication of code introduced here - it seems > that the tail end of macb_mac_link_down() and at91ether_mac_link_down() > are identical, as are the tail end of macb_mac_link_up() and > at91ether_mac_link_up(). > > > Add new phylink callbacks to handle emac and at91rm9200 properly. > > > > Fixes: 7897b071ac3b ("net: macb: convert to phylink") > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > > --- > > I posted a heads-up message last week about updates to phylink that > I'll be submitting soon (most of the prerequisits have now been sent > for review) which touch every phylink_mac_ops-using piece of code in > the tree. Unfortunately, this patch introduces a new instance that > likely isn't going to get my attention, so it's going to create a > subtle merge conflict between net-next and net trees unless we work > out some way to deal with it. > > I'm just mentioning that so that some thought can be applied now > rather than when it actually happens - especially as I've no way to > test the changes that will be necessary for this driver. I'm going to post these changes shortly, but not for davem to merge yet - it would be a good idea if people can test the changes first.
On 17/02/2020 16:56:44+0000, Russell King - ARM Linux admin wrote: > On Mon, Feb 17, 2020 at 11:43:48AM +0100, Alexandre Belloni wrote: > > at91ether_init was handling the phy mode and speed but since the switch to > > phylink, the NCFGR register got overwritten by macb_mac_config(). > > I don't think this actually explains anything - or at least I can't > make sense of it with respect to your patch. > > You claim that the NCFGR register gets overwritten in macb_mac_config(), > but I see that the NCFGR register is read-modify-write in there, > whereas your new implementation below doesn't bother reading the > present value. > > I think the issue you're referring to is the clearing of the PAE bit, > which is also the RM9200_RMII for at91rm9200? > This is the issue, I'll rework the commit message. > Next, there's some duplication of code introduced here - it seems > that the tail end of macb_mac_link_down() and at91ether_mac_link_down() > are identical, as are the tail end of macb_mac_link_up() and > at91ether_mac_link_up(). > I was split between having a new phylink_mac_ops instance or differentiating in the various callbacks. If your preference is the latter, I'm fine with that. > > Add new phylink callbacks to handle emac and at91rm9200 properly. > > > > Fixes: 7897b071ac3b ("net: macb: convert to phylink") > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > > --- > > I posted a heads-up message last week about updates to phylink that > I'll be submitting soon (most of the prerequisits have now been sent > for review) which touch every phylink_mac_ops-using piece of code in > the tree. Unfortunately, this patch introduces a new instance that > likely isn't going to get my attention, so it's going to create a > subtle merge conflict between net-next and net trees unless we work > out some way to deal with it. > > I'm just mentioning that so that some thought can be applied now > rather than when it actually happens - especially as I've no way to > test the changes that will be necessary for this driver. > Does that help if I change the callbacks instead of adding a new phylink_mac_ops instance? I can also wait for your work and rebase on top of that but that would mean that the fix will not get backported.
On Mon, Feb 17, 2020 at 06:42:44PM +0100, Alexandre Belloni wrote: > On 17/02/2020 16:56:44+0000, Russell King - ARM Linux admin wrote: > > On Mon, Feb 17, 2020 at 11:43:48AM +0100, Alexandre Belloni wrote: > > > at91ether_init was handling the phy mode and speed but since the switch to > > > phylink, the NCFGR register got overwritten by macb_mac_config(). > > > > I don't think this actually explains anything - or at least I can't > > make sense of it with respect to your patch. > > > > You claim that the NCFGR register gets overwritten in macb_mac_config(), > > but I see that the NCFGR register is read-modify-write in there, > > whereas your new implementation below doesn't bother reading the > > present value. > > > > I think the issue you're referring to is the clearing of the PAE bit, > > which is also the RM9200_RMII for at91rm9200? > > > > This is the issue, I'll rework the commit message. Thanks. > > Next, there's some duplication of code introduced here - it seems > > that the tail end of macb_mac_link_down() and at91ether_mac_link_down() > > are identical, as are the tail end of macb_mac_link_up() and > > at91ether_mac_link_up(). > > > > I was split between having a new phylink_mac_ops instance or > differentiating in the various callbacks. If your preference is the > latter, I'm fine with that. I haven't thought too much about what the code would look like after the phylink changes - I spent quite some time working out what the differences were between what is already in mainline and what your patch was adding back. As far as I'm concerned, however, any of the MAC drivers I've converted that I don't have the hardware for (which includes this driver) are merely illustrative patches that show the kind of thing I'm after there - and only become "real" patches once they're tested. > > > Add new phylink callbacks to handle emac and at91rm9200 properly. > > > > > > Fixes: 7897b071ac3b ("net: macb: convert to phylink") > > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > > > --- > > > > I posted a heads-up message last week about updates to phylink that > > I'll be submitting soon (most of the prerequisits have now been sent > > for review) which touch every phylink_mac_ops-using piece of code in > > the tree. Unfortunately, this patch introduces a new instance that > > likely isn't going to get my attention, so it's going to create a > > subtle merge conflict between net-next and net trees unless we work > > out some way to deal with it. > > > > I'm just mentioning that so that some thought can be applied now > > rather than when it actually happens - especially as I've no way to > > test the changes that will be necessary for this driver. > > > > Does that help if I change the callbacks instead of adding a new > phylink_mac_ops instance? I can also wait for your work and rebase on > top of that but that would mean that the fix will not get backported. Obviously, the phylink conversion for this driver caused a regression that should be fixed, so I think it's right to fix it in whatever way you think would be most suitable. We just need to consider how to deal with the conflicts that are going to occur between net and net-next. One option would be to let davem know about the impending conflict, and with your patch merged into net, if he can then merge the net tree into net-next before applying my series - with an updated macb conversion patch from you (tested would be good!) - then everything should work out fine.
On 2/17/2020 2:43 AM, Alexandre Belloni wrote: > at91ether_init was handling the phy mode and speed but since the switch to > phylink, the NCFGR register got overwritten by macb_mac_config(). > > Add new phylink callbacks to handle emac and at91rm9200 properly. > > Fixes: 7897b071ac3b ("net: macb: convert to phylink") > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- [snip] > +static void at91ether_mac_link_up(struct phylink_config *config, > + unsigned int mode, > + phy_interface_t interface, > + struct phy_device *phy) > +{ > + struct net_device *ndev = to_net_dev(config->dev); > + struct macb *bp = netdev_priv(ndev); > + > + /* Enable Rx and Tx */ > + macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(RE) | MACB_BIT(TE)); > + > + netif_tx_wake_all_queues(ndev); So this happens to be copied from the mvpp2 driver, if this is a requirement, should not this be moved to the phylink implementation since it already manages the carrier? Those two drivers are the only ones doing this.
On Mon, Feb 17, 2020 at 02:03:47PM -0800, Florian Fainelli wrote: > > > On 2/17/2020 2:43 AM, Alexandre Belloni wrote: > > at91ether_init was handling the phy mode and speed but since the switch to > > phylink, the NCFGR register got overwritten by macb_mac_config(). > > > > Add new phylink callbacks to handle emac and at91rm9200 properly. > > > > Fixes: 7897b071ac3b ("net: macb: convert to phylink") > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > > --- > > [snip] > > > +static void at91ether_mac_link_up(struct phylink_config *config, > > + unsigned int mode, > > + phy_interface_t interface, > > + struct phy_device *phy) > > +{ > > + struct net_device *ndev = to_net_dev(config->dev); > > + struct macb *bp = netdev_priv(ndev); > > + > > + /* Enable Rx and Tx */ > > + macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(RE) | MACB_BIT(TE)); > > + > > + netif_tx_wake_all_queues(ndev); > > So this happens to be copied from the mvpp2 driver, if this is a > requirement, should not this be moved to the phylink implementation > since it already manages the carrier? Those two drivers are the only > ones doing this. Looking at mvneta, it does stuff with managing the queues itself, and I suspect adding that into phylink will mess that driver up. Maybe someone with more knowledge can take a look. But, IMHO, two drivers doing something is not grounds for moving it into higher layers.
diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index dbf7070fcdba..a3f0f27fc79a 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -652,6 +652,7 @@ #define MACB_CAPS_GEM_HAS_PTP 0x00000040 #define MACB_CAPS_BD_RD_PREFETCH 0x00000080 #define MACB_CAPS_NEEDS_RSTONUBR 0x00000100 +#define MACB_CAPS_MACB_IS_EMAC 0x08000000 #define MACB_CAPS_FIFO_MODE 0x10000000 #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 #define MACB_CAPS_SG_DISABLED 0x40000000 diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index def94e91883a..529a1d0d7dab 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -654,6 +654,72 @@ static const struct phylink_mac_ops macb_phylink_ops = { .mac_link_up = macb_mac_link_up, }; +static void at91ether_mac_config(struct phylink_config *config, + unsigned int mode, + const struct phylink_link_state *state) +{ + struct net_device *ndev = to_net_dev(config->dev); + struct macb *bp = netdev_priv(ndev); + unsigned long flags; + u32 ctrl; + + spin_lock_irqsave(&bp->lock, flags); + + ctrl = MACB_BF(CLK, MACB_CLK_DIV32) | MACB_BIT(BIG); + if (state->speed == SPEED_100) + ctrl |= MACB_BIT(SPD); + + if (state->duplex) + ctrl |= MACB_BIT(FD); + + if (state->interface == PHY_INTERFACE_MODE_RMII) + ctrl |= MACB_BIT(RM9200_RMII); + + macb_writel(bp, NCFGR, ctrl); + + bp->speed = state->speed; + + spin_unlock_irqrestore(&bp->lock, flags); +} + +static void at91ether_mac_link_down(struct phylink_config *config, + unsigned int mode, + phy_interface_t interface) +{ + struct net_device *ndev = to_net_dev(config->dev); + struct macb *bp = netdev_priv(ndev); + u32 ctrl; + + /* Disable Rx and Tx */ + ctrl = macb_readl(bp, NCR) & ~(MACB_BIT(RE) | MACB_BIT(TE)); + macb_writel(bp, NCR, ctrl); + + netif_tx_stop_all_queues(ndev); +} + +static void at91ether_mac_link_up(struct phylink_config *config, + unsigned int mode, + phy_interface_t interface, + struct phy_device *phy) +{ + struct net_device *ndev = to_net_dev(config->dev); + struct macb *bp = netdev_priv(ndev); + + /* Enable Rx and Tx */ + macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(RE) | MACB_BIT(TE)); + + netif_tx_wake_all_queues(ndev); +} + +static const struct phylink_mac_ops at91ether_phylink_ops = { + .validate = macb_validate, + .mac_pcs_get_state = macb_mac_pcs_get_state, + .mac_an_restart = macb_mac_an_restart, + .mac_config = at91ether_mac_config, + .mac_link_down = at91ether_mac_link_down, + .mac_link_up = at91ether_mac_link_up, +}; + static bool macb_phy_handle_exists(struct device_node *dn) { dn = of_parse_phandle(dn, "phy-handle", 0); @@ -695,13 +761,17 @@ static int macb_phylink_connect(struct macb *bp) /* based on au1000_eth. c*/ static int macb_mii_probe(struct net_device *dev) { + const struct phylink_mac_ops *phylink_ops = &macb_phylink_ops; struct macb *bp = netdev_priv(dev); + if (bp->caps & MACB_CAPS_MACB_IS_EMAC) + phylink_ops = &at91ether_phylink_ops; + bp->phylink_config.dev = &dev->dev; bp->phylink_config.type = PHYLINK_NETDEV; bp->phylink = phylink_create(&bp->phylink_config, bp->pdev->dev.fwnode, - bp->phy_interface, &macb_phylink_ops); + bp->phy_interface, phylink_ops); if (IS_ERR(bp->phylink)) { netdev_err(dev, "Could not create a phylink instance (%ld)\n", PTR_ERR(bp->phylink)); @@ -4041,7 +4111,6 @@ static int at91ether_init(struct platform_device *pdev) struct net_device *dev = platform_get_drvdata(pdev); struct macb *bp = netdev_priv(dev); int err; - u32 reg; bp->queues[0].bp = bp; @@ -4055,12 +4124,6 @@ static int at91ether_init(struct platform_device *pdev) macb_writel(bp, NCR, 0); - reg = MACB_BF(CLK, MACB_CLK_DIV32) | MACB_BIT(BIG); - if (bp->phy_interface == PHY_INTERFACE_MODE_RMII) - reg |= MACB_BIT(RM9200_RMII); - - macb_writel(bp, NCFGR, reg); - return 0; } @@ -4218,7 +4281,7 @@ static const struct macb_config sama5d4_config = { }; static const struct macb_config emac_config = { - .caps = MACB_CAPS_NEEDS_RSTONUBR, + .caps = MACB_CAPS_NEEDS_RSTONUBR | MACB_CAPS_MACB_IS_EMAC, .clk_init = at91ether_clk_init, .init = at91ether_init, };
at91ether_init was handling the phy mode and speed but since the switch to phylink, the NCFGR register got overwritten by macb_mac_config(). Add new phylink callbacks to handle emac and at91rm9200 properly. Fixes: 7897b071ac3b ("net: macb: convert to phylink") Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> --- drivers/net/ethernet/cadence/macb.h | 1 + drivers/net/ethernet/cadence/macb_main.c | 81 +++++++++++++++++++++--- 2 files changed, 73 insertions(+), 9 deletions(-)