[v2,2/2] efi: fix build error redeclaration of enumerator

Commit a893ea15d764 ("tpm: move tpm_chip definition to
include/linux/tpm.h") introduced a build error when both ima and efi is
enabled. 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.

In file included from ../security/integrity/ima/ima_fs.c:30:
../security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator "NONE"
  hook(NONE)   \
       ^~~~
../security/integrity/ima/ima.h:188:34: note: in definition of macro "__ima_hook_enumify"
 #define __ima_hook_enumify(ENUM) ENUM,
                                  ^~~~
../security/integrity/ima/ima.h:191:2: note: in expansion of macro "__ima_hooks"
  __ima_hooks(__ima_hook_enumify)
  ^~~~~~~~~~~
In file included from ../arch/arm64/include/asm/acpi.h:15,
                 from ../include/acpi/acpi_io.h:7,
                 from ../include/linux/acpi.h:47,
                 from ../include/linux/tpm.h:26,
                 from ../security/integrity/ima/ima.h:25,
                 from ../security/integrity/ima/ima_fs.c:30:
../include/linux/efi.h:1723:2: note: previous definition of "NONE" was here
  NONE,
  ^~~~
make[4]: *** [../scripts/Makefile.build:277: security/integrity/ima/ima_fs.o] Error 1

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

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

---

No changes since v1.

 arch/x86/platform/efi/quirks.c          |  2 +-
 drivers/firmware/efi/runtime-wrappers.c | 48 ++++++++++++-------------
 include/linux/efi.h                     | 26 +++++++-------
 3 files changed, 38 insertions(+), 38 deletions(-)

-- 
2.20.1

On Tue, 12 Feb 2019 at 12:21, Anders Roxell <anders.roxell@linaro.org> wrote:
>

> Commit a893ea15d764 ("tpm: move tpm_chip definition to

> include/linux/tpm.h") introduced a build error when both ima and efi is

> enabled. 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.

>

> In file included from ../security/integrity/ima/ima_fs.c:30:

> ../security/integrity/ima/ima.h:176:7: error: redeclaration of enumerator "NONE"

>   hook(NONE)   \

>        ^~~~

> ../security/integrity/ima/ima.h:188:34: note: in definition of macro "__ima_hook_enumify"

>  #define __ima_hook_enumify(ENUM) ENUM,

>                                   ^~~~

> ../security/integrity/ima/ima.h:191:2: note: in expansion of macro "__ima_hooks"

>   __ima_hooks(__ima_hook_enumify)

>   ^~~~~~~~~~~

> In file included from ../arch/arm64/include/asm/acpi.h:15,

>                  from ../include/acpi/acpi_io.h:7,

>                  from ../include/linux/acpi.h:47,

>                  from ../include/linux/tpm.h:26,

>                  from ../security/integrity/ima/ima.h:25,

>                  from ../security/integrity/ima/ima_fs.c:30:

> ../include/linux/efi.h:1723:2: note: previous definition of "NONE" was here

>   NONE,

>   ^~~~

> make[4]: *** [../scripts/Makefile.build:277: security/integrity/ima/ima_fs.o] Error 1

>

> Rework to prefix the efi enum with 'EFI_*'.

>

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> ---

>

> No changes since v1.

>

>  arch/x86/platform/efi/quirks.c          |  2 +-


I found that I missed rename one 'NONE' to 'EFI_NONE' in the file above.
Will send a v3 shortly.

Cheers,
Anders

>  drivers/firmware/efi/runtime-wrappers.c | 48 ++++++++++++-------------

>  include/linux/efi.h                     | 26 +++++++-------

>  3 files changed, 38 insertions(+), 38 deletions(-)

>

> diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c

> index 9ce85e605052..b7c0b04ee6ad 100644

> --- a/arch/x86/platform/efi/quirks.c

> +++ b/arch/x86/platform/efi/quirks.c

> @@ -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;

> diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c

> index c70df5ae7c4a..28138534643e 100644

> --- a/drivers/firmware/efi/runtime-wrappers.c

> +++ b/drivers/firmware/efi/runtime-wrappers.c

> @@ -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;                                            \

>  })

>

> @@ -181,50 +181,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,

> @@ -248,7 +248,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;

>  }

> @@ -259,7 +259,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;

>  }

> @@ -272,7 +272,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;

> @@ -284,7 +284,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;

> @@ -300,7 +300,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;

> @@ -314,7 +314,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;

> @@ -330,7 +330,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;

> @@ -365,7 +365,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;

> @@ -397,7 +397,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;

> @@ -413,7 +413,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);

>  }

> @@ -429,7 +429,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;

> @@ -447,7 +447,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;

> diff --git a/include/linux/efi.h b/include/linux/efi.h

> index a4de93c96907..b3471b6ff92f 100644

> --- a/include/linux/efi.h

> +++ b/include/linux/efi.h

> @@ -1720,19 +1720,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,

>  };

>

>  /*

> --

> 2.20.1

>