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

[PATCH 1/3] pciehp_handle_preinserted_card

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Mark Lord
Subject: [PATCH 1/3] pciehp_handle_preinserted_card
Date: Wednesday, October 17, 2007 - 8:03 pm

01_pciehp_handle_preinserted_card.patch:

Fix pciehp_probe() to deal with ExpressCard cards
that were inserted prior to the driver being loaded.

Signed-off-by: Mark Lord <mlord@pobox.com>
---
--- git12/drivers/pci/hotplug/pciehp_ctrl.c	2007-10-17 22:30:19.000000000 -0400
+++ linux/drivers/pci/hotplug/pciehp_ctrl.c	2007-10-17 22:29:59.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)
--- git12/drivers/pci/hotplug/pciehp.h	2007-10-17 22:30:19.000000000 -0400
+++ linux/drivers/pci/hotplug/pciehp.h	2007-10-17 22:29:59.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)
 {
--- git12/drivers/pci/hotplug/pciehp_core.c	2007-10-17 22:30:19.000000000 -0400
+++ linux/drivers/pci/hotplug/pciehp_core.c	2007-10-17 22:36:06.000000000 -0400
@@ -471,6 +471,11 @@
 	t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
 
 	t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
+	if (value) {
+		rc = pciehp_enable_slot(t_slot);
+		if (rc)	/* -ENODEV: shouldn't happen, but deal with it */
+			value = 0;
+	}
 	if ((POWER_CTRL(ctrl->ctrlcap)) && !value) {
 		rc = t_slot->hpc_ops->power_off_slot(t_slot); /* Power off slot if not occupied*/
 		if (rc)
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/3] Fix two PEIe hotplug issues, Mark Lord, (Wed Oct 17, 7:57 pm)
Re: [PATCH 1/3] pciehp_handle_preinserted_card, Mark Lord, (Wed Oct 17, 7:59 pm)
Re: [PATCH 2/3] pciehp_split_pcie_init, Mark Lord, (Wed Oct 17, 8:00 pm)
[PATCH 3/3] pciehp_resume_reinit_hardware, Mark Lord, (Wed Oct 17, 8:02 pm)
[PATCH 1/3] pciehp_handle_preinserted_card, Mark Lord, (Wed Oct 17, 8:03 pm)
[PATCH 2/3] pciehp_split_pcie_init, Mark Lord, (Wed Oct 17, 8:04 pm)
Re: [PATCH 0/3] Fix two PEIe hotplug issues, Mark Lord, (Wed Oct 17, 8:05 pm)
Re: [PATCH 0/3] Fix two PEIe hotplug issues, Mark Lord, (Wed Oct 17, 8:09 pm)
[PATCH 1/3] pciehp: hotplug: deal with pre-inserted Expres ..., Mark Lord, (Wed Oct 17, 8:32 pm)
[PATCH 2/3] pciehp: hotplug: split out hardware init from ..., Mark Lord, (Wed Oct 17, 8:33 pm)
[PATCH 3/3] pciehp: hotplug: reinit hotplug h/w on resume ..., Mark Lord, (Wed Oct 17, 8:34 pm)
Re: [Pcihpd-discuss] [PATCH 1/3] pciehp: hotplug: deal wit ..., Kenji Kaneshige, (Thu Oct 18, 4:15 am)
Re: [Pcihpd-discuss] [PATCH 1/3] pciehp: hotplug: deal wit ..., Mark Lord, (Thu Oct 18, 6:31 am)
Re: [PATCH 0/3] Fix two PEIe hotplug issues, Kristen Carlson Accardi, (Thu Oct 18, 9:13 am)
Re: [PATCH 0/3] Fix two PEIe hotplug issues, Kristen Carlson Accardi, (Thu Oct 18, 10:06 am)
Re: [PATCH 0/3] Fix two PEIe hotplug issues, Mark Lord, (Thu Oct 18, 10:06 am)
Re: [PATCH 0/3] Fix two PEIe hotplug issues, Theodore Tso, (Thu Oct 18, 10:49 am)
Re: [PATCH 0/3] Fix two PEIe hotplug issues, Kristen Carlson Accardi, (Thu Oct 18, 10:56 am)
Re: [PATCH 0/3] Fix two PEIe hotplug issues, Mark Lord, (Thu Oct 18, 2:11 pm)
Re: [PATCH 0/3] Fix two PEIe hotplug issues, Mark Lord, (Thu Oct 18, 2:26 pm)
Re: [Pcihpd-discuss] [PATCH 1/3] pciehp: hotplug: deal wit ..., Kenji Kaneshige, (Thu Oct 18, 7:38 pm)
Re: [Pcihpd-discuss] [PATCH 1/3] pciehp: hotplug: deal wit ..., Mark Lord, (Thu Oct 18, 8:09 pm)
Re: [Pcihpd-discuss] [PATCH 1/3] pciehp: hotplug: deal wit ..., Kenji Kaneshige, (Thu Oct 18, 8:27 pm)
[PATCH] Fix PCIe double initialization bug, Mark Lord, (Sat Nov 17, 5:27 pm)
Re: [PATCH] Fix PCIe double initialization bug, Rafael J. Wysocki, (Sun Nov 18, 5:23 am)
Re: [PATCH] Fix PCIe double initialization bug, Mark Lord, (Sun Nov 18, 7:37 am)