Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1481978

[PATCH v2 5/8] PCI: pciehp: Don't re-read Slot Status when handling surprise event

Show all headers | View raw

From: Mayurkumar Patel <mayurkumar.patel@intel.com>

Previously we read Slot Status when handling a surprise event.  But Slot
Status might have changed since we identified the event, and the event_type
already tells us whether to enable or disable the slot, so there's no need
to read it again.

Remove handle_surprise_event() and queue the power work directly.

[bhelgaas: changelog]
Signed-off-by: Mayurkumar Patel <mayurkumar.patel@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rajat Jain <rajatxjain@gmail.com>
---
 drivers/pci/hotplug/pciehp_ctrl.c |   18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 7ea3e61..a787684 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -302,20 +302,6 @@ static void handle_button_press_event(struct slot *p_slot)
 /*
  * Note: This function must be called with slot->lock held
  */
-static void handle_surprise_event(struct slot *p_slot)
-{
-	u8 getstatus;
-
-	pciehp_get_adapter_status(p_slot, &getstatus);
-	if (!getstatus)
-		pciehp_queue_power_work(p_slot, DISABLE_REQ);
-	else
-		pciehp_queue_power_work(p_slot, ENABLE_REQ);
-}
-
-/*
- * Note: This function must be called with slot->lock held
- */
 static void handle_link_event(struct slot *p_slot, u32 event)
 {
 	struct controller *ctrl = p_slot->ctrl;
@@ -378,14 +364,14 @@ static void interrupt_event_handler(struct work_struct *work)
 		pciehp_green_led_off(p_slot);
 		break;
 	case INT_PRESENCE_ON:
-		handle_surprise_event(p_slot);
+		pciehp_queue_power_work(p_slot, ENABLE_REQ);
 		break;
 	case INT_PRESENCE_OFF:
 		/*
 		 * Regardless of surprise capability, we need to
 		 * definitely remove a card that has been pulled out!
 		 */
-		handle_surprise_event(p_slot);
+		pciehp_queue_power_work(p_slot, DISABLE_REQ);
 		break;
 	case INT_LINK_UP:
 	case INT_LINK_DOWN:

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/8] PCI: pciehp: Rework hotplug interrupt routine Bjorn Helgaas <bhelgaas@google.com> - 2016-09-12 23:10 +0200
  [PATCH v2 1/8] PCI: pciehp: Rename pcie_isr() locals for clarity Bjorn Helgaas <bhelgaas@google.com> - 2016-09-12 23:10 +0200
    RE: [PATCH v2 1/8] PCI: pciehp: Rename pcie_isr() locals for clarity "Patel, Mayurkumar" <mayurkumar.patel@intel.com> - 2016-09-13 12:10 +0200
      Re: [PATCH v2 1/8] PCI: pciehp: Rename pcie_isr() locals for clarity Bjorn Helgaas <helgaas@kernel.org> - 2016-09-13 16:00 +0200
        RE: [PATCH v2 1/8] PCI: pciehp: Rename pcie_isr() locals for clarity "Patel, Mayurkumar" <mayurkumar.patel@intel.com> - 2016-09-13 18:10 +0200
  [PATCH v2 4/8] PCI: pciehp: Don't re-read Slot Status when queuing  hotplug event Bjorn Helgaas <bhelgaas@google.com> - 2016-09-12 23:10 +0200
  [PATCH v2 2/8] PCI: pciehp: Return IRQ_NONE when we can't read  interrupt status Bjorn Helgaas <bhelgaas@google.com> - 2016-09-12 23:10 +0200
  [PATCH v2 3/8] PCI: pciehp: Process all hotplug events before  looking for new ones Bjorn Helgaas <bhelgaas@google.com> - 2016-09-12 23:10 +0200
  [PATCH v2 5/8] PCI: pciehp: Don't re-read Slot Status when handling  surprise event Bjorn Helgaas <bhelgaas@google.com> - 2016-09-12 23:10 +0200
  [PATCH v2 8/8] PCI: pciehp: Remove useless  pciehp_get_latch_status() calls Bjorn Helgaas <bhelgaas@google.com> - 2016-09-12 23:20 +0200
  [PATCH v2 6/8] PCI: pciehp: Remove unnecessary guard Bjorn Helgaas <bhelgaas@google.com> - 2016-09-12 23:20 +0200
  [PATCH v2 7/8] PCI: pciehp: Clean up dmesg "Slot(%s)" messages Bjorn Helgaas <bhelgaas@google.com> - 2016-09-12 23:20 +0200
  Re: [PATCH v2 0/8] PCI: pciehp: Rework hotplug interrupt routine Lukas Wunner <lukas@wunner.de> - 2016-09-13 18:30 +0200
    Re: [PATCH v2 0/8] PCI: pciehp: Rework hotplug interrupt routine Bjorn Helgaas <helgaas@kernel.org> - 2016-09-13 20:30 +0200
  Re: [PATCH v2 0/8] PCI: pciehp: Rework hotplug interrupt routine Mika Westerberg <mika.westerberg@linux.intel.com> - 2016-09-14 10:50 +0200
    Re: [PATCH v2 0/8] PCI: pciehp: Rework hotplug interrupt routine Bjorn Helgaas <helgaas@kernel.org> - 2016-09-14 21:30 +0200
  Re: [PATCH v2 0/8] PCI: pciehp: Rework hotplug interrupt routine Bjorn Helgaas <helgaas@kernel.org> - 2016-09-14 23:30 +0200

csiph-web