Commit 220580fb authored Dec 15, 2017 by Andy Shevchenko Committed by Rafael J. Wysocki Dec 28, 2017

ACPI / x86: boot: Get rid of ACPI_INVALID_GSI



Commit 49e4b843 (ACPI: Use correct IRQ when uninstalling ACPI
interrupt handler) brings a new definition for invalid ACPI IRQ,
i.e. INVALID_ACPI_IRQ, which is defined to 0xffffffff (or -1 for
unsigned value).

Get rid of a former one, which was brought in by commit 2c0a6894
(x86, ACPI, irq: Enhance error handling in function acpi_register_gsi()),
in favour of latter.

To clarify the rationale of changing from INT_MIN to ((unsigned)-1)
definition consider the following:
- IRQ 0 is valid one in hardware, so, better not to use it everywhere
  (Linux uses 0 as NO IRQ, though it's another story)
- INT_MIN splits the range into two, while 0xffffffff reserves only the
  last item
- when type casting is done in most cases 0xff, 0xffff is naturally used
  as a marker of invalid HW IRQ: for example PCI INT line 0xff means
  no IRQ assigned by BIOS

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 7d7fb91c

arch/x86/kernel/acpi/boot.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -112,8 +112,6 @@ static u32 isa_irq_to_gsi[NR_IRQS_LEGACY] __read_mostly = {
		0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
		};

		#define ACPI_INVALID_GSI INT_MIN

		/*
		* This is just a simple wrapper around early_memremap(),
		* with sanity checks for phys == 0 and size == 0.
		@@ -372,7 +370,7 @@ static void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
		* and acpi_isa_irq_to_gsi() may give wrong result.
		*/
		if (gsi < nr_legacy_irqs() && isa_irq_to_gsi[gsi] == gsi)
		isa_irq_to_gsi[gsi] = ACPI_INVALID_GSI;
		isa_irq_to_gsi[gsi] = INVALID_ACPI_IRQ;
		isa_irq_to_gsi[bus_irq] = gsi;
		}

		@@ -637,7 +635,7 @@ EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);
		int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi)
		{
		if (isa_irq < nr_legacy_irqs() &&
		isa_irq_to_gsi[isa_irq] != ACPI_INVALID_GSI) {
		isa_irq_to_gsi[isa_irq] != INVALID_ACPI_IRQ) {
		*gsi = isa_irq_to_gsi[isa_irq];
		return 0;
		}