]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
ACPICA: Remove restriction of 256 maximum GPEs in any GPE block
authorBob Moore <robert.moore@intel.com>
Wed, 17 Jul 2013 01:48:50 +0000 (09:48 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 22 Jul 2013 23:06:49 +0000 (01:06 +0200)
The FADT can support over 1000 GPEs, so remove any restriction
on the GPE numbers.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Acked-by: Len Brown <len.brown@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/acpica/evgpeinit.c
include/acpi/actypes.h

index 9037f17c9608f70a6bc2df68eca5b55043ad9723..7842700346a48b0cfa542d46def472ba92643212 100644 (file)
@@ -125,7 +125,6 @@ acpi_status acpi_ev_gpe_initialize(void)
                /* GPE block 0 exists (has both length and address > 0) */
 
                register_count0 = (u16)(acpi_gbl_FADT.gpe0_block_length / 2);
-
                gpe_number_max =
                    (register_count0 * ACPI_GPE_REGISTER_WIDTH) - 1;
 
@@ -204,16 +203,6 @@ acpi_status acpi_ev_gpe_initialize(void)
                goto cleanup;
        }
 
-       /* Check for Max GPE number out-of-range */
-
-       if (gpe_number_max > ACPI_GPE_MAX) {
-               ACPI_ERROR((AE_INFO,
-                           "Maximum GPE number from FADT is too large: 0x%X",
-                           gpe_number_max));
-               status = AE_BAD_VALUE;
-               goto cleanup;
-       }
-
       cleanup:
        (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
        return_ACPI_STATUS(AE_OK);
index 22b03c9286e94d0d4819d5e6610f96a850b4f713..787a977ece9dd5b85310221ad4346f6b27ed3867 100644 (file)
@@ -668,13 +668,6 @@ typedef u32 acpi_event_status;
 #define ACPI_EVENT_FLAG_SET             (acpi_event_status) 0x04
 #define ACPI_EVENT_FLAG_HANDLE         (acpi_event_status) 0x08
 
-/*
- * General Purpose Events (GPE)
- */
-#define ACPI_GPE_INVALID                0xFF
-#define ACPI_GPE_MAX                    0xFF
-#define ACPI_NUM_GPE                    256
-
 /* Actions for acpi_set_gpe, acpi_gpe_wakeup, acpi_hw_low_set_gpe */
 
 #define ACPI_GPE_ENABLE                 0