2014-02-20 13:28:05

by Tomasz Nowicki

Subject: [PATCH v3 1/1] ACPI, PCI, ISA: Call ISA-specific code only for architectures which support ISA.

This commit moves ISA-specific code to separate function and makes that
function depend on CONFIG_{E}ISA so that we do not have to maintain
acpi_isa_irq_to_gsi() function for architectures which do not support ISA.

Signed-off-by: Tomasz Nowicki <[email protected]>
---
drivers/acpi/pci_irq.c | 36 +++++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 361b40c..9c62340 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -370,6 +370,30 @@ static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin)
return NULL;
}

+#if IS_ENABLED(CONFIG_ISA) || IS_ENABLED(CONFIG_EISA)
+static int acpi_isa_register_gsi(struct pci_dev *dev)
+{
+ u32 dev_gsi;
+
+ /* Interrupt Line values above 0xF are forbidden */
+ if (dev->irq > 0 && (dev->irq <= 0xF) &&
+ (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) {
+ dev_warn(&dev->dev, "PCI INT %c: no GSI - using ISA IRQ %d\n",
+ pin_name(dev->pin), dev->irq);
+ acpi_register_gsi(&dev->dev, dev_gsi,
+ ACPI_LEVEL_SENSITIVE,
+ ACPI_ACTIVE_LOW);
+ return 0;
+ }
+ return -EINVAL;
+}
+#else
+static inline int acpi_isa_register_gsi(struct pci_dev *dev)
+{
+ return -ENODEV;
+}
+#endif
+
int acpi_pci_irq_enable(struct pci_dev *dev)
{
struct acpi_prt_entry *entry;
@@ -416,19 +440,9 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
* driver reported one, then use it. Exit in any case.
*/
if (gsi < 0) {
- u32 dev_gsi;
- /* Interrupt Line values above 0xF are forbidden */
- if (dev->irq > 0 && (dev->irq <= 0xF) &&
- (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) {
- dev_warn(&dev->dev, "PCI INT %c: no GSI - using ISA IRQ %d\n",
- pin_name(pin), dev->irq);
- acpi_register_gsi(&dev->dev, dev_gsi,
- ACPI_LEVEL_SENSITIVE,
- ACPI_ACTIVE_LOW);
- } else {
+ if (acpi_isa_register_gsi(dev))
dev_warn(&dev->dev, "PCI INT %c: no GSI\n",
pin_name(pin));
- }

kfree(entry);
return 0;
--
1.7.9.5

2014-02-20 23:47:44

by Rafael J. Wysocki

Subject: Re: [PATCH v3 1/1] ACPI, PCI, ISA: Call ISA-specific code only for architectures which support ISA.

On Thursday, February 20, 2014 02:27:46 PM Tomasz Nowicki wrote:
> This commit moves ISA-specific code to separate function and makes that
> function depend on CONFIG_{E}ISA so that we do not have to maintain
> acpi_isa_irq_to_gsi() function for architectures which do not support ISA.
>
> Signed-off-by: Tomasz Nowicki <[email protected]>

Queued up for 3.15, thanks!

> ---
> drivers/acpi/pci_irq.c | 36 +++++++++++++++++++++++++-----------
> 1 file changed, 25 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
> index 361b40c..9c62340 100644
> --- a/drivers/acpi/pci_irq.c
> +++ b/drivers/acpi/pci_irq.c
> @@ -370,6 +370,30 @@ static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin)
> return NULL;
> }
>
> +#if IS_ENABLED(CONFIG_ISA) || IS_ENABLED(CONFIG_EISA)
> +static int acpi_isa_register_gsi(struct pci_dev *dev)
> +{
> + u32 dev_gsi;
> +
> + /* Interrupt Line values above 0xF are forbidden */
> + if (dev->irq > 0 && (dev->irq <= 0xF) &&
> + (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) {
> + dev_warn(&dev->dev, "PCI INT %c: no GSI - using ISA IRQ %d\n",
> + pin_name(dev->pin), dev->irq);
> + acpi_register_gsi(&dev->dev, dev_gsi,
> + ACPI_LEVEL_SENSITIVE,
> + ACPI_ACTIVE_LOW);
> + return 0;
> + }
> + return -EINVAL;
> +}
> +#else
> +static inline int acpi_isa_register_gsi(struct pci_dev *dev)
> +{
> + return -ENODEV;
> +}
> +#endif
> +
> int acpi_pci_irq_enable(struct pci_dev *dev)
> {
> struct acpi_prt_entry *entry;
> @@ -416,19 +440,9 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
> * driver reported one, then use it. Exit in any case.
> */
> if (gsi < 0) {
> - u32 dev_gsi;
> - /* Interrupt Line values above 0xF are forbidden */
> - if (dev->irq > 0 && (dev->irq <= 0xF) &&
> - (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) {
> - dev_warn(&dev->dev, "PCI INT %c: no GSI - using ISA IRQ %d\n",
> - pin_name(pin), dev->irq);
> - acpi_register_gsi(&dev->dev, dev_gsi,
> - ACPI_LEVEL_SENSITIVE,
> - ACPI_ACTIVE_LOW);
> - } else {
> + if (acpi_isa_register_gsi(dev))
> dev_warn(&dev->dev, "PCI INT %c: no GSI\n",
> pin_name(pin));
> - }
>
> kfree(entry);
> return 0;
>

--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.