Commit 5649e4ce authored by Bjorn Helgaas's avatar Bjorn Helgaas

PCI: keystone: Pass keystone_pcie, not address, to IRQ functions

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: default avatarBjorn Helgaas <bhelgaas@google.com>
parent f3eca6c4
...@@ -261,25 +261,26 @@ void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, int offset) ...@@ -261,25 +261,26 @@ void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, int offset)
writel(offset, ks_pcie->va_app_base + IRQ_EOI); writel(offset, ks_pcie->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 *ks_pcie)
{ {
writel(ERR_IRQ_ALL, reg_base + ERR_IRQ_ENABLE_SET); writel(ERR_IRQ_ALL, ks_pcie->va_app_base + ERR_IRQ_ENABLE_SET);
} }
irqreturn_t ks_dw_pcie_handle_error_irq(struct device *dev, irqreturn_t ks_dw_pcie_handle_error_irq(struct keystone_pcie *ks_pcie)
void __iomem *reg_base)
{ {
u32 status; u32 status;
status = readl(reg_base + ERR_IRQ_STATUS_RAW) & ERR_IRQ_ALL; status = readl(ks_pcie->va_app_base + ERR_IRQ_STATUS_RAW) &
ERR_IRQ_ALL;
if (!status) if (!status)
return IRQ_NONE; return IRQ_NONE;
if (status & ERR_FATAL_IRQ) if (status & ERR_FATAL_IRQ)
dev_err(dev, "fatal error (status %#010x)\n", status); dev_err(ks_pcie->pp.dev, "fatal error (status %#010x)\n",
status);
/* Ack the IRQ; status bits are RW1C */ /* Ack the IRQ; status bits are RW1C */
writel(status, reg_base + ERR_IRQ_STATUS); writel(status, ks_pcie->va_app_base + ERR_IRQ_STATUS);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
...@@ -237,7 +237,7 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie) ...@@ -237,7 +237,7 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie)
} }
if (ks_pcie->error_irq > 0) if (ks_pcie->error_irq > 0)
ks_dw_pcie_enable_error_irq(ks_pcie->va_app_base); ks_dw_pcie_enable_error_irq(ks_pcie);
} }
/* /*
...@@ -305,8 +305,7 @@ static irqreturn_t pcie_err_irq_handler(int irq, void *priv) ...@@ -305,8 +305,7 @@ static irqreturn_t pcie_err_irq_handler(int irq, void *priv)
{ {
struct keystone_pcie *ks_pcie = priv; struct keystone_pcie *ks_pcie = priv;
return ks_dw_pcie_handle_error_irq(ks_pcie->pp.dev, return ks_dw_pcie_handle_error_irq(ks_pcie);
ks_pcie->va_app_base);
} }
static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie, static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie,
......
...@@ -45,9 +45,8 @@ phys_addr_t ks_dw_pcie_get_msi_addr(struct pcie_port *pp); ...@@ -45,9 +45,8 @@ phys_addr_t ks_dw_pcie_get_msi_addr(struct pcie_port *pp);
/* Keystone specific PCI controller APIs */ /* Keystone specific PCI controller APIs */
void ks_dw_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie); void ks_dw_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie);
void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, int offset); void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, int offset);
void ks_dw_pcie_enable_error_irq(void __iomem *reg_base); void ks_dw_pcie_enable_error_irq(struct keystone_pcie *ks_pcie);
irqreturn_t ks_dw_pcie_handle_error_irq(struct device *dev, irqreturn_t ks_dw_pcie_handle_error_irq(struct keystone_pcie *ks_pcie);
void __iomem *reg_base);
int ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie, int ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie,
struct device_node *msi_intc_np); struct device_node *msi_intc_np);
int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment