Skip to content

Commit

Permalink
net: dsa: microchip: Improve phy mode message
Browse files Browse the repository at this point in the history
Always print the selected phy mode for the CPU port when using the
ksz9477 driver. If the phy mode was changed, also print the previous
mode to aid in debugging.

To make the message more clear, prefix it with the port number which it
applies to and improve the language a little.

Signed-off-by: Paul Barker <pbarker@konsulko.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Paul Barker authored and David S. Miller committed Sep 9, 2020
1 parent 3c85f77 commit 805a7e6
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions drivers/net/dsa/microchip/ksz9477.c
Original file line number Diff line number Diff line change
Expand Up @@ -1265,6 +1265,8 @@ static void ksz9477_config_cpu_port(struct dsa_switch *ds)
for (i = 0; i < dev->port_cnt; i++) {
if (dsa_is_cpu_port(ds, i) && (dev->cpu_ports & (1 << i))) {
phy_interface_t interface;
const char *prev_msg;
const char *prev_mode;

dev->cpu_port = i;
dev->host_mask = (1 << dev->cpu_port);
Expand All @@ -1277,11 +1279,19 @@ static void ksz9477_config_cpu_port(struct dsa_switch *ds)
interface = ksz9477_get_interface(dev, i);
if (!dev->interface)
dev->interface = interface;
if (interface && interface != dev->interface)
dev_info(dev->dev,
"use %s instead of %s\n",
phy_modes(dev->interface),
phy_modes(interface));
if (interface && interface != dev->interface) {
prev_msg = " instead of ";
prev_mode = phy_modes(interface);
} else {
prev_msg = "";
prev_mode = "";
}
dev_info(dev->dev,
"Port%d: using phy mode %s%s%s\n",
i,
phy_modes(dev->interface),
prev_msg,
prev_mode);

/* enable cpu port */
ksz9477_port_setup(dev, i, true);
Expand Down

0 comments on commit 805a7e6

Please sign in to comment.