Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a3c33d7 authored by Mark Lord's avatar Mark Lord Committed by Greg Kroah-Hartman
Browse files

PCIE: fix PCIe Hotplug so that it works with ExpressCard slots on Dell... 


PCIE: fix PCIe Hotplug so that it works with ExpressCard slots on Dell notebooks (and others?) in conjunction with modparam of pciehp_force=1.

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

Signed-off-by: default avatarMark Lord <mlord@pobox.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a6f29a98

drivers/pci/hotplug/pciehp.h

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ extern int pciehp_configure_device(struct slot *p_slot); 
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)

{

drivers/pci/hotplug/pciehp_core.c

+5 −0
Original line number Diff line number Diff line
@@ -471,6 +471,11 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ 
	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)

drivers/pci/hotplug/pciehp_ctrl.c

+0 −1
Original line number Diff line number Diff line
@@ -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)