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 .

To emulate the behaviour of older kernels, simply add the following to
to /etc/modprobe.conf:

install ohci1394 /sbin/modprobe eth1394; \
                 /sbin/modprobe --ignore-install ohci1394

Note, autoloading of eth1394 when an _external_ IP-over-1394 capable
device is discovered is _not_ affected by this patch.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 15 insertions, 61 deletions

diff --git a/drivers/ieee1394/config_roms.c b/drivers/ieee1394/config_roms.c
index 556658a1db29..1b981207fa76 100644
--- a/drivers/ieee1394/config_roms.c
+++ b/drivers/ieee1394/config_roms.c
@@ -26,12 +26,6 @@ struct hpsb_config_rom_entry {
         /* Base initialization, called at module load */
         int (*init)(void);
 
-        /* Add entry to specified host */
-        int (*add)(struct hpsb_host *host);
-
-        /* Remove entry from specified host */
-        void (*remove)(struct hpsb_host *host);
-
         /* Cleanup called at module exit */
         void (*cleanup)(void);
 
@@ -78,7 +72,7 @@ int hpsb_default_host_entry(struct hpsb_host *host)
 }
 
 
-#ifdef CONFIG_IEEE1394_CONFIG_ROM_IP1394
+#ifdef CONFIG_IEEE1394_ETH1394_ROM_ENTRY
 #include "eth1394.h"
 
 static struct csr1212_keyval *ip1394_ud;
@@ -137,7 +131,7 @@ static void config_rom_ip1394_cleanup(void)
         }
 }
 
-static int config_rom_ip1394_add(struct hpsb_host *host)
+int hpsb_config_rom_ip1394_add(struct hpsb_host *host)
 {
         if (!ip1394_ud)
                 return -ENODEV;
@@ -146,30 +140,33 @@ static int config_rom_ip1394_add(struct hpsb_host *host)
                                                ip1394_ud) != CSR1212_SUCCESS)
                 return -ENOMEM;
 
+        host->config_roms |= HPSB_CONFIG_ROM_ENTRY_IP1394;
+        host->update_config_rom = 1;
         return 0;
 }
+EXPORT_SYMBOL_GPL(hpsb_config_rom_ip1394_add);
 
-static void config_rom_ip1394_remove(struct hpsb_host *host)
+void hpsb_config_rom_ip1394_remove(struct hpsb_host *host)
 {
         csr1212_detach_keyval_from_directory(host->csr.rom->root_kv, ip1394_ud);
+        host->config_roms &= ~HPSB_CONFIG_ROM_ENTRY_IP1394;
+        host->update_config_rom = 1;
 }
+EXPORT_SYMBOL_GPL(hpsb_config_rom_ip1394_remove);
 
 static struct hpsb_config_rom_entry ip1394_entry = {
         .name           = "ip1394",
         .init           = config_rom_ip1394_init,
-        .add            = config_rom_ip1394_add,
-        .remove         = config_rom_ip1394_remove,
         .cleanup        = config_rom_ip1394_cleanup,
         .flag           = HPSB_CONFIG_ROM_ENTRY_IP1394,
 };
-#endif /* CONFIG_IEEE1394_CONFIG_ROM_IP1394 */
 
+#endif /* CONFIG_IEEE1394_ETH1394_ROM_ENTRY */
 
 static struct hpsb_config_rom_entry *const config_rom_entries[] = {
-#ifdef CONFIG_IEEE1394_CONFIG_ROM_IP1394
+#ifdef CONFIG_IEEE1394_ETH1394_ROM_ENTRY
         &ip1394_entry,
 #endif
-        NULL,
 };
 
 /* Initialize all config roms */
@@ -177,18 +174,12 @@ int hpsb_init_config_roms(void)
 {
         int i, error = 0;
 
-        for (i = 0; config_rom_entries[i]; i++) {
-                if (!config_rom_entries[i]->init)
-                        continue;
-
+        for (i = 0; i < ARRAY_SIZE(config_rom_entries); i++)
                 if (config_rom_entries[i]->init()) {
                         HPSB_ERR("Failed to initialize config rom entry `%s'",
                                  config_rom_entries[i]->name);
                         error = -1;
-                } else
-                        HPSB_DEBUG("Initialized config rom entry `%s'",
-                                   config_rom_entries[i]->name);
-        }
+                }
 
         return error;
 }
@@ -198,43 +189,6 @@ void hpsb_cleanup_config_roms(void)
 {
         int i;
 
-        for (i = 0; config_rom_entries[i]; i++) {
-                if (config_rom_entries[i]->cleanup)
-                        config_rom_entries[i]->cleanup();
-        }
-}
-
-/* Add extra config roms to specified host */
-int hpsb_add_extra_config_roms(struct hpsb_host *host)
-{
-        int i, error = 0;
-
-        for (i = 0; config_rom_entries[i]; i++) {
-                if (config_rom_entries[i]->add(host)) {
-                        HPSB_ERR("fw-host%d: Failed to attach config rom entry `%s'",
-                                 host->id, config_rom_entries[i]->name);
-                        error = -1;
-                } else {
-                        host->config_roms |= config_rom_entries[i]->flag;
-                        host->update_config_rom = 1;
-                }
-        }
-
-        return error;
-}
-
-/* Remove extra config roms from specified host */
-void hpsb_remove_extra_config_roms(struct hpsb_host *host)
-{
-        int i;
-
-        for (i = 0; config_rom_entries[i]; i++) {
-                if (!(host->config_roms & config_rom_entries[i]->flag))
-                        continue;
-
-                config_rom_entries[i]->remove(host);
-
-                host->config_roms &= ~config_rom_entries[i]->flag;
-                host->update_config_rom = 1;
-        }
+        for (i = 0; i < ARRAY_SIZE(config_rom_entries); i++)
+                config_rom_entries[i]->cleanup();
 }