Commit 5c418dc7 authored by Anders Roxell's avatar Anders Roxell Committed by Ingo Molnar
Browse files

efi: Fix build error due to enum collision between efi.h and ima.h 



The following commit:

  a893ea15d764 ("tpm: move tpm_chip definition to include/linux/tpm.h")

introduced a build error when both IMA and EFI are enabled:

    In file included from ../security/integrity/ima/ima_fs.c:30:
    ../security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator "NONE"

What happens is that both headers (ima.h and efi.h) defines the same
'NONE' constant, and it broke when they started getting included from
the same file:

Rework to prefix the EFI enum with 'EFI_*'.

Signed-off-by: default avatarAnders Roxell <anders.roxell@linaro.org>
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20190215165551.12220-2-ard.biesheuvel@linaro.org


[ Cleaned up the changelog a bit. ]
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 69c1f396

arch/x86/platform/efi/quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ void efi_recover_from_page_fault(unsigned long phys_addr) 
	 * "efi_mm" cannot be used to check if the page fault had occurred

	 * in the firmware context because efi=old_map doesn't use efi_pgd.

	 */

	if (efi_rts_work.efi_rts_id == NONE)

	if (efi_rts_work.efi_rts_id == EFI_NONE)

		return;



	/*
@@ -742,7 +742,7 @@ void efi_recover_from_page_fault(unsigned long phys_addr) 
	 * because this case occurs *very* rarely and hence could be improved

	 * on a need by basis.

	 */

	if (efi_rts_work.efi_rts_id == RESET_SYSTEM) {

	if (efi_rts_work.efi_rts_id == EFI_RESET_SYSTEM) {

		pr_info("efi_reset_system() buggy! Reboot through BIOS\n");

		machine_real_restart(MRR_BIOS);

		return;

drivers/firmware/efi/runtime-wrappers.c

+24 −24
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct efi_runtime_work efi_rts_work; 
		pr_err("Failed to queue work to efi_rts_wq.\n");	\

									\

exit:									\

	efi_rts_work.efi_rts_id = NONE;					\

	efi_rts_work.efi_rts_id = EFI_NONE;				\

	efi_rts_work.status;						\

})
@@ -168,50 +168,50 @@ static void efi_call_rts(struct work_struct *work) 
	arg5 = efi_rts_work.arg5;



	switch (efi_rts_work.efi_rts_id) {

	case GET_TIME:

	case EFI_GET_TIME:

		status = efi_call_virt(get_time, (efi_time_t *)arg1,

				       (efi_time_cap_t *)arg2);

		break;

	case SET_TIME:

	case EFI_SET_TIME:

		status = efi_call_virt(set_time, (efi_time_t *)arg1);

		break;

	case GET_WAKEUP_TIME:

	case EFI_GET_WAKEUP_TIME:

		status = efi_call_virt(get_wakeup_time, (efi_bool_t *)arg1,

				       (efi_bool_t *)arg2, (efi_time_t *)arg3);

		break;

	case SET_WAKEUP_TIME:

	case EFI_SET_WAKEUP_TIME:

		status = efi_call_virt(set_wakeup_time, *(efi_bool_t *)arg1,

				       (efi_time_t *)arg2);

		break;

	case GET_VARIABLE:

	case EFI_GET_VARIABLE:

		status = efi_call_virt(get_variable, (efi_char16_t *)arg1,

				       (efi_guid_t *)arg2, (u32 *)arg3,

				       (unsigned long *)arg4, (void *)arg5);

		break;

	case GET_NEXT_VARIABLE:

	case EFI_GET_NEXT_VARIABLE:

		status = efi_call_virt(get_next_variable, (unsigned long *)arg1,

				       (efi_char16_t *)arg2,

				       (efi_guid_t *)arg3);

		break;

	case SET_VARIABLE:

	case EFI_SET_VARIABLE:

		status = efi_call_virt(set_variable, (efi_char16_t *)arg1,

				       (efi_guid_t *)arg2, *(u32 *)arg3,

				       *(unsigned long *)arg4, (void *)arg5);

		break;

	case QUERY_VARIABLE_INFO:

	case EFI_QUERY_VARIABLE_INFO:

		status = efi_call_virt(query_variable_info, *(u32 *)arg1,

				       (u64 *)arg2, (u64 *)arg3, (u64 *)arg4);

		break;

	case GET_NEXT_HIGH_MONO_COUNT:

	case EFI_GET_NEXT_HIGH_MONO_COUNT:

		status = efi_call_virt(get_next_high_mono_count, (u32 *)arg1);

		break;

	case UPDATE_CAPSULE:

	case EFI_UPDATE_CAPSULE:

		status = efi_call_virt(update_capsule,

				       (efi_capsule_header_t **)arg1,

				       *(unsigned long *)arg2,

				       *(unsigned long *)arg3);

		break;

	case QUERY_CAPSULE_CAPS:

	case EFI_QUERY_CAPSULE_CAPS:

		status = efi_call_virt(query_capsule_caps,

				       (efi_capsule_header_t **)arg1,

				       *(unsigned long *)arg2, (u64 *)arg3,
@@ -235,7 +235,7 @@ static efi_status_t virt_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc) 


	if (down_interruptible(&efi_runtime_lock))

		return EFI_ABORTED;

	status = efi_queue_work(GET_TIME, tm, tc, NULL, NULL, NULL);

	status = efi_queue_work(EFI_GET_TIME, tm, tc, NULL, NULL, NULL);

	up(&efi_runtime_lock);

	return status;

}
@@ -246,7 +246,7 @@ static efi_status_t virt_efi_set_time(efi_time_t *tm) 


	if (down_interruptible(&efi_runtime_lock))

		return EFI_ABORTED;

	status = efi_queue_work(SET_TIME, tm, NULL, NULL, NULL, NULL);

	status = efi_queue_work(EFI_SET_TIME, tm, NULL, NULL, NULL, NULL);

	up(&efi_runtime_lock);

	return status;

}
@@ -259,7 +259,7 @@ static efi_status_t virt_efi_get_wakeup_time(efi_bool_t *enabled, 


	if (down_interruptible(&efi_runtime_lock))

		return EFI_ABORTED;

	status = efi_queue_work(GET_WAKEUP_TIME, enabled, pending, tm, NULL,

	status = efi_queue_work(EFI_GET_WAKEUP_TIME, enabled, pending, tm, NULL,

				NULL);

	up(&efi_runtime_lock);

	return status;
@@ -271,7 +271,7 @@ static efi_status_t virt_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm) 


	if (down_interruptible(&efi_runtime_lock))

		return EFI_ABORTED;

	status = efi_queue_work(SET_WAKEUP_TIME, &enabled, tm, NULL, NULL,

	status = efi_queue_work(EFI_SET_WAKEUP_TIME, &enabled, tm, NULL, NULL,

				NULL);

	up(&efi_runtime_lock);

	return status;
@@ -287,7 +287,7 @@ static efi_status_t virt_efi_get_variable(efi_char16_t *name, 


	if (down_interruptible(&efi_runtime_lock))

		return EFI_ABORTED;

	status = efi_queue_work(GET_VARIABLE, name, vendor, attr, data_size,

	status = efi_queue_work(EFI_GET_VARIABLE, name, vendor, attr, data_size,

				data);

	up(&efi_runtime_lock);

	return status;
@@ -301,7 +301,7 @@ static efi_status_t virt_efi_get_next_variable(unsigned long *name_size, 


	if (down_interruptible(&efi_runtime_lock))

		return EFI_ABORTED;

	status = efi_queue_work(GET_NEXT_VARIABLE, name_size, name, vendor,

	status = efi_queue_work(EFI_GET_NEXT_VARIABLE, name_size, name, vendor,

				NULL, NULL);

	up(&efi_runtime_lock);

	return status;
@@ -317,7 +317,7 @@ static efi_status_t virt_efi_set_variable(efi_char16_t *name, 


	if (down_interruptible(&efi_runtime_lock))

		return EFI_ABORTED;

	status = efi_queue_work(SET_VARIABLE, name, vendor, &attr, &data_size,

	status = efi_queue_work(EFI_SET_VARIABLE, name, vendor, &attr, &data_size,

				data);

	up(&efi_runtime_lock);

	return status;
@@ -352,7 +352,7 @@ static efi_status_t virt_efi_query_variable_info(u32 attr, 


	if (down_interruptible(&efi_runtime_lock))

		return EFI_ABORTED;

	status = efi_queue_work(QUERY_VARIABLE_INFO, &attr, storage_space,

	status = efi_queue_work(EFI_QUERY_VARIABLE_INFO, &attr, storage_space,

				remaining_space, max_variable_size, NULL);

	up(&efi_runtime_lock);

	return status;
@@ -384,7 +384,7 @@ static efi_status_t virt_efi_get_next_high_mono_count(u32 *count) 


	if (down_interruptible(&efi_runtime_lock))

		return EFI_ABORTED;

	status = efi_queue_work(GET_NEXT_HIGH_MONO_COUNT, count, NULL, NULL,

	status = efi_queue_work(EFI_GET_NEXT_HIGH_MONO_COUNT, count, NULL, NULL,

				NULL, NULL);

	up(&efi_runtime_lock);

	return status;
@@ -400,7 +400,7 @@ static void virt_efi_reset_system(int reset_type, 
			"could not get exclusive access to the firmware\n");

		return;

	}

	efi_rts_work.efi_rts_id = RESET_SYSTEM;

	efi_rts_work.efi_rts_id = EFI_RESET_SYSTEM;

	__efi_call_virt(reset_system, reset_type, status, data_size, data);

	up(&efi_runtime_lock);

}
@@ -416,7 +416,7 @@ static efi_status_t virt_efi_update_capsule(efi_capsule_header_t **capsules, 


	if (down_interruptible(&efi_runtime_lock))

		return EFI_ABORTED;

	status = efi_queue_work(UPDATE_CAPSULE, capsules, &count, &sg_list,

	status = efi_queue_work(EFI_UPDATE_CAPSULE, capsules, &count, &sg_list,

				NULL, NULL);

	up(&efi_runtime_lock);

	return status;
@@ -434,7 +434,7 @@ static efi_status_t virt_efi_query_capsule_caps(efi_capsule_header_t **capsules, 


	if (down_interruptible(&efi_runtime_lock))

		return EFI_ABORTED;

	status = efi_queue_work(QUERY_CAPSULE_CAPS, capsules, &count,

	status = efi_queue_work(EFI_QUERY_CAPSULE_CAPS, capsules, &count,

				max_size, reset_type, NULL);

	up(&efi_runtime_lock);

	return status;

include/linux/efi.h

+13 −13
Original line number Diff line number Diff line
@@ -1719,19 +1719,19 @@ extern int efi_tpm_eventlog_init(void); 
 * fault happened while executing an efi runtime service.

 */

enum efi_rts_ids {

	NONE,

	GET_TIME,

	SET_TIME,

	GET_WAKEUP_TIME,

	SET_WAKEUP_TIME,

	GET_VARIABLE,

	GET_NEXT_VARIABLE,

	SET_VARIABLE,

	QUERY_VARIABLE_INFO,

	GET_NEXT_HIGH_MONO_COUNT,

	RESET_SYSTEM,

	UPDATE_CAPSULE,

	QUERY_CAPSULE_CAPS,

	EFI_NONE,

	EFI_GET_TIME,

	EFI_SET_TIME,

	EFI_GET_WAKEUP_TIME,

	EFI_SET_WAKEUP_TIME,

	EFI_GET_VARIABLE,

	EFI_GET_NEXT_VARIABLE,

	EFI_SET_VARIABLE,

	EFI_QUERY_VARIABLE_INFO,

	EFI_GET_NEXT_HIGH_MONO_COUNT,

	EFI_RESET_SYSTEM,

	EFI_UPDATE_CAPSULE,

	EFI_QUERY_CAPSULE_CAPS,

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE