Commit 43ad352d authored by Milind Parab's avatar Milind Parab Committed by David S. Miller
Browse files

net: macb: add support for C45 MDIO read/write 



This patch modify MDIO read/write functions to support
communication with C45 PHY.

Signed-off-by: default avatarMilind Parab <mparab@cadence.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a4a52d4

drivers/net/ethernet/cadence/macb.h

+11 −4
Original line number Diff line number Diff line
@@ -630,10 +630,17 @@ 
#define GEM_CLK_DIV96				5



/* Constants for MAN register */

#define MACB_MAN_SOF				1

#define MACB_MAN_WRITE				1

#define MACB_MAN_READ				2

#define MACB_MAN_CODE				2

#define MACB_MAN_C22_SOF			1

#define MACB_MAN_C22_WRITE			1

#define MACB_MAN_C22_READ			2

#define MACB_MAN_C22_CODE			2



#define MACB_MAN_C45_SOF			0

#define MACB_MAN_C45_ADDR			0

#define MACB_MAN_C45_WRITE			1

#define MACB_MAN_C45_POST_READ_INCR		2

#define MACB_MAN_C45_READ			3

#define MACB_MAN_C45_CODE			2



/* Capability mask bits */

#define MACB_CAPS_ISR_CLEAR_ON_WRITE		0x00000001

drivers/net/ethernet/cadence/macb_main.c

+50 −11
Original line number Diff line number Diff line
@@ -337,11 +337,30 @@ static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum) 
	if (status < 0)

		goto mdio_read_exit;



	macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_SOF)

			      | MACB_BF(RW, MACB_MAN_READ)

	if (regnum & MII_ADDR_C45) {

		macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF)

			    | MACB_BF(RW, MACB_MAN_C45_ADDR)

			    | MACB_BF(PHYA, mii_id)

			    | MACB_BF(REGA, (regnum >> 16) & 0x1F)

			    | MACB_BF(DATA, regnum & 0xFFFF)

			    | MACB_BF(CODE, MACB_MAN_C45_CODE)));



		status = macb_mdio_wait_for_idle(bp);

		if (status < 0)

			goto mdio_read_exit;



		macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF)

			    | MACB_BF(RW, MACB_MAN_C45_READ)

			    | MACB_BF(PHYA, mii_id)

			    | MACB_BF(REGA, (regnum >> 16) & 0x1F)

			    | MACB_BF(CODE, MACB_MAN_C45_CODE)));

	} else {

		macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C22_SOF)

				| MACB_BF(RW, MACB_MAN_C22_READ)

				| MACB_BF(PHYA, mii_id)

				| MACB_BF(REGA, regnum)

			      | MACB_BF(CODE, MACB_MAN_CODE)));

				| MACB_BF(CODE, MACB_MAN_C22_CODE)));

	}



	status = macb_mdio_wait_for_idle(bp);

	if (status < 0)
@@ -370,12 +389,32 @@ static int macb_mdio_write(struct mii_bus *bus, int mii_id, int regnum, 
	if (status < 0)

		goto mdio_write_exit;



	macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_SOF)

			      | MACB_BF(RW, MACB_MAN_WRITE)

	if (regnum & MII_ADDR_C45) {

		macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF)

			    | MACB_BF(RW, MACB_MAN_C45_ADDR)

			    | MACB_BF(PHYA, mii_id)

			    | MACB_BF(REGA, (regnum >> 16) & 0x1F)

			    | MACB_BF(DATA, regnum & 0xFFFF)

			    | MACB_BF(CODE, MACB_MAN_C45_CODE)));



		status = macb_mdio_wait_for_idle(bp);

		if (status < 0)

			goto mdio_write_exit;



		macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C45_SOF)

			    | MACB_BF(RW, MACB_MAN_C45_WRITE)

			    | MACB_BF(PHYA, mii_id)

			    | MACB_BF(REGA, (regnum >> 16) & 0x1F)

			    | MACB_BF(CODE, MACB_MAN_C45_CODE)

			    | MACB_BF(DATA, value)));

	} else {

		macb_writel(bp, MAN, (MACB_BF(SOF, MACB_MAN_C22_SOF)

				| MACB_BF(RW, MACB_MAN_C22_WRITE)

				| MACB_BF(PHYA, mii_id)

				| MACB_BF(REGA, regnum)

			      | MACB_BF(CODE, MACB_MAN_CODE)

				| MACB_BF(CODE, MACB_MAN_C22_CODE)

				| MACB_BF(DATA, value)));

	}



	status = macb_mdio_wait_for_idle(bp);

	if (status < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE