Skip to content
Snippets Groups Projects
Commit 15a2acdf authored by Michal Simek's avatar Michal Simek
Browse files

common: miiphyutil: Work and report phy address in hex in mdio cmd


It is confusing that mdio commands work and report phy id as
decimal value when mii is working with hex values.

For example:
ZynqMP> mdio list
gem:
21 - TI DP83867 <--> ethernet@ff0e0000
ZynqMP> mdio read ethernet@ff0e0000 0
Reading from bus gem
PHY at address 21:
0 - 0x1140
ZynqMP> mii dump 21 0
Incorrect PHY address. Range should be 0-31
...
ZynqMP> mii dump 15
0.     (1140)                 -- PHY control register --
  (8000:0000) 0.15    =     0    reset

U-Boot normally takes hex values that's why this patch is changing mdio
command to handle hex instead of changing mii command to handle decimal
values.

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Reviewed-by: default avatarSimon Glass <sjg@chromium.org>
Acked-by: default avatarJoe Hershberger <joe.hershberger@ni.com>
parent 20ca6790
No related branches found
No related tags found
No related merge requests found
...@@ -27,12 +27,12 @@ static uint last_reg_hi; ...@@ -27,12 +27,12 @@ static uint last_reg_hi;
static int extract_range(char *input, int *plo, int *phi) static int extract_range(char *input, int *plo, int *phi)
{ {
char *end; char *end;
*plo = simple_strtol(input, &end, 0); *plo = simple_strtol(input, &end, 16);
if (end == input) if (end == input)
return -1; return -1;
if ((*end == '-') && *(++end)) if ((*end == '-') && *(++end))
*phi = simple_strtol(end, NULL, 0); *phi = simple_strtol(end, NULL, 16);
else if (*end == '\0') else if (*end == '\0')
*phi = *plo; *phi = *plo;
else else
...@@ -79,7 +79,7 @@ static int mdio_read_ranges(struct phy_device *phydev, struct mii_dev *bus, ...@@ -79,7 +79,7 @@ static int mdio_read_ranges(struct phy_device *phydev, struct mii_dev *bus,
printf("Reading from bus %s\n", bus->name); printf("Reading from bus %s\n", bus->name);
for (addr = addrlo; addr <= addrhi; addr++) { for (addr = addrlo; addr <= addrhi; addr++) {
printf("PHY at address %d:\n", addr); printf("PHY at address %x:\n", addr);
for (devad = devadlo; devad <= devadhi; devad++) { for (devad = devadlo; devad <= devadhi; devad++) {
for (reg = reglo; reg <= reghi; reg++) { for (reg = reglo; reg <= reghi; reg++) {
......
...@@ -135,7 +135,7 @@ void mdio_list_devices(void) ...@@ -135,7 +135,7 @@ void mdio_list_devices(void)
struct phy_device *phydev = bus->phymap[i]; struct phy_device *phydev = bus->phymap[i];
if (phydev) { if (phydev) {
printf("%d - %s", i, phydev->drv->name); printf("%x - %s", i, phydev->drv->name);
if (phydev->dev) if (phydev->dev)
printf(" <--> %s\n", phydev->dev->name); printf(" <--> %s\n", phydev->dev->name);
......
...@@ -706,7 +706,7 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev) ...@@ -706,7 +706,7 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
priv->emio = fdtdec_get_bool(gd->fdt_blob, dev->of_offset, "xlnx,emio"); priv->emio = fdtdec_get_bool(gd->fdt_blob, dev->of_offset, "xlnx,emio");
printf("ZYNQ GEM: %lx, phyaddr %d, interface %s\n", (ulong)priv->iobase, printf("ZYNQ GEM: %lx, phyaddr %x, interface %s\n", (ulong)priv->iobase,
priv->phyaddr, phy_string_for_interface(priv->interface)); priv->phyaddr, phy_string_for_interface(priv->interface));
return 0; return 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment