kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PCI: designware: Add irq_create_mapping()

Browse source 
Without irq_create_mapping(), the correct IRQ number cannot be
provided.  In this case, it makes problems such as NULL dereference.
Thus, irq_create_mapping() should be added for MSI.

Suggested-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Pratyush Anand <pratyush.anand@st.com>
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Pratyush Anand 2013-10-09 21:32:12 +09:00 committed by Bjorn Helgaas
parent 73e408508b
commit 904d0e7889
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/pci/host/pcie-designware.c
View file

@ -157,7 +157,7 @@ static struct irq_chip dw_msi_irq_chip = {
void dw_handle_msi_irq(struct pcie_port *pp) void dw_handle_msi_irq(struct pcie_port *pp)
{ {
unsigned long val; unsigned long val;
int i, pos; int i, pos, irq;
for (i = 0; i < MAX_MSI_CTRLS; i++) { for (i = 0; i < MAX_MSI_CTRLS; i++) {
dw_pcie_rd_own_conf(pp, PCIE_MSI_INTR0_STATUS + i * 12, 4, dw_pcie_rd_own_conf(pp, PCIE_MSI_INTR0_STATUS + i * 12, 4,
@ -165,8 +165,9 @@ void dw_handle_msi_irq(struct pcie_port *pp)
if (val) { if (val) {
pos = 0; pos = 0;
while ((pos = find_next_bit(&val, 32, pos)) != 32) { while ((pos = find_next_bit(&val, 32, pos)) != 32) {
generic_handle_irq(pp->msi_irq_start irq = irq_find_mapping(pp->irq_domain,
+ (i * 32) + pos); i * 32 + pos);
generic_handle_irq(irq);
pos++; pos++;
} }
} }
@ -237,9 +238,8 @@ static int assign_irq(int no_irqs, struct msi_desc *desc, int *pos)
} }
} }
irq = (pp->msi_irq_start + pos0); irq = irq_find_mapping(pp->irq_domain, pos0);
if (!irq)
if ((irq + no_irqs) > (pp->msi_irq_start + MAX_MSI_IRQS-1))
goto no_valid_irq; goto no_valid_irq;
i = 0; i = 0;
@ -270,6 +270,7 @@ static void clear_irq(unsigned int irq)
struct irq_desc *desc; struct irq_desc *desc;
struct msi_desc *msi; struct msi_desc *msi;
struct pcie_port *pp; struct pcie_port *pp;
struct irq_data *data = irq_get_irq_data(irq);
/* get the port structure */ /* get the port structure */
desc = irq_to_desc(irq); desc = irq_to_desc(irq);
@ -280,7 +281,7 @@ static void clear_irq(unsigned int irq)
return; return;
} }
pos = irq - pp->msi_irq_start; pos = data->hwirq;
irq_free_desc(irq); irq_free_desc(irq);
@ -371,8 +372,7 @@ int __init dw_pcie_host_init(struct pcie_port *pp)
struct of_pci_range range; struct of_pci_range range;
struct of_pci_range_parser parser; struct of_pci_range_parser parser;
u32 val; u32 val;
int i;
struct irq_domain *irq_domain;
if (of_pci_range_parser_init(&parser, np)) { if (of_pci_range_parser_init(&parser, np)) {
dev_err(pp->dev, "missing ranges property\n"); dev_err(pp->dev, "missing ranges property\n");
@ -441,15 +441,16 @@ int __init dw_pcie_host_init(struct pcie_port *pp)
} }
if (IS_ENABLED(CONFIG_PCI_MSI)) { if (IS_ENABLED(CONFIG_PCI_MSI)) {
irq_domain = irq_domain_add_linear(pp->dev->of_node, pp->irq_domain = irq_domain_add_linear(pp->dev->of_node,
MAX_MSI_IRQS, &msi_domain_ops, MAX_MSI_IRQS, &msi_domain_ops,
&dw_pcie_msi_chip); &dw_pcie_msi_chip);
if (!irq_domain) { if (!pp->irq_domain) {
dev_err(pp->dev, "irq domain init failed\n"); dev_err(pp->dev, "irq domain init failed\n");
return -ENXIO; return -ENXIO;
} }
pp->msi_irq_start = irq_find_mapping(irq_domain, 0); for (i = 0; i < MAX_MSI_IRQS; i++)
irq_create_mapping(pp->irq_domain, i);
} }
if (pp->ops->host_init) if (pp->ops->host_init)

2
drivers/pci/host/pcie-designware.h
View file

@ -50,7 +50,7 @@ struct pcie_port {
u32 lanes; u32 lanes;
struct pcie_host_ops *ops; struct pcie_host_ops *ops;
int msi_irq; int msi_irq;
int msi_irq_start; struct irq_domain *irq_domain;
unsigned long msi_data; unsigned long msi_data;
DECLARE_BITMAP(msi_irq_in_use, MAX_MSI_IRQS); DECLARE_BITMAP(msi_irq_in_use, MAX_MSI_IRQS);
}; };