ieee1394: eth1394: don't autoload by hotplug when ohci1394 starts
PATCH 1/1 ieee1394: eth1394: don't autoload by hotplug when ohci1394 starts
Until now, ieee1394 put an IP-over-1394 capability entry into each new host's config ROM. As soon as the controller was initialized --- i.e. right after modprobe ohci1394 --- this entry triggered a hotplug event which typically caused auto-loading of eth1394.
This irritated or annoyed many users and distributors. Of course they could blacklist eth1394, but then ieee1394 wrongly advertized IP-over- 1394 capability to the FireWire bus.
Therefore
- remove the offending kernel config option
IEEE1394_CONFIG_ROM_IP1394,
- let eth193 add the ROM entry by itself, i.e. only after eth1394 was loaded,
- add a new kernel config option which brings back the old behavior for those who liked it. We don't re-use the old config option because then nobody would notice that there is a choice now. This new option is scheduled to be removed soon.
This fixes http://bugzilla.kernel.org/show_bug.cgi?id=7793 .
Autoloading of eth1394 when an _external_ IP-over-1394 capable device is discovered is _not_ affected by this patch.
---
Instead of keeping this until the proposed date of removal (June 2007), should I kill CONFIG_IEEE1394_AUTOLOAD_ETH1394 right away?
Documentation/feature-removal-schedule.txt | 9 +++ drivers/ieee1394/Kconfig | 49 ++++++++++++--------- drivers/ieee1394/config_roms.c | 47 +++++++++++++++----- drivers/ieee1394/config_roms.h | 10 ++++ drivers/ieee1394/eth1394.c | 9 +++ 5 files changed, 91 insertions(+), 33 deletions(-)
Documentation/feature-removal-schedule.txt +9 -0
@@ -29,6 +29,15 @@ Who: Adrian Bunk <[email protected]> --------------------------- +What: eth1394 autoloading (CONFIG_IEEE1394_AUTOLOAD_ETH1394) +When: June 2007 +Why: Can be emulated by adding the following lines to /etc/modprobe.conf: + install ohci1394 /sbin/modprobe eth1394; \ + /sbin/modprobe --ignore-install ohci1394" +Who: Stefan Richter <[email protected]> + +--------------------------- + What: raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN When: June 2007 Why: Deprecated in favour of the more efficient and robust rawiso interface.
drivers/ieee1394/Kconfig +29 -20
69 lines not on this page · raw message
drivers/ieee1394/config_roms.c +35 -12
104 lines not on this page · raw message
drivers/ieee1394/config_roms.h +10 -0
@@ -13,4 +13,14 @@ void hpsb_remove_extra_config_roms(struc* entry. Available in the host->config_roms member. */ #define HPSB_CONFIG_ROM_ENTRY_IP1394 0x00000001 +#ifdef CONFIG_IEEE1394_ETH1394_ROM_ENTRY +# ifdef CONFIG_IEEE1394_AUTOLOAD_ETH1394 +# define hpsb_config_rom_ip1394_add (host) do {} while (0) +# define hpsb_config_rom_ip1394_remove (host) do {} while (0) +# else +void hpsb_config_rom_ip1394_add (struct hpsb_host *host); +void hpsb_config_rom_ip1394_remove (struct hpsb_host *host); +# endif +#endif +#endif /* _IEEE1394_CONFIG_ROMS_H */
drivers/ieee1394/eth1394.c +8 -1
@@ -561,8 +561,12 @@ static void ether1394_add_host (struct hstruct eth1394_priv *priv;u64 fifo_addr; -if (!(host->config_roms &HPSB_CONFIG_ROM_ENTRY_IP1394 )) +hpsb_config_rom_ip1394_add (host); + +if (!(host->config_roms &HPSB_CONFIG_ROM_ENTRY_IP1394 )) { +ETH1394_PRINT_G (KERN_ERR ,"missing IP-over-1394 ROM entry\n" );return ; + } fifo_addr = hpsb_allocate_and_register_addrspace( ð1394_highlevel, host, &addr_ops,
@@ -570,6 +574,7 @@ static void ether1394_add_host (struct h CSR1212_INVALID_ADDR_SPACE, CSR1212_INVALID_ADDR_SPACE);if (fifo_addr ==CSR1212_INVALID_ADDR_SPACE ) {ETH1394_PRINT_G (KERN_ERR ,"Cannot register CSR space\n" ); +hpsb_config_rom_ip1394_remove (host);return ; }
@@ -649,6 +654,7 @@ out:if (hi)hpsb_destroy_hostinfo (ð1394_highlevel, host);hpsb_unregister_addrspace (ð1394_highlevel, host, fifo_addr); +hpsb_config_rom_ip1394_remove (host); }/* Remove a card from our list */
@@ -662,6 +668,7 @@ static void ether1394_remove_host (strucreturn ; priv =netdev_priv (hi->dev);hpsb_unregister_addrspace (ð1394_highlevel, host, priv->local_fifo); +hpsb_config_rom_ip1394_remove (host);if (priv->iso)hpsb_iso_shutdown (priv->iso);unregister_netdev (hi->dev);
Signature · 3 lines
Stefan Richter -=====-=-=== --== ==-== http://arcgraph.de/sr/
PATCH 1/1 ieee1394: eth1394: don't autoload by hotplug when ohci1394 starts
Quoted 4 lines · I wrote:
- add a new kernel config option which brings back the old behavior for those who liked it. We don't re-use the old config option because then nobody would notice that there is a choice now. This new option is scheduled to be removed soon.
...
Quoted 10 lines
Instead of keeping this until the proposed date of removal (June 2007), should I kill
CONFIG_IEEE1394_AUTOLOAD_ETH1394right away?Documentation/feature-removal-schedule.txt | 9 +++ drivers/ieee1394/Kconfig | 49 ++++++++++++--------- drivers/ieee1394/config_roms.c | 47 +++++++++++++++----- drivers/ieee1394/config_roms.h | 10 ++++ drivers/ieee1394/eth1394.c | 9 +++ 5 files changed, 91 insertions(+), 33 deletions(-)
If I skip the feature-removal-schedule procedure, the resulting code is a lot nicer. I prefer this updated patch and I consider it a candidate for before 2.6.22-rc1.
From: Stefan Richter <[email protected]>
Subject: ieee1394: eth1394: don't autoload by hotplug when ohci1394 starts
Until now, ieee1394 put an IP-over-1394 capability entry into each new host's config ROM. As soon as the controller was initialized --- i.e. right after modprobe ohci1394 --- this entry triggered a hotplug event which typically caused auto-loading of eth1394.
This irritated or annoyed many users and distributors. Of course they could blacklist eth1394, but then ieee1394 wrongly advertized IP-over- 1394 capability to the FireWire bus.
Therefore
- remove the offending kernel config option
IEEE1394_CONFIG_ROM_IP1394,
- let eth1394 add the ROM entry by itself, i.e. only after eth1394 was loaded.
This fixes http://bugzilla.kernel.org/show_bug.cgi?id=7793 .
Autoloading of eth1394 when an _external_ IP-over-1394 capable device is discovered is _not_ affected by this patch.
---
drivers/ieee1394/Kconfig | 29 +++--------- drivers/ieee1394/config_roms.c | 76 ++++++--------------------------- drivers/ieee1394/config_roms.h | 7 ++- drivers/ieee1394/eth1394.c | 7 ++- drivers/ieee1394/hosts.c | 3 - 5 files changed, 36 insertions(+), 86 deletions(-)
drivers/ieee1394/Kconfig +9 -20
@@ -36,23 +36,6 @@ config IEEE1394_VERBOSEDEBUG Say Y if you really want or need the debugging output, everyone else says N. -config IEEE1394_EXTRA_CONFIG_ROMS - bool "Build in extra config rom entries for certain functionality" - depends on IEEE1394 - help - Some IEEE1394 functionality depends on extra config rom entries - being available in the host adapters CSR. These options will - allow you to choose which ones. - -config IEEE1394_CONFIG_ROM_IP1394 - bool "IP-1394 Entry" - depends on IEEE1394_EXTRA_CONFIG_ROMS && IEEE1394 - help - Adds an entry for using IP-over-1394. If you want to use your - IEEE1394 bus as a network for IP systems (including interacting - with MacOSX and WinXP IP-over-1394), enable this option and the - eth1394 option below. - comment "Device Drivers" depends on IEEE1394
@@ -122,11 +105,15 @@ config IEEE1394_SBP2_PHYS_DMA This option is buggy and currently broken on some architectures. If unsure, say N. +config IEEE1394_ETH1394_ROM_ENTRY + depends on IEEE1394 + bool + default n + config IEEE1394_ETH1394 - tristate "Ethernet over 1394" + tristate "IP over 1394" depends on IEEE1394 && EXPERIMENTAL && INET - select IEEE1394_CONFIG_ROM_IP1394 - select IEEE1394_EXTRA_CONFIG_ROMS + select IEEE1394_ETH1394_ROM_ENTRY help This driver implements a functional majority of RFC 2734: IPv4 over 1394. It will provide IP connectivity with implementations of RFC
@@ -135,6 +122,8 @@ config IEEE1394_ETH1394 This driver is still considered experimental. It does not yet support MCAP, therefore multicast support is significantly limited. + The module is called eth1394 although it does not emulate Ethernet. + config IEEE1394_DV1394 tristate "OHCI-DV I/O support (deprecated)" depends on IEEE1394 && IEEE1394_OHCI1394
drivers/ieee1394/config_roms.c +15 -61
132 lines not on this page · raw message
drivers/ieee1394/config_roms.h +5 -2
@@ -6,11 +6,14 @@ struct hpsb_host;int hpsb_default_host_entry (struct hpsb_host *host);int hpsb_init_config_roms (void );void hpsb_cleanup_config_roms (void ); -int hpsb_add_extra_config_roms (struct hpsb_host *host); -void hpsb_remove_extra_config_roms (struct hpsb_host *host);/* List of flags to check if a host contains a certain extra config rom * entry. Available in the host->config_roms member. */ #define HPSB_CONFIG_ROM_ENTRY_IP1394 0x00000001 +#ifdef CONFIG_IEEE1394_ETH1394_ROM_ENTRY +int hpsb_config_rom_ip1394_add (struct hpsb_host *host); +void hpsb_config_rom_ip1394_remove (struct hpsb_host *host); +#endif +#endif /* _IEEE1394_CONFIG_ROMS_H */
drivers/ieee1394/eth1394.c +6 -1
@@ -561,8 +561,10 @@ static void ether1394_add_host (struct hstruct eth1394_priv *priv;u64 fifo_addr; -if (!(host->config_roms &HPSB_CONFIG_ROM_ENTRY_IP1394 )) +if (hpsb_config_rom_ip1394_add (host) !=0 ) { +ETH1394_PRINT_G (KERN_ERR ,"Can't add IP-over-1394 ROM entry\n" );return ; + } fifo_addr = hpsb_allocate_and_register_addrspace( ð1394_highlevel, host, &addr_ops,
@@ -570,6 +572,7 @@ static void ether1394_add_host (struct h CSR1212_INVALID_ADDR_SPACE, CSR1212_INVALID_ADDR_SPACE);if (fifo_addr ==CSR1212_INVALID_ADDR_SPACE ) {ETH1394_PRINT_G (KERN_ERR ,"Cannot register CSR space\n" ); +hpsb_config_rom_ip1394_remove (host);return ; }
@@ -649,6 +652,7 @@ out:if (hi)hpsb_destroy_hostinfo (ð1394_highlevel, host);hpsb_unregister_addrspace (ð1394_highlevel, host, fifo_addr); +hpsb_config_rom_ip1394_remove (host); }/* Remove a card from our list */
@@ -662,6 +666,7 @@ static void ether1394_remove_host (strucreturn ; priv =netdev_priv (hi->dev);hpsb_unregister_addrspace (ð1394_highlevel, host, priv->local_fifo); +hpsb_config_rom_ip1394_remove (host);if (priv->iso)hpsb_iso_shutdown (priv->iso);unregister_netdev (hi->dev);
drivers/ieee1394/hosts.c +1 -2
@@ -180,7 +180,7 @@ int hpsb_add_host(struct hpsb_host *host {if (hpsb_default_host_entry (host))return -ENOMEM ; -hpsb_add_extra_config_roms (host); +highlevel_add_host (host);return 0 ; }
@@ -202,7 +202,6 @@ void hpsb_remove_host(struct hpsb_host * host->driver = &dummy_driver;highlevel_remove_host (host); -hpsb_remove_extra_config_roms (host);class_device_unregister (&host->class_dev);device_unregister (&host->device);
Signature · 3 lines
Stefan Richter -=====-=-=== --== ==-== http://arcgraph.de/sr/