[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1581120007-5280-7-git-send-email-jonathan.derrick@intel.com>
Date: Fri, 7 Feb 2020 17:00:04 -0700
From: Jon Derrick <jonathan.derrick@...el.com>
To: Bjorn Helgaas <helgaas@...nel.org>
Cc: <linux-pci@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
Andy Shevchenko <andriy.shevchenko@...el.com>,
Mika Westerberg <mika.westerberg@...ux.intel.com>,
Pawel Baldysiak <pawel.baldysiak@...el.com>,
Sinan Kaya <okaya@...nel.org>,
Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
Keith Busch <kbusch@...nel.org>,
Alexandru Gagniuc <mr.nuke.me@...il.com>,
Christoph Hellwig <hch@....de>,
Jon Derrick <jonathan.derrick@...el.com>
Subject: [RFC 6/9] PCI: pciehp: Expose the poll loop to other drivers
Abstract the poll loop into an 'events pending' check and a 'handle
events' method in order to allow another driver to call the polling
loop.
Signed-off-by: Jon Derrick <jonathan.derrick@...el.com>
---
drivers/pci/hotplug/pciehp.h | 2 ++
drivers/pci/hotplug/pciehp_hpc.c | 16 +++++++++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index c898c75..48fdd62 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -160,6 +160,8 @@ struct controller {
#define NO_CMD_CMPL(ctrl) ((ctrl)->slot_cap & PCI_EXP_SLTCAP_NCCS)
#define PSN(ctrl) (((ctrl)->slot_cap & PCI_EXP_SLTCAP_PSN) >> 19)
+bool pciehp_events_pending(struct controller *ctrl);
+void pciehp_handle_events(struct controller *ctrl);
void pciehp_request(struct controller *ctrl, int action);
void pciehp_handle_button_press(struct controller *ctrl);
void pciehp_handle_disable_request(struct controller *ctrl);
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index ce1e8c7..e46f177 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -708,6 +708,17 @@ static irqreturn_t pciehp_ist(int irq, void *dev_id)
return IRQ_HANDLED;
}
+bool pciehp_events_pending(struct controller *ctrl)
+{
+ return pciehp_isr(IRQ_NOTCONNECTED, ctrl) == IRQ_WAKE_THREAD ||
+ atomic_read(&ctrl->pending_events);
+}
+
+void pciehp_handle_events(struct controller *ctrl)
+{
+ pciehp_ist(IRQ_NOTCONNECTED, ctrl);
+}
+
static int pciehp_poll(void *data)
{
struct controller *ctrl = data;
@@ -716,9 +727,8 @@ static int pciehp_poll(void *data)
while (!kthread_should_stop()) {
/* poll for interrupt events or user requests */
- while (pciehp_isr(IRQ_NOTCONNECTED, ctrl) == IRQ_WAKE_THREAD ||
- atomic_read(&ctrl->pending_events))
- pciehp_ist(IRQ_NOTCONNECTED, ctrl);
+ while (pciehp_events_pending(ctrl))
+ pciehp_handle_events(ctrl);
if (pciehp_poll_time <= 0 || pciehp_poll_time > 60)
pciehp_poll_time = 2; /* clamp to sane value */
--
1.8.3.1
Powered by blists - more mailing lists