hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powerpc/pci: Use of_irq_parse_and_map_pci() helper 

Instead of calling both of_irq_parse_pci() and irq_create_of_mapping(),
call of_irq_parse_and_map_pci(), which does the same thing. This will allow
making of_irq_parse_pci() a private, static function.

This changes the logic slightly in that the fallback path will also be
taken if irq_create_of_mapping() fails internally.

Signed-off-by: Rob Herring <robh@kernel.org>
[bhelgaas: fold in virq init from Stephen Rothwell <sfr@canb.auug.org.au>]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Rob Herring 2018-01-04 15:12:14 -06:00 committed by Bjorn Helgaas
parent 4670d610d5
commit 59f47eff03
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/kernel/pci-common.c
View File

@ -339,8 +339,7 @@ struct pci_controller* pci_find_hose_for_OF_device(struct device_node* node)
*/ */
static int pci_read_irq_line(struct pci_dev *pci_dev) static int pci_read_irq_line(struct pci_dev *pci_dev)
{ {
struct of_phandle_args oirq; unsigned int virq = 0;
unsigned int virq;
pr_debug("PCI: Try to map irq for %s...\n", pci_name(pci_dev)); pr_debug("PCI: Try to map irq for %s...\n", pci_name(pci_dev));
@ -348,7 +347,7 @@ static int pci_read_irq_line(struct pci_dev *pci_dev)
memset(&oirq, 0xff, sizeof(oirq)); memset(&oirq, 0xff, sizeof(oirq));
#endif #endif
/* Try to get a mapping from the device-tree */ /* Try to get a mapping from the device-tree */
if (of_irq_parse_pci(pci_dev, &oirq)) { if (!of_irq_parse_and_map_pci(pci_dev, 0, 0)) {
u8 line, pin; u8 line, pin;
/* If that fails, lets fallback to what is in the config /* If that fails, lets fallback to what is in the config
@ -372,11 +371,6 @@ static int pci_read_irq_line(struct pci_dev *pci_dev)
virq = irq_create_mapping(NULL, line); virq = irq_create_mapping(NULL, line);
if (virq) if (virq)
irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW); irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
} else {
pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %pOF\n",
oirq.args_count, oirq.args[0], oirq.args[1], oirq.np);
virq = irq_create_of_mapping(&oirq);
} }
if (!virq) { if (!virq) {