Attachment 215963 Details for Bug 390822

[patch] Patch for handling bay devices inside dock stations

libata-handle-dock-hotplug.patch (text/plain), 4.08 KB, created by Holger Macht on 2008-05-16 13:04:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Holger Macht

Created: 2008-05-16 13:04:03 UTC

Size: 4.08 KB

patch

obsolete

>diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
>index 70b77e0..3c7ca3e 100644
>--- a/drivers/ata/libata-acpi.c
>+++ b/drivers/ata/libata-acpi.c
>@@ -118,77 +118,119 @@ static void ata_acpi_associate_ide_port(struct ata_port *ap)
> 		ap->pflags |= ATA_PFLAG_INIT_GTM_VALID;
> }
> 
>+static void ata_acpi_detach_device(struct ata_port *ap, struct ata_device *dev)
>+{
>+	if (dev)
>+		dev->flags |= ATA_DFLAG_DETACH;
>+	else {
>+		struct ata_link *tlink;
>+		struct ata_device *tdev;
>+
>+		ata_port_for_each_link(tlink, ap)
>+			ata_link_for_each_dev(tdev, tlink)
>+			tdev->flags |= ATA_DFLAG_DETACH;
>+	}
>+
>+	ata_port_freeze(ap);
>+	ata_port_schedule_eh(ap);
>+}
>+
> static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
>-				    u32 event)
>+				    u32 event, int is_dock_event)
> {
> 	char event_string[12];
> 	char *envp[] = { event_string, NULL };
> 	struct ata_eh_info *ehi;
> 	struct kobject *kobj = NULL;
> 	int wait = 0;
>-	unsigned long flags;
>+	unsigned long flags, sta;
>+	acpi_status status;
>+	acpi_handle handle;
> 
> 	if (!ap)
> 		ap = dev->link->ap;
> 	ehi = &ap->link.eh_info;
> 
>+	if (dev) {
>+		if (dev->sdev)
>+			kobj = &dev->sdev->sdev_gendev.kobj;
>+		handle = dev->acpi_handle;
>+	} else {
>+		kobj = &ap->dev->kobj;
>+		handle = ap->acpi_handle;
>+	}
>+
>+	if (kobj) {
>+		sprintf(event_string, "BAY_EVENT=%d", event);
>+		kobject_uevent_env(kobj, KOBJ_CHANGE, envp);
>+	}
>+
> 	spin_lock_irqsave(ap->lock, flags);
> 
> 	switch (event) {
> 	case ACPI_NOTIFY_BUS_CHECK:
> 	case ACPI_NOTIFY_DEVICE_CHECK:
>+		status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
>+		if (!ACPI_SUCCESS(status)) {
>+			printk(KERN_INFO "Unable to evaluate bay status\n");
>+			break;
>+		}
>+
> 		ata_ehi_push_desc(ehi, "ACPI event");
>-		ata_ehi_hotplugged(ehi);
>-		ata_port_freeze(ap);
>-		break;
> 
>+		if (sta) {
>+			ata_ehi_hotplugged(ehi);
>+			ata_port_freeze(ap);
>+		} else {
>+			/* The device has gone - unplug it */
>+			ata_acpi_detach_device(ap, dev);
>+			wait = 1;
>+		}
>+		break;
> 	case ACPI_NOTIFY_EJECT_REQUEST:
> 		ata_ehi_push_desc(ehi, "ACPI event");
>-		if (dev)
>-			dev->flags |= ATA_DFLAG_DETACH;
>-		else {
>-			struct ata_link *tlink;
>-			struct ata_device *tdev;
>-
>-			ata_port_for_each_link(tlink, ap)
>-				ata_link_for_each_dev(tdev, tlink)
>-					tdev->flags |= ATA_DFLAG_DETACH;
>-		}
> 
>-		ata_port_schedule_eh(ap);
>+		if (!is_dock_event)
>+			break;
>+
>+		/* undock event - immediate unplug */
>+		ata_acpi_detach_device(ap, dev);
> 		wait = 1;
> 		break;
> 	}
> 
>-	if (dev) {
>-		if (dev->sdev)
>-			kobj = &dev->sdev->sdev_gendev.kobj;
>-	} else
>-		kobj = &ap->dev->kobj;
>-
>-	if (kobj) {
>-		sprintf(event_string, "BAY_EVENT=%d", event);
>-		kobject_uevent_env(kobj, KOBJ_CHANGE, envp);
>-	}
>-
> 	spin_unlock_irqrestore(ap->lock, flags);
> 
> 	if (wait)
> 		ata_port_wait_eh(ap);
> }
> 
>+static void ata_acpi_dev_notify_dock(acpi_handle handle, u32 event, void *data)
>+{
>+	struct ata_device *dev = data;
>+
>+	ata_acpi_handle_hotplug(NULL, dev, event, 1);
>+}
>+
>+static void ata_acpi_ap_notify_dock(acpi_handle handle, u32 event, void *data)
>+{
>+	struct ata_port *ap = data;
>+
>+	ata_acpi_handle_hotplug(ap, NULL, event, 1);
>+}
>+
> static void ata_acpi_dev_notify(acpi_handle handle, u32 event, void *data)
> {
> 	struct ata_device *dev = data;
> 
>-	ata_acpi_handle_hotplug(NULL, dev, event);
>+	ata_acpi_handle_hotplug(NULL, dev, event, 0);
> }
> 
> static void ata_acpi_ap_notify(acpi_handle handle, u32 event, void *data)
> {
> 	struct ata_port *ap = data;
> 
>-	ata_acpi_handle_hotplug(ap, NULL, event);
>+	ata_acpi_handle_hotplug(ap, NULL, event, 0);
> }
> 
> /**
>@@ -229,7 +271,7 @@ void ata_acpi_associate(struct ata_host *host)
> 						    ata_acpi_ap_notify, ap);
> 			/* we might be on a docking station */
> 			register_hotplug_dock_device(ap->acpi_handle,
>-						     ata_acpi_ap_notify, ap);
>+					     ata_acpi_ap_notify_dock, ap);
> 		}
> 
> 		for (j = 0; j < ata_link_max_devices(&ap->link); j++) {
>@@ -241,7 +283,7 @@ void ata_acpi_associate(struct ata_host *host)
> 						ata_acpi_dev_notify, dev);
> 				/* we might be on a docking station */
> 				register_hotplug_dock_device(dev->acpi_handle,
>-						ata_acpi_dev_notify, dev);
>+					     ata_acpi_dev_notify_dock, dev);
> 			}
> 		}
> 	}

Actions: View | Diff

Attachments on bug 390822: 215963