| Message ID | 20220111182252.58682-1-markus@notsyncing.net |
|---|---|
| State | Accepted |
| Commit | eab18b3b06bd914f623c3e8e9d2a905b8cea7366 |
| Delegated to: | Ramon Fried |
| Headers | show |
| Series | [v3] net: fsl: Fix busy flag polling register | expand |
> -----Original Message----- > From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Markus Koch > Sent: Tuesday, January 11, 2022 20:23 > To: Camelia Alexandra Groza <camelia.groza@nxp.com>; > joe.hershberger@ni.com; rfried.dev@gmail.com > Cc: Madalin Bucur (OSS) <madalin.bucur@oss.nxp.com>; Ioana Ciornei > <ioana.ciornei@nxp.com>; u-boot@lists.denx.de; Markus Koch > <markus@notsyncing.net> > Subject: [PATCH v3] net: fsl: Fix busy flag polling register > > 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> > --- > v1->v2: > * Fix register > v2->v3: > * Also apply fix to fsl_ls_mdio > * Add note about define-removal in commit message > > Thanks, Camelia! Thanks for the patch. Reviewed-by: Camelia Groza <camelia.groza@nxp.com>
On Wed, Jan 12, 2022 at 12:50 PM Camelia Alexandra Groza (OSS) <camelia.groza@oss.nxp.com> wrote: > > > -----Original Message----- > > From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Markus Koch > > Sent: Tuesday, January 11, 2022 20:23 > > To: Camelia Alexandra Groza <camelia.groza@nxp.com>; > > joe.hershberger@ni.com; rfried.dev@gmail.com > > Cc: Madalin Bucur (OSS) <madalin.bucur@oss.nxp.com>; Ioana Ciornei > > <ioana.ciornei@nxp.com>; u-boot@lists.denx.de; Markus Koch > > <markus@notsyncing.net> > > Subject: [PATCH v3] net: fsl: Fix busy flag polling register > > > > 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> > > --- > > v1->v2: > > * Fix register > > v2->v3: > > * Also apply fix to fsl_ls_mdio > > * Add note about define-removal in commit message > > > > Thanks, Camelia! > > Thanks for the patch. > > Reviewed-by: Camelia Groza <camelia.groza@nxp.com> > Applied to u-boot-net/next Thanks !
diff --git a/drivers/net/fm/memac_phy.c b/drivers/net/fm/memac_phy.c index 72b500a6d1..3ddae97e09 100644 --- a/drivers/net/fm/memac_phy.c +++ b/drivers/net/fm/memac_phy.c @@ -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(®s->mdio_data) & MDIO_DATA_BSY) && timeout--) + while ((memac_in_32(®s->mdio_stat) & MDIO_STAT_BSY) && timeout--) ; if (!timeout) { diff --git a/drivers/net/fsl_ls_mdio.c b/drivers/net/fsl_ls_mdio.c index 6d4e682fdf..f213e0dd85 100644 --- a/drivers/net/fsl_ls_mdio.c +++ b/drivers/net/fsl_ls_mdio.c @@ -84,7 +84,7 @@ static int dm_fsl_ls_mdio_read(struct udevice *dev, int addr, memac_out_32(®s->mdio_ctl, mdio_ctl); /* Wait till the MDIO write is complete */ - while ((memac_in_32(®s->mdio_data)) & MDIO_DATA_BSY) + while ((memac_in_32(®s->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(®s->mdio_data, MDIO_DATA(val)); /* Wait till the MDIO write is complete */ - while ((memac_in_32(®s->mdio_data)) & MDIO_DATA_BSY) + while ((memac_in_32(®s->mdio_stat)) & MDIO_STAT_BSY) ; return 0; diff --git a/include/fsl_memac.h b/include/fsl_memac.h index d067f1511c..6ac1e558b9 100644 --- a/include/fsl_memac.h +++ b/include/fsl_memac.h @@ -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;
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> --- v1->v2: * Fix register v2->v3: * Also apply fix to fsl_ls_mdio * Add note about define-removal in commit message Thanks, Camelia! drivers/net/fm/memac_phy.c | 2 +- drivers/net/fsl_ls_mdio.c | 4 ++-- include/fsl_memac.h | 1 - 3 files changed, 3 insertions(+), 4 deletions(-)