net: dsa: mt7530: fix port specifications for MT7988
Subsystems (5)
RFC PATCH 1/1 net: dsa: mt7530: fix port specifications for MT7988
From: Arınç ÜNAL <[email protected]>
On the switch on the MT7988 SoC, there are only 4 PHYs. There's only port 6 as the CPU port, there's no port 5. Split the switch statement with a check to enforce these for the switch on the MT7988 SoC. The internal phy-mode is specific to MT7988 so put it for MT7988 only.
---
Daniel, this is based on the information you provided me about the switch. I will add this to my current patch series if it looks good to you.
Arınç
--- drivers/net/dsa/mt7530.c | 67 ++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-)
drivers/net/dsa/mt7530.c +43 -24
@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port,phy_interface_zero (config->supported_interfaces);switch (port) { - case 0 ... 4: /* Internal phy */ + case 0 ... 3: /* Internal phy */__set_bit (PHY_INTERFACE_MODE_INTERNAL , config->supported_interfaces);break ;
@@ -2710,37 +2710,56 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,struct mt7530_priv *priv = ds->priv;u32 mcr_cur, mcr_new; -switch (port) { - case 0 ... 4: /* Internal phy */ -if (state->interface !=PHY_INTERFACE_MODE_GMII && - state->interface !=PHY_INTERFACE_MODE_INTERNAL ) - goto unsupported; -break ; -case 5 :/* Port 5, a CPU port. */ -if (priv->p5_interface == state->interface) +if (priv->id ==ID_MT7988 ) { +switch (port) { + case 0 ... 3: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_INTERNAL ) + goto unsupported;break ; +case 6 :/* Port 6, a CPU port. */ +if (priv->p6_interface == state->interface) +break ; -if (mt753x_mac_config (ds, port, mode, state) <0 ) +if (mt753x_mac_config (ds, port, mode, state) <0 ) + goto unsupported; + + priv->p6_interface = state->interface; +break ; +default : goto unsupported; + } + }else { +switch (port) { + case 0 ... 4: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_GMII ) + goto unsupported; +break ; +case 5 :/* Port 5, a CPU port. */ +if (priv->p5_interface == state->interface) +break ; -if (priv->p5_intf_sel ==P5_INTF_SEL_GMAC5 || - priv->p5_intf_sel ==P5_INTF_SEL_GMAC5_SGMII ) - priv->p5_interface = state->interface; -break ; -case 6 :/* Port 6, a CPU port. */ -if (priv->p6_interface == state->interface) +if (mt753x_mac_config (ds, port, mode, state) <0 ) + goto unsupported; + +if (priv->p5_intf_sel ==P5_INTF_SEL_GMAC5 || + priv->p5_intf_sel ==P5_INTF_SEL_GMAC5_SGMII ) + priv->p5_interface = state->interface;break ; +case 6 :/* Port 6, a CPU port. */ +if (priv->p6_interface == state->interface) +break ; -if (mt753x_mac_config (ds, port, mode, state) <0 ) - goto unsupported; +if (mt753x_mac_config (ds, port, mode, state) <0 ) + goto unsupported; - priv->p6_interface = state->interface; -break ; -default : + priv->p6_interface = state->interface; +break ; +default : unsupported: -dev_err (ds->dev,"%s: unsupported %s port: %i\n" , - __func__,phy_modes (state->interface), port); -return ; +dev_err (ds->dev,"%s: unsupported %s port: %i\n" , + __func__,phy_modes (state->interface), port); +return ; + } } mcr_cur =mt7530_read (priv,MT7530_PMCR_P (port));
Signature · 1 line
2.37.2
Port 6 configuration is shared so it's simpler to put a label.
drivers/net/dsa/mt7530.c +37 -24
@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port,phy_interface_zero (config->supported_interfaces);switch (port) { - case 0 ... 4: /* Internal phy */ + case 0 ... 3: /* Internal phy */__set_bit (PHY_INTERFACE_MODE_INTERNAL , config->supported_interfaces);break ;
@@ -2710,37 +2710,50 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,struct mt7530_priv *priv = ds->priv;u32 mcr_cur, mcr_new; -switch (port) { - case 0 ... 4: /* Internal phy */ -if (state->interface !=PHY_INTERFACE_MODE_GMII && - state->interface !=PHY_INTERFACE_MODE_INTERNAL ) +if (priv->id ==ID_MT7988 ) { +switch (port) { + case 0 ... 3: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_INTERNAL ) + goto unsupported; +break ; +case 6 :/* Port 6, a CPU port. */ + goto port6; +default : goto unsupported; -break ; -case 5 :/* Port 5, a CPU port. */ -if (priv->p5_interface == state->interface) + } + }else { +switch (port) { + case 0 ... 4: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_GMII ) + goto unsupported;break ; +case 5 :/* Port 5, a CPU port. */ +if (priv->p5_interface == state->interface) +break ; -if (mt753x_mac_config (ds, port, mode, state) <0 ) - goto unsupported; +if (mt753x_mac_config (ds, port, mode, state) <0 ) + goto unsupported; -if (priv->p5_intf_sel ==P5_INTF_SEL_GMAC5 || - priv->p5_intf_sel ==P5_INTF_SEL_GMAC5_SGMII ) - priv->p5_interface = state->interface; -break ; -case 6 :/* Port 6, a CPU port. */ -if (priv->p6_interface == state->interface) +if (priv->p5_intf_sel ==P5_INTF_SEL_GMAC5 || + priv->p5_intf_sel ==P5_INTF_SEL_GMAC5_SGMII ) + priv->p5_interface = state->interface;break ; +case 6 :/* Port 6, a CPU port. */ +port6: +if (priv->p6_interface == state->interface) +break ; -if (mt753x_mac_config (ds, port, mode, state) <0 ) - goto unsupported; +if (mt753x_mac_config (ds, port, mode, state) <0 ) + goto unsupported; - priv->p6_interface = state->interface; -break ; -default : + priv->p6_interface = state->interface; +break ; +default : unsupported: -dev_err (ds->dev,"%s: unsupported %s port: %i\n" , - __func__,phy_modes (state->interface), port); -return ; +dev_err (ds->dev,"%s: unsupported %s port: %i\n" , + __func__,phy_modes (state->interface), port); +return ; + } } mcr_cur =mt7530_read (priv,MT7530_PMCR_P (port));
Arınç
Quoted 38 lines · On Thu, Apr 06, 2023 at 01:04:45PM +0300, [email protected] wrote:
From: Arınç ÜNAL <[email protected]>
On the switch on the MT7988 SoC, there are only 4 PHYs. There's only port 6 as the CPU port, there's no port 5. Split the switch statement with a check to enforce these for the switch on the MT7988 SoC. The internal phy-mode is specific to MT7988 so put it for MT7988 only.
Signed-off-by Arınç ÜNAL <[email protected]>---
Daniel, this is based on the information you provided me about the switch. I will add this to my current patch series if it looks good to you.
Arınç
--- drivers/net/dsa/mt7530.c | 67 ++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-)drivers/net/dsa/mt7530.c +1
-3@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port,phy_interface_zero (config->supported_interfaces);switch (port) { - case 0 ... 4: /* Internal phy */ + case 0 ... 3: /* Internal phy */__set_bit (PHY_INTERFACE_MODE_INTERNAL , config->supported_interfaces);break ;@@ -2710,37 +2710,56 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,struct mt7530_priv *priv = ds->priv;u32 mcr_cur, mcr_new; -switch (port) { - case 0 ... 4: /* Internal phy */
drivers/net/dsa/mt7530.c mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode, · line 2716
Quoted 10 lines
drivers/net/dsa/mt7530.c +4
-6-if (state->interface !=PHY_INTERFACE_MODE_GMII && - state->interface !=PHY_INTERFACE_MODE_INTERNAL ) - goto unsupported; -break ; -case 5 :/* Port 5, a CPU port. */ -if (priv->p5_interface == state->interface) +if (priv->id ==ID_MT7988 ) { +switch (port) { + case 0 ... 3: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_INTERNAL )
How do these end up with PHY_INTERFACE_MODE_INTERNAL ? phylib defaults to GMII mode without something else being specified in DT.
Also note that you should *not* be validating state->interface in the mac_config() method because it's way too late to reject it - if you get an unsupported interface here, then that is down to the get_caps() method being buggy. Only report interfaces in get_caps() that you are prepared to handle in the rest of the system.
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Daniel Golle
maintainerQuoted 37 lines · Russell King (Oracle)
Quoted 36 lines · On Thu, Apr 06, 2023 at 01:04:45PM +0300, [email protected] wrote:
From: Arınç ÜNAL <[email protected]>
On the switch on the MT7988 SoC, there are only 4 PHYs. There's only port 6 as the CPU port, there's no port 5. Split the switch statement with a check to enforce these for the switch on the MT7988 SoC. The internal phy-mode is specific to MT7988 so put it for MT7988 only.
Signed-off-by Arınç ÜNAL <[email protected]>---
Daniel, this is based on the information you provided me about the switch. I will add this to my current patch series if it looks good to you.
Arınç
--- drivers/net/dsa/mt7530.c | 67 ++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-)drivers/net/dsa/mt7530.c +1
-1@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port,phy_interface_zero (config->supported_interfaces);switch (port) { - case 0 ... 4: /* Internal phy */ + case 0 ... 3: /* Internal phy */__set_bit (PHY_INTERFACE_MODE_INTERNAL , config->supported_interfaces);break ;@@ -2710,37 +2710,56 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,struct mt7530_priv *priv = ds->priv;u32 mcr_cur, mcr_new;
Quoted 15 lines
drivers/net/dsa/mt7530.c mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode, · line 2716
Quoted 12 lines
drivers/net/dsa/mt7530.c +4
-8-switch (port) { - case 0 ... 4: /* Internal phy */ -if (state->interface !=PHY_INTERFACE_MODE_GMII && - state->interface !=PHY_INTERFACE_MODE_INTERNAL ) - goto unsupported; -break ; -case 5 :/* Port 5, a CPU port. */ -if (priv->p5_interface == state->interface) +if (priv->id ==ID_MT7988 ) { +switch (port) { + case 0 ... 3: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_INTERNAL )How do these end up with
PHY_INTERFACE_MODE_INTERNAL? phylib defaults to GMII mode without something else being specified in DT.
As the link between mtk_eth_soc MAC and built-in switch as well as the links between the built-in switch and the 4 built-in gigE PHYs are internal, I wanted to describe them as such.
This was a reaction to the justified criticism that it doesn't make sense to add 10GBase-KR and USXGMII as a proxy to actually indicate the internal link between mt7530 CPU port and mtk_eth_soc gmac1 on the MT7988, which Arınç had expressed in a review comment.
The phy-mode in the to-be-submitted DTS for MT7988 will be 'internal' to describe the GMAC1<->MT7530 link as well as the MT7530<->gigE-PHY links. I understand that for the built-in gigE PHYs we could just as well us 'gmii', however, I thought that using 'internal' would be less confusing as there is no actual GMII hardware interface. And that's even more true for the link between GMAC1 and the built-in switch, there are no actual USXGMII or 10GBase-KR hardware interfaces but rather just a stateless internal link.
Sidenote: The same applies also for the link between GMAC2 and the built-in 2500Base-T PHY. MediaTek was using 'xgmii' as PHY mode here to program the internal muxes to connect the internal PHY with GMAC2, and it took me a while to understand that there is no actual XGMII interface anywhere, but they were rather just using this otherwise unused interface mode as a flag for that...
Hence I decided to also use 'internal' PHY mode there, especially as in this case there are several options: GMAC2 can also be connected to an actual 1.25Gbaud/3.25Gbaud SGMII interface (pcs-mtk-lynxi again) OR an actual 10GBase-KR/USXGMII SerDes, both can be muxed to the same pins used to connect an external PHYs to the SoC.
Hence "phy-mode = 'internal';" will be a common occurance in mt7988.dtsi.
Quoted 10 lines
Also note that you should *not* be validating
state->interfacein themac_config()method because it's way too late to reject it - if you get an unsupported interface here, then that is down to theget_caps()method being buggy. Only report interfaces inget_caps()that you are prepared to handle in the rest of the system.Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Quoted 53 lines · Russell King (Oracle)
Quoted 38 lines · On Thu, Apr 06, 2023 at 01:04:45PM +0300, [email protected] wrote:
From: Arınç ÜNAL <[email protected]>
On the switch on the MT7988 SoC, there are only 4 PHYs. There's only port 6 as the CPU port, there's no port 5. Split the switch statement with a check to enforce these for the switch on the MT7988 SoC. The internal phy-mode is specific to MT7988 so put it for MT7988 only.
Signed-off-by Arınç ÜNAL <[email protected]>---
Daniel, this is based on the information you provided me about the switch. I will add this to my current patch series if it looks good to you.
Arınç
--- drivers/net/dsa/mt7530.c | 67 ++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-)drivers/net/dsa/mt7530.c +1
-3@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port,phy_interface_zero (config->supported_interfaces);switch (port) { - case 0 ... 4: /* Internal phy */ + case 0 ... 3: /* Internal phy */__set_bit (PHY_INTERFACE_MODE_INTERNAL , config->supported_interfaces);break ;@@ -2710,37 +2710,56 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,struct mt7530_priv *priv = ds->priv;u32 mcr_cur, mcr_new; -switch (port) { - case 0 ... 4: /* Internal phy */drivers/net/dsa/mt7530.c mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode, · line 2716
Quoted 10 lines
drivers/net/dsa/mt7530.c +4
-6-if (state->interface !=PHY_INTERFACE_MODE_GMII && - state->interface !=PHY_INTERFACE_MODE_INTERNAL ) - goto unsupported; -break ; -case 5 :/* Port 5, a CPU port. */ -if (priv->p5_interface == state->interface) +if (priv->id ==ID_MT7988 ) { +switch (port) { + case 0 ... 3: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_INTERNAL )How do these end up with
PHY_INTERFACE_MODE_INTERNAL? phylib defaults to GMII mode without something else being specified in DT.
Quoted 5 lines
Also note that you should *not* be validating
state->interfacein themac_config()method because it's way too late to reject it - if you get an unsupported interface here, then that is down to theget_caps()method being buggy. Only report interfaces inget_caps()that you are prepared to handle in the rest of the system.
This is already the case for all three get_caps(). The supported interfaces for each port are properly defined.
Though mt7988_mac_port_get_caps() clears the config->supported_interfaces bitmap before reporting the supported interfaces. I don't think this is needed as all bits in the bitmap should already be initialized to zero when the phylink_config structure is allocated.
I'm not sure if your suggestion is to make sure the supported interfaces are properly reported on get_caps(), or validate state->interface somewhere else.
Arınç
Daniel Golle
maintainerQuoted 61 lines · Arınç ÜNAL
Quoted 51 lines · Russell King (Oracle)
Quoted 36 lines · On Thu, Apr 06, 2023 at 01:04:45PM +0300, [email protected] wrote:
From: Arınç ÜNAL <[email protected]>
On the switch on the MT7988 SoC, there are only 4 PHYs. There's only port 6 as the CPU port, there's no port 5. Split the switch statement with a check to enforce these for the switch on the MT7988 SoC. The internal phy-mode is specific to MT7988 so put it for MT7988 only.
Signed-off-by Arınç ÜNAL <[email protected]>---
Daniel, this is based on the information you provided me about the switch. I will add this to my current patch series if it looks good to you.
Arınç
--- drivers/net/dsa/mt7530.c | 67 ++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-)drivers/net/dsa/mt7530.c +1
-3@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port,phy_interface_zero (config->supported_interfaces);switch (port) { - case 0 ... 4: /* Internal phy */ + case 0 ... 3: /* Internal phy */__set_bit (PHY_INTERFACE_MODE_INTERNAL , config->supported_interfaces);break ;@@ -2710,37 +2710,56 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,struct mt7530_priv *priv = ds->priv;u32 mcr_cur, mcr_new; -switch (port) { - case 0 ... 4: /* Internal phy */drivers/net/dsa/mt7530.c mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode, · line 2715
Quoted 10 lines
drivers/net/dsa/mt7530.c +4
-6-if (state->interface !=PHY_INTERFACE_MODE_GMII && - state->interface !=PHY_INTERFACE_MODE_INTERNAL ) - goto unsupported; -break ; -case 5 :/* Port 5, a CPU port. */ -if (priv->p5_interface == state->interface) +if (priv->id ==ID_MT7988 ) { +switch (port) { + case 0 ... 3: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_INTERNAL )How do these end up with
PHY_INTERFACE_MODE_INTERNAL? phylib defaults to GMII mode without something else being specified in DT.Quoted 5 lines
Also note that you should *not* be validating
state->interfacein themac_config()method because it's way too late to reject it - if you get an unsupported interface here, then that is down to theget_caps()method being buggy. Only report interfaces inget_caps()that you are prepared to handle in the rest of the system.This is already the case for all three
get_caps(). The supported interfaces for each port are properly defined.
Quoted 8 lines
Though
mt7988_mac_port_get_caps()clears theconfig->supported_interfacesbitmap before reporting the supported interfaces. I don't think this is needed as all bits in the bitmap should already be initialized to zero when thephylink_configstructure is allocated.I'm not sure if your suggestion is to make sure the supported interfaces are properly reported on
get_caps(), or validatestate->interfacesomewhere else.
I think what Russell meant is just there is no point in being overly precise about permitted interface modes in mt753x_phylink_mac_config, as this function is not meant and called too late to validate the validity of the selected interface mode.
You change to mt7988_mac_port_get_caps looks correct to me and doing this will already prevent mt753x_phylink_mac_config from ever being called on MT7988 for port == 4 as well as and port == 5.
Quoted 71 lines · Daniel Golle
Quoted 61 lines · Arınç ÜNAL
Quoted 51 lines · Russell King (Oracle)
Quoted 36 lines · On Thu, Apr 06, 2023 at 01:04:45PM +0300, [email protected] wrote:
From: Arınç ÜNAL <[email protected]>
On the switch on the MT7988 SoC, there are only 4 PHYs. There's only port 6 as the CPU port, there's no port 5. Split the switch statement with a check to enforce these for the switch on the MT7988 SoC. The internal phy-mode is specific to MT7988 so put it for MT7988 only.
Signed-off-by Arınç ÜNAL <[email protected]>---
Daniel, this is based on the information you provided me about the switch. I will add this to my current patch series if it looks good to you.
Arınç
--- drivers/net/dsa/mt7530.c | 67 ++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-)drivers/net/dsa/mt7530.c +1
-3@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port,phy_interface_zero (config->supported_interfaces);switch (port) { - case 0 ... 4: /* Internal phy */ + case 0 ... 3: /* Internal phy */__set_bit (PHY_INTERFACE_MODE_INTERNAL , config->supported_interfaces);break ;@@ -2710,37 +2710,56 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,struct mt7530_priv *priv = ds->priv;u32 mcr_cur, mcr_new; -switch (port) { - case 0 ... 4: /* Internal phy */drivers/net/dsa/mt7530.c mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode, · line 2715
Quoted 10 lines
drivers/net/dsa/mt7530.c +4
-6-if (state->interface !=PHY_INTERFACE_MODE_GMII && - state->interface !=PHY_INTERFACE_MODE_INTERNAL ) - goto unsupported; -break ; -case 5 :/* Port 5, a CPU port. */ -if (priv->p5_interface == state->interface) +if (priv->id ==ID_MT7988 ) { +switch (port) { + case 0 ... 3: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_INTERNAL )How do these end up with
PHY_INTERFACE_MODE_INTERNAL? phylib defaults to GMII mode without something else being specified in DT.Quoted 5 lines
Also note that you should *not* be validating
state->interfacein themac_config()method because it's way too late to reject it - if you get an unsupported interface here, then that is down to theget_caps()method being buggy. Only report interfaces inget_caps()that you are prepared to handle in the rest of the system.This is already the case for all three
get_caps(). The supported interfaces for each port are properly defined.Quoted 8 lines
Though
mt7988_mac_port_get_caps()clears theconfig->supported_interfacesbitmap before reporting the supported interfaces. I don't think this is needed as all bits in the bitmap should already be initialized to zero when thephylink_configstructure is allocated.I'm not sure if your suggestion is to make sure the supported interfaces are properly reported on
get_caps(), or validatestate->interfacesomewhere else.
Quoted 8 lines
I think what Russell meant is just there is no point in being overly precise about permitted interface modes in
mt753x_phylink_mac_config, as this function is not meant and called too late to validate the validity of the selected interface mode.You change to
mt7988_mac_port_get_capslooks correct to me and doing this will already preventmt753x_phylink_mac_configfrom ever being called on MT7988 for port == 4 as well as and port == 5.
Ah, thanks for pointing this out Daniel. I see ds->ops->phylink_get_caps() is run right before phylink_create() on dsa_port_phylink_create(), as it should get the capabilities before creating an instance.
Should I remove phy_interface_zero(config->supported_interfaces); mt7988_mac_port_get_caps()? I'd prefer to do identical operations on each get_caps(), if there's no apparent reason for this to be on mt7988_mac_port_get_caps().
Arınç
Daniel Golle
maintainerQuoted 81 lines · Arınç ÜNAL
Quoted 71 lines · Daniel Golle
Quoted 61 lines · Arınç ÜNAL
Quoted 51 lines · Russell King (Oracle)
Quoted 36 lines · On Thu, Apr 06, 2023 at 01:04:45PM +0300, [email protected] wrote:
From: Arınç ÜNAL <[email protected]>
On the switch on the MT7988 SoC, there are only 4 PHYs. There's only port 6 as the CPU port, there's no port 5. Split the switch statement with a check to enforce these for the switch on the MT7988 SoC. The internal phy-mode is specific to MT7988 so put it for MT7988 only.
Signed-off-by Arınç ÜNAL <[email protected]>---
Daniel, this is based on the information you provided me about the switch. I will add this to my current patch series if it looks good to you.
Arınç
--- drivers/net/dsa/mt7530.c | 67 ++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-)drivers/net/dsa/mt7530.c +1
-3@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port,phy_interface_zero (config->supported_interfaces);switch (port) { - case 0 ... 4: /* Internal phy */ + case 0 ... 3: /* Internal phy */__set_bit (PHY_INTERFACE_MODE_INTERNAL , config->supported_interfaces);break ;@@ -2710,37 +2710,56 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,struct mt7530_priv *priv = ds->priv;u32 mcr_cur, mcr_new; -switch (port) { - case 0 ... 4: /* Internal phy */drivers/net/dsa/mt7530.c mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode, · line 2715
Quoted 10 lines
drivers/net/dsa/mt7530.c +4
-6-if (state->interface !=PHY_INTERFACE_MODE_GMII && - state->interface !=PHY_INTERFACE_MODE_INTERNAL ) - goto unsupported; -break ; -case 5 :/* Port 5, a CPU port. */ -if (priv->p5_interface == state->interface) +if (priv->id ==ID_MT7988 ) { +switch (port) { + case 0 ... 3: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_INTERNAL )How do these end up with
PHY_INTERFACE_MODE_INTERNAL? phylib defaults to GMII mode without something else being specified in DT.Quoted 5 lines
Also note that you should *not* be validating
state->interfacein themac_config()method because it's way too late to reject it - if you get an unsupported interface here, then that is down to theget_caps()method being buggy. Only report interfaces inget_caps()that you are prepared to handle in the rest of the system.This is already the case for all three
get_caps(). The supported interfaces for each port are properly defined.Quoted 8 lines
Though
mt7988_mac_port_get_caps()clears theconfig->supported_interfacesbitmap before reporting the supported interfaces. I don't think this is needed as all bits in the bitmap should already be initialized to zero when thephylink_configstructure is allocated.I'm not sure if your suggestion is to make sure the supported interfaces are properly reported on
get_caps(), or validatestate->interfacesomewhere else.Quoted 8 lines
I think what Russell meant is just there is no point in being overly precise about permitted interface modes in
mt753x_phylink_mac_config, as this function is not meant and called too late to validate the validity of the selected interface mode.You change to
mt7988_mac_port_get_capslooks correct to me and doing this will already preventmt753x_phylink_mac_configfrom ever being called on MT7988 for port == 4 as well as and port == 5.
Quoted 8 lines
Ah, thanks for pointing this out Daniel. I see
ds->ops->phylink_get_caps()is run right beforephylink_create()ondsa_port_phylink_create(), as it should get the capabilities before creating an instance.Should I remove
phy_interface_zero(config->supported_interfaces);mt7988_mac_port_get_caps()? I'd prefer to do identical operations on eachget_caps(), if there's no apparent reason for this to be onmt7988_mac_port_get_caps().
Yes, sounds sane to me, please do so.
Also we could make .mac_port_config optional, as for MT7988 we actually won't need it at all:
drivers/net/dsa/mt7530.c +4 -14
@@ -2653,17 +2653,6 @@ static bool mt753x_is_mac_port(u32 port)return (port ==5 || port ==6 ); } -static int -mt7988_mac_config (struct dsa_switch *ds,int port,unsigned int mode, -phy_interface_t interface) -{ -if (dsa_is_cpu_port (ds, port) && - interface ==PHY_INTERFACE_MODE_INTERNAL ) -return 0 ; - -return -EINVAL ; -} -static int mt7531_mac_config (struct dsa_switch *ds,int port,unsigned int mode,phy_interface_t interface)
@@ -2704,6 +2693,9 @@ mt753x_mac_config(struct dsa_switch *ds, int port, unsigned int mode, {struct mt7530_priv *priv = ds->priv; +if (!priv->info->mac_port_config) +return 0 ; +return priv->info->mac_port_config (ds, port, mode, state->interface); }
@@ -3157,7 +3149,6 @@ const struct mt753x_info mt753x_table[] = { .pad_setup = mt7988_pad_setup, .cpu_port_config = mt7988_cpu_port_config, .mac_port_get_caps = mt7988_mac_port_get_caps, - .mac_port_config = mt7988_mac_config, }, };EXPORT_SYMBOL_GPL (mt753x_table);
@@ -3186,8 +3177,7 @@ mt7530_probe_common(struct mt7530_priv *priv)*/ if (!priv->info->sw_setup || !priv->info->pad_setup || !priv->info->phy_read_c22 || !priv->info->phy_write_c22 || - !priv->info->mac_port_get_caps || - !priv->info->mac_port_config) + !priv->info->mac_port_get_caps)return -EINVAL ; priv->id = priv->info->id;
Quoted 137 lines · Daniel Golle
Quoted 81 lines · Arınç ÜNAL
Quoted 71 lines · Daniel Golle
Quoted 61 lines · Arınç ÜNAL
Quoted 51 lines · Russell King (Oracle)
Quoted 36 lines · On Thu, Apr 06, 2023 at 01:04:45PM +0300, [email protected] wrote:
From: Arınç ÜNAL <[email protected]>
On the switch on the MT7988 SoC, there are only 4 PHYs. There's only port 6 as the CPU port, there's no port 5. Split the switch statement with a check to enforce these for the switch on the MT7988 SoC. The internal phy-mode is specific to MT7988 so put it for MT7988 only.
Signed-off-by Arınç ÜNAL <[email protected]>---
Daniel, this is based on the information you provided me about the switch. I will add this to my current patch series if it looks good to you.
Arınç
--- drivers/net/dsa/mt7530.c | 67 ++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-)drivers/net/dsa/mt7530.c +1
-3@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port,phy_interface_zero (config->supported_interfaces);switch (port) { - case 0 ... 4: /* Internal phy */ + case 0 ... 3: /* Internal phy */__set_bit (PHY_INTERFACE_MODE_INTERNAL , config->supported_interfaces);break ;@@ -2710,37 +2710,56 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,struct mt7530_priv *priv = ds->priv;u32 mcr_cur, mcr_new; -switch (port) { - case 0 ... 4: /* Internal phy */drivers/net/dsa/mt7530.c mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode, · line 2715
Quoted 10 lines
drivers/net/dsa/mt7530.c +4
-6-if (state->interface !=PHY_INTERFACE_MODE_GMII && - state->interface !=PHY_INTERFACE_MODE_INTERNAL ) - goto unsupported; -break ; -case 5 :/* Port 5, a CPU port. */ -if (priv->p5_interface == state->interface) +if (priv->id ==ID_MT7988 ) { +switch (port) { + case 0 ... 3: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_INTERNAL )How do these end up with
PHY_INTERFACE_MODE_INTERNAL? phylib defaults to GMII mode without something else being specified in DT.Quoted 5 lines
Also note that you should *not* be validating
state->interfacein themac_config()method because it's way too late to reject it - if you get an unsupported interface here, then that is down to theget_caps()method being buggy. Only report interfaces inget_caps()that you are prepared to handle in the rest of the system.This is already the case for all three
get_caps(). The supported interfaces for each port are properly defined.Quoted 8 lines
Though
mt7988_mac_port_get_caps()clears theconfig->supported_interfacesbitmap before reporting the supported interfaces. I don't think this is needed as all bits in the bitmap should already be initialized to zero when thephylink_configstructure is allocated.I'm not sure if your suggestion is to make sure the supported interfaces are properly reported on
get_caps(), or validatestate->interfacesomewhere else.Quoted 8 lines
I think what Russell meant is just there is no point in being overly precise about permitted interface modes in
mt753x_phylink_mac_config, as this function is not meant and called too late to validate the validity of the selected interface mode.You change to
mt7988_mac_port_get_capslooks correct to me and doing this will already preventmt753x_phylink_mac_configfrom ever being called on MT7988 for port == 4 as well as and port == 5.Quoted 8 lines
Ah, thanks for pointing this out Daniel. I see
ds->ops->phylink_get_caps()is run right beforephylink_create()ondsa_port_phylink_create(), as it should get the capabilities before creating an instance.Should I remove
phy_interface_zero(config->supported_interfaces);mt7988_mac_port_get_caps()? I'd prefer to do identical operations on eachget_caps(), if there's no apparent reason for this to be onmt7988_mac_port_get_caps().Yes, sounds sane to me, please do so.
Also we could make .mac_port_config optional, as for MT7988 we actually won't need it at all:
drivers/net/dsa/mt7530.c +3
-12@@ -2653,17 +2653,6 @@ static bool mt753x_is_mac_port(u32 port)return (port ==5 || port ==6 ); } -static int -mt7988_mac_config (struct dsa_switch *ds,int port,unsigned int mode, -phy_interface_t interface) -{ -if (dsa_is_cpu_port (ds, port) && - interface ==PHY_INTERFACE_MODE_INTERNAL ) -return 0 ; - -return -EINVAL ; -} -static int mt7531_mac_config (struct dsa_switch *ds,int port,unsigned int mode,phy_interface_t interface)@@ -2704,6 +2693,9 @@ mt753x_mac_config(struct dsa_switch *ds, int port, unsigned int mode, {struct mt7530_priv *priv = ds->priv; +if (!priv->info->mac_port_config) +return 0 ; +return priv->info->mac_port_config (ds, port, mode, state->interface); }@@ -3157,7 +3149,6 @@ const struct mt753x_info mt753x_table[] = { .pad_setup = mt7988_pad_setup, .cpu_port_config = mt7988_cpu_port_config, .mac_port_get_caps = mt7988_mac_port_get_caps, - .mac_port_config = mt7988_mac_config, }, };EXPORT_SYMBOL_GPL (mt753x_table);
drivers/net/dsa/mt7530.c mt7530_probe_common(struct mt7530_priv *priv) · line 3180
Quoted 6 lines
drivers/net/dsa/mt7530.c +1
-2@@ -3186,8 +3177,7 @@ mt7530_probe_common(struct mt7530_priv *priv)*/ if (!priv->info->sw_setup || !priv->info->pad_setup || !priv->info->phy_read_c22 || !priv->info->phy_write_c22 || - !priv->info->mac_port_get_caps || - !priv->info->mac_port_config) + !priv->info->mac_port_get_caps)
Why split the sanity check? Isn't just removing mt7988_mac_config() and .mac_port_config = mt7988_mac_config enough?
Arınç
Quoted 139 lines · Arınç ÜNAL
Quoted 138 lines · Daniel Golle
Quoted 84 lines · Arınç ÜNAL
Quoted 74 lines · Daniel Golle
Quoted 64 lines · Arınç ÜNAL
Quoted 54 lines · Russell King (Oracle)
Quoted 39 lines · On Thu, Apr 06, 2023 at 01:04:45PM +0300, [email protected] wrote:
From: Arınç ÜNAL <[email protected]>
On the switch on the MT7988 SoC, there are only 4 PHYs. There's only port 6 as the CPU port, there's no port 5. Split the switch statement with a check to enforce these for the switch on the MT7988 SoC. The internal phy-mode is specific to MT7988 so put it for MT7988 only.
Signed-off-by Arınç ÜNAL <[email protected]>---
Daniel, this is based on the information you provided me about the switch. I will add this to my current patch series if it looks good to you.
Arınç
---
drivers/net/dsa/mt7530.c| 67
++++++++++++++++++++++++++--------------1 file changed, 43 insertions(+), 24 deletions(-)drivers/net/dsa/mt7530.c +1
-3@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port, phy_interface_zero(config->supported_interfaces); switch (port) { - case 0 ... 4: /* Internal phy */ + case 0 ... 3: /* Internal phy */ __set_bit(PHY_INTERFACE_MODE_INTERNAL, config->supported_interfaces); break;@@ -2710,37 +2710,56 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode, struct mt7530_priv *priv = ds->priv; u32 mcr_cur, mcr_new; - switch (port) { - case 0 ... 4: /* Internal phy */drivers/net/dsa/mt7530.c mt753x_phylink_mac_config(struct · line 2716
Quoted 10 lines
drivers/net/dsa/mt7530.c +4
-6- if (state->interface != PHY_INTERFACE_MODE_GMII && - state->interface != PHY_INTERFACE_MODE_INTERNAL) - goto unsupported; - break; - case 5: /* Port 5, a CPU port. */ - if (priv->p5_interface == state->interface) + if (priv->id == ID_MT7988) { + switch (port) { + case 0 ... 3: /* Internal phy */ + if (state->interface != PHY_INTERFACE_MODE_INTERNAL)How do these end up with
PHY_INTERFACE_MODE_INTERNAL? phylib defaults to GMII mode without something else being specified in DT.Quoted 5 lines
Also note that you should *not* be validating
state->interfacein themac_config()method because it's way too late to reject it - if you get an unsupported interface here, then that is down to theget_caps()method being buggy. Only report interfaces inget_caps()that you are prepared to handle in the rest of the system.This is already the case for all three
get_caps(). The supported interfaces for each port are properly defined.Quoted 8 lines
Though
mt7988_mac_port_get_caps()clears theconfig->supported_interfacesbitmap before reporting the supported interfaces. I don't think this is needed as all bits in the bitmap should already be initialized to zero when thephylink_configstructure is allocated.I'm not sure if your suggestion is to make sure the supported interfaces are properly reported on
get_caps(), or validatestate->interfacesomewhere else.Quoted 8 lines
I think what Russell meant is just there is no point in being overly precise about permitted interface modes in
mt753x_phylink_mac_config, as this function is not meant and called too late to validate the validity of the selected interface mode.You change to
mt7988_mac_port_get_capslooks correct to me and doing this will already preventmt753x_phylink_mac_configfrom ever being called on MT7988 for port == 4 as well as and port == 5.Quoted 8 lines
Ah, thanks for pointing this out Daniel. I see
ds->ops->phylink_get_caps()is run right beforephylink_create()ondsa_port_phylink_create(), as it should get the capabilities before creating an instance.Should I remove
phy_interface_zero(config->supported_interfaces);mt7988_mac_port_get_caps()? I'd prefer to do identical operations on eachget_caps(), if there's no apparent reason for this to be onmt7988_mac_port_get_caps().Yes, sounds sane to me, please do so.
Also we could make .mac_port_config optional, as for MT7988 we actually won't need it at all:
drivers/net/dsa/mt7530.c +0
-11@@ -2653,17 +2653,6 @@ static bool mt753x_is_mac_port(u32 port) return (port == 5 || port == 6); } -static int -mt7988_mac_config (struct dsa_switch *ds,int port,unsigned int mode, - phy_interface_t interface) -{ - if (dsa_is_cpu_port(ds, port) && - interface == PHY_INTERFACE_MODE_INTERNAL) - return 0; - - return -EINVAL; -} -static int
mt7531_mac_config(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface)drivers/net/dsa/mt7530.c +3
-1@@ -2704,6 +2693,9 @@ mt753x_mac_config(struct dsa_switch *ds, int port, unsigned int mode, { struct mt7530_priv *priv = ds->priv; + if (!priv->info->mac_port_config) + return 0; + return priv->info->mac_port_config(ds, port, mode, state->interface); }@@ -3157,7 +3149,6 @@ const struct mt753x_info mt753x_table[] = { .pad_setup = mt7988_pad_setup, .cpu_port_config = mt7988_cpu_port_config, .mac_port_get_caps = mt7988_mac_port_get_caps, - .mac_port_config = mt7988_mac_config, }, }; EXPORT_SYMBOL_GPL(mt753x_table);@@ -3186,8 +3177,7 @@ mt7530_probe_common(struct mt7530_priv *priv)
Quoted 8 lines
Quoted 6 lines
drivers/net/dsa/mt7530.c +0
-0*/ if (!priv->info->sw_setup || !priv->info->pad_setup || !priv->info->phy_read_c22 || !priv->info->phy_write_c22 || - !priv->info->mac_port_get_caps ||
- !priv->info->mac_port_config)
+ !priv->info->mac_port_get_caps)Why split the sanity check? Isn't just removing
mt7988_mac_config()and .mac_port_config =mt7988_mac_configenough?
Nevermind, it is necessary. I confused the return logic. This looks good to me. Should I take this to my current series? It will conflict with sanity check changes as I also remove pad_setup from there.
Arınç
Daniel Golle
maintainerQuoted 168 lines · Arınç ÜNAL
Quoted 158 lines · Arınç ÜNAL
Quoted 157 lines · Daniel Golle
Quoted 104 lines · Arınç ÜNAL
Quoted 89 lines · Daniel Golle
Quoted 82 lines · Arınç ÜNAL
Quoted 62 lines · Russell King (Oracle)
Quoted 45 lines · On Thu, Apr 06, 2023 at 01:04:45PM +0300, [email protected] wrote:
From: Arınç ÜNAL <[email protected]>
On the switch on the MT7988 SoC, there are only
4 PHYs. There's only port 6
as the CPU port, there's no port 5. Split the
switch statement with a check
to enforce these for the switch on the MT7988
SoC. The internal phy-mode is
specific to MT7988 so put it for MT7988 only.Signed-off-by Arınç ÜNAL <[email protected]>---
Daniel, this is based on the information you
provided me about the switch.
I will add this to my current patch series if it looks good to you.Arınç
---
drivers/net/dsa/mt7530.c| 67
++++++++++++++++++++++++++--------------1 file changed, 43 insertions(+), 24 deletions(-)drivers/net/dsa/mt7530.c +1
-1@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port, phy_interface_zero(config->supported_interfaces); switch (port) { - case 0 ... 4: /* Internal phy */ + case 0 ... 3: /* Internal phy */ __set_bit(PHY_INTERFACE_MODE_INTERNAL, config->supported_interfaces);break;
drivers/net/dsa/mt7530.c +0
-2@@ -2710,37 +2710,56 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode, struct mt7530_priv *priv = ds->priv; u32 mcr_cur, mcr_new; - switch (port) { - case 0 ... 4: /* Internal phy */drivers/net/dsa/mt7530.c line 2717
Quoted 10 lines
drivers/net/dsa/mt7530.c +4
-6- if (state->interface != PHY_INTERFACE_MODE_GMII && - state->interface != PHY_INTERFACE_MODE_INTERNAL) - goto unsupported; - break; - case 5: /* Port 5, a CPU port. */ - if (priv->p5_interface == state->interface) + if (priv->id == ID_MT7988) { + switch (port) { + case 0 ... 3: /* Internal phy */ + if (state->interface != PHY_INTERFACE_MODE_INTERNAL)How do these end up with
PHY_INTERFACE_MODE_INTERNAL? phylib defaults
to GMII mode without something else being specified in DT.Quoted 6 lines
Also note that you should *not* be validating
state->interfacein themac_config()method because it's way too late to
reject it - if you get
an unsupported interface here, then that is down to theget_caps()method being buggy. Only report interfaces inget_caps()that you are prepared to handle in the rest of the system.This is already the case for all three
get_caps(). The supported interfaces
for each port are properly defined.Though
mt7988_mac_port_get_caps()clears theconfig->supported_interfaces
bitmap before reporting the supported interfaces. I don't think this is
needed as all bits in the bitmap should already be initialized to zero when
thephylink_configstructure is allocated.Quoted 5 lines
I'm not sure if your suggestion is to make sure the supported interfaces are
properly reported onget_caps(), or validatestate->interfacesomewhere
else.Quoted 8 lines
I think what Russell meant is just there is no point in being overly precise about permitted interface modes in
mt753x_phylink_mac_config, as this function is not meant and called too late to validate the validity of the selected interface mode.You change to
mt7988_mac_port_get_capslooks correct to me and doing this will already preventmt753x_phylink_mac_configfrom ever being called on MT7988 for port == 4 as well as and port == 5.Ah, thanks for pointing this out Daniel. I see
ds->ops->phylink_get_caps()
is run right beforephylink_create()ondsa_port_phylink_create(), as it should get the capabilities before creating an instance.Quoted 5 lines
Should I remove
phy_interface_zero(config->supported_interfaces);mt7988_mac_port_get_caps()? I'd prefer to do identical operations on eachget_caps(), if there's no apparent reason for this to be onmt7988_mac_port_get_caps().Yes, sounds sane to me, please do so.
Also we could make .mac_port_config optional, as for MT7988 we actually won't need it at all:
drivers/net/dsa/mt7530.c +0
-11@@ -2653,17 +2653,6 @@ static bool mt753x_is_mac_port(u32 port) return (port == 5 || port == 6); } -static int -mt7988_mac_config (struct dsa_switch *ds,int port,unsigned int mode, - phy_interface_t interface) -{ - if (dsa_is_cpu_port(ds, port) && - interface == PHY_INTERFACE_MODE_INTERNAL) - return 0; - - return -EINVAL; -} -static int
mt7531_mac_config(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface)drivers/net/dsa/mt7530.c +3
-1@@ -2704,6 +2693,9 @@ mt753x_mac_config(struct dsa_switch *ds, int port, unsigned int mode, { struct mt7530_priv *priv = ds->priv; + if (!priv->info->mac_port_config) + return 0; + return priv->info->mac_port_config(ds, port, mode, state->interface); }@@ -3157,7 +3149,6 @@ const struct mt753x_info mt753x_table[] = { .pad_setup = mt7988_pad_setup, .cpu_port_config = mt7988_cpu_port_config, .mac_port_get_caps = mt7988_mac_port_get_caps, - .mac_port_config = mt7988_mac_config, }, }; EXPORT_SYMBOL_GPL(mt753x_table);@@ -3186,8 +3177,7 @@ mt7530_probe_common(struct mt7530_priv *priv)*/ Quoted 8 lines
Quoted 5 lines
if (!priv->info->sw_setup || !priv->info->pad_setup || !priv->info->phy_read_c22 || !priv->info->phy_write_c22 || - !priv->info->mac_port_get_caps ||
- !priv->info->mac_port_config)
+ !priv->info->mac_port_get_caps)Why split the sanity check? Isn't just removing
mt7988_mac_config()and .mac_port_config =mt7988_mac_configenough?
Quoted 3 lines
Nevermind, it is necessary. I confused the return logic. This looks good to me. Should I take this to my current series? It will conflict with sanity check changes as I also remove
pad_setupfrom there.
Yes please do so, I will review and test the whole series all together then later today.
Thank you!
Daniel
Daniel Golle
maintainerQuoted 136 lines · Arınç ÜNAL
Quoted 135 lines · Daniel Golle
Quoted 81 lines · Arınç ÜNAL
Quoted 71 lines · Daniel Golle
Quoted 61 lines · Arınç ÜNAL
Quoted 51 lines · Russell King (Oracle)
Quoted 36 lines · On Thu, Apr 06, 2023 at 01:04:45PM +0300, [email protected] wrote:
From: Arınç ÜNAL <[email protected]>
On the switch on the MT7988 SoC, there are only 4 PHYs. There's only port 6 as the CPU port, there's no port 5. Split the switch statement with a check to enforce these for the switch on the MT7988 SoC. The internal phy-mode is specific to MT7988 so put it for MT7988 only.
Signed-off-by Arınç ÜNAL <[email protected]>---
Daniel, this is based on the information you provided me about the switch. I will add this to my current patch series if it looks good to you.
Arınç
--- drivers/net/dsa/mt7530.c | 67 ++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 24 deletions(-)drivers/net/dsa/mt7530.c +1
-3@@ -2548,7 +2548,7 @@ static void mt7988_mac_port_get_caps(struct dsa_switch *ds, int port,phy_interface_zero (config->supported_interfaces);switch (port) { - case 0 ... 4: /* Internal phy */ + case 0 ... 3: /* Internal phy */__set_bit (PHY_INTERFACE_MODE_INTERNAL , config->supported_interfaces);break ;@@ -2710,37 +2710,56 @@ mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode,struct mt7530_priv *priv = ds->priv;u32 mcr_cur, mcr_new; -switch (port) { - case 0 ... 4: /* Internal phy */drivers/net/dsa/mt7530.c mt753x_phylink_mac_config(struct dsa_switch *ds, int port, unsigned int mode, · line 2715
Quoted 10 lines
drivers/net/dsa/mt7530.c +4
-6-if (state->interface !=PHY_INTERFACE_MODE_GMII && - state->interface !=PHY_INTERFACE_MODE_INTERNAL ) - goto unsupported; -break ; -case 5 :/* Port 5, a CPU port. */ -if (priv->p5_interface == state->interface) +if (priv->id ==ID_MT7988 ) { +switch (port) { + case 0 ... 3: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_INTERNAL )How do these end up with
PHY_INTERFACE_MODE_INTERNAL? phylib defaults to GMII mode without something else being specified in DT.Quoted 5 lines
Also note that you should *not* be validating
state->interfacein themac_config()method because it's way too late to reject it - if you get an unsupported interface here, then that is down to theget_caps()method being buggy. Only report interfaces inget_caps()that you are prepared to handle in the rest of the system.This is already the case for all three
get_caps(). The supported interfaces for each port are properly defined.Quoted 8 lines
Though
mt7988_mac_port_get_caps()clears theconfig->supported_interfacesbitmap before reporting the supported interfaces. I don't think this is needed as all bits in the bitmap should already be initialized to zero when thephylink_configstructure is allocated.I'm not sure if your suggestion is to make sure the supported interfaces are properly reported on
get_caps(), or validatestate->interfacesomewhere else.Quoted 8 lines
I think what Russell meant is just there is no point in being overly precise about permitted interface modes in
mt753x_phylink_mac_config, as this function is not meant and called too late to validate the validity of the selected interface mode.You change to
mt7988_mac_port_get_capslooks correct to me and doing this will already preventmt753x_phylink_mac_configfrom ever being called on MT7988 for port == 4 as well as and port == 5.Quoted 8 lines
Ah, thanks for pointing this out Daniel. I see
ds->ops->phylink_get_caps()is run right beforephylink_create()ondsa_port_phylink_create(), as it should get the capabilities before creating an instance.Should I remove
phy_interface_zero(config->supported_interfaces);mt7988_mac_port_get_caps()? I'd prefer to do identical operations on eachget_caps(), if there's no apparent reason for this to be onmt7988_mac_port_get_caps().Yes, sounds sane to me, please do so.
Also we could make .mac_port_config optional, as for MT7988 we actually won't need it at all:
drivers/net/dsa/mt7530.c +3
-12@@ -2653,17 +2653,6 @@ static bool mt753x_is_mac_port(u32 port)return (port ==5 || port ==6 ); } -static int -mt7988_mac_config (struct dsa_switch *ds,int port,unsigned int mode, -phy_interface_t interface) -{ -if (dsa_is_cpu_port (ds, port) && - interface ==PHY_INTERFACE_MODE_INTERNAL ) -return 0 ; - -return -EINVAL ; -} -static int mt7531_mac_config (struct dsa_switch *ds,int port,unsigned int mode,phy_interface_t interface)@@ -2704,6 +2693,9 @@ mt753x_mac_config(struct dsa_switch *ds, int port, unsigned int mode, {struct mt7530_priv *priv = ds->priv; +if (!priv->info->mac_port_config) +return 0 ; +return priv->info->mac_port_config (ds, port, mode, state->interface); }@@ -3157,7 +3149,6 @@ const struct mt753x_info mt753x_table[] = { .pad_setup = mt7988_pad_setup, .cpu_port_config = mt7988_cpu_port_config, .mac_port_get_caps = mt7988_mac_port_get_caps, - .mac_port_config = mt7988_mac_config, }, };EXPORT_SYMBOL_GPL (mt753x_table);@@ -3186,8 +3177,7 @@ mt7530_probe_common(struct mt7530_priv *priv)*/
Quoted 8 lines
drivers/net/dsa/mt7530.c mt7530_probe_common(struct mt7530_priv *priv) · line 3180
Quoted 5 lines
drivers/net/dsa/mt7530.c +1
-2if (!priv->info->sw_setup || !priv->info->pad_setup || !priv->info->phy_read_c22 || !priv->info->phy_write_c22 || - !priv->info->mac_port_get_caps || - !priv->info->mac_port_config) + !priv->info->mac_port_get_caps)Why split the sanity check? Isn't just removing
mt7988_mac_config()and .mac_port_config =mt7988_mac_configenough?
No, because the sanity check currently requires a pointer to a mac_port_config function to be non-NULL. If we want to make it optional then we'll also have to skip that in the santity check which will otherwise fail.