Home » Mailing list archives » linux-kernel » 2007 » October » 16

[PATCH 2/4] Fix PCIe hotplug for non-ACPI ExpressCard slots (version 2)

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Mark Lord <lkml@...>
To: Kristen Carlson Accardi <kristen.c.accardi@...>, Linux Kernel <linux-kernel@...>
Cc: Greg KH <greg@...>, <pcihpd-discuss@...>, Andrew Morton <akpm@...>, Theodore Tso <tytso@...>
Subject: [PATCH 2/4] Fix PCIe hotplug for non-ACPI ExpressCard slots (version 2)
Date: Tuesday, October 16, 2007 - 9:54 pm

Fix pciehp_probe() to deal with pre-inserted ExpressCard cards,
but only when pciehp_force==1.  Otherwise behaviour is unmodified.

Signed-off-by: Mark Lord <mlord@pobox.com>
---
--- old/drivers/pci/hotplug/pciehp_ctrl.c	2007-10-16 21:14:44.000000000 -0400
+++ linux/drivers/pci/hotplug/pciehp_ctrl.c	2007-10-16 21:16:36.000000000 -0400
@@ -37,7 +37,6 @@
 #include "pciehp.h"
 
 static void interrupt_event_handler(struct work_struct *work);
-static int pciehp_enable_slot(struct slot *p_slot);
 static int pciehp_disable_slot(struct slot *p_slot);
 
 static int queue_interrupt_event(struct slot *p_slot, u32 event_type)
--- old/drivers/pci/hotplug/pciehp.h	2007-10-12 12:43:44.000000000 -0400
+++ linux/drivers/pci/hotplug/pciehp.h	2007-10-16 21:16:06.000000000 -0400
@@ -161,6 +161,7 @@
 extern int pciehp_unconfigure_device(struct slot *p_slot);
 extern void pciehp_queue_pushbutton_work(struct work_struct *work);
 int pcie_init(struct controller *ctrl, struct pcie_device *dev);
