From: Voon Weifeng <[email protected]>
Set all EHL/TGL phy_addr to -1 so that the driver will automatically
detect it at run-time by probing all the possible 32 addresses.
Signed-off-by: Voon Weifeng <[email protected]>
Signed-off-by: Wong Vee Khee <[email protected]>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index b6e5e3e36b63..7c1353f37247 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -236,6 +236,7 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
int ret;
int i;
+ plat->phy_addr = -1;
plat->clk_csr = 5;
plat->has_gmac = 0;
plat->has_gmac4 = 1;
@@ -345,7 +346,6 @@ static int ehl_sgmii_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat)
{
plat->bus_id = 1;
- plat->phy_addr = 0;
plat->phy_interface = PHY_INTERFACE_MODE_SGMII;
plat->serdes_powerup = intel_serdes_powerup;
@@ -362,7 +362,6 @@ static int ehl_rgmii_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat)
{
plat->bus_id = 1;
- plat->phy_addr = 0;
plat->phy_interface = PHY_INTERFACE_MODE_RGMII;
return ehl_common_data(pdev, plat);
@@ -376,7 +375,6 @@ static int ehl_pse0_common_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat)
{
plat->bus_id = 2;
- plat->phy_addr = 1;
return ehl_common_data(pdev, plat);
}
@@ -408,7 +406,6 @@ static int ehl_pse1_common_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat)
{
plat->bus_id = 3;
- plat->phy_addr = 1;
return ehl_common_data(pdev, plat);
}
@@ -450,7 +447,6 @@ static int tgl_sgmii_data(struct pci_dev *pdev,
struct plat_stmmacenet_data *plat)
{
plat->bus_id = 1;
- plat->phy_addr = 0;
plat->phy_interface = PHY_INTERFACE_MODE_SGMII;
plat->serdes_powerup = intel_serdes_powerup;
plat->serdes_powerdown = intel_serdes_powerdown;
--
2.17.0
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
On Fri, 6 Nov 2020 17:43:41 +0800 you wrote:
> From: Voon Weifeng <[email protected]>
>
> Set all EHL/TGL phy_addr to -1 so that the driver will automatically
> detect it at run-time by probing all the possible 32 addresses.
>
> Signed-off-by: Voon Weifeng <[email protected]>
> Signed-off-by: Wong Vee Khee <[email protected]>
>
> [...]
Here is the summary with links:
- [net-next,1/1] stmmac: intel: change all EHL/TGL to auto detect phy addr
https://git.kernel.org/netdev/net-next/c/bff6f1db91e3
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
On 06.11.20 10:43, Wong Vee Khee wrote:
> From: Voon Weifeng <[email protected]>
>
> Set all EHL/TGL phy_addr to -1 so that the driver will automatically
> detect it at run-time by probing all the possible 32 addresses.
>
> Signed-off-by: Voon Weifeng <[email protected]>
> Signed-off-by: Wong Vee Khee <[email protected]>
> ---
> drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
> index b6e5e3e36b63..7c1353f37247 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
> @@ -236,6 +236,7 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
> int ret;
> int i;
>
> + plat->phy_addr = -1;
> plat->clk_csr = 5;
> plat->has_gmac = 0;
> plat->has_gmac4 = 1;
> @@ -345,7 +346,6 @@ static int ehl_sgmii_data(struct pci_dev *pdev,
> struct plat_stmmacenet_data *plat)
> {
> plat->bus_id = 1;
> - plat->phy_addr = 0;
> plat->phy_interface = PHY_INTERFACE_MODE_SGMII;
>
> plat->serdes_powerup = intel_serdes_powerup;
> @@ -362,7 +362,6 @@ static int ehl_rgmii_data(struct pci_dev *pdev,
> struct plat_stmmacenet_data *plat)
> {
> plat->bus_id = 1;
> - plat->phy_addr = 0;
> plat->phy_interface = PHY_INTERFACE_MODE_RGMII;
>
> return ehl_common_data(pdev, plat);
> @@ -376,7 +375,6 @@ static int ehl_pse0_common_data(struct pci_dev *pdev,
> struct plat_stmmacenet_data *plat)
> {
> plat->bus_id = 2;
> - plat->phy_addr = 1;
> return ehl_common_data(pdev, plat);
> }
>
> @@ -408,7 +406,6 @@ static int ehl_pse1_common_data(struct pci_dev *pdev,
> struct plat_stmmacenet_data *plat)
> {
> plat->bus_id = 3;
> - plat->phy_addr = 1;
> return ehl_common_data(pdev, plat);
> }
>
> @@ -450,7 +447,6 @@ static int tgl_sgmii_data(struct pci_dev *pdev,
> struct plat_stmmacenet_data *plat)
> {
> plat->bus_id = 1;
> - plat->phy_addr = 0;
> plat->phy_interface = PHY_INTERFACE_MODE_SGMII;
> plat->serdes_powerup = intel_serdes_powerup;
> plat->serdes_powerdown = intel_serdes_powerdown;
>
This fixes PHY detection on one of our EHL-based boards. Can this also
be applied to stable 5.10?
Thanks,
Jan
--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux
On Sat, 16 Jan 2021 10:12:21 +0100 Jan Kiszka wrote:
> On 06.11.20 10:43, Wong Vee Khee wrote:
> > From: Voon Weifeng <[email protected]>
> >
> > Set all EHL/TGL phy_addr to -1 so that the driver will automatically
> > detect it at run-time by probing all the possible 32 addresses.
> >
> > Signed-off-by: Voon Weifeng <[email protected]>
> > Signed-off-by: Wong Vee Khee <[email protected]>
>
> This fixes PHY detection on one of our EHL-based boards. Can this also
> be applied to stable 5.10?
Sure.
Greg, we'd like to request a backport of the following commit to 5.10.
commit bff6f1db91e330d7fba56f815cdbc412c75fe163
Author: Voon Weifeng <[email protected]>
Date: Fri Nov 6 17:43:41 2020 +0800
stmmac: intel: change all EHL/TGL to auto detect phy addr
Set all EHL/TGL phy_addr to -1 so that the driver will automatically
detect it at run-time by probing all the possible 32 addresses.
Signed-off-by: Voon Weifeng <[email protected]>
Signed-off-by: Wong Vee Khee <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
It's relatively small, and Jan reports it makes his boards detect the
PHY. The change went in via -next and into Linus's tree during the 5.11
merge window.
On Sat, Jan 16, 2021 at 04:59:14PM -0800, Jakub Kicinski wrote:
> On Sat, 16 Jan 2021 10:12:21 +0100 Jan Kiszka wrote:
> > On 06.11.20 10:43, Wong Vee Khee wrote:
> > > From: Voon Weifeng <[email protected]>
> > >
> > > Set all EHL/TGL phy_addr to -1 so that the driver will automatically
> > > detect it at run-time by probing all the possible 32 addresses.
> > >
> > > Signed-off-by: Voon Weifeng <[email protected]>
> > > Signed-off-by: Wong Vee Khee <[email protected]>
> >
> > This fixes PHY detection on one of our EHL-based boards. Can this also
> > be applied to stable 5.10?
>
> Sure.
>
> Greg, we'd like to request a backport of the following commit to 5.10.
>
> commit bff6f1db91e330d7fba56f815cdbc412c75fe163
> Author: Voon Weifeng <[email protected]>
> Date: Fri Nov 6 17:43:41 2020 +0800
>
> stmmac: intel: change all EHL/TGL to auto detect phy addr
>
> Set all EHL/TGL phy_addr to -1 so that the driver will automatically
> detect it at run-time by probing all the possible 32 addresses.
>
> Signed-off-by: Voon Weifeng <[email protected]>
> Signed-off-by: Wong Vee Khee <[email protected]>
> Link: https://lore.kernel.org/r/[email protected]
> Signed-off-by: Jakub Kicinski <[email protected]>
>
>
> It's relatively small, and Jan reports it makes his boards detect the
> PHY. The change went in via -next and into Linus's tree during the 5.11
> merge window.
Now queued up, thanks.
greg k-h