| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20200714142213.21365-1-marek.behun@nic.cz>
Date: Tue, 14 Jul 2020 16:22:12 +0200
From: Marek Behún <marek.behun@....cz>
To: netdev@...r.kernel.org
Cc: Russell King <linux@...linux.org.uk>,
"David S . Miller" <davem@...emloft.net>,
Andrew Lunn <andrew@...n.ch>,
Marek Behún <marek.behun@....cz>
Subject: [PATCH net-next v1 1/2] net: mdiobus: add support to access PHY registers via debugfs
This adds config option CONFIG_MDIO_BUS_DEBUGFS which, when enabled,
adds support to communicate with the devices connected to the MDIO
via debugfs.
For every MDIO bus this creates directory
/sys/kernel/debug/mdio_bus/MDIO_BUS_NAME
with files "addr", "reg" and "val".
User can write device address to the "addr" file and register number to
the "reg" file, and then can read the value of the register from the
"val" file, or can write new value by writing to the "val" file.
This is useful when debugging various PHYs or switches.
Signed-off-by: Marek Behún <marek.behun@....cz>
---
drivers/net/phy/Kconfig | 8 ++++++++
drivers/net/phy/Makefile | 2 ++
drivers/net/phy/mdio_bus.c | 31 ++++++++++++++++++++++++++-----
include/linux/phy.h | 5 +++++
4 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index dd20c2c27c2f..aca4b52225b1 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -24,6 +24,14 @@ if MDIO_BUS
config MDIO_DEVRES
tristate
+config MDIO_BUS_DEBUGFS
+ bool "MDIO bus debugfs support"
+ depends on DEBUG_FS
+ help
+ This adds support to communicate via the MDIO bus via files in
+ debugfs. Note that using this on a PHY device that is being handled by
+ a driver can break the state of the PHY.
+
config MDIO_ASPEED
tristate "ASPEED MDIO bus controller"
depends on ARCH_ASPEED || COMPILE_TEST
diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile
index d84bab489a53..4500050faf64 100644
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -5,6 +5,8 @@ libphy-y := phy.o phy-c45.o phy-core.o phy_device.o \
linkmode.o
mdio-bus-y += mdio_bus.o mdio_device.o
+obj-$(CONFIG_MDIO_BUS_DEBUGFS) += mdio_debugfs.o
+
ifdef CONFIG_MDIO_DEVICE
obj-y += mdio-boardinfo.o
endif
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 46b33701ad4b..b31fa70dbd95 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -39,6 +39,7 @@
#include <trace/events/mdio.h>
#include "mdio-boardinfo.h"
+#include "mdio_debugfs.h"
static int mdiobus_register_gpiod(struct mdio_device *mdiodev)
{
@@ -576,6 +577,12 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
}
}
+ err = mdiobus_register_debugfs(bus);
+ if (err) {
+ dev_err(&bus->dev, "mii_bus %s couldn't create debugfs entries\n", bus->id);
+ goto error;
+ }
+
mdiobus_setup_mdiodev_from_board_info(bus, mdiobus_create_device);
bus->state = MDIOBUS_REGISTERED;
@@ -609,6 +616,8 @@ void mdiobus_unregister(struct mii_bus *bus)
BUG_ON(bus->state != MDIOBUS_REGISTERED);
bus->state = MDIOBUS_UNREGISTERED;
+ mdiobus_unregister_debugfs(bus);
+
for (i = 0; i < PHY_MAX_ADDR; i++) {
mdiodev = bus->mdio_map[i];
if (!mdiodev)
@@ -1005,12 +1014,23 @@ int __init mdio_bus_init(void)
int ret;
ret = class_register(&mdio_bus_class);
- if (!ret) {
- ret = bus_register(&mdio_bus_type);
- if (ret)
- class_unregister(&mdio_bus_class);
- }
+ if (ret)
+ return ret;
+ ret = bus_register(&mdio_bus_type);
+ if (ret)
+ goto err_class;
+
+ ret = mdiobus_debugfs_init();
+ if (ret)
+ goto err_bus;
+
+ return 0;
+
+err_bus:
+ bus_unregister(&mdio_bus_type);
+err_class:
+ class_unregister(&mdio_bus_class);
return ret;
}
EXPORT_SYMBOL_GPL(mdio_bus_init);
@@ -1018,6 +1038,7 @@ EXPORT_SYMBOL_GPL(mdio_bus_init);
#if IS_ENABLED(CONFIG_PHYLIB)
void mdio_bus_exit(void)
{
+ mdiobus_debugfs_exit();
class_unregister(&mdio_bus_class);
bus_unregister(&mdio_bus_type);
}
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 0403eb799913..e281099fb526 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -309,6 +309,11 @@ struct mii_bus {
/* shared state across different PHYs */
struct phy_package_shared *shared[PHY_MAX_ADDR];
+
+#if IS_ENABLED(CONFIG_MDIO_BUS_DEBUGFS)
+ /* address and regnum for debugfs */
+ u32 debug_addr, debug_reg;
+#endif
};
#define to_mii_bus(d) container_of(d, struct mii_bus, dev)
--
2.26.2
Powered by blists - more mailing lists