From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 121BAC25B08 for ; Wed, 17 Aug 2022 18:54:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BF99684A5B; Wed, 17 Aug 2022 20:54:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Z7+jxA/T"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BA17584A4E; Wed, 17 Aug 2022 20:54:08 +0200 (CEST) Received: from mail-yw1-x1135.google.com (mail-yw1-x1135.google.com [IPv6:2607:f8b0:4864:20::1135]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9FBAC84A51 for ; Wed, 17 Aug 2022 20:54:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@google.com Received: by mail-yw1-x1135.google.com with SMTP id 00721157ae682-32a09b909f6so255947187b3.0 for ; Wed, 17 Aug 2022 11:54:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=RVenIMst+3tWm3Y6NSOVSm5gOiLYutQXb4CLWSuRWS8=; b=Z7+jxA/TCAyUgLofy2bt2yO6AYZ/XHwvtFn0R93/yzLjlrbPag0Bl9fe4PoM+iNVDH W5xz9dq6f5uFQxLCr2e2QT4A/SPByZ+4maIDMTyjuzdLJXh/fVsKqLtc+rvE3fRnEWwd l3F0jDkHP7ODBiWRPzPo1R22WHYa7qZj5NDTM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=RVenIMst+3tWm3Y6NSOVSm5gOiLYutQXb4CLWSuRWS8=; b=sry+rLvhMCRGhpskV2uGwvdBPFHHHxFP5bGjN6T+t/Zs8bs1mAW6IEGiNOCRRdVHcv zFwb7t0s4I2aPuPlNSOwZP3UtNh5QNvMtVrKkrA6JZFGRHJ+TlfQEZdqer/PNdLVkLCs PQhfORcvDCatUK9J1D3KOwiKL6x6lQJgmwQgILsPGfPEiqCMQAPumPBqQtzcjYB7nFK1 CVkLmpXFU+WQqPd6H5BQD3LLV4OzSPb9yooq/dqpAmvSoGegeWGxEOg38L/T/+G83lyN gH+aaIO92yc8VH/obMa+7xhDVuawgGpzHoqaYPaKPt3mKW8kUFs9YrcRvb3atGZ9wqc+ ppLA== X-Gm-Message-State: ACgBeo0wGyMKNX4pAFAg/HKTgRAIgGNZXipfj4vz7U/hlI55kcYCFLGX OuD+HE80RnGjk9yUBIL7hbuFUhyxE8FJxHTRTq/52g== X-Google-Smtp-Source: AA6agR6ZWgp5xWH5YOopRbp8iTn15SMP84/9A9Arf/RT7tUmyAVRHN7vDNwpGM4tjz8WXH3DsrLuI2oBqteJ/AsPh8M= X-Received: by 2002:a81:83cf:0:b0:334:fe5:b2fe with SMTP id t198-20020a8183cf000000b003340fe5b2femr6850001ywf.402.1660762440075; Wed, 17 Aug 2022 11:54:00 -0700 (PDT) MIME-Version: 1.0 References: <20220813195639.1824765-1-sjg@chromium.org> <20220813195639.1824765-7-sjg@chromium.org> In-Reply-To: From: Simon Glass Date: Wed, 17 Aug 2022 12:53:48 -0600 Message-ID: Subject: Re: [PATCH v2 6/7] tpm: Implement state command for Cr50 To: Ilias Apalodimas Cc: U-Boot Mailing List , Heinrich Schuchardt , Masahisa Kojima , Ruchika Gupta Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Hi Ilias, On Tue, 16 Aug 2022 at 06:43, Ilias Apalodimas wrote: > > Hi Simon, > > I know little of this device and the whole patch seems fine apart from > the definitions and declarations of the state functions. > > > On Sat, 13 Aug 2022 at 22:56, Simon Glass wrote: > > > > > > > drivers/tpm/cr50_i2c.c | 117 +++++++++++++++++++++++++++++++++++++++++ > > include/tpm-v2.h | 54 +++++++++++++++++++ > > lib/tpm-v2.c | 24 +++++++++ > > [...] > > > diff --git a/include/tpm-v2.h b/include/tpm-v2.h > > index e79c90b9395..8e90a616220 100644 > > --- a/include/tpm-v2.h > > +++ b/include/tpm-v2.h > > @@ -419,6 +419,50 @@ enum { > > HR_NV_INDEX = TPM_HT_NV_INDEX << HR_SHIFT, > > }; > > > > +/* > > + * Operations specific to the Cr50 TPM used on Chromium OS and Android devices > > + * > > + * FIXME: below is not enough to differentiate between vendors commands > > + * of numerous devices. However, the current tpm2 APIs aren't very amenable > > + * to extending generically because the marshaling code is assuming all > > + * knowledge of all commands. > > + */ > > +#define TPM2_CC_VENDOR_BIT_MASK 0x20000000 > > + > > +#define TPM2_CR50_VENDOR_COMMAND (TPM2_CC_VENDOR_BIT_MASK | 0) > > +#define TPM2_CR50_SUB_CMD_IMMEDIATE_RESET 19 > > +#define TPM2_CR50_SUB_CMD_NVMEM_ENABLE_COMMITS 21 > > +#define TPM2_CR50_SUB_CMD_REPORT_TPM_STATE 23 > > +#define TPM2_CR50_SUB_CMD_TURN_UPDATE_ON 24 > > +#define TPM2_CR50_SUB_CMD_GET_REC_BTN 29 > > +#define TPM2_CR50_SUB_CMD_TPM_MODE 40 > > +#define TPM2_CR50_SUB_CMD_GET_BOOT_MODE 52 > > +#define TPM2_CR50_SUB_CMD_RESET_EC 53 > > + > > +/* Cr50 vendor-specific error codes. */ > > +#define VENDOR_RC_ERR 0x00000500 > > +enum cr50_vendor_rc { > > + VENDOR_RC_INTERNAL_ERROR = (VENDOR_RC_ERR | 6), > > + VENDOR_RC_NO_SUCH_SUBCOMMAND = (VENDOR_RC_ERR | 8), > > + VENDOR_RC_NO_SUCH_COMMAND = (VENDOR_RC_ERR | 127), > > +}; > > + > > +enum cr50_tpm_mode { > > + /* > > + * Default state: TPM is enabled, and may be set to either > > + * TPM_MODE_ENABLED or TPM_MODE_DISABLED. > > + */ > > + TPM_MODE_ENABLED_TENTATIVE = 0, > > + > > + /* TPM is enabled, and mode may not be changed. */ > > + TPM_MODE_ENABLED = 1, > > + > > + /* TPM is disabled, and mode may not be changed. */ > > + TPM_MODE_DISABLED = 2, > > + > > + TPM_MODE_INVALID, > > +}; > > + > > /** > > * Issue a TPM2_Startup command. > > * > > @@ -658,4 +702,14 @@ u32 tpm2_disable_platform_hierarchy(struct udevice *dev); > > u32 tpm2_submit_command(struct udevice *dev, const u8 *sendbuf, > > u8 *recvbuf, size_t *recv_size); > > > > +/** > > + * tpm_cr50_report_state() - Report the Cr50 internal state > > + * > > + * @dev: TPM device > > + * @recvbuf: Buffer to save the response to > > + * @recv_size: Pointer to the size of the response buffer > > + * Return: result of the operation > > + */ > > +u32 tpm2_cr50_report_state(struct udevice *dev, u8 *recvbuf, size_t *recv_size); > > + > > I think we should keep the generic include files clean for hardware > specific details. > > > #endif /* __TPM_V2_H */ > > diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c > > index 3e240bb4c67..3de4841974a 100644 > > --- a/lib/tpm-v2.c > > +++ b/lib/tpm-v2.c > > @@ -679,3 +679,27 @@ u32 tpm2_submit_command(struct udevice *dev, const u8 *sendbuf, > > { > > return tpm_sendrecv_command(dev, sendbuf, recvbuf, recv_size); > > } > > + > > +u32 tpm2_cr50_report_state(struct udevice *dev, u8 *recvbuf, size_t *recv_size) > > +{ > > + u8 command_v2[COMMAND_BUFFER_SIZE] = { > > + /* header 10 bytes */ > > + tpm_u16(TPM2_ST_NO_SESSIONS), /* TAG */ > > + tpm_u32(10 + 2), /* Length */ > > + tpm_u32(TPM2_CR50_VENDOR_COMMAND), /* Command code */ > > + > > + tpm_u16(TPM2_CR50_SUB_CMD_REPORT_TPM_STATE), > > + }; > > + int ret; > > + > > + ret = tpm_sendrecv_command(dev, command_v2, recvbuf, recv_size); > > + log_debug("ret=%s, %x\n", dev->name, ret); > > + if (ret) > > + return ret; > > + if (*recv_size < 12) > > + return -ENODATA; > > + *recv_size -= 12; > > + memcpy(recvbuf, recvbuf + 12, *recv_size); > > + > > + return 0; > > +} > > Same here, this functions seems ok but shouldn't land in the generic TPM API So shall I create a new tpm_cr50.h header file? What about the C file? > > Thanks > /Ilias > > -- > > 2.37.1.595.g718a3a8f04-goog > > Regards, Simon