rpms/kernel/F-13 linux-2.6-phylib-autoload.patch,1.1,1.2
David Woodhouse
dwmw2 at fedoraproject.org
Wed Apr 14 21:21:27 UTC 2010
Author: dwmw2
Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6879
Modified Files:
linux-2.6-phylib-autoload.patch
Log Message:
oops, no fuzz
linux-2.6-phylib-autoload.patch:
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/phy_device.c | 12 ++++++++++++
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 ++++++++
include/linux/mod_devicetable.h | 26 ++++++++++++++++++++++++++
include/linux/phy.h | 1 +
scripts/mod/file2alias.c | 26 ++++++++++++++++++++++++++
18 files changed, 189 insertions(+)
Index: linux-2.6-phylib-autoload.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/linux-2.6-phylib-autoload.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-phylib-autoload.patch 14 Apr 2010 21:01:07 -0000 1.1
+++ linux-2.6-phylib-autoload.patch 14 Apr 2010 21:21:25 -0000 1.2
@@ -41,127 +41,6 @@ Signed-off-by: David Woodhouse <David.Wo
drivers/net/phy/vitesse.c | 8 ++++++++
14 files changed, 124 insertions(+), 0 deletions(-)
-diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
-index b10fedd..0db6781 100644
---- a/drivers/net/phy/phy_device.c
-+++ b/drivers/net/phy/phy_device.c
-@@ -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);
-@@ -178,6 +179,17 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
-
- mutex_init(&dev->lock);
-
-+ /* 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);
-diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
-index f58e9d8..55f1f9c 100644
---- a/include/linux/mod_devicetable.h
-+++ b/include/linux/mod_devicetable.h
-@@ -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 */
-diff --git a/include/linux/phy.h b/include/linux/phy.h
-index b1368b8..b85de0d 100644
---- a/include/linux/phy.h
-+++ b/include/linux/phy.h
-@@ -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>
-
-diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
-index 62a9025..05f0c06 100644
---- a/scripts/mod/file2alias.c
-+++ b/scripts/mod/file2alias.c
-@@ -727,6 +727,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)
- {
-@@ -874,6 +896,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);
- }
-
diff --git a/drivers/net/phy/bcm63xx.c b/drivers/net/phy/bcm63xx.c
index 4fed95e..ac5e498 100644
--- a/drivers/net/phy/bcm63xx.c
@@ -179,10 +58,10 @@ index 4fed95e..ac5e498 100644
+
+MODULE_DEVICE_TABLE(mdio, bcm64xx_tbl);
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
-index f81e532..f46815d 100644
+index 33c4b12..f1939c3 100644
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
-@@ -830,3 +830,19 @@ static void __exit broadcom_exit(void)
+@@ -911,3 +911,19 @@ static void __exit broadcom_exit(void)
module_init(broadcom_init);
module_exit(broadcom_exit);
@@ -317,6 +196,36 @@ index 6c636eb..729ab29 100644
+};
+
+MODULE_DEVICE_TABLE(mdio, ns_tbl);
+diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
+index adbc0fd..16aa083 100644
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c
+@@ -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);
diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c
index 23062d0..3ec9610 100644
--- a/drivers/net/phy/qsemi.c
@@ -401,6 +310,94 @@ index dd3b244..45cce50 100644
+};
+
+MODULE_DEVICE_TABLE(mdio, vitesse_tbl);
---
-1.6.6.1
-
+diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
+index f58e9d8..55f1f9c 100644
+--- a/include/linux/mod_devicetable.h
++++ b/include/linux/mod_devicetable.h
+@@ -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 */
+diff --git a/include/linux/phy.h b/include/linux/phy.h
+index 6a7eb40..8d5715a 100644
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h
+@@ -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>
+
+diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
+index 220213e..36a60a8 100644
+--- a/scripts/mod/file2alias.c
++++ b/scripts/mod/file2alias.c
+@@ -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);
+ }
+
More information about the scm-commits
mailing list