+int pciehp_enable_slot(struct slot *p_slot);
 
 static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)
 {
--- old/drivers/pci/hotplug/pciehp_core.c	2007-10-16 21:14:44.000000000 -0400
+++ linux/drivers/pci/hotplug/pciehp_core.c	2007-10-16 21:15:56.000000000 -0400
@@ -477,7 +477,8 @@
 		rc = t_slot->hpc_ops->power_off_slot(t_slot);
 		if (rc)
 			goto err_out_free_ctrl_slot;
-	}
+	} else if (pciehp_force)
+		pciehp_enable_slot(t_slot);
 
 	return 0;
 
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
PCIe Hotplug: NFG unless I boot with card already inserted., Mark Lord, (Tue Oct 16, 9:46 am)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Mark Lord, (Tue Oct 16, 11:21 am)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Kristen Carlson Accardi, (Tue Oct 16, 11:46 am)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Mark Lord, (Tue Oct 16, 2:39 pm)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Kristen Carlson Accardi, (Tue Oct 16, 4:29 pm)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Mark Lord, (Tue Oct 16, 4:41 pm)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Kristen Carlson Accardi, (Tue Oct 16, 2:43 pm)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Mark Lord, (Tue Oct 16, 2:57 pm)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Mark Lord, (Tue Oct 16, 2:59 pm)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Mark Lord, (Tue Oct 16, 3:31 pm)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Kristen Carlson Accardi, (Tue Oct 16, 4:07 pm)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Mark Lord, (Tue Oct 16, 4:39 pm)
Re: [Pcihpd-discuss] PCIe Hotplug: NFG unless I boot with ca..., Greg KH, (Tue Oct 16, 5:41 pm)
[PATCH] Fix PCIe hotplug for Dell notebook ExpressCard slots, Mark Lord, (Tue Oct 16, 5:57 pm)
[PATCH 0/4] Fix PCIe hotplug for non-ACPI ExpressCard slots ..., Mark Lord, (Tue Oct 16, 9:53 pm)
Re: [PATCH 0/4] Fix PCIe hotplug for non-ACPI ExpressCard sl..., Andrew Morton, (Wed Oct 17, 6:02 pm)
Re: [PATCH 0/4] Fix PCIe hotplug for non-ACPI ExpressCard sl..., Mark Lord, (Wed Oct 17, 6:59 pm)
Re: [PATCH 0/4] Fix PCIe hotplug for non-ACPI ExpressCard sl..., Andrew Morton, (Wed Oct 17, 7:25 pm)
[PATCH 1/4] Fix PCIe hotplug for non-ACPI ExpressCard slots ..., Mark Lord, (Tue Oct 16, 9:54 pm)
Re: [Pcihpd-discuss] [PATCH 1/4] Fix PCIe hotplug for non-AC..., Matthew Wilcox, (Tue Oct 16, 11:29 pm)
Re: [Pcihpd-discuss] [PATCH 1/4] Fix PCIe hotplug for non-AC..., Mark Lord, (Wed Oct 17, 9:09 am)
Re: [Pcihpd-discuss] [PATCH 1/4] Fix PCIe hotplug for non-AC..., Matthew Wilcox, (Wed Oct 17, 10:02 am)
Re: [Pcihpd-discuss] [PATCH 1/4] Fix PCIe hotplug for non-AC..., Mark Lord, (Wed Oct 17, 10:33 am)
[PATCH 2/4] Fix PCIe hotplug for non-ACPI ExpressCard slots ..., Mark Lord, (Tue Oct 16, 9:54 pm)
Re: [Pcihpd-discuss] [PATCH 2/4] Fix PCIe hotplug for non-AC..., Kristen Carlson Accardi, (Wed Oct 17, 7:54 pm)
Re: [Pcihpd-discuss] [PATCH 2/4] Fix PCIe hotplug for non-AC..., Mark Lord, (Wed Oct 17, 10:25 pm)
Re: [Pcihpd-discuss] [PATCH 2/4] Fix PCIe hotplug for non-AC..., Matthew Wilcox, (Tue Oct 16, 11:31 pm)
[PATCH 3/4] Fix PCIe hotplug for non-ACPI ExpressCard slots ..., Mark Lord, (Tue Oct 16, 9:55 pm)
[PATCH 4/4] Fix PCIe hotplug for non-ACPI ExpressCard slots ..., Mark Lord, (Tue Oct 16, 9:55 pm)
Re: [PATCH 4/4] Fix PCIe hotplug for non-ACPI ExpressCard sl..., Kristen Carlson Accardi, (Wed Oct 17, 8:01 pm)
Re: [PATCH 4/4] Fix PCIe hotplug for non-ACPI ExpressCard sl..., Mark Lord, (Wed Oct 17, 10:28 pm)
Re: [PATCH] Fix PCIe hotplug for Dell notebook ExpressCard s..., Greg KH, (Tue Oct 16, 6:03 pm)
Re: [Pcihpd-discuss] [PATCH] Fix PCIe hotplug for Dell noteb..., Kristen Carlson Accardi, (Tue Oct 16, 6:41 pm)
Re: [PATCH] Fix PCIe hotplug for Dell notebook ExpressCard s..., Mark Lord, (Tue Oct 16, 6:19 pm)
Re: [PATCH] Fix PCIe hotplug for Dell notebook ExpressCard s..., Kristen Carlson Accardi, (Tue Oct 16, 6:04 pm)
Re: [PATCH] Fix PCIe hotplug for Dell notebook ExpressCard s..., Mark Lord, (Tue Oct 16, 6:17 pm)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Kristen Carlson Accardi, (Tue Oct 16, 5:01 pm)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Theodore Tso, (Tue Oct 16, 6:33 pm)
Re: PCIe Hotplug: NFG unless I boot with card already inser..., Kristen Carlson Accardi, (Tue Oct 16, 3:51 pm)