Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/pci/host/pci-keystone-dw.c

+8 −7
Original line number Diff line number Diff line
@@ -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);

}



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,

					void __iomem *reg_base)

irqreturn_t ks_dw_pcie_handle_error_irq(struct keystone_pcie *ks_pcie)

{

	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)

		return IRQ_NONE;



	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 */

	writel(status, reg_base + ERR_IRQ_STATUS);

	writel(status, ks_pcie->va_app_base + ERR_IRQ_STATUS);

	return IRQ_HANDLED;

}

drivers/pci/host/pci-keystone.c

+2 −3
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie) 
	}



	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) 
{

	struct keystone_pcie *ks_pcie = priv;



	return ks_dw_pcie_handle_error_irq(ks_pcie->pp.dev,

					   ks_pcie->va_app_base);

	return ks_dw_pcie_handle_error_irq(ks_pcie);

}



static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie,

drivers/pci/host/pci-keystone.h

+2 −3
Original line number Diff line number Diff line
@@ -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 *ks_pcie);

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);

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 *ks_pcie);

irqreturn_t ks_dw_pcie_handle_error_irq(struct keystone_pcie *ks_pcie);

int  ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie,

			struct device_node *msi_intc_np);

int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,