Patch "net: dsa: seville: ignore mscc-miim read errors from Lynx PCS" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    net: dsa: seville: ignore mscc-miim read errors from Lynx PCS

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-dsa-seville-ignore-mscc-miim-read-errors-from-ly.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 9c627210e7177ad215828b69bbf1ea7150c1b995
Author: Vladimir Oltean <vladimir.oltean@xxxxxxx>
Date:   Fri Feb 24 17:52:33 2023 +0200

    net: dsa: seville: ignore mscc-miim read errors from Lynx PCS
    
    [ Upstream commit 0322ef49c1ac6f0e2ef37b146c0bf8440873072c ]
    
    During the refactoring in the commit below, vsc9953_mdio_read() was
    replaced with mscc_miim_read(), which has one extra step: it checks for
    the MSCC_MIIM_DATA_ERROR bits before returning the result.
    
    On T1040RDB, there are 8 QSGMII PCSes belonging to the switch, and they
    are organized in 2 groups. First group responds to MDIO addresses 4-7
    because QSGMIIACR1[MDEV_PORT] is 1, and the second group responds to
    MDIO addresses 8-11 because QSGMIIBCR1[MDEV_PORT] is 2. I have double
    checked that these values are correctly set in the SERDES, as well as
    PCCR1[QSGMA_CFG] and PCCR1[QSGMB_CFG] are both 0b01.
    
    mscc_miim_read: phyad 8 reg 0x1 MIIM_DATA 0x2d
    mscc_miim_read: phyad 8 reg 0x5 MIIM_DATA 0x5801
    mscc_miim_read: phyad 8 reg 0x1 MIIM_DATA 0x2d
    mscc_miim_read: phyad 8 reg 0x5 MIIM_DATA 0x5801
    mscc_miim_read: phyad 9 reg 0x1 MIIM_DATA 0x2d
    mscc_miim_read: phyad 9 reg 0x5 MIIM_DATA 0x5801
    mscc_miim_read: phyad 9 reg 0x1 MIIM_DATA 0x2d
    mscc_miim_read: phyad 9 reg 0x5 MIIM_DATA 0x5801
    mscc_miim_read: phyad 10 reg 0x1 MIIM_DATA 0x2d
    mscc_miim_read: phyad 10 reg 0x5 MIIM_DATA 0x5801
    mscc_miim_read: phyad 10 reg 0x1 MIIM_DATA 0x2d
    mscc_miim_read: phyad 10 reg 0x5 MIIM_DATA 0x5801
    mscc_miim_read: phyad 11 reg 0x1 MIIM_DATA 0x2d
    mscc_miim_read: phyad 11 reg 0x5 MIIM_DATA 0x5801
    mscc_miim_read: phyad 11 reg 0x1 MIIM_DATA 0x2d
    mscc_miim_read: phyad 11 reg 0x5 MIIM_DATA 0x5801
    mscc_miim_read: phyad 4 reg 0x1 MIIM_DATA 0x3002d, ERROR
    mscc_miim_read: phyad 4 reg 0x5 MIIM_DATA 0x3da01, ERROR
    mscc_miim_read: phyad 5 reg 0x1 MIIM_DATA 0x3002d, ERROR
    mscc_miim_read: phyad 5 reg 0x5 MIIM_DATA 0x35801, ERROR
    mscc_miim_read: phyad 5 reg 0x1 MIIM_DATA 0x3002d, ERROR
    mscc_miim_read: phyad 5 reg 0x5 MIIM_DATA 0x35801, ERROR
    mscc_miim_read: phyad 6 reg 0x1 MIIM_DATA 0x3002d, ERROR
    mscc_miim_read: phyad 6 reg 0x5 MIIM_DATA 0x35801, ERROR
    mscc_miim_read: phyad 6 reg 0x1 MIIM_DATA 0x3002d, ERROR
    mscc_miim_read: phyad 6 reg 0x5 MIIM_DATA 0x35801, ERROR
    mscc_miim_read: phyad 7 reg 0x1 MIIM_DATA 0x3002d, ERROR
    mscc_miim_read: phyad 7 reg 0x5 MIIM_DATA 0x35801, ERROR
    mscc_miim_read: phyad 7 reg 0x1 MIIM_DATA 0x3002d, ERROR
    mscc_miim_read: phyad 7 reg 0x5 MIIM_DATA 0x35801, ERROR
    
    As can be seen, the data in MIIM_DATA is still valid despite having the
    MSCC_MIIM_DATA_ERROR bits set. The driver as introduced in commit
    84705fc16552 ("net: dsa: felix: introduce support for Seville VSC9953
    switch") was ignoring these bits, perhaps deliberately (although
    unbeknownst to me).
    
    This is an old IP and the hardware team cannot seem to be able to help
    me track down a plausible reason for these failures. I'll keep
    investigating, but in the meantime, this is a direct regression which
    must be restored to a working state.
    
    The only thing I can do is keep ignoring the errors as before.
    
    Fixes: b99658452355 ("net: dsa: ocelot: felix: utilize shared mscc-miim driver for indirect MDIO access")
    Signed-off-by: Vladimir Oltean <vladimir.oltean@xxxxxxx>
    Reviewed-by: Florian Fainelli <f.fainelli@xxxxxxxxx>
    Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/dsa/ocelot/seville_vsc9953.c b/drivers/net/dsa/ocelot/seville_vsc9953.c
