From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Shaohua Li <shaohua.li@intel.com>, Len Brown <len.brown@intel.com>
Subject: [PATCH 34/85] libata: remove functions now handed by ACPI dock driver
Date: Sat, 11 Oct 2008 02:35:54 -0400 [thread overview]
Message-ID: <f730ae1838635a02aa60834762c61566911d004c.1223706853.git.len.brown@intel.com> (raw)
In-Reply-To: <1223707005-26864-1-git-send-email-lenb@kernel.org>
In-Reply-To: <1d80ebdb81444701024ad9b9f026516561496a43.1223706853.git.len.brown@intel.com>
From: Shaohua Li <shaohua.li@intel.com>
dock driver can handle ata(bay) hotplug now. dock driver already handles
_EJ0 and _STA, so remove them. Also libata doesn't need register
notification handler anymore.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Acked-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/dock.c | 3 +-
drivers/ata/libata-acpi.c | 107 ++++++---------------------------------------
2 files changed, 16 insertions(+), 94 deletions(-)
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 4b395b1..f19f643 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -738,7 +738,8 @@ static void dock_notify(acpi_handle handle, u32 event, void *data)
/* Fall back */
case ACPI_NOTIFY_EJECT_REQUEST:
begin_undock(ds);
- if (immediate_undock || surprise_removal)
+ if ((immediate_undock && !(ds->flags & DOCK_IS_ATA))
+ || surprise_removal)
handle_eject_request(ds, event);
else
dock_event(ds, event, UNDOCK_EVENT);
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 9330b79..97727be 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -120,21 +120,6 @@ static void ata_acpi_associate_ide_port(struct ata_port *ap)
ap->pflags |= ATA_PFLAG_INIT_GTM_VALID;
}
-static void ata_acpi_eject_device(acpi_handle handle)
-{
- struct acpi_object_list arg_list;
- union acpi_object arg;
-
- arg_list.count = 1;
- arg_list.pointer = &arg;
- arg.type = ACPI_TYPE_INTEGER;
- arg.integer.value = 1;
-
- if (ACPI_FAILURE(acpi_evaluate_object(handle, "_EJ0",
- &arg_list, NULL)))
- printk(KERN_ERR "Failed to evaluate _EJ0!\n");
-}
-
/* @ap and @dev are the same as ata_acpi_handle_hotplug() */
static void ata_acpi_detach_device(struct ata_port *ap, struct ata_device *dev)
{
@@ -157,7 +142,6 @@ static void ata_acpi_detach_device(struct ata_port *ap, struct ata_device *dev)
* @ap: ATA port ACPI event occurred
* @dev: ATA device ACPI event occurred (can be NULL)
* @event: ACPI event which occurred
- * @is_dock_event: boolean indicating whether the event was a dock one
*
* All ACPI bay / device realted events end up in this function. If
* the event is port-wide @dev is NULL. If the event is specific to a
@@ -171,115 +155,58 @@ static void ata_acpi_detach_device(struct ata_port *ap, struct ata_device *dev)
* ACPI notify handler context. May sleep.
*/
static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
- u32 event, int is_dock_event)
+ u32 event)
{
- char event_string[12];
- char *envp[] = { event_string, NULL };
struct ata_eh_info *ehi = &ap->link.eh_info;
- struct kobject *kobj = NULL;
int wait = 0;
unsigned long flags;
- acpi_handle handle, tmphandle;
- unsigned long sta;
- acpi_status status;
+ acpi_handle handle;
- if (dev) {
- if (dev->sdev)
- kobj = &dev->sdev->sdev_gendev.kobj;
+ if (dev)
handle = dev->acpi_handle;
- } else {
- kobj = &ap->dev->kobj;
+ else
handle = ap->acpi_handle;
- }
-
- status = acpi_get_handle(handle, "_EJ0", &tmphandle);
- if (ACPI_FAILURE(status))
- /* This device does not support hotplug */
- return;
-
- if (event == ACPI_NOTIFY_BUS_CHECK ||
- event == ACPI_NOTIFY_DEVICE_CHECK)
- status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
spin_lock_irqsave(ap->lock, flags);
-
+ /*
+ * When dock driver calls into the routine, it will always use
+ * ACPI_NOTIFY_BUS_CHECK/ACPI_NOTIFY_DEVICE_CHECK for add and
+ * ACPI_NOTIFY_EJECT_REQUEST for remove
+ */
switch (event) {
case ACPI_NOTIFY_BUS_CHECK:
case ACPI_NOTIFY_DEVICE_CHECK:
ata_ehi_push_desc(ehi, "ACPI event");
- if (ACPI_FAILURE(status)) {
- ata_port_printk(ap, KERN_ERR,
- "acpi: failed to determine bay status (0x%x)\n",
- status);
- 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;
- }
+ ata_ehi_hotplugged(ehi);
+ ata_port_freeze(ap);
break;
case ACPI_NOTIFY_EJECT_REQUEST:
ata_ehi_push_desc(ehi, "ACPI event");
- if (!is_dock_event)
- break;
-
- /* undock event - immediate unplug */
ata_acpi_detach_device(ap, dev);
wait = 1;
break;
}
- /* make sure kobj doesn't go away while ap->lock is released */
- kobject_get(kobj);
-
spin_unlock_irqrestore(ap->lock, flags);
- if (wait) {
+ if (wait)
ata_port_wait_eh(ap);
- ata_acpi_eject_device(handle);
- }
-
- if (kobj && !is_dock_event) {
- sprintf(event_string, "BAY_EVENT=%d", event);
- kobject_uevent_env(kobj, KOBJ_CHANGE, envp);
- }
-
- kobject_put(kobj);
}
static void ata_acpi_dev_notify_dock(acpi_handle handle, u32 event, void *data)
{
struct ata_device *dev = data;
- ata_acpi_handle_hotplug(dev->link->ap, dev, event, 1);
+ ata_acpi_handle_hotplug(dev->link->ap, dev, event);
}
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(dev->link->ap, 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, 0);
+ ata_acpi_handle_hotplug(ap, NULL, event);
}
/**
@@ -315,9 +242,6 @@ void ata_acpi_associate(struct ata_host *host)
ata_acpi_associate_ide_port(ap);
if (ap->acpi_handle) {
- acpi_install_notify_handler(ap->acpi_handle,
- ACPI_SYSTEM_NOTIFY,
- ata_acpi_ap_notify, ap);
/* we might be on a docking station */
register_hotplug_dock_device(ap->acpi_handle,
ata_acpi_ap_notify_dock, ap);
@@ -327,9 +251,6 @@ void ata_acpi_associate(struct ata_host *host)
struct ata_device *dev = &ap->link.device[j];
if (dev->acpi_handle) {
- acpi_install_notify_handler(dev->acpi_handle,
- ACPI_SYSTEM_NOTIFY,
- ata_acpi_dev_notify, dev);
/* we might be on a docking station */
register_hotplug_dock_device(dev->acpi_handle,
ata_acpi_dev_notify_dock, dev);
--
1.5.5.1
next prev parent reply other threads:[~2008-10-11 6:45 UTC|newest]
Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-11 6:35 ACPI patch queue for 2.6.28 Len Brown
2008-10-11 6:35 ` [PATCH 01/85] ACPI: Add missing acpi.debug_layer Documentation hunk from Thomas Renninger Len Brown
2008-10-11 6:35 ` [PATCH 02/85] acpi: replace AE_BAD_ADDRESS exception code with AE_ERROR Len Brown
2008-10-11 6:35 ` [PATCH 03/85] ACPI: Get the device power state in the course of scanning device Len Brown
2008-10-11 6:35 ` [PATCH 04/85] ACPI: Attach the ACPI device to the ACPI handle as early as possible Len Brown
2008-10-11 6:35 ` [PATCH 05/85] ACPI: Add "acpi.power_nocheck=1" to disable power state check in power transition Len Brown
2008-10-11 6:35 ` [PATCH 06/85] ACPI: Add DMI check " Len Brown
2008-10-11 6:35 ` [PATCH 07/85] ACPI : Load device driver according to the status of acpi device Len Brown
2008-10-11 6:35 ` [PATCH 08/85] ACPICA: Copy dynamically loaded tables to local buffer Len Brown
2008-10-11 6:35 ` [PATCH 09/85] ACPICA: Add check for invalid handle in acpi_get_object_info Len Brown
2008-10-11 6:35 ` [PATCH 10/85] ACPICA: Allow same ACPI table to be loaded/unloaded more than once Len Brown
2008-10-11 6:35 ` [PATCH 11/85] ACPICA: Fix wrong resource descriptor length for 64-bit build Len Brown
2008-10-11 6:35 ` [PATCH 12/85] ACPICA: Fix table compare code, length then data Len Brown
2008-10-11 6:35 ` [PATCH 13/85] ACPICA: Return status from global init function Len Brown
2008-10-11 6:35 ` [PATCH 14/85] ACPICA: Add function to dereference returned reference objects Len Brown
2008-10-11 6:35 ` [PATCH 15/85] ACPICA: Fix warning for 64-bit build Len Brown
2008-10-11 6:35 ` [PATCH 16/85] ACPICA: Cleanup macro definition file Len Brown
2008-10-11 6:35 ` [PATCH 17/85] ACPICA: Return method arg count from acpi_get_object_info Len Brown
2008-10-11 6:35 ` [PATCH 18/85] ACPICA: Update version to 20080701 Len Brown
2008-10-11 6:35 ` [PATCH 19/85] ACPICA: Add function to decode reference obj types to strings Len Brown
2008-10-11 6:35 ` [PATCH 20/85] ACPICA: Improve object conversion error messages Len Brown
2008-10-11 6:35 ` [PATCH 21/85] ACPICA: x2APIC support: changes for MADT and SRAT ACPI tables Len Brown
2008-10-11 6:35 ` [PATCH 22/85] ACPICA: Update version to 20080729 Len Brown
2008-10-11 6:35 ` [PATCH 23/85] ACPI: Clear WAK_STS on resume Len Brown
2008-10-13 9:01 ` Christian Borntraeger
2008-10-11 6:35 ` [PATCH 24/85] ACPI : Add the support for _TTS object Len Brown
2008-10-11 6:35 ` [PATCH 25/85] Introduce FW_BUG, FW_WARN and FW_INFO to consistenly tell users about BIOS bugs Len Brown
2008-10-11 6:35 ` [PATCH 26/85] ACPI: cpufreq, processor: Detect old BIOS, not supporting CPU freq on a recent CPU Len Brown
2008-10-11 6:35 ` [PATCH 27/85] CPUFREQ: powernow-k8: Try to detect old BIOS, not supporting CPU freq on a recent AMD CPUs Len Brown
2008-10-11 6:35 ` [PATCH 28/85] ACPI: dock: avoid check _STA method Len Brown
2008-10-11 6:35 ` [PATCH 29/85] dock: fix eject request process (2.6.27-rc1 regression) Len Brown
2008-10-11 6:35 ` [PATCH 30/85] dock: add _LCK support Len Brown
2008-10-11 6:35 ` [PATCH 31/85] dock: add bay and battery hotplug support Len Brown
2008-10-11 6:35 ` [PATCH 32/85] ACPI: introduce notifier change to avoid duplicates Len Brown
2008-10-11 6:35 ` [PATCH 33/85] ACPI: fix hotplug race Len Brown
2008-10-11 6:35 ` Len Brown [this message]
2008-10-11 6:35 ` [PATCH 35/85] dock: introduce .uevent for devices in dock, eg libata Len Brown
2008-10-11 6:35 ` [PATCH 36/85] bay: remove driver, all functions now handled by dock driver Len Brown
2008-10-11 6:35 ` [PATCH 37/85] dock: fix for ATA bay in a dock station Len Brown
2008-10-11 6:35 ` [PATCH 38/85] dock: add 'type' sysfs file Len Brown
2008-10-11 6:35 ` [PATCH 39/85] dock: Shaohua Li is new maintainer Len Brown
2008-10-11 6:36 ` [PATCH 40/85] ACPI suspend: Always use the 32-bit waking vector Len Brown
2008-10-11 6:36 ` [PATCH 41/85] panasonic-laptop: add Panasonic Let's Note laptop extras driver v0.94 Len Brown
2008-10-11 6:36 ` [PATCH 42/85] ACPI: EC: do transaction from interrupt context Len Brown
2008-10-11 6:36 ` [PATCH 43/85] ACPI: EC: Rename some variables Len Brown
2008-10-11 6:36 ` [PATCH 44/85] ACPICA: add preemption point after each opcode parse Len Brown
2008-10-11 6:36 ` [PATCH 45/85] ACPI Suspend: Enable ACPI during resume if SCI_EN is not set Len Brown
2008-10-11 6:36 ` [PATCH 46/85] ACPI: don't enable control method power button as wakeup device when Fixed Power button is used Len Brown
2008-10-11 6:36 ` [PATCH 47/85] acer-wmi: Add rfkill support for wireless and bluetooth Len Brown
2008-10-11 6:36 ` [PATCH 48/85] acer-wmi: Remove wireless and bluetooth sysfs entries Len Brown
2008-10-11 6:36 ` [PATCH 49/85] ACPI: WMI: Enable event methods when registering notifiers Len Brown
2008-10-11 6:36 ` [PATCH 50/85] ACPI: Change acpi_evaluate_integer to support 64-bit on 32-bit kernels Len Brown
2008-10-11 6:36 ` [PATCH 51/85] ACPI: fix FADT parsing Len Brown
2008-10-11 6:36 ` [PATCH 52/85] fujitsu-laptop: better handling of P8010 hotkey Len Brown
2008-10-11 6:36 ` [PATCH 53/85] i7300_idle driver v1.55 Len Brown
2008-10-11 8:33 ` Ingo Molnar
2008-10-15 22:32 ` Len Brown
2008-10-16 22:05 ` [PATCH 1/2] x86: allow module driver to register idle notifier Len Brown
2008-10-21 1:57 ` Len Brown
2008-10-21 11:49 ` Ingo Molnar
2008-10-16 22:08 ` [PATCH 2/2] i7300_idle driver v1.55 Len Brown
2008-10-20 17:32 ` Randy Dunlap
2008-10-21 22:09 ` Pallipadi, Venkatesh
2008-10-21 22:15 ` Randy Dunlap
2008-10-21 23:02 ` Pallipadi, Venkatesh
2008-10-21 16:47 ` Andi Kleen
2008-10-21 22:34 ` Pallipadi, Venkatesh
2008-10-22 7:19 ` Andi Kleen
2008-10-22 23:34 ` [PATCH] Disable ioat channel only on platforms where ile driver can load Venki Pallipadi
2008-10-22 23:51 ` [PATCH] Cleanup of i7300_idle based on review comments Venki Pallipadi
2008-10-24 17:03 ` Len Brown
2008-10-24 17:02 ` [PATCH] Disable ioat channel only on platforms where ile driver can load Len Brown
[not found] ` <f12847240810270941v68a1cf7aqfa7db14fceb61fe5@mail.gmail.com>
2008-10-28 16:30 ` Sosnowski, Maciej
2008-10-22 23:40 ` [PATCH 2/2] i7300_idle driver v1.55 Venki Pallipadi
2008-10-23 1:11 ` Andi Kleen
2008-10-23 4:59 ` Pallipadi, Venkatesh
2008-10-23 12:26 ` Andi Kleen
2008-10-23 15:00 ` Paul E. McKenney
2008-10-23 16:26 ` Andi Kleen
2008-10-11 6:36 ` [PATCH 54/85] eeepc-laptop: Use standard interfaces Len Brown
2008-10-11 6:36 ` [PATCH 55/85] x86: remove magic number from ACPI sleep stack buffer Len Brown
2008-10-11 6:36 ` [PATCH 56/85] x86: trim " Len Brown
2008-10-11 6:36 ` [PATCH 57/85] ACPI: acpi_driver_data could only be applied to acpi_device Len Brown
2008-10-11 6:36 ` [PATCH 58/85] ACPI: toshiba_acpi.c fix sparse signedness mismatch warnings Len Brown
2008-10-11 6:36 ` [PATCH 59/85] ACPI: catch calls of acpi_driver_data on pointer of wrong type Len Brown
2008-10-11 6:36 ` [PATCH 60/85] toshiba_acpi: depends on INPUT Len Brown
2008-10-11 6:36 ` [PATCH 61/85] PNP: fix debug formatting (cosmetic) Len Brown
2008-10-11 6:36 ` [PATCH 62/85] PNPACPI: use dev_printk when possible Len Brown
2008-10-11 6:36 ` [PATCH 63/85] PNP: convert the last few pnp_info() uses to printk() Len Brown
2008-10-11 6:36 ` [PATCH 64/85] PNP: use new vsprintf symbolic function pointer format Len Brown
2008-10-11 6:36 ` [PATCH 65/85] PNP: remove some uses of DEBUG ifdef Len Brown
2008-10-11 6:36 ` [PATCH 66/85] PNP: add CONFIG_PNP_DEBUG_MESSAGES and pnp_dbg() Len Brown
2008-10-11 6:36 ` [PATCH 67/85] PNP: convert to using pnp_dbg() Len Brown
2008-10-11 6:36 ` [PATCH 68/85] PNP: remove old CONFIG_PNP_DEBUG option Len Brown
2008-10-11 6:36 ` [PATCH 69/85] ACPI: don't load acpi_cpufreq if acpi=off Len Brown
2008-10-11 6:36 ` [PATCH 70/85] ACPI: remove unused have_arch_parse_srat Len Brown
2008-10-11 6:36 ` [PATCH 71/85] acer-wmi: Remove private workqueue Len Brown
2008-10-11 6:36 ` [PATCH 72/85] Subject: ACPI dock: Use ACPI_EXCEPTION instead of printk(KERN_ERR Len Brown
2008-10-11 6:36 ` [PATCH 73/85] ACPI cm_sbs: Debug interface used for error message cleanup Len Brown
2008-10-11 6:36 ` [PATCH 74/85] ACPI memhotplug: " Len Brown
2008-10-11 6:36 ` [PATCH 75/85] ACPI processor: " Len Brown
2008-10-11 6:36 ` [PATCH 76/85] ACPI video: " Len Brown
2008-10-11 6:36 ` [PATCH 77/85] ACPI scan: " Len Brown
2008-10-11 6:36 ` [PATCH 78/85] ACPI fan: " Len Brown
2008-10-11 6:36 ` [PATCH 79/85] ACPI osl: " Len Brown
2008-10-11 6:36 ` [PATCH 80/85] ACPI thermal: " Len Brown
2008-10-11 6:36 ` [PATCH 81/85] ACPI system: " Len Brown
2008-10-11 6:36 ` [PATCH 82/85] ACPI: remove unused acpi_is_child_device() Len Brown
2008-10-11 6:36 ` [PATCH 83/85] ACPI: Enable EC device immediately after ACPI full initialization Len Brown
2008-10-11 6:36 ` [PATCH 84/85] delete drivers/acpi/bay.c Len Brown
2008-10-11 6:36 ` [PATCH 85/85] panasonic-laptop: fix build Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f730ae1838635a02aa60834762c61566911d004c.1223706853.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=shaohua.li@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®