From: Bjorn Helgaas <bhelgaas@google.com>
To: Murali Karicheri <m-karicheri2@ti.com>
Cc: linux-pci@vger.kernel.org
Subject: [PATCH 2/6] PCI: keystone: Pass keystone_pcie, not address, to IRQ functions
Date: Fri, 07 Oct 2016 11:40:35 -0500 [thread overview]
Message-ID: <20161007164035.26090.37896.stgit@bhelgaas-glaptop2.roam.corp.google.com> (raw)
In-Reply-To: <20161007164026.26090.42844.stgit@bhelgaas-glaptop2.roam.corp.google.com>
Instead of passing the application register base to IRQ functions,
pass the struct keystone_pcie. This will allow them to use register
accessors. No functional change intended.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pci-keystone-dw.c | 15 ++++++++-------
drivers/pci/host/pci-keystone.c | 5 ++---
drivers/pci/host/pci-keystone.h | 5 ++---
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/drivers/pci/host/pci-keystone-dw.c b/drivers/pci/host/pci-keystone-dw.c
index d09e3c6..5c67d54 100644
--- a/drivers/pci/host/pci-keystone-dw.c
+++ b/drivers/pci/host/pci-keystone-dw.c
@@ -259,25 +259,26 @@ void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *keystone, int offset)
writel(offset, keystone->va_app_base + IRQ_EOI);
}
-void ks_dw_pcie_enable_error_irq(void __iomem *reg_base)
+void ks_dw_pcie_enable_error_irq(struct keystone_pcie *keystone)
{
- writel(ERR_IRQ_ALL, reg_base + ERR_IRQ_ENABLE_SET);
+ writel(ERR_IRQ_ALL, keystone->va_app_base + ERR_IRQ_ENABLE_SET);
}
-irqreturn_t ks_dw_pcie_handle_error_irq(struct device *dev,
- void __iomem *reg_base)
+irqreturn_t ks_dw_pcie_handle_error_irq(struct keystone_pcie *keystone)
{
u32 status;
- status = readl(reg_base + ERR_IRQ_STATUS_RAW) & ERR_IRQ_ALL;
+ status = readl(keystone->va_app_base + ERR_IRQ_STATUS_RAW) &
+ ERR_IRQ_ALL;
if (!status)
return IRQ_NONE;
if (status & ERR_FATAL_IRQ)
- dev_err(dev, "fatal error (status %#010x)\n", status);
+ dev_err(keystone->pp.dev, "fatal error (status %#010x)\n",
+ status);
/* Ack the IRQ; status bits are RW1C */
- writel(status, reg_base + ERR_IRQ_STATUS);
+ writel(status, keystone->va_app_base + ERR_IRQ_STATUS);
return IRQ_HANDLED;
}
diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
index 55b2be7..6b1cb14 100644
--- a/drivers/pci/host/pci-keystone.c
+++ b/drivers/pci/host/pci-keystone.c
@@ -234,7 +234,7 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *keystone)
}
if (keystone->error_irq > 0)
- ks_dw_pcie_enable_error_irq(keystone->va_app_base);
+ ks_dw_pcie_enable_error_irq(keystone);
}
/*
@@ -302,8 +302,7 @@ static irqreturn_t pcie_err_irq_handler(int irq, void *priv)
{
struct keystone_pcie *keystone = priv;
- return ks_dw_pcie_handle_error_irq(keystone->pp.dev,
- keystone->va_app_base);
+ return ks_dw_pcie_handle_error_irq(keystone);
}
static int __init ks_add_pcie_port(struct keystone_pcie *keystone,
diff --git a/drivers/pci/host/pci-keystone.h b/drivers/pci/host/pci-keystone.h
index 379213c..2a81e05 100644
--- a/drivers/pci/host/pci-keystone.h
+++ b/drivers/pci/host/pci-keystone.h
@@ -45,9 +45,8 @@ phys_addr_t ks_dw_pcie_get_msi_addr(struct pcie_port *pp);
/* Keystone specific PCI controller APIs */
void ks_dw_pcie_enable_legacy_irqs(struct keystone_pcie *keystone);
void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *keystone, int offset);
-void ks_dw_pcie_enable_error_irq(void __iomem *reg_base);
-irqreturn_t ks_dw_pcie_handle_error_irq(struct device *dev,
- void __iomem *reg_base);
+void ks_dw_pcie_enable_error_irq(struct keystone_pcie *keystone);
+irqreturn_t ks_dw_pcie_handle_error_irq(struct keystone_pcie *keystone);
int ks_dw_pcie_host_init(struct keystone_pcie *keystone,
struct device_node *msi_intc_np);
int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,
next prev parent reply other threads:[~2016-10-07 16:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 16:40 [PATCH 1/6] PCI: keystone: Name private struct pointer "keystone" consistently Bjorn Helgaas
2016-10-07 16:40 ` Bjorn Helgaas [this message]
2016-10-07 16:40 ` [PATCH 3/6] PCI: keystone: Pass keystone_pcie, not address, to DBI functions Bjorn Helgaas
2016-10-07 16:40 ` [PATCH 4/6] PCI: keystone: Add app register accessors Bjorn Helgaas
2016-10-07 16:41 ` [PATCH 5/6] PCI: keystone: Reorder struct keystone_pcie Bjorn Helgaas
2016-10-07 16:41 ` [PATCH 6/6] PCI: keystone: Use dw_pcie_readl_rc() and dw_pcie_pcie_writel_rc() Bjorn Helgaas
2016-10-07 16:53 ` [PATCH 1/6] PCI: keystone: Name private struct pointer "keystone" consistently Murali Karicheri
2016-10-07 16:56 ` Murali Karicheri
2016-10-07 18:09 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161007164035.26090.37896.stgit@bhelgaas-glaptop2.roam.corp.google.com \
--to=bhelgaas@google.com \
--cc=linux-pci@vger.kernel.org \
--cc=m-karicheri2@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox