[PATCH] libata: add host_set->next for legacy two host_sets case, take #3

For a legacy ATA controller, libata registers two separate host sets.
There was no connection between the two hosts making it impossible to
traverse all ports related to the controller.  This patch adds
host_set->next which points to the second host_set and makes
ata_pci_remove_one() remove all associated host_sets.

* On device removal, all ports hanging off the device are properly
  detached.  Prior to this patch, ports on the first host_set weren't
  detached casuing oops on driver unloading.

* On device removal, both host_sets are properly freed

This will also be used by new power management code to suspend and
resume all ports of a controller.  host_set/port representation will
be improved to handle legacy controllers better and this host_set
linking will go away with it.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

3 files changed, 19 insertions, 3 deletions

diff --git a/drivers/scsi/libata-bmdma.c b/drivers/scsi/libata-bmdma.c
index 4bc05371737c..13fab97c840e 100644
--- a/drivers/scsi/libata-bmdma.c
+++ b/drivers/scsi/libata-bmdma.c
@@ -1076,10 +1076,21 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
 
         /* FIXME: check ata_device_add return */
         if (legacy_mode) {
-                if (legacy_mode & (1 << 0))
+                struct device *dev = &pdev->dev;
+                struct ata_host_set *host_set = NULL;
+
+                if (legacy_mode & (1 << 0)) {
                         ata_device_add(probe_ent);
-                if (legacy_mode & (1 << 1))
+                        host_set = dev_get_drvdata(dev);
+                }
+
+                if (legacy_mode & (1 << 1)) {
                         ata_device_add(probe_ent2);
+                        if (host_set) {
+                                host_set->next = dev_get_drvdata(dev);
+                                dev_set_drvdata(dev, host_set);
+                        }
+                }
         } else
                 ata_device_add(probe_ent);
 
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 014855e5a43a..d73cb3672d6a 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -5621,8 +5621,12 @@ void ata_pci_remove_one (struct pci_dev *pdev)
 {
         struct device *dev = pci_dev_to_dev(pdev);
         struct ata_host_set *host_set = dev_get_drvdata(dev);
+        struct ata_host_set *host_set2 = host_set->next;
 
         ata_host_set_remove(host_set);
+        if (host_set2)
+                ata_host_set_remove(host_set2);
+
         pci_release_regions(pdev);
         pci_disable_device(pdev);
         dev_set_drvdata(dev, NULL);
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 61eea5795d5a..f03b8664af11 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -356,7 +356,8 @@ struct ata_host_set {
         unsigned long           flags;
         int                     simplex_claimed;        /* Keep seperate in case we
                                                            ever need to do this locked */
-        struct ata_port *       ports[0];
+        struct ata_host_set     *next;          /* for legacy mode */
+        struct ata_port         *ports[0];
 };
 
 struct ata_queued_cmd {