Skip to content

Commit 220580f

Browse files
andy-shevrafaeljw
authored andcommitted
ACPI / x86: boot: Get rid of ACPI_INVALID_GSI
Commit 49e4b84 (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 2c0a689 (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 <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 7d7fb91 commit 220580f

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

arch/x86/kernel/acpi/boot.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ static u32 isa_irq_to_gsi[NR_IRQS_LEGACY] __read_mostly = {
112112
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
113113
};
114114

115-
#define ACPI_INVALID_GSI INT_MIN
116-
117115
/*
118116
* This is just a simple wrapper around early_memremap(),
119117
* 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,
372370
* and acpi_isa_irq_to_gsi() may give wrong result.
373371
*/
374372
if (gsi < nr_legacy_irqs() && isa_irq_to_gsi[gsi] == gsi)
375-
isa_irq_to_gsi[gsi] = ACPI_INVALID_GSI;
373+
isa_irq_to_gsi[gsi] = INVALID_ACPI_IRQ;
376374
isa_irq_to_gsi[bus_irq] = gsi;
377375
}
378376

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

0 commit comments

Comments
 (0)