michael/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: fsl: Fix busy flag polling register

Browse Source 
NXP's mEMAC reference manual, Chapter 6.5.5 "MDIO Ethernet Management
Interface usage", specifies to poll the BSY (0) bit in the CFG/STAT
register to wait until a transaction has finished, not bit 31 in the
data register.

In the Linux kernel, this has already been fixed in commit 26eee0210ad7
("net/fsl: fix a bug in xgmac_mdio").

This patch changes the register in the fman_mdio and fsl_ls_mdio
drivers.

As the MDIO_DATA_BSY define is no longer in use, this patch also removes
its definition from the fsl_memac header.

Signed-off-by: Markus Koch <markus@notsyncing.net>
Reviewed-by: Camelia Groza <camelia.groza@nxp.com>
This commit is contained in:
Markus Koch
2022-01-11 19:22:54 +01:00
committed by Ramon Fried
parent 766ba78375
commit eab18b3b06
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/fm/memac_phy.c
View File

@@ -64,7 +64,7 @@ static int memac_wait_until_done(struct memac_mdio_controller *regs)
{
unsigned int timeout = MAX_NUM_RETRIES;
while ((memac_in_32(&regs->mdio_data) & MDIO_DATA_BSY) && timeout--)
while ((memac_in_32(&regs->mdio_stat) & MDIO_STAT_BSY) && timeout--)
;
if (!timeout) {

4
drivers/net/fsl_ls_mdio.c
View File

@@ -84,7 +84,7 @@ static int dm_fsl_ls_mdio_read(struct udevice *dev, int addr,
memac_out_32(&regs->mdio_ctl, mdio_ctl);
/* Wait till the MDIO write is complete */
while ((memac_in_32(&regs->mdio_data)) & MDIO_DATA_BSY)
while ((memac_in_32(&regs->mdio_stat)) & MDIO_STAT_BSY)
;
/* Return all Fs if nothing was there */
@@ -107,7 +107,7 @@ static int dm_fsl_ls_mdio_write(struct udevice *dev, int addr, int devad,
memac_out_32(&regs->mdio_data, MDIO_DATA(val));
/* Wait till the MDIO write is complete */
while ((memac_in_32(&regs->mdio_data)) & MDIO_DATA_BSY)
while ((memac_in_32(&regs->mdio_stat)) & MDIO_STAT_BSY)
;
return 0;

1
include/fsl_memac.h
View File

@@ -254,7 +254,6 @@ struct memac_mdio_controller {
#define MDIO_CTL_READ (1 << 15)
#define MDIO_DATA(x) (x & 0xffff)
#define MDIO_DATA_BSY (1 << 31)
struct fsl_enet_mac;