From patchwork Thu Apr 12 10:13:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Thi=C3=A9baud_Weksteen?= X-Patchwork-Id: 10338149 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7AB78604D4 for ; Thu, 12 Apr 2018 10:14:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6759F28765 for ; Thu, 12 Apr 2018 10:14:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A54128769; Thu, 12 Apr 2018 10:14:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEFCF28765 for ; Thu, 12 Apr 2018 10:14:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752900AbeDLKOb (ORCPT ); Thu, 12 Apr 2018 06:14:31 -0400 Received: from mail-yb0-f201.google.com ([209.85.213.201]:52154 "EHLO mail-yb0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752894AbeDLKO1 (ORCPT ); Thu, 12 Apr 2018 06:14:27 -0400 Received: by mail-yb0-f201.google.com with SMTP id r5-v6so2315719ybm.18 for ; Thu, 12 Apr 2018 03:14:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:in-reply-to:message-id:references:subject:from:to :cc; bh=sU1i5OxqibKOai4W3IAu7riwj1txIZ1zKhYJLenRoAQ=; b=IcD3Xc0AzWiVWTQb2dZp0a7DHmLmqR+GLq2h80wEwk1dngluZEKg4XNK7zaGwBxQfT 1IhJ3LDdL1tWKqXs3iqaaCO0jrvIYl5UlMxkA8r3uCcXHiP0cUxABRq2d7a+inCseFcr wnYJQp/oVZLldLmj4AxrldumIo2SMpSMeF9oABrtdkDrJEQalYGbvET08FtpXKSFishl Du3QCwnr+KkhzbpcnrNs9z+OEhbcRNKb2Ryr4ANSr6Wct3Nca1twlM2jdrZwPFzQbkvG tfD7c7ORWUHwKu3tR2+5LfFxQtjotTmbXXY076Eu66i+/Ndlxh80mCPQSu29bqt23+TN mmsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:in-reply-to:message-id :references:subject:from:to:cc; bh=sU1i5OxqibKOai4W3IAu7riwj1txIZ1zKhYJLenRoAQ=; b=oD6ccAhWRVoAD8kiZpQcgaTnfIXBimJ13qwLar+HQGHVCKMKl1KZmsRcKk61o27/BJ yyywJJhs5R5egKTnZWl8RIrbQSnHaEdrJFQDzC6JqsaNCMmDtSL3arrEZul6/EEDA02r nigZf++p8HMbzNMUeDSddBQUjztcmbboxPmd6K7gEha4DPIaGuc9gS3IF+1u833HV48V aXsgaUkGjIzZBG0tmdY9GIVQ4ZHTxpHyoQonx01LTZOXOCNeg0uSe5u9jLceOLECttn2 Se3FDXn4uI9mHU4KqjJlGeASNEC4q1SZiASq6c1WZ69SONo24R0cm+i8fkWEDv4v+nfc u8JQ== X-Gm-Message-State: ALQs6tCRNvSdohZcJ/mEwwmBsSd8rkH6z/z8IbMyZvUdCK5PNkeeTt+D sDcAaZPt9pk8kXbXQn94GnToDOG5kw== X-Google-Smtp-Source: AIpwx48zSYyzUvoXi/bZEVdX5RJpe94ApD6YlZT1PRIpBEF8fk5bbQl41eZieZbI2gtuoDU77KHpn22jbA== MIME-Version: 1.0 X-Received: by 10.129.141.6 with SMTP id d6mr85068ywg.74.1523528066160; Thu, 12 Apr 2018 03:14:26 -0700 (PDT) Date: Thu, 12 Apr 2018 12:13:50 +0200 In-Reply-To: <20180412101350.210547-1-tweek@google.com> Message-Id: <20180412101350.210547-5-tweek@google.com> References: <20180412101350.210547-1-tweek@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog Subject: [PATCH v2 4/4] tpm: Move eventlog declarations to its own header From: Thiebaud Weksteen To: jarkko.sakkinen@linux.intel.com, nayna@linux.vnet.ibm.com, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, tweek@google.com Cc: linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, Thiebaud Weksteen Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reduce the size of tpm.h by moving eventlog declarations to a separate header. Signed-off-by: Thiebaud Weksteen Suggested-by: Jarkko Sakkinen Reviewed-by: Jarkko Sakkinen Tested-by: Jarkko Sakkinen --- drivers/char/tpm/eventlog/acpi.c | 1 + drivers/char/tpm/eventlog/common.c | 2 +- drivers/char/tpm/eventlog/common.h | 35 ++++++++++++++++++++++++++++++ drivers/char/tpm/eventlog/efi.c | 1 + drivers/char/tpm/eventlog/of.c | 1 + drivers/char/tpm/eventlog/tpm1.c | 1 + drivers/char/tpm/eventlog/tpm2.c | 1 + drivers/char/tpm/tpm.h | 29 ------------------------- 8 files changed, 41 insertions(+), 30 deletions(-) create mode 100644 drivers/char/tpm/eventlog/common.h diff --git a/drivers/char/tpm/eventlog/acpi.c b/drivers/char/tpm/eventlog/acpi.c index 8476be2e9526..7c53b1973b62 100644 --- a/drivers/char/tpm/eventlog/acpi.c +++ b/drivers/char/tpm/eventlog/acpi.c @@ -28,6 +28,7 @@ #include #include "../tpm.h" +#include "common.h" struct acpi_tcpa { struct acpi_table_header hdr; diff --git a/drivers/char/tpm/eventlog/common.c b/drivers/char/tpm/eventlog/common.c index 54934b5a1566..5a8720df2b51 100644 --- a/drivers/char/tpm/eventlog/common.c +++ b/drivers/char/tpm/eventlog/common.c @@ -25,7 +25,7 @@ #include #include "../tpm.h" - +#include "common.h" static int tpm_bios_measurements_open(struct inode *inode, struct file *file) diff --git a/drivers/char/tpm/eventlog/common.h b/drivers/char/tpm/eventlog/common.h new file mode 100644 index 000000000000..47ff8136ceb5 --- /dev/null +++ b/drivers/char/tpm/eventlog/common.h @@ -0,0 +1,35 @@ +#ifndef __TPM_EVENTLOG_COMMON_H__ +#define __TPM_EVENTLOG_COMMON_H__ + +#include "../tpm.h" + +extern const struct seq_operations tpm1_ascii_b_measurements_seqops; +extern const struct seq_operations tpm1_binary_b_measurements_seqops; +extern const struct seq_operations tpm2_binary_b_measurements_seqops; + +#if defined(CONFIG_ACPI) +int tpm_read_log_acpi(struct tpm_chip *chip); +#else +static inline int tpm_read_log_acpi(struct tpm_chip *chip) +{ + return -ENODEV; +} +#endif +#if defined(CONFIG_OF) +int tpm_read_log_of(struct tpm_chip *chip); +#else +static inline int tpm_read_log_of(struct tpm_chip *chip) +{ + return -ENODEV; +} +#endif +#if defined(CONFIG_EFI) +int tpm_read_log_efi(struct tpm_chip *chip); +#else +static inline int tpm_read_log_efi(struct tpm_chip *chip) +{ + return -ENODEV; +} +#endif + +#endif diff --git a/drivers/char/tpm/eventlog/efi.c b/drivers/char/tpm/eventlog/efi.c index e1593c5271a4..68f1e7ee60ce 100644 --- a/drivers/char/tpm/eventlog/efi.c +++ b/drivers/char/tpm/eventlog/efi.c @@ -15,6 +15,7 @@ #include #include "../tpm.h" +#include "common.h" /* read binary bios log from EFI configuration table */ int tpm_read_log_efi(struct tpm_chip *chip) diff --git a/drivers/char/tpm/eventlog/of.c b/drivers/char/tpm/eventlog/of.c index d98c184d5c13..f8ad4c3ffe8e 100644 --- a/drivers/char/tpm/eventlog/of.c +++ b/drivers/char/tpm/eventlog/of.c @@ -20,6 +20,7 @@ #include #include "../tpm.h" +#include "common.h" int tpm_read_log_of(struct tpm_chip *chip) { diff --git a/drivers/char/tpm/eventlog/tpm1.c b/drivers/char/tpm/eventlog/tpm1.c index 8f30316e9bb6..58c84784ba25 100644 --- a/drivers/char/tpm/eventlog/tpm1.c +++ b/drivers/char/tpm/eventlog/tpm1.c @@ -29,6 +29,7 @@ #include #include "../tpm.h" +#include "common.h" static const char* tcpa_event_type_strings[] = { diff --git a/drivers/char/tpm/eventlog/tpm2.c b/drivers/char/tpm/eventlog/tpm2.c index f0723fa9ae14..1b8fa9de2cac 100644 --- a/drivers/char/tpm/eventlog/tpm2.c +++ b/drivers/char/tpm/eventlog/tpm2.c @@ -24,6 +24,7 @@ #include #include "../tpm.h" +#include "common.h" /* * calc_tpm2_event_size() - calculate the event size, where event diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index a583c5001904..067f305e36f0 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -580,35 +580,6 @@ int tpm2_prepare_space(struct tpm_chip *chip, struct tpm_space *space, u32 cc, int tpm2_commit_space(struct tpm_chip *chip, struct tpm_space *space, u32 cc, u8 *buf, size_t *bufsiz); -extern const struct seq_operations tpm1_ascii_b_measurements_seqops; -extern const struct seq_operations tpm1_binary_b_measurements_seqops; -extern const struct seq_operations tpm2_binary_b_measurements_seqops; - -#if defined(CONFIG_ACPI) -int tpm_read_log_acpi(struct tpm_chip *chip); -#else -static inline int tpm_read_log_acpi(struct tpm_chip *chip) -{ - return -ENODEV; -} -#endif -#if defined(CONFIG_OF) -int tpm_read_log_of(struct tpm_chip *chip); -#else -static inline int tpm_read_log_of(struct tpm_chip *chip) -{ - return -ENODEV; -} -#endif -#if defined(CONFIG_EFI) -int tpm_read_log_efi(struct tpm_chip *chip); -#else -static inline int tpm_read_log_efi(struct tpm_chip *chip) -{ - return -ENODEV; -} -#endif - int tpm_bios_log_setup(struct tpm_chip *chip); void tpm_bios_log_teardown(struct tpm_chip *chip); #endif