phylib: Support phy module autoloading
Subsystems (5)
PATCH 1/2 phylib: Support phy module autoloading
We don't use the normal hotplug mechanism because it doesn't work. It will load the module some time after the device appears, but that's not good enough for us -- we need the driver loaded _immediately_ because otherwise the NIC driver may just abort and then the phy 'device' goes away.
Instead, we just issue a request_module() directly in phy_device_create().
The device aliases take the form 'phy:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' with a binary representation of the phy_id. This means that the "don't care" bits of driver's phy_id_mask can be question marks which modprobe will interpret correctly as wildcards.
So a driver with { .phy_id = 0x02345600, .phy_id_mask = 0x0fffff00 } will have an alias of phy:????00100011010001010110???????? and will be loaded whenever any matching phy is created by phy_device_create().
--- drivers/net/phy/phy_device.c | 13 +++++++++++++ include/linux/mod_devicetable.h | 20 ++++++++++++++++++++ include/linux/phy.h | 1 + scripts/mod/file2alias.c | 25 +++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 0 deletions(-)
drivers/net/phy/phy_device.c +13 -0
@@ -149,6 +149,8 @@ EXPORT_SYMBOL(phy_scan_fixups);struct phy_device *phy_device_create (struct mii_bus *bus,int addr,int phy_id) {struct phy_device *dev; +char modid[37 ]; +/* We allocate the device, and initialize the * default values */ dev =kzalloc (sizeof (*dev),GFP_KERNEL );
@@ -179,6 +181,17 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)mutex_init (&dev->lock);INIT_DELAYED_WORK (&dev->state_queue, phy_state_machine); +#ifdef CONFIG_MODULES +/* Request the appropriate module unconditionally. A hotplug +event would have done so anyway. But normal hotplug won't +work for MDIO -- because it relies on the device staying +around for long enough for the driver to get loaded. With +MDIO, the NIC driver will get bored and give up as soon +as it finds that there's no driver _already_ loaded. */ +sprintf (modid,"phy:" PHYID_FMT ,PHYID_ARGS (phy_id)); +request_module (modid); +#endif +return dev; }EXPORT_SYMBOL (phy_device_create);
include/linux/mod_devicetable.h +20 -0
@@ -474,4 +474,24 @@ struct platform_device_id { __attribute__((aligned(sizeof(kernel_ulong_t)))); }; +#define PHY_MODULE_PREFIX "phy:" + +#define PHYID_FMT "%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d" +#define PHYID_ARGS (_id) \ + (_id)>>31, ((_id)>>30) & 1, ((_id)>>29) & 1, ((_id)>>28) & 1, \ + ((_id)>>27) & 1, ((_id)>>26) & 1, ((_id)>>25) & 1, ((_id)>>24) & 1, \ + ((_id)>>23) & 1, ((_id)>>22) & 1, ((_id)>>21) & 1, ((_id)>>20) & 1, \ + ((_id)>>19) & 1, ((_id)>>18) & 1, ((_id)>>17) & 1, ((_id)>>16) & 1, \ + ((_id)>>15) & 1, ((_id)>>14) & 1, ((_id)>>13) & 1, ((_id)>>12) & 1, \ + ((_id)>>11) & 1, ((_id)>>10) & 1, ((_id)>>9) & 1, ((_id)>>8) & 1, \ + ((_id)>>7) & 1, ((_id)>>6) & 1, ((_id)>>5) & 1, ((_id)>>4) & 1, \ + ((_id)>>3) & 1, ((_id)>>2) & 1, ((_id)>>1) & 1, (_id) & 1 + + + +struct phy_device_id { +uint32_t phy_id; +uint32_t phy_id_mask; +}; +#endif /* LINUX_MOD_DEVICETABLE_H */
include/linux/phy.h +1 -0
@@ -24,6 +24,7 @@#include <linux/mii.h> #include <linux/timer.h> #include <linux/workqueue.h> +#include <linux/mod_devicetable.h> #include <asm/atomic.h>
scripts/mod/file2alias.c +25 -0
@@ -796,6 +796,27 @@ static int do_platform_entry(const char *filename,return 1 ; } +static int do_phy_entry (const char *filename, +struct phy_device_id *id,char *alias) +{ +char str[33 ]; +int i; + + str[32 ] =0 ; + +for (i =0 ; i <32 ; i++) { +if (!((id->phy_id_mask >> (31 -i)) &1 )) + str[i] ='?' ; +else if ((id->phy_id >> (31 -i)) &1 ) + str[i] ='1' ; +else + str[i] ='0' ; + } + +sprintf (alias,PHY_MODULE_PREFIX "%s" , str); +return 1 ; +} +/* Ignore any prefix, eg. some architectures prepend _ */ static inline int sym_is (const char *symbol,const char *name) {
@@ -943,6 +964,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,do_table (symval, sym->st_size,sizeof (struct platform_device_id ),"platform" , do_platform_entry, mod); + else if (sym_is(symname, "__mod_phy_device_table")) + do_table(symval, sym->st_size, + sizeof(struct phy_device_id), "phy", + do_phy_entry, mod);free (zeros ); }
Signature · 5 lines
1.6.6.1 -- David Woodhouse Open Source Technology Centre [email protected] Intel Corporation
Quoted 6 lines · David Woodhouse
We don't use the normal hotplug mechanism because it doesn't work. It will load the module some time after the device appears, but that's not good enough for us -- we need the driver loaded _immediately_ because otherwise the NIC driver may just abort and then the phy 'device' goes away.
Instead, we just issue a
request_module()directly inphy_device_create().
[...]
Thanks for doing this, David. I had a stab at it earlier when this problem was reported in Debian <http://bugs.debian.org/553024>. I didn't complete this because (a) I didn't understand all the details of adding new device table type, and (b) I tried to avoid duplicating information, which turns out to be rather difficult in modules with multiple drivers.
Since you've dealt with (a), and (b) is not really as important, I would just like to suggest some minor changes to your patch 1 (see below). Feel free to fold them in. Your patch 2 would then need the substitutions s/phy_device_id/mdio_device_id/; s/TABLE(phy/TABLE(mdio/.
Ben.
From: Ben Hutchings <[email protected]>
Date: Thu, 1 Apr 2010 05:03:02 +0100
Subject: [PATCH] phylib: Minor cleanup of phylib autoloading
Refer to MDIO, consistent with other module aliases using bus names. Change type names to __u32, consistent with the rest of the file. Add kernel-doc comment to struct mdio_device_id.
--- drivers/net/phy/phy_device.c | 2 +- include/linux/mod_devicetable.h | 22 ++++++++++++++-------- scripts/mod/file2alias.c | 8 ++++---- 3 files changed, 19 insertions(+), 13 deletions(-)
drivers/net/phy/phy_device.c +1 -1
@@ -188,7 +188,7 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)around for long enough for the driver to get loaded. With MDIO, the NIC driver will get bored and give up as soon as it finds that there's no driver _already_ loaded. */ -sprintf (modid,"phy:" PHYID_FMT ,PHYID_ARGS (phy_id)); + sprintf(modid, MDIO_MODULE_PREFIX MDIO_ID_FMT, MDIO_ID_ARGS(phy_id));request_module (modid);#endif
include/linux/mod_devicetable.h +14 -8
@@ -474,10 +474,10 @@ struct platform_device_id { __attribute__((aligned(sizeof(kernel_ulong_t)))); }; -#define PHY_MODULE_PREFIX "phy:" +#define MDIO_MODULE_PREFIX "mdio:" -#define PHYID_FMT "%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d" -#define PHYID_ARGS (_id) \ +#define MDIO_ID_FMT "%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d" +#define MDIO_ID_ARGS (_id) \ (_id)>>31, ((_id)>>30) & 1, ((_id)>>29) & 1, ((_id)>>28) & 1, \ ((_id)>>27) & 1, ((_id)>>26) & 1, ((_id)>>25) & 1, ((_id)>>24) & 1, \ ((_id)>>23) & 1, ((_id)>>22) & 1, ((_id)>>21) & 1, ((_id)>>20) & 1, \
@@ -487,11 +487,17 @@ struct platform_device_id { ((_id)>>7 ) &1 , ((_id)>>6 ) &1 , ((_id)>>5 ) &1 , ((_id)>>4 ) &1 , \ ((_id)>>3 ) &1 , ((_id)>>2 ) &1 , ((_id)>>1 ) &1 , (_id) &1 - - -struct phy_device_id { - uint32_t phy_id; -uint32_t phy_id_mask; +/** +* struct mdio_device_id - identifies PHY devices on an MDIO/MII bus +* @phy_id: The result of +* (mdio_read(&MII_PHYSID1) << 16 | mdio_read(&PHYSID2)) & @phy_id_mask +* for this PHY type +* @phy_id_mask: Defines the significant bits of @phy_id. A value of 0 +* is used to terminate an array of struct mdio_device_id. +*/ +struct mdio_device_id { + __u32 phy_id; +__u32 phy_id_mask; };#endif /* LINUX_MOD_DEVICETABLE_H */
scripts/mod/file2alias.c +4 -4
@@ -797,7 +797,7 @@ static int do_platform_entry(const char *filename, }static int do_phy_entry (const char *filename, -struct phy_device_id *id,char *alias) +struct mdio_device_id *id,char *alias) {char str[33 ];int i;
@@ -813,7 +813,7 @@ static int do_phy_entry(const char *filename, str[i] ='0' ; } -sprintf (alias,PHY_MODULE_PREFIX "%s" , str); +sprintf (alias,MDIO_MODULE_PREFIX "%s" , str);return 1 ; }
@@ -964,9 +964,9 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,do_table (symval, sym->st_size,sizeof (struct platform_device_id ),"platform" , do_platform_entry, mod); - else if (sym_is(symname, "__mod_phy_device_table")) + else if (sym_is(symname, "__mod_mdio_device_table")) do_table(symval, sym->st_size, - sizeof(struct phy_device_id), "phy", + sizeof(struct mdio_device_id), "phy", do_phy_entry, mod);free (zeros ); }
Signature · 6 lines
1.7.0.3 -- Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.
Quoted 7 lines · Ben Hutchings
Quoted 6 lines · David Woodhouse
We don't use the normal hotplug mechanism because it doesn't work. It will load the module some time after the device appears, but that's not good enough for us -- we need the driver loaded _immediately_ because otherwise the NIC driver may just abort and then the phy 'device' goes away.
Instead, we just issue a
request_module()directly inphy_device_create().
Quoted 8 lines
[...]
Thanks for doing this, David. I had a stab at it earlier when this problem was reported in Debian <http://bugs.debian.org/553024>. I didn't complete this because (a) I didn't understand all the details of adding new device table type, and (b) I tried to avoid duplicating information, which turns out to be rather difficult in modules with multiple drivers.
It shouldn't be _that_ hard.
You could contrive a macro which you use inside the driver definition and which takes the phy_id and phy_id_mask as arguments, and has the side-effect of setting up the MODULE_DEVICE_TABLE data.
Quoted 4 lines
Since you've dealt with (a), and (b) is not really as important, I would just like to suggest some minor changes to your patch 1 (see below). Feel free to fold them in. Your patch 2 would then need the substitutions s/phy_device_id/mdio_device_id/; s/TABLE(phy/TABLE(mdio/.
I'll tolerate the silly __u32 crap if I must for consistency, but normally I prefer to write in C.
I did think about 'mdio:' for the module alias, but I decided that 'phy:' probably made more sense since these are PHY driver modules and the number is the phy_id.
Kernel-doc is good though.
Signature · 2 lines
David Woodhouse Open Source Technology Centre [email protected] Intel Corporation
Quoted 1 line · David Woodhouse
On Thu, 2010-04-01 at 05:34 +0100, Ben Hutchings wrote:
[...]
Quoted 11 lines
Quoted 4 lines
Since you've dealt with (a), and (b) is not really as important, I would just like to suggest some minor changes to your patch 1 (see below). Feel free to fold them in. Your patch 2 would then need the substitutions s/phy_device_id/mdio_device_id/; s/TABLE(phy/TABLE(mdio/.
I'll tolerate the silly
__u32crap if I must for consistency, but normally I prefer to write in C.I did think about 'mdio:' for the module alias, but I decided that 'phy:' probably made more sense since these are PHY driver modules and the number is the
phy_id.
[...]
Many multi-layered communication standards have distinct PHY devices, and they presumably have their own ID spaces. phylib deals only with management of Ethernet PHYs over an MDIO bus, identified using MDIO ID registers.
Ben.
Signature · 3 lines
Ben Hutchings
We get into the habit of living before acquiring the habit of thinking.
- Albert CamusDavid Miller
maintainerFrom: Ben Hutchings <[email protected]>
Date: Thu, 1 Apr 2010 19:05:12 +0100
Quoted 14 lines · David Woodhouse
Quoted 1 line · Ben Hutchings
[...]
Quoted 11 lines
Quoted 4 lines
Since you've dealt with (a), and (b) is not really as important, I would just like to suggest some minor changes to your patch 1 (see below). Feel free to fold them in. Your patch 2 would then need the substitutions s/phy_device_id/mdio_device_id/; s/TABLE(phy/TABLE(mdio/.
I'll tolerate the silly
__u32crap if I must for consistency, but normally I prefer to write in C.I did think about 'mdio:' for the module alias, but I decided that 'phy:' probably made more sense since these are PHY driver modules and the number is the
phy_id.
Quoted 6 lines
[...]
Many multi-layered communication standards have distinct PHY devices, and they presumably have their own ID spaces. phylib deals only with management of Ethernet PHYs over an MDIO bus, identified using MDIO ID registers.
Agreed, PHYs exist on so many different kinds of topologies, the ones here are definitely specific to Ethernet and MDIO and therefore that is probably the more useful basis for naming.
David can you freshen things up in this area and integrate whatever you deem useful and immediate from Ben's patch? Whatever you submit next I'd like to toss into net-next-2.6 so it can cook for a while and maybe we'll backport it so that this bug can be fixed for good upstream and then perhaps even in -stable.
Thanks!
PATCH 1/2 phylib: Support phy module autoloading
We don't use the normal hotplug mechanism because it doesn't work. It will load the module some time after the device appears, but that's not good enough for us -- we need the driver loaded _immediately_ because otherwise the NIC driver may just abort and then the phy 'device' goes away.
[bwh: s/phy/mdio/ in module alias, kerneldoc for struct mdio_device_id]
---
I redid the bit in file2alias.c too, so it generates the string directly in place instead of in a temporary buffer.
drivers/net/phy/phy_device.c | 12 ++++++++++++ include/linux/mod_devicetable.h | 26 ++++++++++++++++++++++++++ include/linux/phy.h | 1 + scripts/mod/file2alias.c | 26 ++++++++++++++++++++++++++ 4 files changed, 65 insertions(+), 0 deletions(-)
drivers/net/phy/phy_device.c +12 -0
@@ -149,6 +149,7 @@ EXPORT_SYMBOL(phy_scan_fixups);struct phy_device *phy_device_create (struct mii_bus *bus,int addr,int phy_id) {struct phy_device *dev; +/* We allocate the device, and initialize the * default values */ dev =kzalloc (sizeof (*dev),GFP_KERNEL );
@@ -179,6 +180,17 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)mutex_init (&dev->lock);INIT_DELAYED_WORK (&dev->state_queue, phy_state_machine); +/* Request the appropriate module unconditionally; don't +bother trying to do so only if it isn't already loaded, +because that gets complicated. A hotplug event would have +done an unconditional modprobe anyway. +We don't do normal hotplug because it won't work for MDIO +-- because it relies on the device staying around for long +enough for the driver to get loaded. With MDIO, the NIC +driver will get bored and give up as soon as it finds that +there's no driver _already_ loaded. */ + request_module(MDIO_MODULE_PREFIX MDIO_ID_FMT, MDIO_ID_ARGS(phy_id)); +return dev; }EXPORT_SYMBOL (phy_device_create);
include/linux/mod_devicetable.h +26 -0
@@ -474,4 +474,30 @@ struct platform_device_id { __attribute__((aligned(sizeof(kernel_ulong_t)))); }; +#define MDIO_MODULE_PREFIX "mdio:" + +#define MDIO_ID_FMT "%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d" +#define MDIO_ID_ARGS (_id) \ + (_id)>>31, ((_id)>>30) & 1, ((_id)>>29) & 1, ((_id)>>28) & 1, \ + ((_id)>>27) & 1, ((_id)>>26) & 1, ((_id)>>25) & 1, ((_id)>>24) & 1, \ + ((_id)>>23) & 1, ((_id)>>22) & 1, ((_id)>>21) & 1, ((_id)>>20) & 1, \ + ((_id)>>19) & 1, ((_id)>>18) & 1, ((_id)>>17) & 1, ((_id)>>16) & 1, \ + ((_id)>>15) & 1, ((_id)>>14) & 1, ((_id)>>13) & 1, ((_id)>>12) & 1, \ + ((_id)>>11) & 1, ((_id)>>10) & 1, ((_id)>>9) & 1, ((_id)>>8) & 1, \ + ((_id)>>7) & 1, ((_id)>>6) & 1, ((_id)>>5) & 1, ((_id)>>4) & 1, \ + ((_id)>>3) & 1, ((_id)>>2) & 1, ((_id)>>1) & 1, (_id) & 1 + +/** +* struct mdio_device_id - identifies PHY devices on an MDIO/MII bus +* @phy_id: The result of +* (mdio_read(&MII_PHYSID1) << 16 | mdio_read(&PHYSID2)) & @phy_id_mask +* for this PHY type +* @phy_id_mask: Defines the significant bits of @phy_id. A value of 0 +* is used to terminate an array of struct mdio_device_id. +*/ +struct mdio_device_id { +__u32 phy_id; +__u32 phy_id_mask; +}; +#endif /* LINUX_MOD_DEVICETABLE_H */
include/linux/phy.h +1 -0
@@ -24,6 +24,7 @@#include <linux/mii.h> #include <linux/timer.h> #include <linux/workqueue.h> +#include <linux/mod_devicetable.h> #include <asm/atomic.h>
scripts/mod/file2alias.c +26 -0
@@ -796,6 +796,28 @@ static int do_platform_entry(const char *filename,return 1 ; } +static int do_mdio_entry (const char *filename, +struct mdio_device_id *id,char *alias) +{ +int i; + + alias +=sprintf (alias,MDIO_MODULE_PREFIX ); + +for (i =0 ; i <32 ; i++) { +if (!((id->phy_id_mask >> (31 -i)) &1 )) + *(alias++) ='?' ; +else if ((id->phy_id >> (31 -i)) &1 ) + *(alias++) ='1' ; +else + *(alias++) ='0' ; + } + +/* Terminate the string */ + *alias =0 ; + +return 1 ; +} +/* Ignore any prefix, eg. some architectures prepend _ */ static inline int sym_is (const char *symbol,const char *name) {
@@ -943,6 +965,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,do_table (symval, sym->st_size,sizeof (struct platform_device_id ),"platform" , do_platform_entry, mod); + else if (sym_is(symname, "__mod_mdio_device_table")) + do_table(symval, sym->st_size, + sizeof(struct mdio_device_id), "mdio", + do_mdio_entry, mod);free (zeros ); }
Signature · 6 lines
1.6.6.1 -- David Woodhouse Open Source Technology Centre [email protected] Intel Corporation
Quoted 9 lines · David Woodhouse
We don't use the normal hotplug mechanism because it doesn't work. It will load the module some time after the device appears, but that's not good enough for us -- we need the driver loaded _immediately_ because otherwise the NIC driver may just abort and then the phy 'device' goes away.
[bwh: s/phy/mdio/ in module alias, kerneldoc for struct
mdio_device_id]Signed-off-by David Woodhouse <[email protected]>Signed-off-by Ben Hutchings <[email protected]>
Neat!
From: David Woodhouse <[email protected]>
Date: Fri, 02 Apr 2010 12:05:27 +0100
Quoted 9 lines
We don't use the normal hotplug mechanism because it doesn't work. It will load the module some time after the device appears, but that's not good enough for us -- we need the driver loaded _immediately_ because otherwise the NIC driver may just abort and then the phy 'device' goes away.
[bwh: s/phy/mdio/ in module alias, kerneldoc for struct
mdio_device_id]Signed-off-by David Woodhouse <[email protected]>Signed-off-by Ben Hutchings <[email protected]>
Applied.
PATCH 2/2 phylib: Add module table to all existing phy drivers
In reply to David Miller---
s/phy/mdio/
drivers/net/phy/bcm63xx.c | 8 ++++++++ drivers/net/phy/broadcom.c | 16 ++++++++++++++++ drivers/net/phy/cicada.c | 8 ++++++++ drivers/net/phy/davicom.c | 9 +++++++++ drivers/net/phy/et1011c.c | 7 +++++++ drivers/net/phy/icplus.c | 7 +++++++ drivers/net/phy/lxt.c | 8 ++++++++ drivers/net/phy/marvell.c | 13 +++++++++++++ drivers/net/phy/national.c | 7 +++++++ drivers/net/phy/qsemi.c | 7 +++++++ drivers/net/phy/realtek.c | 7 +++++++ drivers/net/phy/smsc.c | 11 +++++++++++ drivers/net/phy/ste10Xp.c | 8 ++++++++ drivers/net/phy/vitesse.c | 8 ++++++++ 14 files changed, 124 insertions(+), 0 deletions(-)
drivers/net/phy/bcm63xx.c +8 -0
@@ -130,3 +130,11 @@ static void __exit bcm63xx_phy_exit(void)module_init (bcm63xx_phy_init);module_exit (bcm63xx_phy_exit); + +static struct mdio_device_id bcm63xx_tbl[] = { + {0x00406000 ,0xfffffc00 }, + {0x002bdc00 ,0xfffffc00 }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, bcm64xx_tbl);
drivers/net/phy/broadcom.c +16 -0
@@ -908,3 +908,19 @@ static void __exit broadcom_exit(void)module_init (broadcom_init);module_exit (broadcom_exit); + +static struct mdio_device_id broadcom_tbl[] = { + {0x00206070 ,0xfffffff0 }, + {0x002060e0 ,0xfffffff0 }, + {0x002060c0 ,0xfffffff0 }, + {0x002060b0 ,0xfffffff0 }, + {0x0143bca0 ,0xfffffff0 }, + {0x0143bcb0 ,0xfffffff0 }, + {PHY_ID_BCM50610 ,0xfffffff0 }, + {PHY_ID_BCM50610M ,0xfffffff0 }, + {PHY_ID_BCM57780 ,0xfffffff0 }, + {PHY_ID_BCMAC131 ,0xfffffff0 }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, broadcom_tbl);
drivers/net/phy/cicada.c +8 -0
@@ -159,3 +159,11 @@ static void __exit cicada_exit(void)module_init (cicada_init);module_exit (cicada_exit); + +static struct mdio_device_id cicada_tbl[] = { + {0x000fc410 ,0x000ffff0 }, + {0x000fc440 ,0x000fffc0 }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, cicada_tbl);
drivers/net/phy/davicom.c +9 -0
@@ -219,3 +219,12 @@ static void __exit davicom_exit(void)module_init (davicom_init);module_exit (davicom_exit); + +static struct mdio_device_id davicom_tbl[] = { + {0x0181b880 ,0x0ffffff0 }, + {0x0181b8a0 ,0x0ffffff0 }, + {0x00181b80 ,0x0ffffff0 }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, davicom_tbl);
drivers/net/phy/et1011c.c +7 -0
@@ -111,3 +111,10 @@ static void __exit et1011c_exit(void)module_init (et1011c_init);module_exit (et1011c_exit); + +static struct mdio_device_id et1011c_tbl[] = { + {0x0282f014 ,0xfffffff0 }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, et1011c_tbl);
drivers/net/phy/icplus.c +7 -0
@@ -132,3 +132,10 @@ static void __exit ip175c_exit(void)module_init (ip175c_init);module_exit (ip175c_exit); + +static struct mdio_device_id icplus_tbl[] = { + {0x02430d80 ,0x0ffffff0 }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, icplus_tbl);
drivers/net/phy/lxt.c +8 -0
@@ -174,3 +174,11 @@ static void __exit lxt_exit(void)module_init (lxt_init);module_exit (lxt_exit); + +static struct mdio_device_id lxt_tbl[] = { + {0x78100000 ,0xfffffff0 }, + {0x001378e0 ,0xfffffff0 }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, lxt_tbl);
drivers/net/phy/marvell.c +13 -0
@@ -649,3 +649,16 @@ static void __exit marvell_exit(void)module_init (marvell_init);module_exit (marvell_exit); + +static struct mdio_device_id marvell_tbl[] = { + {0x01410c60 ,0xfffffff0 }, + {0x01410c90 ,0xfffffff0 }, + {0x01410cc0 ,0xfffffff0 }, + {0x01410e10 ,0xfffffff0 }, + {0x01410cb0 ,0xfffffff0 }, + {0x01410cd0 ,0xfffffff0 }, + {0x01410e30 ,0xfffffff0 }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, marvell_tbl);
drivers/net/phy/national.c +7 -0
@@ -153,3 +153,10 @@ MODULE_LICENSE("GPL");module_init (ns_init);module_exit (ns_exit); + +static struct mdio_device_id ns_tbl[] = { + {DP83865_PHY_ID ,0xfffffff0 }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, ns_tbl);
drivers/net/phy/qsemi.c +7 -0
@@ -138,3 +138,10 @@ static void __exit qs6612_exit(void)module_init (qs6612_init);module_exit (qs6612_exit); + +static struct mdio_device_id qs6612_tbl[] = { + {0x00181440 ,0xfffffff0 }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, qs6612_tbl);
drivers/net/phy/realtek.c +7 -0
@@ -78,3 +78,10 @@ static void __exit realtek_exit(void)module_init (realtek_init);module_exit (realtek_exit); + +static struct mdio_device_id realtek_tbl[] = { + {0x001cc912 ,0x001fffff }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, realtek_tbl);
drivers/net/phy/smsc.c +11 -0
@@ -253,3 +253,14 @@ MODULE_LICENSE("GPL");module_init (smsc_init);module_exit (smsc_exit); + +static struct mdio_device_id smsc_tbl[] = { + {0x0007c0a0 ,0xfffffff0 }, + {0x0007c0b0 ,0xfffffff0 }, + {0x0007c0c0 ,0xfffffff0 }, + {0x0007c0d0 ,0xfffffff0 }, + {0x0007c0f0 ,0xfffffff0 }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, smsc_tbl);
drivers/net/phy/ste10Xp.c +8 -0
@@ -132,6 +132,14 @@ static void __exit ste10Xp_exit(void)module_init (ste10Xp_init);module_exit (ste10Xp_exit); +static struct mdio_device_id ste10Xp_tbl[] = { + {STE101P_PHY_ID ,0xfffffff0 }, + {STE100P_PHY_ID ,0xffffffff }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, ste10Xp_tbl); +MODULE_DESCRIPTION ("STMicroelectronics STe10Xp PHY driver" );MODULE_AUTHOR ("Giuseppe Cavallaro <[email protected]>" );MODULE_LICENSE ("GPL" );
drivers/net/phy/vitesse.c +8 -0
@@ -191,3 +191,11 @@ static void __exit vsc82xx_exit(void)module_init (vsc82xx_init);module_exit (vsc82xx_exit); + +static struct mdio_device_id vitesse_tbl[] = { + {PHY_ID_VSC8244 ,0x000fffc0 }, + {PHY_ID_VSC8221 ,0x000ffff0 }, + { } +}; + +MODULE_DEVICE_TABLE (mdio, vitesse_tbl);
Signature · 5 lines
1.6.6.1 -- David Woodhouse Open Source Technology Centre [email protected] Intel Corporation
Re: [PATCH 2/2] phylib: Add module table to all existing phy drivers
From: David Woodhouse <[email protected]>
Date: Fri, 02 Apr 2010 12:05:56 +0100
Quoted 1 line
Signed-off-by David Woodhouse <[email protected]>
Applied, thanks for doing the notes and providing backporting notes :-)
Quoted 4 lines · David Miller
Whatever you submit
next I'd like to toss into net-next-2.6 so it can cook for a while and maybe we'll backport it so that this bug can be fixed for good upstream and then perhaps even in -stable.
When backporting, note that you'll need s/PHY_ID_BCMAC131/0x0143bc70/ in the patch to broadcom.c, because 2.6.32 didn't have a definition for that.
There's also trivial change in phy_device_create() which will make the patch fail to apply, but git-cherry-pick copes.
Signature · 2 lines
David Woodhouse Open Source Technology Centre [email protected] Intel Corporation
Quoted 6 lines · David Woodhouse
Quoted 4 lines · David Miller
Whatever you submit
next I'd like to toss into net-next-2.6 so it can cook for a while and maybe we'll backport it so that this bug can be fixed for good upstream and then perhaps even in -stable.
Quoted 6 lines
When backporting, note that you'll need s/PHY_ID_BCMAC131/0x0143bc70/ in the patch to
broadcom.c, because 2.6.32 didn't have a definition for that.There's also trivial change in
phy_device_create()which will make the patch fail to apply, but git-cherry-pick copes.
Thanks again, David.
Ben.
Signature · 2 lines
Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.
drivers/net/phy/phy_device.c struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id) · line 192
Quoted 9 lines · Ben Hutchings
drivers/net/phy/phy_device.c +1
-1@@ -188,7 +188,7 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)around for long enough for the driver to get loaded. With MDIO, the NIC driver will get bored and give up as soon as it finds that there's no driver _already_ loaded. */ -sprintf (modid,"phy:" PHYID_FMT ,PHYID_ARGS (phy_id)); + sprintf(modid, MDIO_MODULE_PREFIX MDIO_ID_FMT, MDIO_ID_ARGS(phy_id));request_module (modid);
You forgot to increase the size of the 'modid' storage there, and it needed to grow by one character. But that's OK. I forgot that request_module() takes printf-style arguments. So now I've killed the temporary 'modid' buffer altogether, and I just call request_module(MDIO_MODULE_PREFIX ...). I dropped the ifdef, too.
drivers/net/phy/phy_device.c struct platform_device_id { · line 488
Quoted 13 lines
drivers/net/phy/phy_device.c +3
-3-#define PHY_MODULE_PREFIX "phy:" +#define MDIO_MODULE_PREFIX "mdio:" -#define PHYID_FMT "%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d" -#define PHYID_ARGS (_id) \ +#define MDIO_ID_FMT "%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d" +#define MDIO_ID_ARGS (_id) \ (_id)>>31, ((_id)>>30) & 1, ((_id)>>29) & 1, ((_id)>>28) & 1, \ ((_id)>>27) & 1, ((_id)>>26) & 1, ((_id)>>25) & 1, ((_id)>>24) & 1, \ ((_id)>>23) & 1, ((_id)>>22) & 1, ((_id)>>21) & 1, ((_id)>>20) & 1, \@@ -487,11 +487,17 @@ struct platform_device_id { ((_id)>>7 ) &1 , ((_id)>>6 ) &1 , ((_id)>>5 ) &1 , ((_id)>>4 ) &1 , \ ((_id)>>3 ) &1 , ((_id)>>2 ) &1 , ((_id)>>1 ) &1 , (_id) &1
Still tempted to add a %b format to the kernel's printf... some runtimes have it.
drivers/net/phy/phy_device.c struct platform_device_id { · line 495
Quoted 12 lines
drivers/net/phy/phy_device.c +7
-5- - -struct phy_device_id { -uint32_t phy_id; -uint32_t phy_id_mask; +/** +* struct mdio_device_id - identifies PHY devices on an MDIO/MII bus +* @phy_id: The result of +* (mdio_read(&MII_PHYSID1) << 16 | mdio_read(&PHYSID2)) & @phy_id_mask +* for this PHY type +* @phy_id_mask: Defines the significant bits of @phy_id. A value of 0 +* is used to terminate an array of struct mdio_device_id.
That last sentence is a lie; I removed it. file2alias.c just ignores the last entry in the array regardless of what it contains. I have no idea why we use a 'terminator' in these arrays. Legacy, perhaps?
drivers/net/phy/phy_device.c struct platform_device_id { · line 497
Quoted 3 lines
drivers/net/phy/phy_device.c +1
-1static int do_phy_entry (const char *filename, -struct phy_device_id *id,char *alias) +struct mdio_device_id *id,char *alias)
I made that 'do_mdio_entry()' for cosmetic reasons.
drivers/net/phy/phy_device.c struct platform_device_id { · line 498
Quoted 2 lines
drivers/net/phy/phy_device.c +1
-1- sizeof(struct phy_device_id), "phy", + sizeof(struct mdio_device_id), "phy",
And that "mdio", not "phy", so that it works.
Signature · 1 line
dwmw2