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

Commit ff96a397 authored by Fugang Duan's avatar Fugang Duan Committed by Greg Kroah-Hartman
Browse files

net: fec: don't dump RX FIFO register when not available 



[ Upstream commit ec20a63a ]

Commit db65f35f ("net: fec: add support of ethtool get_regs") introduce
ethool "--register-dump" interface to dump all FEC registers.

But not all silicon implementations of the Freescale FEC hardware module
have the FRBR (FIFO Receive Bound Register) and FRSR (FIFO Receive Start
Register) register, so we should not be trying to dump them on those that
don't.

To fix it we create a quirk flag, FEC_QUIRK_HAS_RFREG, and check it before
dump those RX FIFO registers.

Signed-off-by: default avatarFugang Duan <fugang.duan@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6bb1381c

drivers/net/ethernet/freescale/fec.h

+4 −0
Original line number Diff line number Diff line
@@ -451,6 +451,10 @@ struct bufdesc_ex { 
 * initialisation.

 */

#define FEC_QUIRK_MIB_CLEAR		(1 << 15)

/* Only i.MX25/i.MX27/i.MX28 controller supports FRBR,FRSR registers,

 * those FIFO receive registers are resolved in other platforms.

 */

#define FEC_QUIRK_HAS_FRREG		(1 << 16)



struct bufdesc_prop {

	int qid;

drivers/net/ethernet/freescale/fec_main.c

+12 −4
Original line number Diff line number Diff line
@@ -89,14 +89,16 @@ static struct platform_device_id fec_devtype[] = { 
		.driver_data = 0,

	}, {

		.name = "imx25-fec",

		.driver_data = FEC_QUIRK_USE_GASKET | FEC_QUIRK_MIB_CLEAR,

		.driver_data = FEC_QUIRK_USE_GASKET | FEC_QUIRK_MIB_CLEAR |

			       FEC_QUIRK_HAS_FRREG,

	}, {

		.name = "imx27-fec",

		.driver_data = FEC_QUIRK_MIB_CLEAR,

		.driver_data = FEC_QUIRK_MIB_CLEAR | FEC_QUIRK_HAS_FRREG,

	}, {

		.name = "imx28-fec",

		.driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_SWAP_FRAME |

				FEC_QUIRK_SINGLE_MDIO | FEC_QUIRK_HAS_RACC,

				FEC_QUIRK_SINGLE_MDIO | FEC_QUIRK_HAS_RACC |

				FEC_QUIRK_HAS_FRREG,

	}, {

		.name = "imx6q-fec",

		.driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |
@@ -2166,7 +2168,13 @@ static void fec_enet_get_regs(struct net_device *ndev, 
	memset(buf, 0, regs->len);



	for (i = 0; i < ARRAY_SIZE(fec_enet_register_offset); i++) {

		off = fec_enet_register_offset[i] / 4;

		off = fec_enet_register_offset[i];



		if ((off == FEC_R_BOUND || off == FEC_R_FSTART) &&

		    !(fep->quirks & FEC_QUIRK_HAS_FRREG))

			continue;



		off >>= 2;

		buf[off] = readl(&theregs[off]);

	}

}