* [PATCH v6] net: mv643xx_eth: support MII/GMII/RGMII modes for Kirkwood [not found] <202210020108.UlXaYP3c-lkp@intel.com> @ 2022-10-01 17:45 ` David Yang 2022-10-04 0:13 ` Jakub Kicinski 0 siblings, 1 reply; 5+ messages in thread From: David Yang @ 2022-10-01 17:45 UTC (permalink / raw) To: mmyangfl Cc: Sebastian Hesselbarth, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, netdev, linux-kernel Support mode switch properly, which is not available before. If SoC has two Ethernet controllers, by setting both of them into MII mode, the first controller enters GMII mode, while the second controller is effectively disabled. This requires configuring (and maybe enabling) the second controller in the device tree, even though it cannot be used. Signed-off-by: David Yang <mmyangfl@gmail.com> --- v2: clarify modes work on controllers, read default value from PSC1 v3: Kirkwood only v4: cleanup v5: test on 88f6282 v6: fix missing header reported by kernel test robot drivers/net/ethernet/marvell/mv643xx_eth.c | 49 ++++++++++++++++++---- include/linux/mv643xx_eth.h | 2 + 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index b6be0552a..ed674c512 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -108,6 +108,7 @@ static char mv643xx_eth_driver_version[] = "1.4"; #define TXQ_COMMAND 0x0048 #define TXQ_FIX_PRIO_CONF 0x004c #define PORT_SERIAL_CONTROL1 0x004c +#define RGMII_EN 0x00000008 #define CLK125_BYPASS_EN 0x00000010 #define TX_BW_RATE 0x0050 #define TX_BW_MTU 0x0058 @@ -2761,6 +2762,8 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev, mv643xx_eth_property(pnp, "rx-sram-addr", ppd.rx_sram_addr); mv643xx_eth_property(pnp, "rx-sram-size", ppd.rx_sram_size); + of_get_phy_mode(pnp, &ppd.interface); + ppd.phy_node = of_parse_phandle(pnp, "phy-handle", 0); if (!ppd.phy_node) { ppd.phy_addr = MV643XX_ETH_PHY_NONE; @@ -3092,6 +3095,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev) struct mv643xx_eth_private *mp; struct net_device *dev; struct phy_device *phydev = NULL; + u32 psc1r; int err, irq; pd = dev_get_platdata(&pdev->dev); @@ -3119,14 +3123,45 @@ static int mv643xx_eth_probe(struct platform_device *pdev) mp->dev = dev; - /* Kirkwood resets some registers on gated clocks. Especially - * CLK125_BYPASS_EN must be cleared but is not available on - * all other SoCs/System Controllers using this driver. - */ if (of_device_is_compatible(pdev->dev.of_node, - "marvell,kirkwood-eth-port")) - wrlp(mp, PORT_SERIAL_CONTROL1, - rdlp(mp, PORT_SERIAL_CONTROL1) & ~CLK125_BYPASS_EN); + "marvell,kirkwood-eth-port")) { + psc1r = rdlp(mp, PORT_SERIAL_CONTROL1); + + /* Kirkwood resets some registers on gated clocks. Especially + * CLK125_BYPASS_EN must be cleared but is not available on + * all other SoCs/System Controllers using this driver. + */ + psc1r &= ~CLK125_BYPASS_EN; + + /* On Kirkwood with two Ethernet controllers, if both of them + * have RGMII_EN disabled, the first controller will be in GMII + * mode and the second one is effectively disabled, instead of + * two MII interfaces. + * + * To enable GMII in the first controller, the second one must + * also be configured (and may be enabled) with RGMII_EN + * disabled too, even though it cannot be used at all. + */ + switch (pd->interface) { + /* Use internal to denote second controller being disabled */ + case PHY_INTERFACE_MODE_INTERNAL: + case PHY_INTERFACE_MODE_MII: + case PHY_INTERFACE_MODE_GMII: + psc1r &= ~RGMII_EN; + break; + case PHY_INTERFACE_MODE_RGMII: + case PHY_INTERFACE_MODE_RGMII_ID: + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_TXID: + psc1r |= RGMII_EN; + break; + default: + /* Unknown; don't touch */ + break; + } + + wrlp(mp, PORT_SERIAL_CONTROL1, psc1r); + } /* * Start with a default rate, and if there is a clock, allow diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h index 3682ae75c..145169be2 100644 --- a/include/linux/mv643xx_eth.h +++ b/include/linux/mv643xx_eth.h @@ -8,6 +8,7 @@ #include <linux/mbus.h> #include <linux/if_ether.h> +#include <linux/phy.h> #define MV643XX_ETH_SHARED_NAME "mv643xx_eth" #define MV643XX_ETH_NAME "mv643xx_eth_port" @@ -59,6 +60,7 @@ struct mv643xx_eth_platform_data { */ int speed; int duplex; + phy_interface_t interface; /* * How many RX/TX queues to use. -- 2.35.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v6] net: mv643xx_eth: support MII/GMII/RGMII modes for Kirkwood 2022-10-01 17:45 ` [PATCH v6] net: mv643xx_eth: support MII/GMII/RGMII modes for Kirkwood David Yang @ 2022-10-04 0:13 ` Jakub Kicinski 2022-10-04 14:36 ` Jakub Kicinski 0 siblings, 1 reply; 5+ messages in thread From: Jakub Kicinski @ 2022-10-04 0:13 UTC (permalink / raw) To: David Yang Cc: Sebastian Hesselbarth, David S. Miller, Eric Dumazet, Paolo Abeni, netdev, linux-kernel On Sun, 2 Oct 2022 01:45:23 +0800 David Yang wrote: > Subject: [PATCH v6] net: mv643xx_eth: support MII/GMII/RGMII modes for Kirkwood > Date: Sun, 2 Oct 2022 01:45:23 +0800 > X-Mailer: git-send-email 2.35.1 > > Support mode switch properly, which is not available before. > > If SoC has two Ethernet controllers, by setting both of them into MII > mode, the first controller enters GMII mode, while the second > controller is effectively disabled. This requires configuring (and > maybe enabling) the second controller in the device tree, even though > it cannot be used. > > Signed-off-by: David Yang <mmyangfl@gmail.com> > --- > v2: clarify modes work on controllers, read default value from PSC1 > v3: Kirkwood only > v4: cleanup > v5: test on 88f6282 I don't see any of the versions before v5, you should restart numbering when you post something to the list for the first time. Regardless, the merge window has now started (after Linus tagged 6.0) and will last until he tags 6.1-rc1 (two weeks from now). During this time we'll not be taking any patches adding new features/support so please repost in around 2 weeks. Thanks! ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v6] net: mv643xx_eth: support MII/GMII/RGMII modes for Kirkwood 2022-10-04 0:13 ` Jakub Kicinski @ 2022-10-04 14:36 ` Jakub Kicinski 2022-10-28 2:01 ` David Yang 0 siblings, 1 reply; 5+ messages in thread From: Jakub Kicinski @ 2022-10-04 14:36 UTC (permalink / raw) To: David Yang, Paolo Abeni Cc: Sebastian Hesselbarth, David S. Miller, Eric Dumazet, netdev, linux-kernel On Mon, 3 Oct 2022 17:13:20 -0700 Jakub Kicinski wrote: > I don't see any of the versions before v5, you should restart numbering > when you post something to the list for the first time. Paolo pointed out to me that there were previous versions.. Apologies for the confusion, I must have deleted them locally because they were all posted in a thread and that messes up my review queue ordering. ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v6] net: mv643xx_eth: support MII/GMII/RGMII modes for Kirkwood 2022-10-04 14:36 ` Jakub Kicinski @ 2022-10-28 2:01 ` David Yang 2022-11-07 8:50 ` patchwork-bot+netdevbpf 0 siblings, 1 reply; 5+ messages in thread From: David Yang @ 2022-10-28 2:01 UTC (permalink / raw) To: mmyangfl Cc: Sebastian Hesselbarth, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, netdev, linux-kernel Support mode switch properly, which is not available before. If SoC has two Ethernet controllers, by setting both of them into MII mode, the first controller enters GMII mode, while the second controller is effectively disabled. This requires configuring (and maybe enabling) the second controller in the device tree, even though it cannot be used. Signed-off-by: David Yang <mmyangfl@gmail.com> --- v2: clarify modes work on controllers, read default value from PSC1 v3: Kirkwood only v4: cleanup v5: test on 88f6282 v6: fix missing header reported by kernel test robot repost after merge window drivers/net/ethernet/marvell/mv643xx_eth.c | 49 ++++++++++++++++++---- include/linux/mv643xx_eth.h | 2 + 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index b6be0552a..ed674c512 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -108,6 +108,7 @@ static char mv643xx_eth_driver_version[] = "1.4"; #define TXQ_COMMAND 0x0048 #define TXQ_FIX_PRIO_CONF 0x004c #define PORT_SERIAL_CONTROL1 0x004c +#define RGMII_EN 0x00000008 #define CLK125_BYPASS_EN 0x00000010 #define TX_BW_RATE 0x0050 #define TX_BW_MTU 0x0058 @@ -2761,6 +2762,8 @@ static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev, mv643xx_eth_property(pnp, "rx-sram-addr", ppd.rx_sram_addr); mv643xx_eth_property(pnp, "rx-sram-size", ppd.rx_sram_size); + of_get_phy_mode(pnp, &ppd.interface); + ppd.phy_node = of_parse_phandle(pnp, "phy-handle", 0); if (!ppd.phy_node) { ppd.phy_addr = MV643XX_ETH_PHY_NONE; @@ -3092,6 +3095,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev) struct mv643xx_eth_private *mp; struct net_device *dev; struct phy_device *phydev = NULL; + u32 psc1r; int err, irq; pd = dev_get_platdata(&pdev->dev); @@ -3119,14 +3123,45 @@ static int mv643xx_eth_probe(struct platform_device *pdev) mp->dev = dev; - /* Kirkwood resets some registers on gated clocks. Especially - * CLK125_BYPASS_EN must be cleared but is not available on - * all other SoCs/System Controllers using this driver. - */ if (of_device_is_compatible(pdev->dev.of_node, - "marvell,kirkwood-eth-port")) - wrlp(mp, PORT_SERIAL_CONTROL1, - rdlp(mp, PORT_SERIAL_CONTROL1) & ~CLK125_BYPASS_EN); + "marvell,kirkwood-eth-port")) { + psc1r = rdlp(mp, PORT_SERIAL_CONTROL1); + + /* Kirkwood resets some registers on gated clocks. Especially + * CLK125_BYPASS_EN must be cleared but is not available on + * all other SoCs/System Controllers using this driver. + */ + psc1r &= ~CLK125_BYPASS_EN; + + /* On Kirkwood with two Ethernet controllers, if both of them + * have RGMII_EN disabled, the first controller will be in GMII + * mode and the second one is effectively disabled, instead of + * two MII interfaces. + * + * To enable GMII in the first controller, the second one must + * also be configured (and may be enabled) with RGMII_EN + * disabled too, even though it cannot be used at all. + */ + switch (pd->interface) { + /* Use internal to denote second controller being disabled */ + case PHY_INTERFACE_MODE_INTERNAL: + case PHY_INTERFACE_MODE_MII: + case PHY_INTERFACE_MODE_GMII: + psc1r &= ~RGMII_EN; + break; + case PHY_INTERFACE_MODE_RGMII: + case PHY_INTERFACE_MODE_RGMII_ID: + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_TXID: + psc1r |= RGMII_EN; + break; + default: + /* Unknown; don't touch */ + break; + } + + wrlp(mp, PORT_SERIAL_CONTROL1, psc1r); + } /* * Start with a default rate, and if there is a clock, allow diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h index 3682ae75c..145169be2 100644 --- a/include/linux/mv643xx_eth.h +++ b/include/linux/mv643xx_eth.h @@ -8,6 +8,7 @@ #include <linux/mbus.h> #include <linux/if_ether.h> +#include <linux/phy.h> #define MV643XX_ETH_SHARED_NAME "mv643xx_eth" #define MV643XX_ETH_NAME "mv643xx_eth_port" @@ -59,6 +60,7 @@ struct mv643xx_eth_platform_data { */ int speed; int duplex; + phy_interface_t interface; /* * How many RX/TX queues to use. -- 2.35.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v6] net: mv643xx_eth: support MII/GMII/RGMII modes for Kirkwood 2022-10-28 2:01 ` David Yang @ 2022-11-07 8:50 ` patchwork-bot+netdevbpf 0 siblings, 0 replies; 5+ messages in thread From: patchwork-bot+netdevbpf @ 2022-11-07 8:50 UTC (permalink / raw) To: David Yang Cc: sebastian.hesselbarth, davem, edumazet, kuba, pabeni, netdev, linux-kernel Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 28 Oct 2022 10:01:01 +0800 you wrote: > Support mode switch properly, which is not available before. > > If SoC has two Ethernet controllers, by setting both of them into MII > mode, the first controller enters GMII mode, while the second > controller is effectively disabled. This requires configuring (and > maybe enabling) the second controller in the device tree, even though > it cannot be used. > > [...] Here is the summary with links: - [v6] net: mv643xx_eth: support MII/GMII/RGMII modes for Kirkwood https://git.kernel.org/netdev/net-next/c/d08cb2555677 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-11-07 8:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <202210020108.UlXaYP3c-lkp@intel.com>
2022-10-01 17:45 ` [PATCH v6] net: mv643xx_eth: support MII/GMII/RGMII modes for Kirkwood David Yang
2022-10-04 0:13 ` Jakub Kicinski
2022-10-04 14:36 ` Jakub Kicinski
2022-10-28 2:01 ` David Yang
2022-11-07 8:50 ` patchwork-bot+netdevbpf
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).