Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PCI: pciehp: Remove a non-existent card, regardless of "surprise" capability

Browse source 
In case a card is physically yanked out, it should immediately be removed,
regardless of the "surprise" capability bit. Thus:

  - Always handle the physical removal - regardless of the "surprise" bit.
  - Don't use "surprise" capability when making decisions about enabling
    presence detect notifications.
  - Reword the comments to indicate the intent.

Signed-off-by: Rajat Jain <rajatxjain@gmail.com>
Signed-off-by: Rajat Jain <rajatjain@juniper.net>
Signed-off-by: Guenter Roeck <groeck@juniper.net>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Rajat Jain 2014-02-18 18:53:19 -08:00 committed by Bjorn Helgaas
parent 50277c8b06
commit 2b3940b606
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/pci/hotplug/pciehp_ctrl.c
View file

@ -535,9 +535,16 @@ static void interrupt_event_handler(struct work_struct *work)
pciehp_green_led_off(p_slot); pciehp_green_led_off(p_slot);
break; break;
case INT_PRESENCE_ON: case INT_PRESENCE_ON:
case INT_PRESENCE_OFF:
if (!HP_SUPR_RM(ctrl)) if (!HP_SUPR_RM(ctrl))
break; break;
ctrl_dbg(ctrl, "Surprise Insertion\n");
handle_surprise_event(p_slot);
break;
case INT_PRESENCE_OFF:
/*
* Regardless of surprise capability, we need to
* definitely remove a card that has been pulled out!
*/
ctrl_dbg(ctrl, "Surprise Removal\n"); ctrl_dbg(ctrl, "Surprise Removal\n");
handle_surprise_event(p_slot); handle_surprise_event(p_slot);
break; break;

9
drivers/pci/hotplug/pciehp_hpc.c
View file

@ -619,9 +619,10 @@ static void pcie_disable_notification(struct controller *ctrl)
/* /*
* pciehp has a 1:1 bus:slot relationship so we ultimately want a secondary * pciehp has a 1:1 bus:slot relationship so we ultimately want a secondary
* bus reset of the bridge, but if the slot supports surprise removal (or * bus reset of the bridge, but at the same time we want to ensure that it is
* link state change based hotplug), we need to disable presence detection * not seen as a hot-unplug, followed by the hot-plug of the device. Thus,
* (or link state notifications) around the bus reset and clear any spurious * disable link state notification and presence detection change notification
* momentarily, if we see that they could interfere. Also, clear any spurious
* events after. * events after.
*/ */
int pciehp_reset_slot(struct slot *slot, int probe) int pciehp_reset_slot(struct slot *slot, int probe)
@ -633,7 +634,7 @@ int pciehp_reset_slot(struct slot *slot, int probe)
if (probe) if (probe)
return 0; return 0;
if (HP_SUPR_RM(ctrl) && !ATTN_BUTTN(ctrl)) { if (!ATTN_BUTTN(ctrl)) {
ctrl_mask |= PCI_EXP_SLTCTL_PDCE; ctrl_mask |= PCI_EXP_SLTCTL_PDCE;
stat_mask |= PCI_EXP_SLTSTA_PDC; stat_mask |= PCI_EXP_SLTSTA_PDC;
} }