Skip to content

Commit

Permalink
MIPS: pci-ar724x: use per-controller IRQ base
Browse files Browse the repository at this point in the history 
Change to the code to use per-controller IRQ base.
This is needed for multiple PCI controller support.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/4915/
Signed-off-by: John Crispin <blogic@openwrt.org>
  • Loading branch information
Gabor Juhos authored and John Crispin committed Feb 17, 2013
1 parent 34b134a commit 8b66d46
Showing 1 changed file with 21 additions and 10 deletions.
31 changes: 21 additions & 10 deletions arch/mips/pci/pci-ar724x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ struct ar724x_pci_controller {
void __iomem *ctrl_base;

int irq;
int irq_base;

bool link_up;
bool bar0_is_cached;
Expand Down Expand Up @@ -205,7 +206,7 @@ static void ar724x_pci_irq_handler(unsigned int irq, struct irq_desc *desc)
__raw_readl(base + AR724X_PCI_REG_INT_MASK);

if (pending & AR724X_PCI_INT_DEV0)
generic_handle_irq(ATH79_PCI_IRQ(0));
generic_handle_irq(apc->irq_base + 0);

else
spurious_interrupt();
Expand All @@ -215,13 +216,15 @@ static void ar724x_pci_irq_unmask(struct irq_data *d)
{
struct ar724x_pci_controller *apc;
void __iomem *base;
int offset;
u32 t;

apc = irq_data_get_irq_chip_data(d);
base = apc->ctrl_base;
offset = apc->irq_base - d->irq;

switch (d->irq) {
case ATH79_PCI_IRQ(0):
switch (offset) {
case 0:
t = __raw_readl(base + AR724X_PCI_REG_INT_MASK);
__raw_writel(t | AR724X_PCI_INT_DEV0,
base + AR724X_PCI_REG_INT_MASK);
Expand All @@ -234,13 +237,15 @@ static void ar724x_pci_irq_mask(struct irq_data *d)
{
struct ar724x_pci_controller *apc;
void __iomem *base;
int offset;
u32 t;

apc = irq_data_get_irq_chip_data(d);
base = apc->ctrl_base;
offset = apc->irq_base - d->irq;

switch (d->irq) {
case ATH79_PCI_IRQ(0):
switch (offset) {
case 0:
t = __raw_readl(base + AR724X_PCI_REG_INT_MASK);
__raw_writel(t & ~AR724X_PCI_INT_DEV0,
base + AR724X_PCI_REG_INT_MASK);
Expand All @@ -264,7 +269,8 @@ static struct irq_chip ar724x_pci_irq_chip = {
.irq_mask_ack = ar724x_pci_irq_mask,
};

static void ar724x_pci_irq_init(struct ar724x_pci_controller *apc)
static void ar724x_pci_irq_init(struct ar724x_pci_controller *apc,
int id)
{
void __iomem *base;
int i;
Expand All @@ -274,10 +280,10 @@ static void ar724x_pci_irq_init(struct ar724x_pci_controller *apc)
__raw_writel(0, base + AR724X_PCI_REG_INT_MASK);
__raw_writel(0, base + AR724X_PCI_REG_INT_STATUS);

BUILD_BUG_ON(ATH79_PCI_IRQ_COUNT < AR724X_PCI_IRQ_COUNT);
apc->irq_base = ATH79_PCI_IRQ_BASE + (id * AR724X_PCI_IRQ_COUNT);

for (i = ATH79_PCI_IRQ_BASE;
i < ATH79_PCI_IRQ_BASE + AR724X_PCI_IRQ_COUNT; i++) {
for (i = apc->irq_base;
i < apc->irq_base + AR724X_PCI_IRQ_COUNT; i++) {
irq_set_chip_and_handler(i, &ar724x_pci_irq_chip,
handle_level_irq);
irq_set_chip_data(i, apc);
Expand All @@ -291,6 +297,11 @@ static int ar724x_pci_probe(struct platform_device *pdev)
{
struct ar724x_pci_controller *apc;
struct resource *res;
int id;

id = pdev->id;
if (id == -1)
id = 0;

apc = devm_kzalloc(&pdev->dev, sizeof(struct ar724x_pci_controller),
GFP_KERNEL);
Expand Down Expand Up @@ -347,7 +358,7 @@ static int ar724x_pci_probe(struct platform_device *pdev)
if (!apc->link_up)
dev_warn(&pdev->dev, "PCIe link is down\n");

ar724x_pci_irq_init(apc);
ar724x_pci_irq_init(apc, id);

register_pci_controller(&apc->pci_controller);

Expand Down

0 comments on commit 8b66d46

Please sign in to comment.