net: phy: fixed_phy: replace list of fixed PHYs with static array
Subsystems (3)
Heiner Kallweit
maintainerv2 cover net: phy: fixed_phy: replace list of fixed PHYs with static array
Due to max 32 PHY addresses being available per mii bus, using a list can't support more fixed PHY's. And there's no known use case for as much as 32 fixed PHY's on a system. 8 should be plenty of fixed PHY's, so use an array of that size instead of a list. This allows to significantly reduce the code size and complexity.
In addition replace heavy-weight IDA with a simple bitmap.
Heiner Kallweit (2):
net: phy: fixed_phy: replace list of fixed PHYs with static array
net: phy: fixed_phy: replace IDA with a bitmap
drivers/net/phy/fixed_phy.c | 83 +++++++++++++------------------------ 1 file changed, 29 insertions(+), 54 deletions(-)
Signature · 1 line
2.52.0
Heiner Kallweit
maintainerPATCH v2 1/2 net: phy: fixed_phy: replace list of fixed PHYs with static array
Due to max 32 PHY addresses being available per mii bus, using a list can't support more fixed PHY's. And there's no known use case for as much as 32 fixed PHY's on a system. 8 should be plenty of fixed PHY's, so use an array of that size instead of a list. This allows to significantly reduce the code size and complexity.
--- drivers/net/phy/fixed_phy.c | 69 +++++++++---------------------------- 1 file changed, 17 insertions(+), 52 deletions(-)
drivers/net/phy/fixed_phy.c +17 -52
@@ -10,7 +10,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/list.h> #include <linux/mii.h> #include <linux/phy.h> #include <linux/phy_fixed.h>
@@ -22,27 +21,24 @@#include "swphy.h" +/* The DSA loop driver may allocate 4 fixed PHY's, and 4 additional +* fixed PHY's for a system should be sufficient. +*/ +#define NUM_FP 8 +struct fixed_phy { -int addr;struct phy_device *phydev;struct fixed_phy_status status;int (*link_update)(struct net_device *,struct fixed_phy_status *); -struct list_head node; }; +static struct fixed_phy fmb_fixed_phys[NUM_FP ];static struct mii_bus *fmb_mii_bus; -static LIST_HEAD (fmb_phys); +static DEFINE_IDA (phy_fixed_ida);static struct fixed_phy *fixed_phy_find (int addr) { -struct fixed_phy *fp; - -list_for_each_entry (fp, &fmb_phys, node) { -if (fp->addr == addr) -return fp; - } - -return NULL ; +return ida_exists (&phy_fixed_ida, addr) ? fmb_fixed_phys + addr :NULL ; }int fixed_phy_change_carrier (struct net_device *dev,bool new_carrier)
@@ -108,31 +104,6 @@ int fixed_phy_set_link_update(struct phy_device *phydev, }EXPORT_SYMBOL_GPL (fixed_phy_set_link_update); -static int __fixed_phy_add (int phy_addr, -const struct fixed_phy_status *status) -{ -struct fixed_phy *fp; -int ret; - - ret =swphy_validate_state (status); -if (ret <0 ) -return ret; - - fp =kzalloc (sizeof (*fp),GFP_KERNEL ); -if (!fp) -return -ENOMEM ; - - fp->addr = phy_addr; - fp->status = *status; - fp->status.link = true; - -list_add_tail (&fp->node, &fmb_phys); - -return 0 ; -} - -static DEFINE_IDA (phy_fixed_ida); -static void fixed_phy_del (int phy_addr) {struct fixed_phy *fp;
@@ -141,8 +112,7 @@ static void fixed_phy_del(int phy_addr)if (!fp)return ; -list_del (&fp->node); -kfree (fp); +memset (fp,0 ,sizeof (*fp));ida_free (&phy_fixed_ida, phy_addr); }
@@ -153,19 +123,20 @@ struct phy_device *fixed_phy_register(const struct fixed_phy_status *status,int phy_addr;int ret; + ret =swphy_validate_state (status); +if (ret <0 ) +return ERR_PTR (ret); +if (!fmb_mii_bus || fmb_mii_bus->state !=MDIOBUS_REGISTERED )return ERR_PTR (-EPROBE_DEFER ); -/* Get the next available PHY address, up to PHY_MAX_ADDR */ - phy_addr =ida_alloc_max (&phy_fixed_ida,PHY_MAX_ADDR -1 ,GFP_KERNEL ); +/* Get the next available PHY address, up to NUM_FP */ + phy_addr =ida_alloc_max (&phy_fixed_ida,NUM_FP -1 ,GFP_KERNEL );if (phy_addr <0 )return ERR_PTR (phy_addr); - ret =__fixed_phy_add (phy_addr, status); -if (ret <0 ) { -ida_free (&phy_fixed_ida, phy_addr); -return ERR_PTR (ret); - } + fmb_fixed_phys[phy_addr].status = *status; + fmb_fixed_phys[phy_addr].status.link = true; phy =get_phy_device (fmb_mii_bus, phy_addr, false);if (IS_ERR (phy)) {
@@ -237,15 +208,9 @@ module_init(fixed_mdio_bus_init); static void __exit fixed_mdio_bus_exit(void) { -struct fixed_phy *fp, *tmp; -mdiobus_unregister (fmb_mii_bus);mdiobus_free (fmb_mii_bus); -list_for_each_entry_safe (fp, tmp, &fmb_phys, node) { -list_del (&fp->node); -kfree (fp); - }ida_destroy (&phy_fixed_ida); }module_exit (fixed_mdio_bus_exit);
Signature · 1 line
2.52.0
Heiner Kallweit
maintainerPATCH v2 2/2 net: phy: fixed_phy: replace IDA with a bitmap
In reply to Heiner KallweitSize of array fmb_fixed_phys is small, so we can use a simple bitmap instead of an IDA to manage dynamic allocation of fixed PHY's. find_first_zero_bit() isn't atomic, so we need the loop to rule out double allocation of a PHY address.
---
v2:
- patch added
--- drivers/net/phy/fixed_phy.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
drivers/net/phy/fixed_phy.c +17 -7
@@ -16,7 +16,6 @@#include <linux/err.h> #include <linux/slab.h> #include <linux/of.h> -#include <linux/idr.h> #include <linux/netdevice.h> #include "swphy.h"
@@ -32,13 +31,13 @@ struct fixed_phy {int (*link_update)(struct net_device *,struct fixed_phy_status *); }; +static DECLARE_BITMAP(fixed_phy_ids, NUM_FP);static struct fixed_phy fmb_fixed_phys[NUM_FP ];static struct mii_bus *fmb_mii_bus; -static DEFINE_IDA (phy_fixed_ida);static struct fixed_phy *fixed_phy_find (int addr) { -return ida_exists (&phy_fixed_ida, addr) ? fmb_fixed_phys + addr :NULL ; +return test_bit (addr, fixed_phy_ids) ? fmb_fixed_phys + addr :NULL ; }int fixed_phy_change_carrier (struct net_device *dev,bool new_carrier)
@@ -113,7 +112,20 @@ static void fixed_phy_del(int phy_addr)return ;memset (fp,0 ,sizeof (*fp)); -ida_free (&phy_fixed_ida, phy_addr); +clear_bit (phy_addr, fixed_phy_ids); +} + +static int fixed_phy_get_free_addr (void ) +{ +int addr; + +do { + addr =find_first_zero_bit (fixed_phy_ids,NUM_FP ); +if (addr ==NUM_FP ) +return -ENOSPC ; + }while (test_and_set_bit (addr, fixed_phy_ids)); + +return addr; } struct phy_device *fixed_phy_register(const struct fixed_phy_status *status,
@@ -131,7 +143,7 @@ struct phy_device *fixed_phy_register(const struct fixed_phy_status *status,return ERR_PTR (-EPROBE_DEFER );/* Get the next available PHY address, up to NUM_FP */ - phy_addr =ida_alloc_max (&phy_fixed_ida,NUM_FP -1 ,GFP_KERNEL ); + phy_addr =fixed_phy_get_free_addr ();if (phy_addr <0 )return ERR_PTR (phy_addr);
@@ -210,8 +222,6 @@ static void __exit fixed_mdio_bus_exit(void) {mdiobus_unregister (fmb_mii_bus);mdiobus_free (fmb_mii_bus); - -ida_destroy (&phy_fixed_ida); }module_exit (fixed_mdio_bus_exit);
Signature · 1 line
2.52.0
Hello Heiner,
Quoted 7 lines · Heiner Kallweit
Due to max 32 PHY addresses being available per mii bus, using a list can't support more fixed PHY's. And there's no known use case for as much as 32 fixed PHY's on a system. 8 should be plenty of fixed PHY's, so use an array of that size instead of a list. This allows to significantly reduce the code size and complexity.
In addition replace heavy-weight IDA with a simple bitmap.
Quoted 7 lines
Heiner Kallweit (2):
net: phy:fixed_phy: replace list of fixed PHYs with static array
net: phy:fixed_phy: replace IDA with a bitmapdrivers/net/phy/fixed_phy.c | 83 +++++++++++++------------------------ 1 file changed, 29 insertions(+), 54 deletions(-)
I've tested this on a few boards that use fixed-link (A turris omnia, a custom board with ksz9477), and the code LGTM :) I think 8 fixed-phy is good for now, and the way you implemented that makes it trivial to change that if need be.
For the series,
Maxime
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Sun, 11 Jan 2026 13:40:30 +0100 you wrote:
Due to max 32 PHY addresses being available per mii bus, using a list can't support more fixed PHY's. And there's no known use case for as much as 32 fixed PHY's on a system. 8 should be plenty of fixed PHY's, so use an array of that size instead of a list. This allows to significantly reduce the code size and complexity.
In addition replace heavy-weight IDA with a simple bitmap.[...]
Here is the summary with links:
- [net-next,v2,1/2] net: phy: fixed_phy: replace list of fixed PHYs with static array
https://git.kernel.org/netdev/net-next/c/511cb4526022 - [net-next,v2,2/2] net: phy: fixed_phy: replace IDA with a bitmap https://git.kernel.org/netdev/net-next/c/ca8934f80c4f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html