index 7af33b2c685da..c2863d6d870fb 100644
--- a/drivers/net/dsa/ocelot/seville_vsc9953.c
+++ b/drivers/net/dsa/ocelot/seville_vsc9953.c
@@ -923,8 +923,8 @@ static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot)
 
 	rc = mscc_miim_setup(dev, &bus, "VSC9953 internal MDIO bus",
 			     ocelot->targets[GCB],
-			     ocelot->map[GCB][GCB_MIIM_MII_STATUS & REG_MASK]);
-
+			     ocelot->map[GCB][GCB_MIIM_MII_STATUS & REG_MASK],
+			     true);
 	if (rc) {
 		dev_err(dev, "failed to setup MDIO bus\n");
 		return rc;
diff --git a/drivers/net/mdio/mdio-mscc-miim.c b/drivers/net/mdio/mdio-mscc-miim.c
index 51f68daac152f..34b87389788bb 100644
--- a/drivers/net/mdio/mdio-mscc-miim.c
+++ b/drivers/net/mdio/mdio-mscc-miim.c
@@ -52,6 +52,7 @@ struct mscc_miim_info {
 struct mscc_miim_dev {
 	struct regmap *regs;
 	int mii_status_offset;
+	bool ignore_read_errors;
 	struct regmap *phy_regs;
 	const struct mscc_miim_info *info;
 	struct clk *clk;
@@ -138,7 +139,7 @@ static int mscc_miim_read(struct mii_bus *bus, int mii_id, int regnum)
 		goto out;
 	}
 
-	if (val & MSCC_MIIM_DATA_ERROR) {
+	if (!miim->ignore_read_errors && !!(val & MSCC_MIIM_DATA_ERROR)) {
 		ret = -EIO;
 		goto out;
 	}
@@ -218,7 +219,8 @@ static const struct regmap_config mscc_miim_phy_regmap_config = {
 };
 
 int mscc_miim_setup(struct device *dev, struct mii_bus **pbus, const char *name,
-		    struct regmap *mii_regmap, int status_offset)
+		    struct regmap *mii_regmap, int status_offset,
+		    bool ignore_read_errors)
 {
 	struct mscc_miim_dev *miim;
 	struct mii_bus *bus;
@@ -240,6 +242,7 @@ int mscc_miim_setup(struct device *dev, struct mii_bus **pbus, const char *name,
 
 	miim->regs = mii_regmap;
 	miim->mii_status_offset = status_offset;
+	miim->ignore_read_errors = ignore_read_errors;
 
 	*pbus = bus;
 
@@ -291,7 +294,7 @@ static int mscc_miim_probe(struct platform_device *pdev)
 		return dev_err_probe(dev, PTR_ERR(phy_regmap),
 				     "Unable to create phy register regmap\n");
 
-	ret = mscc_miim_setup(dev, &bus, "mscc_miim", mii_regmap, 0);
+	ret = mscc_miim_setup(dev, &bus, "mscc_miim", mii_regmap, 0, false);
 	if (ret < 0) {
 		dev_err(dev, "Unable to setup the MDIO bus\n");
 		return ret;
diff --git a/include/linux/mdio/mdio-mscc-miim.h b/include/linux/mdio/mdio-mscc-miim.h
index 5b4ed2c3cbb9a..1ce699740af63 100644
--- a/include/linux/mdio/mdio-mscc-miim.h
+++ b/include/linux/mdio/mdio-mscc-miim.h
@@ -14,6 +14,6 @@
 
 int mscc_miim_setup(struct device *device, struct mii_bus **bus,
 		    const char *name, struct regmap *mii_regmap,
-		    int status_offset);
+		    int status_offset, bool ignore_read_errors);
 
 #endif



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux