Commit 2c48e3ea authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki
Browse files

ACPICA: Remove restriction of 256 maximum GPEs in any GPE block 



The FADT can support over 1000 GPEs, so remove any restriction
on the GPE numbers.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Acked-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0fb3adf8

drivers/acpi/acpica/evgpeinit.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -125,7 +125,6 @@ acpi_status acpi_ev_gpe_initialize(void) 
		/* GPE block 0 exists (has both length and address > 0) */

		/* GPE block 0 exists (has both length and address > 0) */





		register_count0 = (u16)(acpi_gbl_FADT.gpe0_block_length / 2);

		register_count0 = (u16)(acpi_gbl_FADT.gpe0_block_length / 2);



		gpe_number_max =

		gpe_number_max =

		    (register_count0 * ACPI_GPE_REGISTER_WIDTH) - 1;

		    (register_count0 * ACPI_GPE_REGISTER_WIDTH) - 1;
@@ -204,16 +203,6 @@ acpi_status acpi_ev_gpe_initialize(void) 
		goto cleanup;

		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:

      cleanup:

	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);

	(void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);

	return_ACPI_STATUS(AE_OK);

	return_ACPI_STATUS(AE_OK);

include/acpi/actypes.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -668,13 +668,6 @@ typedef u32 acpi_event_status; 
#define ACPI_EVENT_FLAG_SET             (acpi_event_status) 0x04

#define ACPI_EVENT_FLAG_SET             (acpi_event_status) 0x04

#define ACPI_EVENT_FLAG_HANDLE		(acpi_event_status) 0x08

#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 */

/* Actions for acpi_set_gpe, acpi_gpe_wakeup, acpi_hw_low_set_gpe */





#define ACPI_GPE_ENABLE                 0

#define ACPI_GPE_ENABLE                 0