From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk> To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com> Cc: "Alexandre Belloni" <alexandre.belloni@bootlin.com>, "Alvin __ipraga" <alsi@bang-olufsen.dk>, "Claudiu Manoil" <claudiu.manoil@nxp.com>, "David S. Miller" <davem@davemloft.net>, "DENG Qingfang" <dqfext@gmail.com>, "Eric Dumazet" <edumazet@google.com>, "Florian Fainelli" <f.fainelli@gmail.com>, "George McCollister" <george.mccollister@gmail.com>, "Hauke Mehrtens" <hauke@hauke-m.de>, "Jakub Kicinski" <kuba@kernel.org>, "Kurt Kanzenbach" <kurt@linutronix.de>, "Landen Chao" <Landen.Chao@mediatek.com>, "Linus Walleij" <linus.walleij@linaro.org>, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, "Matthias Brugger" <matthias.bgg@gmail.com>, netdev@vger.kernel.org, "Paolo Abeni" <pabeni@redhat.com>, "Sean Wang" <sean.wang@mediatek.com>, UNGLinuxDriver@microchip.com, "Vivien Didelot" <vivien.didelot@gmail.com>, "Vladimir Oltean" <olteanv@gmail.com>, "Woojung Huh" <woojung.huh@microchip.com>, "Marek Behún" <kabel@kernel.org> Subject: [PATCH RFC net-next 2/6] net: dsa: mv88e6xxx: report the default interface mode for the port Date: Wed, 29 Jun 2022 13:51:27 +0100 [thread overview] Message-ID: <E1o6XAF-004pVi-Ue@rmk-PC.armlinux.org.uk> (raw) In-Reply-To: <YrxKdVmBzeMsVjsH@shell.armlinux.org.uk> Report the maximum speed interface mode for the port, or if we don't have that information, the hardware configured interface mode for the port. This allows phylink to know which interface mode CPU and DSA ports are operating, which will be necessary when we want to select the maximum speed for the port (required for such ports without a PHY or fixed-link specified in firmware.) Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- drivers/net/dsa/mv88e6xxx/chip.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index f98be98551ef..1c6b4b00d58d 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -823,6 +823,7 @@ static void mv88e6xxx_get_caps(struct dsa_switch *ds, int port, phy_interface_t *default_interface) { struct mv88e6xxx_chip *chip = ds->priv; + u8 cmode = chip->ports[port].cmode; chip->info->ops->phylink_get_caps(chip, port, config); @@ -830,6 +831,14 @@ static void mv88e6xxx_get_caps(struct dsa_switch *ds, int port, if (mv88e6xxx_phy_is_internal(ds, port)) __set_bit(PHY_INTERFACE_MODE_GMII, config->supported_interfaces); + + if (chip->info->ops->port_max_speed_mode) + *default_interface = chip->info->ops->port_max_speed_mode(port); + else if (cmode < ARRAY_SIZE(mv88e6xxx_phy_interface_modes) && + mv88e6xxx_phy_interface_modes[cmode]) + *default_interface = mv88e6xxx_phy_interface_modes[cmode]; + else if (cmode == MV88E6XXX_PORT_STS_CMODE_RGMII) + *default_interface = PHY_INTERFACE_MODE_RGMII; } static void mv88e6xxx_mac_config(struct dsa_switch *ds, int port, -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk> To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com> Cc: "Alexandre Belloni" <alexandre.belloni@bootlin.com>, "Alvin __ipraga" <alsi@bang-olufsen.dk>, "Claudiu Manoil" <claudiu.manoil@nxp.com>, "David S. Miller" <davem@davemloft.net>, "DENG Qingfang" <dqfext@gmail.com>, "Eric Dumazet" <edumazet@google.com>, "Florian Fainelli" <f.fainelli@gmail.com>, "George McCollister" <george.mccollister@gmail.com>, "Hauke Mehrtens" <hauke@hauke-m.de>, "Jakub Kicinski" <kuba@kernel.org>, "Kurt Kanzenbach" <kurt@linutronix.de>, "Landen Chao" <Landen.Chao@mediatek.com>, "Linus Walleij" <linus.walleij@linaro.org>, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, "Matthias Brugger" <matthias.bgg@gmail.com>, netdev@vger.kernel.org, "Paolo Abeni" <pabeni@redhat.com>, "Sean Wang" <sean.wang@mediatek.com>, UNGLinuxDriver@microchip.com, "Vivien Didelot" <vivien.didelot@gmail.com>, "Vladimir Oltean" <olteanv@gmail.com>, "Woojung Huh" <woojung.huh@microchip.com>, "Marek Behún" <kabel@kernel.org> Subject: [PATCH RFC net-next 2/6] net: dsa: mv88e6xxx: report the default interface mode for the port Date: Wed, 29 Jun 2022 13:51:27 +0100 [thread overview] Message-ID: <E1o6XAF-004pVi-Ue@rmk-PC.armlinux.org.uk> (raw) In-Reply-To: <YrxKdVmBzeMsVjsH@shell.armlinux.org.uk> Report the maximum speed interface mode for the port, or if we don't have that information, the hardware configured interface mode for the port. This allows phylink to know which interface mode CPU and DSA ports are operating, which will be necessary when we want to select the maximum speed for the port (required for such ports without a PHY or fixed-link specified in firmware.) Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- drivers/net/dsa/mv88e6xxx/chip.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index f98be98551ef..1c6b4b00d58d 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -823,6 +823,7 @@ static void mv88e6xxx_get_caps(struct dsa_switch *ds, int port, phy_interface_t *default_interface) { struct mv88e6xxx_chip *chip = ds->priv; + u8 cmode = chip->ports[port].cmode; chip->info->ops->phylink_get_caps(chip, port, config); @@ -830,6 +831,14 @@ static void mv88e6xxx_get_caps(struct dsa_switch *ds, int port, if (mv88e6xxx_phy_is_internal(ds, port)) __set_bit(PHY_INTERFACE_MODE_GMII, config->supported_interfaces); + + if (chip->info->ops->port_max_speed_mode) + *default_interface = chip->info->ops->port_max_speed_mode(port); + else if (cmode < ARRAY_SIZE(mv88e6xxx_phy_interface_modes) && + mv88e6xxx_phy_interface_modes[cmode]) + *default_interface = mv88e6xxx_phy_interface_modes[cmode]; + else if (cmode == MV88E6XXX_PORT_STS_CMODE_RGMII) + *default_interface = PHY_INTERFACE_MODE_RGMII; } static void mv88e6xxx_mac_config(struct dsa_switch *ds, int port, -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-06-29 12:51 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-29 12:49 [PATCH RFC net-next 0/6] net: dsa: always use phylink Russell King (Oracle) 2022-06-29 12:49 ` Russell King (Oracle) 2022-06-29 12:51 ` [PATCH RFC net-next 1/6] net: dsa: add support for retrieving the interface mode Russell King (Oracle) 2022-06-29 12:51 ` Russell King (Oracle) 2022-07-01 19:20 ` Marek Behún 2022-07-01 19:20 ` Marek Behún 2022-06-29 12:51 ` Russell King (Oracle) [this message] 2022-06-29 12:51 ` [PATCH RFC net-next 2/6] net: dsa: mv88e6xxx: report the default interface mode for the port Russell King (Oracle) 2022-07-01 19:25 ` Marek Behún 2022-07-01 19:25 ` Marek Behún 2022-06-29 12:51 ` [PATCH RFC net-next 3/6] net: phylink: split out interface to caps translation Russell King (Oracle) 2022-06-29 12:51 ` Russell King (Oracle) 2022-07-01 19:27 ` Marek Behún 2022-07-01 19:27 ` Marek Behún 2022-06-29 12:51 ` [PATCH RFC net-next 4/6] net: phylink: add phylink_set_max_fixed_link() Russell King (Oracle) 2022-06-29 12:51 ` Russell King (Oracle) 2022-07-01 19:31 ` Marek Behún 2022-07-01 19:31 ` Marek Behún 2022-06-29 12:51 ` [PATCH RFC net-next 5/6] net: dsa: always use phylink for CPU and DSA ports Russell King (Oracle) 2022-06-29 12:51 ` Russell King (Oracle) 2022-07-01 19:34 ` Marek Behún 2022-07-01 19:34 ` Marek Behún 2022-07-02 20:27 ` Russell King (Oracle) 2022-07-02 20:27 ` Russell King (Oracle) 2022-06-29 12:51 ` [PATCH RFC net-next 6/6] net: phylink: debug print Russell King (Oracle) 2022-06-29 12:51 ` Russell King (Oracle)
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=E1o6XAF-004pVi-Ue@rmk-PC.armlinux.org.uk \ --to=rmk+kernel@armlinux.org.uk \ --cc=Landen.Chao@mediatek.com \ --cc=UNGLinuxDriver@microchip.com \ --cc=alexandre.belloni@bootlin.com \ --cc=alsi@bang-olufsen.dk \ --cc=andrew@lunn.ch \ --cc=claudiu.manoil@nxp.com \ --cc=davem@davemloft.net \ --cc=dqfext@gmail.com \ --cc=edumazet@google.com \ --cc=f.fainelli@gmail.com \ --cc=george.mccollister@gmail.com \ --cc=hauke@hauke-m.de \ --cc=hkallweit1@gmail.com \ --cc=kabel@kernel.org \ --cc=kuba@kernel.org \ --cc=kurt@linutronix.de \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=matthias.bgg@gmail.com \ --cc=netdev@vger.kernel.org \ --cc=olteanv@gmail.com \ --cc=pabeni@redhat.com \ --cc=sean.wang@mediatek.com \ --cc=vivien.didelot@gmail.com \ --cc=woojung.huh@microchip.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.