From patchwork Sat Nov 2 15:22:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 13860183 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 01594185936; Sat, 2 Nov 2024 15:22:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730560960; cv=none; b=JeSFOxrOplpTaFJf/t0ORKgl4OJGReVaqbLb1zXnJbXneLrXXdGEr6t5IqKW0H1KRpWHTpyPntV7CbxGTMIZ1X3IRICGlY+yJRtjSSLnCLTjERrSIV6JhAanTS78Ij/lHYu9WyWaVULQSvm8vJsiC7I/saNemF8EMRAJ3s2YBhA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730560960; c=relaxed/simple; bh=68YV7lYxwusnDvzyWCT/Q+HR0JDgE7I7JZdfOswM0dE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mfN66+lG6bp+AIOR61LZj7M45dm+9PEnM64Zwf8TASuyc1+a1nrB8bqKrlIt5vbs2bgdDCiJ4566x1S8Q7qlZdb515/kspO/Jfnt+5ahaiAkPsYpp4EXp+dYuRpr+6uA43Kf6nQJv2h8jo+JwfkRowzfumNMuqaYJhLzoAt30kU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kpHHKPZo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kpHHKPZo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA63AC4CEC3; Sat, 2 Nov 2024 15:22:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730560959; bh=68YV7lYxwusnDvzyWCT/Q+HR0JDgE7I7JZdfOswM0dE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kpHHKPZo0btC1HFGFlM3HzFk3VNVBv5prfnv/lnmhy80RfoXC2Iend43GEoLPoJJj sZ5+NfjGMNxcHkYfSspTYz81xsi+/4MBiT0ULHj/jYDdNp2x6gWUEX7/C+hLmP2tTj y7OiHxg9/aNPbkFbg1Cey9xHIbgfgbeQ1aYLEdcPt5xJlirY9+66qXQ4np4lz5ALei uJ0Nux9Bh/FWDz92z7eAvzXYVWPq2YD7uEGJ4RUPmS1r24ewDEy1c0RqyepwcvFVD4 p9GpbIdByMoJM0rzTY1UxadgVTLhOvFykZ0Ik0zAql0vJBnciuxij32oRfb/cKl3GQ +lnfUk0lXqkPA== From: Jarkko Sakkinen To: Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe Cc: x86@kernel.org, "Daniel P. Smith" , Ross Philipson , Ard Biesheuvel , Thomas Gleixner , linux-integrity@vger.kernel.org (open list:TPM DEVICE DRIVER), linux-kernel@vger.kernel.org (open list), James Bottomley , Stefan Berger , Al Viro Subject: [RFC PATCH 1/4] tpm, tpm_tis: Close all localities Date: Sat, 2 Nov 2024 17:22:18 +0200 Message-ID: <20241102152226.2593598-2-jarkko@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241102152226.2593598-1-jarkko@kernel.org> References: <20241102152226.2593598-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Daniel P. Smith" There are environments, for example, those that comply with the TCG D-RTM specification that requires the TPM to be left in locality 2. Prepare kernel for such environments by closing all the localities. Signed-off-by: Daniel P. Smith Signed-off-by: Ross Philipson Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_tis_core.c | 11 ++++++++++- include/linux/tpm.h | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index fdef214b9f6b..c58f360fb4a4 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -1104,7 +1104,7 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, u32 intmask; u32 clkrun_val; u8 rid; - int rc, probe; + int rc, probe, i; struct tpm_chip *chip; chip = tpmm_chip_alloc(dev, &tpm_tis); @@ -1166,6 +1166,15 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, goto out_err; } + /* + * There are environments, for example, those that comply with the TCG D-RTM + * specification that requires the TPM to be left in Locality 2. + */ + for (i = 0; i <= TPM_MAX_LOCALITY; i++) { + if (check_locality(chip, i)) + tpm_tis_relinquish_locality(chip, i); + } + /* Take control of the TPM's interrupt hardware and shut it off */ rc = tpm_tis_read32(priv, TPM_INT_ENABLE(priv->locality), &intmask); if (rc < 0) diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 587b96b4418e..0708f744c803 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -147,6 +147,12 @@ struct tpm_chip_seqops { */ #define TPM2_MAX_CONTEXT_SIZE 4096 +/* + * The maximum locality (0 - 4) for a TPM, as defined in section 3.2 of the + * Client Platform Profile Specification. + */ +#define TPM_MAX_LOCALITY 4 + struct tpm_chip { struct device dev; struct device devs; From patchwork Sat Nov 2 15:22:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 13860184 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B7181A76A4; Sat, 2 Nov 2024 15:22:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730560965; cv=none; b=drDri/ndikDGYMW5inRRlddMECj4pfD/TMUcZsKxeXE7HDDx7X2NaAFEu9p49ZUFqO/VWSoh9Lxz7XW5kxjWx0lrpubAAmzBGh1kwQ1fQg/AaG/T1WOxqDC9B/l1BHbfH1HqlwO/ITDZ3Y8NHcJ8exts0pq9gzIMYzvkg4WnmrQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730560965; c=relaxed/simple; bh=0E9FnIba8YISVBF+XObPqZLXOvidxbgGlojWB3QDDq8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hZpI65AQ4zYIpSEGOrTl8IZwrQI0nkFQ4gS9kMvyUvsEcAbKJ89CKdAcx9hPbkaSGBZatfly+jC3uscYq4eKPb7wkSyminqY5s2DcX7v9o9sR/lLbr5xorf/QSKuaLceMpXdwoFGY/Q0EQFxpDISqulI9wUmNi3a4hWHPdDfbtk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dfVP/+Gg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dfVP/+Gg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25165C4CEC3; Sat, 2 Nov 2024 15:22:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730560964; bh=0E9FnIba8YISVBF+XObPqZLXOvidxbgGlojWB3QDDq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dfVP/+GgKMm4traXec6be5eA47h3+DDTJruujarYcMUTHAgoMNoywWxUY01oE8qNn kY//7xOdxM4eiJNIDu803d3Q9uCwj23H5TAV8n18Ax834PVB5Vn9wYgGb7sKalph55 yhMIGMKIweluOI6cMFmMirk18Be3LXlCCnLddG9mZYqYwAp1ArVW2DLli4ObI9+9/P pVFZCZjrmoNXrXednHOnmNP7uv0Xi5BbTxIu3g5EGwRjusjcm6FdL7UHz0DG25cOPZ fajYr86TzV2g9nadkcZQZOXupeP+A+4FF5AJ69Ck/rTavvL5h5CvBTo6DjCcPcaq5b 1YikpFZnWwcSA== From: Jarkko Sakkinen To: Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe Cc: x86@kernel.org, "Daniel P. Smith" , Ross Philipson , Ard Biesheuvel , Thomas Gleixner , linux-integrity@vger.kernel.org (open list:TPM DEVICE DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [RFC PATCH 2/4] tpm, tpm_tis: Address positive localities in tpm_tis_request_locality() Date: Sat, 2 Nov 2024 17:22:19 +0200 Message-ID: <20241102152226.2593598-3-jarkko@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241102152226.2593598-1-jarkko@kernel.org> References: <20241102152226.2593598-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: "Daniel P. Smith" Validate that the input locality is within the correct range, as specified by TCG standards, and increase the locality count also for the positive localities. Signed-off-by: Daniel P. Smith Signed-off-by: Ross Philipson Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_tis_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index c58f360fb4a4..c86100ad743a 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -234,10 +234,13 @@ static int tpm_tis_request_locality(struct tpm_chip *chip, int l) struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev); int ret = 0; + if (l < 0 || l > TPM_MAX_LOCALITY) + return -EINVAL; + mutex_lock(&priv->locality_count_mutex); if (priv->locality_count == 0) ret = __tpm_tis_request_locality(chip, l); - if (!ret) + if (ret >= 0) priv->locality_count++; mutex_unlock(&priv->locality_count_mutex); return ret; From patchwork Sat Nov 2 15:22:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 13860185 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A7241AAE0B; Sat, 2 Nov 2024 15:22:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730560971; cv=none; b=b0Y/cdvHbBPMsPHUi6b9GoAAIXlG497BD6dlw6syaGQbmBrre2PeGTH4AGwOS0YUJSukVpVhWPm6iAunQX0iVqBQcXm/OB3yuKgmkK6ifBTNJoT9T6EIkAgEvXobLdSMywjiTxRMmdvrCzAGDuQ/efLpfLfbrco3SEplhVZWROQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730560971; c=relaxed/simple; bh=GWZbkppcuc7wjj5TOO/2z8af24+dJui7EA7rWA19EVI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=g/5jv6yKKjs/nRQxfxLCQASyCtt/psv0gIAoCQG2X9HG5aDmqgg+f00ehhpeEpgKSJZ/ictma1AXG52/XeiZcPN0BseKTAzvHMCChcrekL/h1jHSSkkcnsTGHvARFK9mb51Uy2lvuYUl2MgVGErjlzf5OWzc+CGtMmWVGyXhdgg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JBkkaEPE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JBkkaEPE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88AD7C4CEC3; Sat, 2 Nov 2024 15:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730560970; bh=GWZbkppcuc7wjj5TOO/2z8af24+dJui7EA7rWA19EVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JBkkaEPEG++L9rcrxjwnpPwunUiQvN+Xaf7xvnlOfyh5EsDRUBF9Dr/BarebIy4Kx 0+Xdfc9r30wegxNY96649ysEURR/RnfJtKLQ/AAsh6Svzl3sKzWh0NRLxWlT+L8sLw SJkdZ/Z8dLHcOKuXZ9TX+6RWYkxDdGFyNOjBPwMKFpmkg8U3phaFQyWgnlIoNnzSoz AwDguzDYErJjwuB8YezFOpU6WiwFSBffer91NCJ99Q25iG1GEJNvxPmDwlXzgNRCjn 7VevAwdEccn49KwUUJ6IIw2I0sIkG4sdBQQkKcu3m56fonuIcIxbhbNrhGzi2lMjht cZAR+6yf2akrQ== From: Jarkko Sakkinen To: Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe Cc: x86@kernel.org, "Daniel P. Smith" , Ross Philipson , Ard Biesheuvel , Thomas Gleixner , linux-integrity@vger.kernel.org (open list:TPM DEVICE DRIVER), linux-kernel@vger.kernel.org (open list), James Bottomley , Stefan Berger , Al Viro Subject: [RFC PATCH 3/4] tpm, tpm_tis: allow to set locality to a different value Date: Sat, 2 Nov 2024 17:22:20 +0200 Message-ID: <20241102152226.2593598-4-jarkko@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241102152226.2593598-1-jarkko@kernel.org> References: <20241102152226.2593598-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Ross Philipson DRTM needs to be able to set the locality used by kernel. Provide a one-shot function tpm_chip_set_locality() for the purpose. Signed-off-by: Ross Philipson Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm-chip.c | 33 ++++++++++++++++++++++++++++++++- drivers/char/tpm/tpm_tis_core.c | 2 ++ include/linux/tpm.h | 4 ++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index 7df7abaf3e52..ac200514c4d7 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -44,7 +44,7 @@ static int tpm_request_locality(struct tpm_chip *chip) if (!chip->ops->request_locality) return 0; - rc = chip->ops->request_locality(chip, 0); + rc = chip->ops->request_locality(chip, chip->kernel_locality); if (rc < 0) return rc; @@ -374,6 +374,7 @@ struct tpm_chip *tpm_chip_alloc(struct device *pdev, } chip->locality = -1; + chip->kernel_locality = 0; return chip; out: @@ -689,3 +690,33 @@ void tpm_chip_unregister(struct tpm_chip *chip) tpm_del_char_device(chip); } EXPORT_SYMBOL_GPL(tpm_chip_unregister); + +/** + * tpm_chip_set_locality() - Set the TPM locality kernel uses + * @chip: &tpm_chip instance + * @locality: new locality + * + * This a one-shot function. Returns zero or POSIX error on failure. + */ +int tpm_chip_set_locality(struct tpm_chip *chip, u8 locality) +{ + int ret; + + if (locality < 0 || locality >= TPM_MAX_LOCALITY) + return -EINVAL; + + ret = tpm_try_get_ops(chip); + if (ret) + return ret; + + if (!(chip->flags & TPM_CHIP_FLAG_SET_LOCALITY_ENABLED)) { + tpm_put_ops(chip); + return -EINVAL; + } + + chip->kernel_locality = locality; + chip->flags &= ~TPM_CHIP_FLAG_SET_LOCALITY_ENABLED; + tpm_put_ops(chip); + return 0; +} +EXPORT_SYMBOL_GPL(tpm_chip_set_locality); diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c index c86100ad743a..b85677eccc86 100644 --- a/drivers/char/tpm/tpm_tis_core.c +++ b/drivers/char/tpm/tpm_tis_core.c @@ -1114,6 +1114,8 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, if (IS_ERR(chip)) return PTR_ERR(chip); + chip->flags |= TPM_CHIP_FLAG_SET_LOCALITY_ENABLED; + #ifdef CONFIG_ACPI chip->acpi_dev_handle = acpi_dev_handle; #endif diff --git a/include/linux/tpm.h b/include/linux/tpm.h index 0708f744c803..af88161c1316 100644 --- a/include/linux/tpm.h +++ b/include/linux/tpm.h @@ -207,6 +207,8 @@ struct tpm_chip { /* active locality */ int locality; + /* the locality used by kernel */ + u8 kernel_locality; #ifdef CONFIG_TCG_TPM2_HMAC /* details for communication security via sessions */ @@ -354,6 +356,7 @@ enum tpm_chip_flags { TPM_CHIP_FLAG_SUSPENDED = BIT(8), TPM_CHIP_FLAG_HWRNG_DISABLED = BIT(9), TPM_CHIP_FLAG_DISABLE = BIT(10), + TPM_CHIP_FLAG_SET_LOCALITY_ENABLED = BIT(11), }; #define to_tpm_chip(d) container_of(d, struct tpm_chip, dev) @@ -446,6 +449,7 @@ static inline u32 tpm2_rc_value(u32 rc) extern int tpm_is_tpm2(struct tpm_chip *chip); extern __must_check int tpm_try_get_ops(struct tpm_chip *chip); extern void tpm_put_ops(struct tpm_chip *chip); +int tpm_chip_set_locality(struct tpm_chip *chip, u8 locality); extern ssize_t tpm_transmit_cmd(struct tpm_chip *chip, struct tpm_buf *buf, size_t min_rsp_body_length, const char *desc); extern int tpm_pcr_read(struct tpm_chip *chip, u32 pcr_idx, From patchwork Sat Nov 2 15:22:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 13860186 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DA721AB50D; Sat, 2 Nov 2024 15:22:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730560976; cv=none; b=GgR/V1binuNqwO/oI2Nz0D+bvkgxyTv2Agn4Je7bLERATe0vUU39irb7QLBITUEmrI5st3xcvL2L+9K6iZ8sfH17Bzk93STsHWPFXbj8ykT5qKpo00Oq8EAEIbaVbhpXB+V/xP5tI3QHSPZ5gTW+x/iVZPbRteKgICw29Gxc9gg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730560976; c=relaxed/simple; bh=e+MpOC0Ch/mh7XcLQQJX783++tlbidsB+xGwfq076W0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mXVP3892B6TaZjnWOkNg2kNb/+6+VzSWY1LDz/6HD4Rhho3AUXlUVXMNf8huLhleWGL2xcatVop6akjA7rtXvFuUmcKGLNL9n60lLnKLNV6ORuxDkw4M8ULcUY+INZSvjCjpYqvUiDa5Yb2lzDF+hA7sVfm8+8LL5hV5H/k2CQ4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OPHB5x7a; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OPHB5x7a" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65A0CC4CED2; Sat, 2 Nov 2024 15:22:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730560975; bh=e+MpOC0Ch/mh7XcLQQJX783++tlbidsB+xGwfq076W0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OPHB5x7aU1Vm6EJLBbZp+gsIV6EjRGnpKZ7ClfOBgi7GQb8kIth++a/WH7fAbOrPv +N1zRpVpXoyEqgJ8v/XPa0SOePssaQ9iMTEzCmbN3Izgp3RfqjmL8jqRJcKb194IL1 bmAseRBRT5x2vRUCQvGhzFXy/0q4YKiSAngaaandWbq/kNgH9aiKy0ZAbU8J0mwGFI USy6HxLLhKRWnwrXdjgT5LfnvQG8W3juMLUtOqOLqV4HnvXUpFNMTGA86fnvnkYupU kkcfKT5AVa9OPtnLI38t6ItjeQpEewKKO1IKx20nPHgvkleCSxmmlm5Y3aUQ6Wrqta 9fyXn5lkRHQAA== From: Jarkko Sakkinen To: Peter Huewe , Jarkko Sakkinen , Jason Gunthorpe Cc: x86@kernel.org, "Daniel P. Smith" , Ross Philipson , Ard Biesheuvel , Thomas Gleixner , linux-integrity@vger.kernel.org (open list:TPM DEVICE DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [RFC PATCH 4/4] tpm: sysfs: Show locality used by kernel Date: Sat, 2 Nov 2024 17:22:21 +0200 Message-ID: <20241102152226.2593598-5-jarkko@kernel.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241102152226.2593598-1-jarkko@kernel.org> References: <20241102152226.2593598-1-jarkko@kernel.org> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Ross Philipson Expose the locality used by kernel to sysfs. Signed-off-by: Ross Philipson Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm-sysfs.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/char/tpm/tpm-sysfs.c b/drivers/char/tpm/tpm-sysfs.c index 94231f052ea7..2da5857e223b 100644 --- a/drivers/char/tpm/tpm-sysfs.c +++ b/drivers/char/tpm/tpm-sysfs.c @@ -309,6 +309,14 @@ static ssize_t tpm_version_major_show(struct device *dev, } static DEVICE_ATTR_RO(tpm_version_major); +static ssize_t locality_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct tpm_chip *chip = to_tpm_chip(dev); + + return sprintf(buf, "%u\n", chip->kernel_locality); +} +static DEVICE_ATTR_RO(locality); + #ifdef CONFIG_TCG_TPM2_HMAC static ssize_t null_name_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -336,6 +344,7 @@ static struct attribute *tpm1_dev_attrs[] = { &dev_attr_durations.attr, &dev_attr_timeouts.attr, &dev_attr_tpm_version_major.attr, + &dev_attr_locality.attr, NULL, }; @@ -344,6 +353,7 @@ static struct attribute *tpm2_dev_attrs[] = { #ifdef CONFIG_TCG_TPM2_HMAC &dev_attr_null_name.attr, #endif + &dev_attr_locality.attr, NULL };