acpiphp: handle dock stations
PATCH 1/1 acpiphp: handle dock stations
From: [email protected]
This patch will add hot add/remove of docking stations to acpiphp. Because some docking stations will have a _DCK method that is not associated with a dock bridge, we use the _EJD method to determine which devices are dependent on the dock device, then try to find which of these dependent devices are pci devices. We register a separate event handler with acpi to handle dock notifications, but if we have discovered any pci devices dependent on the dock station, we notify the acpiphp driver to rescan the correct bus. If no pci devices are found, but there is still a _DCK method present, the driver will stay loaded to deal with the dock notifications.
This patch does not implement full _EJD support yet - it just uses it to find the dock bridge (if it exists) for rescanning pci. It also does not attempt to add devices that are not enumerable via pci. It will stay loaded even if we find a dock station with no p2p dock bridge to handle the dock notifications. I will likely move all the dependent device stuff out of acpiphp and into acpi in the future because some of that code can be used by any device that has _EJD, not just pci hotplug - but for now we'll leave it here.
You cannot use this patch and the ibm_acpi driver at same time due to the fact that both drivers attempt to register for dock notifications.
---
Greg - this patch is against 2.6.16-rc1-git5 and replaces the patch pci-hotplug-acpiphp-handle-dock-bridges.patch in your tree. I assume the other patches I sent originally are still applied. I moved all the dock stuff into a separate file because I felt it was starting to clutter acpiphp_glue.c a bit. I don't think this will conflict with anything anyone else is working on.
drivers/pci/hotplug/Makefile | 3 drivers/pci/hotplug/acpiphp.h | 36 +++ drivers/pci/hotplug/acpiphp_core.c | 7 drivers/pci/hotplug/acpiphp_dock.c | 368 +++++++++++++++++++++++++++++++++++++ drivers/pci/hotplug/acpiphp_glue.c | 53 ++++- 5 files changed, 452 insertions(+), 15 deletions(-)
drivers/pci/hotplug/Makefile +2 -1
@@ -37,7 +37,8 @@ ibmphp-objs := ibmphp_core.o \ ibmphp_hpc.o acpiphp-objs := acpiphp_core.o \ - acpiphp_glue.o + acpiphp_glue.o \ + acpiphp_dock.o rpaphp-objs := rpaphp_core.o \ rpaphp_pci.o \
drivers/pci/hotplug/acpiphp.h +36 -0
@@ -160,6 +160,25 @@ struct acpiphp_attention_infostruct module *owner; }; + +struct dependent_device { +struct list_head device_list; +struct list_head pci_list; +acpi_handle handle; +struct acpiphp_func *func; +}; + + +struct acpiphp_dock_station { +acpi_handle handle; +u32 last_dock_time; +u32 flags; +struct acpiphp_func *dock_bridge; +struct list_head dependent_devices; +struct list_head pci_dependent_devices; +}; + +/* PCI bus bridge HID */ #define ACPI_PCI_HOST_HID "PNP0A03"
@@ -197,6 +216,12 @@ struct acpiphp_attention_info#define FUNC_HAS_PS1 (0x00000020)#define FUNC_HAS_PS2 (0x00000040)#define FUNC_HAS_PS3 (0x00000080) +#define FUNC_HAS_DCK (0x00000100) +#define FUNC_IS_DD (0x00000200) + +/* dock station flags */ +#define DOCK_DOCKING (0x00000001) +#define DOCK_HAS_BRIDGE (0x00000002)/* function prototypes */
@@ -210,6 +235,7 @@ extern void acpiphp_glue_exit (void);extern int acpiphp_get_num_slots (void );extern struct acpiphp_slot *get_slot_from_id (int id);typedef int (*acpiphp_callback )(struct acpiphp_slot *slot,void *data); +void handle_hotplug_event_func (acpi_handle ,u32 ,void *);extern int acpiphp_enable_slot (struct acpiphp_slot *slot);extern int acpiphp_disable_slot (struct acpiphp_slot *slot);
@@ -219,6 +245,16 @@ extern u8 acpiphp_get_latch_status (struextern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot);extern u32 acpiphp_get_address (struct acpiphp_slot *slot); +/* acpiphp_dock.c */ +extern int find_dock_station (void ); +extern void remove_dock_station (void ); +extern void add_dependent_device (struct dependent_device *new_dd); +extern void add_pci_dependent_device (struct dependent_device *new_dd); +extern struct dependent_device *get_dependent_device (acpi_handle handle); +extern int is_dependent_device (acpi_handle handle); +extern int detect_dependent_devices (acpi_handle *bridge_handle); +extern struct dependent_device *alloc_dependent_device (acpi_handle handle); +/* variables */ extern int acpiphp_debug;
drivers/pci/hotplug/acpiphp_core.c +6 -1
@@ -429,14 +429,17 @@ static void __exit cleanup_slots (void)static int __init acpiphp_init (void ) {int retval; +int docking_station;info (DRIVER_DESC " version: " DRIVER_VERSION "\n" ); acpiphp_debug = debug; + docking_station =find_dock_station (); +/* read all the ACPI info from the system */ retval =init_acpi (); -if (retval) +if (retval && !(docking_station))return retval;return init_slots ();
@@ -448,6 +451,8 @@ static void __exit acpiphp_exit(void)cleanup_slots ();/* deallocate internal data structures etc. */ acpiphp_glue_exit (); + +remove_dock_station (); }module_init (acpiphp_init);
drivers/pci/hotplug/acpiphp_dock.c new file +368 -0
368 lines not on this page · raw message
drivers/pci/hotplug/acpiphp_glue.c +40 -13
116 lines not on this page · raw message
Quoted 13 lines · Kristen Carlson Accardi
drivers/pci/hotplug/acpiphp_dock.c new file +13
-0+int is_dependent_device (acpi_handle handle) +{ +struct dependent_device *dd; + +if (!ds) +return 0 ; + +list_for_each_entry (dd, &ds->dependent_devices, device_list) { +if (handle == dd->handle) +return 1 ; + } +return 0 ; +}
(snip.)
drivers/pci/hotplug/acpiphp_dock.c line 96
Quoted 10 lines
drivers/pci/hotplug/acpiphp_dock.c new file +10
-0+struct dependent_device *get_dependent_device (acpi_handle handle) +{ +struct dependent_device *dd; + +list_for_each_entry (dd, &ds->dependent_devices, device_list) { +if (handle == dd->handle) +return dd; + } +return NULL ; +}
Those look very similar...
Quoted 13 lines
drivers/pci/hotplug/acpiphp_dock.c new file +13
-0+ +/* make sure we are dependent on the dock device */ +acpi_get_name (dck_handle,ACPI_FULL_PATHNAME , &buffer); + status =acpi_evaluate_object (handle,"_EJD" ,NULL , &ejd_buffer); +if (ACPI_FAILURE (status)) { +err ("Unable to execute _EJD!\n" ); + goto find_ejd_out; + } + +/* because acpi_get_name will pad the names if they are less +* than 4 characters, we can't compare the strings returned +* from _EJD with those returned from acpi_get_name. So, +* we have to get a handle to the object referenced by _EJD
drivers/pci/hotplug/acpiphp_dock.c line 267
Quoted 10 lines
drivers/pci/hotplug/acpiphp_dock.c new file +10
-0+* and then call get name on that. +*/ + ejd_obj = ejd_buffer.pointer; + status =acpi_get_handle (NULL , ejd_obj->string.pointer, &tmp); +if (ACPI_FAILURE (status)) + goto find_ejd_out; +acpi_get_name (tmp,ACPI_FULL_PATHNAME , &ejd_name_buffer); + + dck_obj = buffer.pointer; +if (!strncmp (ejd_objname, objname,strlen (ejd_objname))) {
I don't think you need to compare pathnames.
Why not just compare ACPI handles like below?
if (dck_handle == tmp) {
...Thanks,
Kenji Kaneshige
Hi!
Quoted 11 lines
From: [email protected]
This patch will add hot add/remove of docking stations to acpiphp. Because some docking stations will have a
_DCKmethod that is not associated with a dock bridge, we use the_EJDmethod to determine which devices are dependent on the dock device, then try to find which of these dependent devices are pci devices. We register a separate event handler with acpi to handle dock notifications, but if we have discovered any pci devices dependent on the dock station, we notify the acpiphp driver to rescan the correct bus. If no pci devices are found, but there is still a_DCKmethod present, the driver will stay loaded to deal with the dock notifications.
It still registers my docking bridge as -1:
acpiphp: ACPI Hot Plug PCI Controller Driver version: 0.5
acpiphp: Slot [4294967295] registeredacpiphp_ibm: ibm_find_acpi_device: Failed to get device information<3>acpiphp_ibm: ibm_find_acpi_device: Failed to get device information<3>acpiphp_ibm: ibm_find_acpi_device: Failed to get device information<3>acpiphp_ibm: ibm_acpiphp_init: acpi_walk_namespace failed
radeonfb: Retrieved PLL infos from BIOS
...which is still better than not registering it at all :-).
This one actually does not oops at insertion into dock. Good!
It detects insertion into dock:
Feb 6 14:13:00 amd kernel: acpi_bus-0073 [62] bus_get_device : No context for object [c1d2c408] Feb 6 14:13:01 amd kernel: PCI: Bus 3, cardbus bridge: 0000:02:00.0 Feb 6 14:13:01 amd kernel: IO window: 00004000-000040ff Feb 6 14:13:01 amd kernel: IO window: 00004400-000044ff Feb 6 14:13:01 amd kernel: PREFETCH window: e8000000-e9ffffff Feb 6 14:13:01 amd kernel: MEM window: c2000000-c3ffffff Feb 6 14:13:01 amd kernel: PCI: Bus 7, cardbus bridge: 0000:02:00.1 Feb 6 14:13:01 amd kernel: IO window: 00004800-000048ff Feb 6 14:13:01 amd kernel: IO window: 00004c00-00004cff Feb 6 14:13:01 amd kernel: PREFETCH window: ea000000-ebffffff Feb 6 14:13:01 amd kernel: MEM window: c4000000-c5ffffff
When I press eject button, I get
Feb 6 14:13:27 amd kernel: acpi_bus-0073 [72] bus_get_device :
No context for object [c1d2c408]
and dock fan stops (but machine is not unlocked):
root@amd:/sys/bus/pci/slots/4294967295# cat * 0 0000:02:03 cat: attention: Invalid argument 0 0
...but I can't remove machine.
Pavel
Signature · 1 line
Web maintainer for suspend.sf.net (www.sf.net/projects/suspend) wanted...
Hi!
Quoted 10 lines
This patch will add hot add/remove of docking stations to acpiphp. Because some docking stations will have a
_DCKmethod that is not associated with a dock bridge, we use the_EJDmethod to determine which devices are dependent on the dock device, then try to find which of these dependent devices are pci devices. We register a separate event handler with acpi to handle dock notifications, but if we have discovered any pci devices dependent on the dock station, we notify the acpiphp driver to rescan the correct bus. If no pci devices are found, but there is still a_DCKmethod present, the driver will stay loaded to deal with the dock notifications.
Even while machine is locked in dock, I don't see aditional devices at lspci. Is there some additional steps I need to do?
-rw-r--r-- 1 root root 4096 Feb 6 14:17 attention
..should probably be write-only. It seems to only return errors on read, anyway.
Is there a way to physicaly remove my machine from dock? echo 0 > power should do it, right? Well, it does not :-).
Pavel
Signature · 1 line
Web maintainer for suspend.sf.net (www.sf.net/projects/suspend) wanted...
Hi Kristen,
At Wed, 1 Feb 2006 15:30:05 -0800,
Quoted 21 lines · Kristen Carlson Accardi
From: [email protected]
drivers/pci/hotplug/acpiphp_glue.c +12
-1+/* if this is a device dependent on a dock station, +* associate the acpiphp_func to the dependent_device +* struct. +*/ +if ((dd =get_dependent_device (handle))) { + newfunc->flags |=FUNC_IS_DD ; + dd->func = newfunc; +add_pci_dependent_device (dd); + } +/* install notify handler */ - status =acpi_install_notify_handler (handle, +if (!(newfunc->flags &FUNC_HAS_DCK )) { + status =acpi_install_notify_handler (handle,ACPI_SYSTEM_NOTIFY , handle_hotplug_event_func, newfunc);
drivers/pci/hotplug/acpiphp_glue.c register_slot(acpi_handle handle, u32 lv · line 249
Quoted 10 lines
drivers/pci/hotplug/acpiphp_glue.c +3
-4-if (ACPI_FAILURE (status)) { -err ("failed to register interrupt notify handler\n" ); -return status; +if (ACPI_FAILURE (status)) +err ("failed to register interrupt notify handler\n" ); } -return AE_OK ; +return status; }
I tried 2.6.12-rc2-mm1(includes this patch) on my Tiger box, I could not insmod the acpiphp module because of the NaT consumption.
My box does not have any _DCK method, so find_dock() returns without making any acpiphp_dock_station struct. Therefore, NaT consumption has occurred at get_dependent_device().
Here is a log.
pci_hotplug: PCI Hot Plug PCI Core version: 0.5
acpiphp: ACPI Hot Plug PCI Controller Driver version: 0.5acpiphp_glue: found PCI-to-PCI bridge at PCI 0000:02:1f.0acpiphp_glue: _HPP parameter = (10, 40, 01, 01)acpiphp_glue: found ACPI PCI Hotplug slot 1 at PCI 0000:06:01 insmod[5085]: NaT consumption 17179869216 [1]
Modules linked in: acpiphp pci_hotplug sunrpc binfmt_misc thermal processor fan container button ehci_hcd
Pid: 5085, CPU 1, comm: insmod
psr : 00001010081a6018 ifs : 8000000000000006 ip : [<a000000200112080>] Not tainted
ip is at get_dependent_device+0x20/0xe0 [acpiphp]
unat: 0000000000000000 pfs : 0000000000000795 rsc : 0000000000000003
rnat: 0000000000000002 bsps: 0000000000000013 pr : 00000000059a1569
ldrs: 0000000000000000 ccv : 0000000000000000 fpsr: 0009804c8a70033f csd : 0000000000000000 ssd : 0000000000000000
b0 : a00000020010dcb0 b6 : a0000001003e99e0 b7 : a0000001003ce860 f6 : 0fffafffffffff0000000 f7 : 0ffdb8000000000000000 f8 : 0ffff8000000000000000 f9 : 100038000000000000000 f10 : 0fffafffffffff0000000 f11 : 1003e0000000000000000 r1 : a0000002001124f8 r2 : 000000000000038b r3 : e0000001040c0f78 r8 : 0000000000000000 r9 : 0000000000000018 r10 : a0000002001189e0 r11 : e0000002ffd34840 r12 : e0000001040c7de0 r13 : e0000001040c0000 r14 : 0000000000000000 r15 : e0000002ffdc69a8 r16 : e0000002ffd35810 r17 : a00000010095af70 r18 : ffffffffffffffff r19 : a00000010095a090 r20 : 0000000000000007 r21 : a00000010095a0a0 r22 : 0000000000000000 r23 : a00000010095af90 r24 : a00000010087f698 r25 : a00000010087f690 r26 : a000000100944248 r27 : 0000000000000000 r28 : a000000100968b8e r29 : 0000000000003556 r30 : 0000000000000000 r31 : a00000010095a338
Call Trace:
[<a000000100011f50>] show_stack+0x50/0xa0
sp=e0000001040c77f0 bsp=e0000001040c1548
[<a000000100012820>] show_regs+0x820/0x840
sp=e0000001040c79c0 bsp=e0000001040c1500
[<a000000100036a70>] die+0x1d0/0x280
sp=e0000001040c79c0 bsp=e0000001040c14b8
[<a000000100036b60>] die_if_kernel+0x40/0x60
sp=e0000001040c79e0 bsp=e0000001040c1488
[<a0000001000382a0>] ia64_fault+0x1140/0x1180
sp=e0000001040c79e0 bsp=e0000001040c1408
[<a00000010000c3c0>] ia64_leave_kernel+0x0/0x280
sp=e0000001040c7c10 bsp=e0000001040c1408
[<a000000200112080>] get_dependent_device+0x20/0xe0 [acpiphp]
sp=e0000001040c7de0 bsp=e0000001040c13d0
[<a00000020010dcb0>] register_slot+0x710/0x860 [acpiphp]
sp=e0000001040c7de0 bsp=e0000001040c1358
[<a0000001003f3530>] acpi_ns_walk_namespace+0x130/0x2a0
sp=e0000001040c7e00 bsp=e0000001040c12e0
[<a0000001003eed10>] acpi_walk_namespace+0x90/0xe0
sp=e0000001040c7e00 bsp=e0000001040c1290
[<a00000020010e270>] init_bridge_misc+0x70/0x180 [acpiphp]
sp=e0000001040c7e00 bsp=e0000001040c1268
[<a00000020010e6d0>] find_p2p_bridge+0x350/0x400 [acpiphp]
sp=e0000001040c7e00 bsp=e0000001040c1220
[<a0000001003f3530>] acpi_ns_walk_namespace+0x130/0x2a0
sp=e0000001040c7e10 bsp=e0000001040c11a0
[<a0000001003eed10>] acpi_walk_namespace+0x90/0xe0
sp=e0000001040c7e10 bsp=e0000001040c1150
[<a00000020010eb50>] add_bridge+0x3d0/0x440 [acpiphp]
sp=e0000001040c7e10 bsp=e0000001040c1118
[<a00000010040f090>] acpi_pci_register_driver+0x110/0x180
sp=e0000001040c7e20 bsp=e0000001040c10e0
[<a0000002000d88f0>] acpiphp_glue_init+0x90/0xc0 [acpiphp]
sp=e0000001040c7e20 bsp=e0000001040c10c8
[<a0000002000d8260>] acpiphp_init+0x80/0x680 [acpiphp]
sp=e0000001040c7e30 bsp=e0000001040c1078
[<a0000001000cc620>] sys_init_module+0x1c0/0x440
sp=e0000001040c7e30 bsp=e0000001040c1008
[<a00000010000c220>] ia64_ret_from_syscall+0x0/0x20
sp=e0000001040c7e30 bsp=e0000001040c1008
[<a000000000010640>] __kernel_syscall_via_break+0x0/0x20
sp=e0000001040c8000 bsp=e0000001040c1008Thanks,
MUNE
Hi Kristen, Takahiro,
Quoted 9 lines · MUNEDA Takahiro
I tried 2.6.12-rc2-mm1(includes this patch) on my Tiger box, I could not insmod the acpiphp module because of the NaT consumption.
My box does not have any
_DCKmethod, sofind_dock()returns without making anyacpiphp_dock_stationstruct. Therefore, NaT consumption has occurred atget_dependent_device().
This problem will be fixed by the following patch.
Thanks,
Kenji Kaneshige
The get_dependent_device() function must check if ds is not NULL, otherwise it will cause kernel panic on the system that has no _DCK method.
drivers/pci/hotplug/acpiphp_dock.c | 3 +++
1 files changed, 3 insertions(+)
drivers/pci/hotplug/acpiphp_dock.c +0 -0
@@ -88,6 +88,9 @@
{
struct dependent_device *dd;+ if (!ds)
+ return NULL;
+
list_for_each_entry(dd, &ds->dependent_devices, device_list) {
if (handle == dd->handle)
return dd;Hi Kenji,
At Tue, 14 Feb 2006 00:57:38 +0900,
Quoted 16 lines · Kenji Kaneshige
Hi Kristen, Takahiro,
Quoted 9 lines · MUNEDA Takahiro
I tried 2.6.12-rc2-mm1(includes this patch) on my Tiger box, I could not insmod the acpiphp module because of the NaT consumption.
My box does not have any
_DCKmethod, sofind_dock()returns without making anyacpiphp_dock_stationstruct. Therefore, NaT consumption has occurred atget_dependent_device().This problem will be fixed by the following patch.
Quoted 7 lines
Thanks,
Kenji KaneshigeThe
get_dependent_device()function must check if ds is not NULL, otherwise it will cause kernel panic on the system that has no_DCKmethod.
Thank you for your patch.
It works on my Tiger box well.
Thanks,
MUNE