From patchwork Tue Feb 12 11:21:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 158153 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3718635jaa; Tue, 12 Feb 2019 03:21:59 -0800 (PST) X-Google-Smtp-Source: AHgI3IYzyL0vBgylUymkoIkj4wvi5Nkg+jMnMlA8h4CBy7O1fyHzUCladvuRYrVrWAGhajYUMxg5 X-Received: by 2002:a63:374e:: with SMTP id g14mr3238473pgn.59.1549970519020; Tue, 12 Feb 2019 03:21:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549970519; cv=none; d=google.com; s=arc-20160816; b=Bhs76alkMcBEjAtcEholjvioc6g8eq8+8SVlv3eJsxIWwfZyO4kJBUoAgpUZ7WTuym 83H9MhETIpriVehH9ZVhVz891MAowDQuAmD5L21om4aZxZ410SYfdkbUzB3O4qAgY+yJ CvOg1N8zhEL+FqpbNDKDJkw791DDh5EOUuOkJTmkA8xJXEy0Hynq9S2I3NQ5aoYeFGBl qRCU4zQIPq0vmzxjAfewqJbzK1YbaOkQpRRQWrb9l822HKCAQ6oudg4CYYelSonWG1Sg feuCX59aE7kbvGj1t7ZXe1Ae6DzbBzPcKJlXm6i1x7XCZLB5oGH4RERkQE6WdE3yQH1M NmoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vFBH/V6LEkNoC/aySeMKfFfgzuL+Duht33rNBgINdlg=; b=ofn1sgcNjSg+1N537ai51H74xwa/+2Ce/AHG80ejhdzq28NrSGddYQuMg8q26Ghs+z k+52QfYwHt5zRu5Ovw6XHlX9qhS0CdYUkTj1nqQydB0DWDaX5TlAxsq79A4zYG2akwdB L+dPLjW0j9ay4HhZXjW6K1NQfRgfe82fUO5jrxCuT6pcNA+m6koFlWKkQxiHYdeTBSPB NaZraYhCaY/kmSwer6IPx/ig+TLCRojm10Ja96Oi5Kz6RJ8YqoVDHDnQ0Suzpf7FgPFQ jnVV4Z+n+9wh+HWYfq7+OyAmoSgPl62cZglQY6NuqEH7A53+f2nuYyu0NBC50mBfpJZM 8kuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CFhFptJe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i35si3451022pgm.37.2019.02.12.03.21.58; Tue, 12 Feb 2019 03:21:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CFhFptJe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729459AbfBLLV4 (ORCPT + 31 others); Tue, 12 Feb 2019 06:21:56 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:34579 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729447AbfBLLVz (ORCPT ); Tue, 12 Feb 2019 06:21:55 -0500 Received: by mail-lj1-f195.google.com with SMTP id v14-v6so1913135ljv.1 for ; Tue, 12 Feb 2019 03:21:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vFBH/V6LEkNoC/aySeMKfFfgzuL+Duht33rNBgINdlg=; b=CFhFptJeDiMhh2/2MW9suqBqXdp8ud4G3VF5u15RbdXJ6tuqK7UvvXLzK5ahmjYi8H twgPOa/pBBxQraVOdpuTVkmIDYlkS3zZrGzn/H+a/yUeAToAaPCdOlt5EU62JCOVnAAg K5TpBNJF/QClf5aDTIUB6nhkvVwCLazaBMjTSnFX0sAmcVFrHdjtiuhdzHDMDzVTHTuq 4LUuO7WWEf5RTq5AekQpOmkAiYRhWMyP8/byAC9meiEtotYtdG0bmvyf4cEeVGLR4nI3 U5vclDNcl57w+UWKhsSYWrdJiYeZrjEU09cOdqWvFxMpnGnzyYibU7oP5Nv1nfgpwvt6 Gplw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vFBH/V6LEkNoC/aySeMKfFfgzuL+Duht33rNBgINdlg=; b=AWgM3bDHTMv1R1xfWtJQqUsd/neq2V4g67XU/5wQEJiFVamfBIWNatEBxXgR3q2gPG Nwk5Qwxpv5clrSfbU7ZL62CYIwDbu+fncnKVRg0lue5tlz2TNqFGGw3BfB29R/lufCa1 AJWx5t5AdpJvP5FDW0rvW2YjiMZ+Nqz6XWWDkCsiTC4ztbIXCmVhtZvGzTBLAGXOGSlM 32wbcXJD7okArO+g1TVqt3hnt5m/MyeZQJXewU586DRsULZGA81Dsbfisp4gCdYX2Bip ZYkUPWDIgcYaF44VEKmqE8IJs5mPnV+wNxafIyuxdXrCpf42iPP49jy/avo9ZuhYFpKk LweA== X-Gm-Message-State: AHQUAuZFKDdlk2QCg8HyD/gZ8h2SsZ3GIUGQgWWBf5t+mPVSVQH0gK39 nFFmjWkU5zPeqSyNqqx1yrL/0Q== X-Received: by 2002:a2e:3219:: with SMTP id y25-v6mr2107227ljy.20.1549970512183; Tue, 12 Feb 2019 03:21:52 -0800 (PST) Received: from localhost (c-573670d5.07-21-73746f28.bbcust.telenor.se. [213.112.54.87]) by smtp.gmail.com with ESMTPSA id h3sm2854833lfj.25.2019.02.12.03.21.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Feb 2019 03:21:51 -0800 (PST) From: Anders Roxell To: zohar@linux.ibm.com, dmitry.kasatkin@gmail.com, jmorris@namei.org, serge@hallyn.com, ard.biesheuvel@linaro.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de Cc: linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-efi@vger.kernel.org, platform-driver-x86@vger.kernel.org, Anders Roxell Subject: [PATCH v2 2/2] efi: fix build error redeclaration of enumerator Date: Tue, 12 Feb 2019 12:21:21 +0100 Message-Id: <20190212112121.32163-2-anders.roxell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190212112121.32163-1-anders.roxell@linaro.org> References: <20190212112121.32163-1-anders.roxell@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 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, }; /*