Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08303170 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "net: ethernet: stmmac: fix altr_tse_pcs function when using a fixed-link" 

This reverts commit edba120f which is
commit a6aaa00324240967272b451bfa772547bd576ee6 upstream.

Pavel reports that it causes boot issues, so revert it for now.

Link: https://lore.kernel.org/r/20220429074341.GB1423@amd


Reported-by: default avatarPavel Machek <pavel@denx.de>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0dd02ff7

drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.c

+8 −0
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ 
#define TSE_PCS_USE_SGMII_ENA				BIT(0)

#define TSE_PCS_IF_USE_SGMII				0x03



#define SGMII_ADAPTER_CTRL_REG				0x00

#define SGMII_ADAPTER_DISABLE				0x0001

#define SGMII_ADAPTER_ENABLE				0x0000



#define AUTONEGO_LINK_TIMER				20



static int tse_pcs_reset(void __iomem *base, struct tse_pcs *pcs)
@@ -211,8 +215,12 @@ void tse_pcs_fix_mac_speed(struct tse_pcs *pcs, struct phy_device *phy_dev, 
			   unsigned int speed)

{

	void __iomem *tse_pcs_base = pcs->tse_pcs_base;

	void __iomem *sgmii_adapter_base = pcs->sgmii_adapter_base;

	u32 val;



	writew(SGMII_ADAPTER_ENABLE,

	       sgmii_adapter_base + SGMII_ADAPTER_CTRL_REG);



	pcs->autoneg = phy_dev->autoneg;



	if (phy_dev->autoneg == AUTONEG_ENABLE) {

drivers/net/ethernet/stmicro/stmmac/altr_tse_pcs.h

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ 
#include <linux/phy.h>

#include <linux/timer.h>



#define SGMII_ADAPTER_CTRL_REG		0x00

#define SGMII_ADAPTER_ENABLE		0x0000

#define SGMII_ADAPTER_DISABLE		0x0001



struct tse_pcs {

	struct device *dev;

	void __iomem *tse_pcs_base;

drivers/net/ethernet/stmicro/stmmac/dwmac-socfpga.c

+8 −5
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 


#include "altr_tse_pcs.h"



#define SGMII_ADAPTER_CTRL_REG                          0x00

#define SGMII_ADAPTER_DISABLE                           0x0001



#define SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_GMII_MII 0x0

#define SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII 0x1

#define SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RMII 0x2
@@ -62,12 +65,14 @@ static void socfpga_dwmac_fix_mac_speed(void *priv, unsigned int speed) 
{

	struct socfpga_dwmac *dwmac = (struct socfpga_dwmac *)priv;

	void __iomem *splitter_base = dwmac->splitter_base;

	void __iomem *tse_pcs_base = dwmac->pcs.tse_pcs_base;

	void __iomem *sgmii_adapter_base = dwmac->pcs.sgmii_adapter_base;

	struct device *dev = dwmac->dev;

	struct net_device *ndev = dev_get_drvdata(dev);

	struct phy_device *phy_dev = ndev->phydev;

	u32 val;



	if ((tse_pcs_base) && (sgmii_adapter_base))

		writew(SGMII_ADAPTER_DISABLE,

		       sgmii_adapter_base + SGMII_ADAPTER_CTRL_REG);
@@ -91,9 +96,7 @@ static void socfpga_dwmac_fix_mac_speed(void *priv, unsigned int speed) 
		writel(val, splitter_base + EMAC_SPLITTER_CTRL_REG);

	}



	writew(SGMII_ADAPTER_ENABLE,

	       sgmii_adapter_base + SGMII_ADAPTER_CTRL_REG);

	if (phy_dev)

	if (tse_pcs_base && sgmii_adapter_base)

		tse_pcs_fix_mac_speed(&dwmac->pcs, phy_dev, speed);

}