CINXE.COM

<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: Matthew Garrett: RFC: ACPI/scsi/libata integration and hotswap</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by Matthew Garrett" href="/groupie.php?aid=6180" /><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2005"> [2005]</a> 聽 <a class="nb" href="/lkml/2005/12"> [Dec]</a> 聽 <a class="nb" href="/lkml/2005/12/7"> [7]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2005/12/7/425" onclick="this.href='/lkml/headers'+'/2005/12/7/425';">[headers]</a>聽 <a href="/lkml/bounce/2005/12/7/425">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2005/12/7/425">First message in thread</a></li><li class="origin"><a href="/lkml/2005/12/8/42">Matthew Garrett</a><ul><li><a href="/lkml/2005/12/8/42">Christoph Hellwig</a><ul><li><a href="/lkml/2005/12/8/76">Matthew Garrett</a><ul><li><a href="/lkml/2005/12/8/79">Christoph Hellwig</a><ul><li><a href="/lkml/2005/12/8/80">Matthew Garrett</a></li></ul></li></ul></li></ul></li><li><a href="/lkml/2005/12/13/268">Randy Dunlap</a><ul><li><a href="/lkml/2005/12/13/273">Matthew Garrett</a><ul><li><a href="/lkml/2005/12/13/288">Randy Dunlap</a></li></ul></li></ul></li></ul></li></ul><div class="threadlist">Patch in this message</div><ul class="threadlist"><li><a href="/lkml/diff/2005/12/7/425/1">Get diff 1</a></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Thu, 8 Dec 2005 03:02:42 +0000</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">Matthew Garrett <></td></tr><tr><td class="lp">Subject</td><td class="rp" itemprop="name">RFC: ACPI/scsi/libata integration and hotswap</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody">Hi! The included patch does three things: 1) It adds basic support for binding SCSI and SATA devices to ACPI device handles. At the moment this is limited to hosts, and in practice it's probably limited to SATA ones (ACPI doesn't spec how SCSI devices should appear in the DSDT, so I'm guessing that in general they don't). Given a host, you can DEVICE_ACPI_HANDLE(dev) it to get the handle to the ACPI device - this should be handy for implementing suspend functions, since the methods should be in a standard location underneath this. Support for binding the devices hasn't been implemented yet. I'm not entire sure where they should be bound (the target, presumably?), and I haven't actually got it to work... 2) It adds support for attaching notification events to the host. These can be host-driver specific (they're just part of the host template). Whenever the hardware generates an event on that bus, the host will be called. I've added one of these to ata_piix (since that's what I have), which should really be implemented in the host and only call the generic one when appropriate. But still. 3) Adds a generic libata notification handler that currently treats all notifications as drive removal/insertion. It then calls Lukasz Kosewski's hotplug code to remove/add the drive as appropriate. Most laptops generate ACPI notifications requesting bus rescans whenever a bay drive is inserted or removed. This handles the event appropriately. On my Dell d610, removing or plugging the drive results in it appearing or disappearing from /proc/scsi/scsi as appropriate. Patch: diff -u drivers/scsi/ata_piix.c /tmp/drivers/scsi/ata_piix.c --- drivers/scsi/ata_piix.c 2005-12-05 14:30:58 +0000 +++ /tmp/drivers/scsi/ata_piix.c 2005-12-08 02:16:59 +0000 @@ -148,6 +148,7 @@ .ordered_flush = 1, .resume = ata_scsi_device_resume, .suspend = ata_scsi_device_suspend, + .acpi_notify = ata_acpi_notify, }; static const struct ata_port_operations piix_pata_ops = { diff -u drivers/scsi/libata-core.c /tmp/drivers/scsi/libata-core.c --- drivers/scsi/libata-core.c 2005-12-08 02:27:02 +0000 +++ /tmp/drivers/scsi/libata-core.c 2005-12-08 02:16:50 +0000 @@ -50,6 +50,7 @@ #include <linux/workqueue.h> #include <linux/jiffies.h> #include <linux/scatterlist.h> +#include <linux/acpi.h> #include <scsi/scsi.h> #include "scsi_priv.h" #include <scsi/scsi_cmnd.h> @@ -75,9 +76,11 @@ unsigned int *xfer_shift_out); static void __ata_qc_complete(struct ata_queued_cmd *qc); static void ata_pio_error(struct ata_port *ap); +static int ata_bus_probe(struct ata_port *ap); static unsigned int ata_unique_id = 1; static struct workqueue_struct *ata_wq; +static struct workqueue_struct *ata_hotplug_wq; int atapi_enabled = 1; module_param(atapi_enabled, int, 0444); @@ -88,6 +91,17 @@ MODULE_LICENSE("GPL"); MODULE_VERSION(DRV_VERSION); +void ata_acpi_notify(acpi_handle device, u32 type, void *data) { + struct device *dev = acpi_get_physical_device(device); + struct Scsi_Host *shost = dev_to_shost(dev); + struct ata_port *ap = (struct ata_port *) &shost->hostdata[0]; + + if (!ata_bus_probe(ap)) + ata_hotplug_plug(ap); + else + ata_hotplug_unplug(ap); +} + /** * ata_tf_load_pio - send taskfile registers to host controller * @ap: Port to which output is sent diff -u drivers/scsi/scsi.c /tmp/drivers/scsi/scsi.c --- drivers/scsi/scsi.c 2005-12-04 16:48:07 +0000 +++ /tmp/drivers/scsi/scsi.c 2005-12-08 02:16:28 +0000 @@ -55,6 +55,7 @@ #include <linux/interrupt.h> #include <linux/notifier.h> #include <linux/cpu.h> +#include <linux/acpi.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> @@ -1305,6 +1306,48 @@ #define unregister_scsi_cpu() #endif /* CONFIG_HOTPLUG_CPU */ +#ifdef CONFIG_ACPI +static int scsi_acpi_find_device(struct device *dev, acpi_handle *handle) +{ + return -ENODEV; +} + +void ata_acpi_notify(acpi_handle handle, u32 type, void *data); + +static int scsi_acpi_find_channel(struct device *dev, acpi_handle *handle) +{ + int i; + struct Scsi_Host *shost; + + if (sscanf(dev->bus_id, "host%u", &i) != 1) { + return -ENODEV; + } + + *handle = acpi_get_child(DEVICE_ACPI_HANDLE(dev->parent), (acpi_integer) i); + if (!*handle) + return -ENODEV; + + shost = dev_to_shost(dev); + + if (shost->hostt->acpi_notify) { + acpi_install_notify_handler(*handle, ACPI_ALL_NOTIFY, &ata_acpi_notify, (void *)i); + } + + return 0; +} + +static struct acpi_bus_type scsi_acpi_bus = { + .bus = &scsi_bus_type, + .find_bridge = scsi_acpi_find_channel, + .find_device = scsi_acpi_find_device, +}; + +static __init int scsi_acpi_register(void) +{ + return register_acpi_bus_type(&scsi_acpi_bus); +} +#endif /* CONFIG_ACPI */ + MODULE_DESCRIPTION("SCSI core"); MODULE_LICENSE("GPL"); @@ -1333,6 +1376,11 @@ error = scsi_sysfs_register(); if (error) goto cleanup_sysctl; +#ifdef CONFIG_ACPI + error = scsi_acpi_register(); + if (error) + goto cleanup_sysfs; +#endif for (i = 0; i < NR_CPUS; i++) INIT_LIST_HEAD(&per_cpu(scsi_done_q, i)); @@ -1343,6 +1391,8 @@ printk(KERN_NOTICE "SCSI subsystem initialized\n"); return 0; +cleanup_sysfs: + scsi_sysfs_unregister(); cleanup_sysctl: scsi_exit_sysctl(); cleanup_hosts: --- include/linux/libata.h 2005-12-05 14:32:50 +0000 +++ /tmp/include/linux/libata.h 2005-12-08 02:35:59 +0000 @@ -453,7 +468,9 @@ extern int ata_scsi_device_suspend(struct scsi_device *); extern int ata_device_resume(struct ata_port *, struct ata_device *); extern int ata_device_suspend(struct ata_port *, struct ata_device *); - +#ifdef CONFIG_ACPI +extern void ata_acpi_notify(acpi_handle device, u32 type, void *data); +#endif /* * Default driver ops implementations */ diff -u include/linux/libata.h /tmp/include/linux/libata.h --- include/linux/libata.h 2005-12-05 14:32:50 +0000 +++ /tmp/include/linux/libata.h 2005-12-08 02:10:03 +0000 @@ -448,12 +463,16 @@ extern int ata_scsi_error(struct Scsi_Host *host); extern int ata_scsi_release(struct Scsi_Host *host); extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc); +extern void ata_hotplug_unplug(struct ata_port *ap); +extern void ata_hotplug_plug(struct ata_port *ap); extern int ata_ratelimit(void); extern int ata_scsi_device_resume(struct scsi_device *); extern int ata_scsi_device_suspend(struct scsi_device *); extern int ata_device_resume(struct ata_port *, struct ata_device *); extern int ata_device_suspend(struct ata_port *, struct ata_device *); - +#ifdef CONFIG_ACPI +extern void ata_acpi_notify(acpi_handle device, u32 type, void *data); +#endif /* * Default driver ops implementations */ diff -u include/scsi/scsi_host.h /tmp/include/scsi/scsi_host.h --- include/scsi/scsi_host.h 2005-11-14 14:57:13 +0000 +++ /tmp/include/scsi/scsi_host.h 2005-12-08 02:12:14 +0000 @@ -5,6 +5,7 @@ #include <linux/list.h> #include <linux/types.h> #include <linux/workqueue.h> +#include <linux/acpi.h> struct block_device; struct completion; @@ -300,6 +301,13 @@ */ int (*resume)(struct scsi_device *); int (*suspend)(struct scsi_device *); + +#ifdef CONFIG_ACPI + /* + * ACPI notification handler + */ + void (*acpi_notify)(acpi_handle device, u32 type, void *data); +#endif /* * Name of proc directory -- Matthew Garrett | mjg59@srcf.ucam.org - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a> Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a> </pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2005-12-08 04:05 聽聽 [from the cache] 漏2003-2020 <a href="http://blog.jasper.es/">Jasper Spaans</a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>