From patchwork Thu Aug 3 01:50:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 130296 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp889589vqx; Wed, 2 Aug 2023 20:46:25 -0700 (PDT) X-Google-Smtp-Source: APBJJlHtHAV6u/DbWyhCBr3EXTq2HT9irSEjjzWiZ2W8CH7r6UGT8ENLm3lPU5gyDatfV/Y+Qtf9 X-Received: by 2002:a5d:4d4a:0:b0:317:6c0d:fda7 with SMTP id a10-20020a5d4d4a000000b003176c0dfda7mr10365771wru.0.1691034385722; Wed, 02 Aug 2023 20:46:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1691034385; cv=pass; d=google.com; s=arc-20160816; b=zhFdCgyhVCnEoMaIdZAouqvisWXr0c9Vn62bzmpQu/8B8QC9aB2ed0IXUol0hcwdxj W3ClTZm5MVNUMmfo2qqKfBziSQW23AUdR8Rauu4WpF98iO1uo1RDcw6IKHBp+wFIpgBC /azixlwpRYscqs8Esl27UwyeHdlBFklnP4qRjylN8MsSkKbjibM8z6JT43NuAbjuOhff zsGJTDh2t3kIxJhajl6Ei/IXjMUh7jNSH1IfIQKbdbHCqoGKpYtoH9q2uMdRQWpwK8Im 4ehy6b1pQ0g1DZrgNojevM83dzB1SP/f8/kmHVWQ3GOs5tiWYp6x+s7YwjnU8nW1RXZ2 lZ6Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oMOOmqq/eiZlUbhnmu/KV0sSYQzes5GaMDpH8G+Dg4c=; fh=irq1Eziv5SOWJC/gsdEOwPj/1mhmvgVtoohmB/ssJ+c=; b=Kr9myJgIJUxf+rVG/u9BpPLikYH721a7u9XsbpgxXo/IqMz5dUEnYB1I/irhGtVNWR 9Iux+sTH+iLiIZ3708mNN1N2m1cnwDzo4wy3ywStYu4JN3sHKgm6YVPI8dagQCaz+OLe nE/edzt3ahC0KfE4xLFod7M+1hVN6P9TOXU6ASe7TIW/hqH3PntSbMsIS04pVQiyYa5N YCnTtFYi/dyNXo7wKwWOcRAmz7WZFz5S20SW7ivwHzmqWMJLCmcCeFoxaOqljGgzNHJH VNKcRB7/CJHJxUy03pnj7tz0JcuSz4q3BpFgiHVm2EyvME0Rlt1f0c0Z2d7BNIU98ari w3tg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=rz+UIt00; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j13-20020a17090686cd00b00991ece4c966si7533072ejy.101.2023.08.02.20.45.59; Wed, 02 Aug 2023 20:46:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=rz+UIt00; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232442AbjHCBy0 (ORCPT + 99 others); Wed, 2 Aug 2023 21:54:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230088AbjHCBxS (ORCPT ); Wed, 2 Aug 2023 21:53:18 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF14C4C09; Wed, 2 Aug 2023 18:50:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pd9/SIB/dq4tngoj2E/6g51tqnoaldJofDiTcwhEJ6wI2hJYCbVU9CzTrn+xGuUmfQ6yzLaTuLYDgBfLYXgm696B8MWwSxZWFXiGm1N0zX1pKHl/78J8tQg1Ci/vDbOelsm2e9pYovsIITqZSgmD4UuyrtApNWLX2EjQJxbbN+ojsHDleNezDAg8WoFYK0J4/7iIfxiKOCG4pxntCE4mV8S+NcNbHYQV2kTRE1syLhjbKPs7xCRP8K+jPMxN6nZf1D/y7ui/wcVOIpNEm/O3HYQnuvC4HGfhJIAkJPJ2nPySPIT/Q5pVHeOrm7Dj2jqsYrhX30dSvaabcIixPPR8hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oMOOmqq/eiZlUbhnmu/KV0sSYQzes5GaMDpH8G+Dg4c=; b=eT6Pz6MtCKUJqd0XKYI6I7zim6nqE1zUu5RFB+LHbQxYuzt6Nbd22+q3pSs7PBoi5wjqDBC81HE+K9MptKSNYbN7x7zroc+Lv3cS3TNoTvK3FBnIQJ5LlaBZVrYuydTlPytM0+DBXor3Lg8afh1e3rAIKHGGHMCWhSNWGG0J02bb7HUefw67kImF654jqvBuG82pQcokqPjFDUQjVRqkedL7CN91gYkKpildlwyJuRkN6uW/V/enBNV4WuEWx3kwplBhGDoXnh5SK98o2TemnFV/twU9VToOQeZaOaf6t/Ij4CiQ6bHAPLtjcHU/qLGRp396hN0krkzf04KqT4McQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=oMOOmqq/eiZlUbhnmu/KV0sSYQzes5GaMDpH8G+Dg4c=; b=rz+UIt00b05vp/qmI3yBTpSTwqEKfyDmSrnxGOU1SB67YB5T9K6PAAPr5X4TEv4hMnv9MQwa8X6tPOJI/PrkqZDDBJlENb6rdzM491f9WEnnEzlUb/XZ/KRQtXgBJrfuai6XUUoFETaA6fStOw7D8ZSHlic7qd8gmh7eevEjV4c= Received: from MW4PR03CA0147.namprd03.prod.outlook.com (2603:10b6:303:8c::32) by IA1PR12MB6161.namprd12.prod.outlook.com (2603:10b6:208:3eb::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.32; Thu, 3 Aug 2023 01:50:31 +0000 Received: from CO1PEPF000044FD.namprd21.prod.outlook.com (2603:10b6:303:8c:cafe::2f) by MW4PR03CA0147.outlook.office365.com (2603:10b6:303:8c::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45 via Frontend Transport; Thu, 3 Aug 2023 01:50:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044FD.mail.protection.outlook.com (10.167.241.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.19 via Frontend Transport; Thu, 3 Aug 2023 01:50:31 +0000 Received: from SITE-L-T34-2.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 2 Aug 2023 20:50:30 -0500 From: Mario Limonciello To: , CC: , , , , Mario Limonciello Subject: [PATCH 1/3] tpm: Add a missing check for TPM_CHIP_FLAG_HWRNG_DISABLED Date: Wed, 2 Aug 2023 20:50:13 -0500 Message-ID: <20230803015015.915-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230803015015.915-1-mario.limonciello@amd.com> References: <20230803015015.915-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044FD:EE_|IA1PR12MB6161:EE_ X-MS-Office365-Filtering-Correlation-Id: aff7b205-4aec-4494-b2d4-08db93c40548 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1qbkMPpfyqT1K7VzEVtRTk5a73P5xghN1smWbngsDZsLTj3X2xMW6o/ZUIHrid0lRxfibacKKHeXU6e9ars6EjoHjSQ1WHMeVjwZVhraD0amUl7bdlDuDVvb8b8t/yDyfgT1TwP6S+4W6isN8FDNSiSSa4EbWLVW4grO003wvaXrnd9bT2cSG+nyHfuYSIb4Q7Oy607ee3mTuq1PAtML0WO9AgwL99UVDnWZJ1X8SKWauV/EdU7R+ZJA8IJXmQJtUxNlTQFwi9FYgaZKBuqbFtYUEJJC7tEzd9ZGfH03dyZFXhIkDGO55Jdc0HDgwc6VMytmwGQyCnOrM3RpnJi4rtGu2tZcynPrdR09i4qRWD4vA9yC5y4aIyIXSHwt+ELtkPirH6+fbjmvLLoHRra1RkYZ480Vl3yGxDmbXJ4/iQj2CdgRzpR8wdaqKp0Pcq0mxhBpCfyIECkyQ8Jk7Xmce/EiPQxBinKoTfNuxb38t+sdQMDvsjHle83+r0TPGc92gLhO24oE+5GbreW77OPmjFwdFNkrA1Cqo6PndVYHbyG00k+0IpgpMlrOTzZ+sUdB7YFINDYYKYtRH8dYgPxQuqEimbu3IU5BgaM0KpVMjIMZosMhQQPRFPEt8F1ZusXkxNs2FukTMd8WMrCGVXa51i+yRUc4THRsWkrweK1W8ODHN7blOcFT96axMMT0V1nS0co8U0sLnJRqNeB2eQwZaxG82sebXr9kQCnEoJEgVtCYggwVYlRyTg+UnvboxSDDgwkSnwTkt8XTqJVLv/Z2Wg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(136003)(396003)(39860400002)(376002)(346002)(82310400008)(451199021)(36840700001)(46966006)(40470700004)(82740400003)(356005)(8676002)(8936002)(40460700003)(5660300002)(44832011)(36860700001)(2906002)(4744005)(83380400001)(186003)(26005)(1076003)(336012)(86362001)(16526019)(40480700001)(426003)(70586007)(70206006)(2616005)(47076005)(316002)(4326008)(54906003)(110136005)(478600001)(36756003)(7696005)(6666004)(41300700001)(81166007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2023 01:50:31.3018 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aff7b205-4aec-4494-b2d4-08db93c40548 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044FD.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6161 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773178071838976845 X-GMAIL-MSGID: 1773178071838976845 If the TPM is opted out of hwrng the error handling for tpm_chip_register() needs to know this so it doesn't try to clean up an uninitialized chip->hwrng. Signed-off-by: Mario Limonciello --- drivers/char/tpm/tpm-chip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index e904aae9771be..8f61b784810d6 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -629,7 +629,8 @@ int tpm_chip_register(struct tpm_chip *chip) return 0; out_hwrng: - if (IS_ENABLED(CONFIG_HW_RANDOM_TPM) && !tpm_is_firmware_upgrade(chip)) + if (IS_ENABLED(CONFIG_HW_RANDOM_TPM) && !tpm_is_firmware_upgrade(chip) && + !(chip->flags & TPM_CHIP_FLAG_HWRNG_DISABLED)) hwrng_unregister(&chip->hwrng); out_ppi: tpm_bios_log_teardown(chip); From patchwork Thu Aug 3 01:50:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 130250 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp861223vqx; Wed, 2 Aug 2023 19:25:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlEQEUro3SFYyj/k2B+2guckbinUNcxMtXblwE/DWhvfZcvFVzqh9i4epgjwZL2ey8IfsT1t X-Received: by 2002:a05:6402:430b:b0:521:66b4:13b4 with SMTP id m11-20020a056402430b00b0052166b413b4mr14178219edc.0.1691029554128; Wed, 02 Aug 2023 19:25:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1691029554; cv=pass; d=google.com; s=arc-20160816; b=XRc22Z8hC+sJ7knfYqSGyYszBektkPUlUM6V8ugtKq9VtnPaVdImrF0Mfbt+YI6FJl ZtnjX9yCQLnXwORAZSH9P4OICo3lwB+Vv/mXpGq63ChHEMc1gABQXwqcd7wbUYtBJFnU RZdhOTgiD4J9igQPD+z9kmM72t7rB6otiYfHoPZG47/LGVpxn7M1I2Otc0fjyH4hHdfw w+KmxKOwRxwDhk/3GlVLi+pO4q8Ok38fWBv1uYMJ7O5e11Et4AuYALGoOzL2ymfRMPOT KntI/z5vlnmF1aDKCN5gSrZBiMtBsHf0S48GVz+ux8M70iLjIGyDV9FYtm3GK1l+joFQ dlYg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SPeAtWGA5IgpMy8bGWlPUebHFttBKKl3kxuGbsfyuYA=; fh=irq1Eziv5SOWJC/gsdEOwPj/1mhmvgVtoohmB/ssJ+c=; b=h7KaVUEAvS4FD9BmYt/nDfaRtyWURqcWtT4bsb6pty85J5yht/xpABdcsTvLPqOirl o9Q9UyTCy08IWlXLbgOEmw3+ANiElojR+l+DtsiZOUpPEhZkrSmyQXIm2J/2h5m5UDJg 9tlWkhSRcsDpI/LmEUO98v41ureMBvvnA0gC5Qfmr2lrTanQUS+VeCxQn14Nhanc72ZF Mxv63lyIq+zh9gdSSaPTA2fRlrLjoXOH2wGQmUHEwydR0iFO7SzXtKKJdqL+q2rvJjyc oIFc1rZVn4qJ7b48llhEzzQ0dzNm4LMizGfHqF/GuD+g0uZTMDvCkH8Q11n5pMuyJOmn owOg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=H1EYz20W; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w18-20020aa7da52000000b0051dd30da018si1716167eds.611.2023.08.02.19.25.30; Wed, 02 Aug 2023 19:25:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=H1EYz20W; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232593AbjHCByl (ORCPT + 99 others); Wed, 2 Aug 2023 21:54:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230143AbjHCBxV (ORCPT ); Wed, 2 Aug 2023 21:53:21 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2063.outbound.protection.outlook.com [40.107.237.63]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 701574C0C; Wed, 2 Aug 2023 18:50:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CRxxu2aiberEzHsZPT2tnxJE8xj8N1UG6bmWjth1GKt0ACMTJYqGrjHwab1JrGrlaV+Rq3/c1FbUL/ghCfMevsJ4pB7/G05LCp7tzuGKngc8dKKKSAQLdH8H1xwMw9LJBFhJs1LmTKSmeXBibMoRQnGnSzHN7BU5cK+xl8hAUMXUWD1ecYPGtf+LD3OGWYQXpKlEZfqB0S2iGeAZwznfjzAprfOz0ZzmDBXZRRsY3OhNShMIJaXJOnU13+66fpr+45Q2DdRV34lXtPapHJKk5bCqxguTbNCfWwvEAWq2JY850/gqbIeDLJ0n5HlzNF/sAr24ctO/tvGkBJ7C6V5+2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SPeAtWGA5IgpMy8bGWlPUebHFttBKKl3kxuGbsfyuYA=; b=PB2sg+FFQSW5uYCR3wCLGhvPIJoCMJp0UOOArWk5jIF5V5wc3v9fDUboJJH1putybKlBSfUheC2M4nzUi/F1PjXLEe5Jkh53yAxXB+ABudW090FDM+H4KNOyFo4ohhNuRFyGY1YdIhprxwx+JpEq+7cfOmJXn4I7L4H/vSvurl4lhqmNGPlJyDbPnc39PmNtfa3ohKshuAlqZjNNX48vTUfRNQf85j4v2vk8Y1Oym9iX6HsQIs/syiBTZvOFBagkVBgurbCIaa1j1HMN1DLYBJKyVxBwC0sUVF5gjsyb/8+iBmnrhD2fUcqGyMUSPDFCQ0slQp2A81Pw/IAvvF6cuw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SPeAtWGA5IgpMy8bGWlPUebHFttBKKl3kxuGbsfyuYA=; b=H1EYz20WoFXbFydHlr72xJaWwnGLGjVpaWMCdDKue3OAsgiRPaSuZrvP7vMb6v/BMPqRoHhOTTQjbhb9zWmkvhTko51ivs1iFQEDkwKcA9x0hbIys8qvRST42J60DhkeCDexE6qSElLVfzLsamvj4T2pfH1y9Odfpi9zSrmiyyg= Received: from MW4PR03CA0121.namprd03.prod.outlook.com (2603:10b6:303:8c::6) by SA3PR12MB9227.namprd12.prod.outlook.com (2603:10b6:806:398::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Thu, 3 Aug 2023 01:50:32 +0000 Received: from CO1PEPF000044FD.namprd21.prod.outlook.com (2603:10b6:303:8c:cafe::cf) by MW4PR03CA0121.outlook.office365.com (2603:10b6:303:8c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.20 via Frontend Transport; Thu, 3 Aug 2023 01:50:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044FD.mail.protection.outlook.com (10.167.241.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.19 via Frontend Transport; Thu, 3 Aug 2023 01:50:32 +0000 Received: from SITE-L-T34-2.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 2 Aug 2023 20:50:31 -0500 From: Mario Limonciello To: , CC: , , , , Mario Limonciello Subject: [PATCH 2/3] tpm: Add command line for not trusting tpm for RNG Date: Wed, 2 Aug 2023 20:50:14 -0500 Message-ID: <20230803015015.915-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230803015015.915-1-mario.limonciello@amd.com> References: <20230803015015.915-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044FD:EE_|SA3PR12MB9227:EE_ X-MS-Office365-Filtering-Correlation-Id: bd28b192-6db6-4263-4ac7-08db93c405c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y1Hk0i1XIF43XezUu/jk5xTyb+GGxzB+n4V+pA+qxdXnKr4arm75WZHmiT15+jrIJIjgWzRVrhZ9dAdi/3pvvOwv6tncCmqORQ8MFG2NPT0jzjK9rOcXXLuVnUJ/Ur+ycxmZANCam/fFVmhHE1hvHkrmV7Mwr039bIcWUlWi4cRyvpZ2pUv8zGxko9vllGfGDU6+alT0syKPXkAKsOlnC/qy9IZ4Gn+izyr/qewtISLYTIPaVarP7WrdcZeyOKY3q0KFf7y5FNO+4u9R/CfwiwzCdazVm8vmrAEKWUPYCdsG4KoTMvXQ0mp/td598LAEMPTZgENccCCZL0H6heWHJpByAyCHocKHW9eemHXF2zKqCit6AJ+hA1KJF8OypBmoDCge/+st4bJbz68nEtl3xrmAQ0UGQ3cTheq7VB8RVbCZll7N4Is1sURLjp0mH8MYYzTusWe1H4QgOJKzVVTq1S78PBL6hP9ylu1IhRiQAwxOMJSt6QL9VOUKM3uroZ9g+cVx+zBTSyrg6KdTlAQ+hfBQ3rLA3Kl1fmIPKNnzOXUnY7vPIcBawbHLxKgi0K6U1muZX/ovy+17HzbXHVjEbpCjS+WgqOU91o7rNFfLBVEx+vAyw8UaOucGAPhWWCxXpoI0IMo2cfptDXrNip0YnaJdZRWdPZnsk15Lik+6FecsNvZMKKDWSbfqzqjFWI/RCJsplsYsc7ZAduQxK9tSydjaWm5CRrKziMYk1k406XulErqYogQ5z+vhogydast+h/8SeP5oZ5IcAFk70ttQ+w== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(376002)(396003)(136003)(39860400002)(346002)(451199021)(82310400008)(36840700001)(46966006)(40470700004)(110136005)(83380400001)(478600001)(54906003)(6666004)(81166007)(7696005)(70206006)(86362001)(70586007)(4326008)(40480700001)(316002)(336012)(186003)(1076003)(26005)(16526019)(82740400003)(47076005)(2616005)(426003)(40460700003)(36860700001)(8936002)(8676002)(356005)(5660300002)(36756003)(44832011)(41300700001)(2906002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2023 01:50:32.0830 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bd28b192-6db6-4263-4ac7-08db93c405c2 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044FD.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB9227 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773173005569172724 X-GMAIL-MSGID: 1773173005569172724 The kernel supports random.cpu=off and random.bootloader=off. As TPM RNG is also registered as a hwrng, add the ability to prevent registering the TPM RNG. Suggested-by: Mateusz Schyboll Signed-off-by: Mario Limonciello --- Documentation/admin-guide/kernel-parameters.txt | 5 +++++ drivers/char/tpm/tpm-chip.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index a1457995fd41c..9ff602c09f55c 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4672,6 +4672,11 @@ passed by the bootloader (if available) to initialize the kernel's RNG. + random.trust_tpm=off + [KNL] Disable trusting the use of the TPM's + random number generator (if available) to + initialize the kernel's RNG. + randomize_kstack_offset= [KNL] Enable or disable kernel stack offset randomization, which provides roughly 5 bits of diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index 8f61b784810d6..8fb42232bd7a5 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -32,6 +32,13 @@ struct class *tpm_class; struct class *tpmrm_class; dev_t tpm_devt; +static bool trust_tpm __initdata = true; +static int __init parse_trust_tpm(char *arg) +{ + return kstrtobool(arg, &trust_tpm); +} +early_param("random.trust_tpm", parse_trust_tpm); + static int tpm_request_locality(struct tpm_chip *chip) { int rc; @@ -523,6 +530,9 @@ static int tpm_hwrng_read(struct hwrng *rng, void *data, size_t max, bool wait) static int tpm_add_hwrng(struct tpm_chip *chip) { + if (!trust_tpm) + chip->flags |= TPM_CHIP_FLAG_HWRNG_DISABLED; + if (!IS_ENABLED(CONFIG_HW_RANDOM_TPM) || tpm_is_firmware_upgrade(chip) || chip->flags & TPM_CHIP_FLAG_HWRNG_DISABLED) return 0; From patchwork Thu Aug 3 01:50:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 130246 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp859903vqx; Wed, 2 Aug 2023 19:22:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlE9SC8O1pg0cnfZrbjH1WS+p5aNLzjODiLdvAsVafbHN9JitxEFI8bfJp5sHFLRbfYgw57h X-Received: by 2002:a05:6a20:394c:b0:12e:f6e6:882b with SMTP id r12-20020a056a20394c00b0012ef6e6882bmr18525958pzg.1.1691029324202; Wed, 02 Aug 2023 19:22:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1691029324; cv=pass; d=google.com; s=arc-20160816; b=R7HEN9H+/rF5TaWGXEKAKXrpVd7x7ES5V5FQ6EI7QOirsNTOJ3vvzFuIJrNJ7GbXRC gHJmV6c0F5SvqjdeNEx+aTFCdLdGpsh3rZyzUMUaADQVbib4gnOCdfeuu5fM4+Zcnkwv XqTBUtRsiLlS2qlL7lSvMdlhj7MpYlTh+moFi33BC4GQIlpJwdVIHSWtnw+LjwrcaZWQ cBZD6cituIBq5kCXIFATqK47jicvf2k1UdtL8nHcmdcT7C8b2ZB6hfm8crzKWh+a9dAB 1JVq27q5bp1Z6Uh3dkfAxuXM3dK6VvYJeuKJBcSJIwIfnRKfqHUysH5W38uCKLgB6VyD 3B7A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Y6j7G0wHpGT5TV5mFGYDuSed9aFAeuI1Qx17cWQMASQ=; fh=irq1Eziv5SOWJC/gsdEOwPj/1mhmvgVtoohmB/ssJ+c=; b=MDUiSRTYZRoikxtsNTauNzocAzC/lMGmz3YiMnTMuaoOnqFRjJspa1OaJS5mtbgvm2 AomZWzFY+SG6mjTUdTCerAYYPwFqb/86czR8OcYRR5ZTHbFNtr0xJoI/gv/NUJbMSxDm zZTmGJ0qPC+qFEPpWLZYWnxSCJeIgWNuX+Z2HBa1Qb0Vx1/0JgNiDBwpUgMDvGChCXgn OxjQIvWUq5mIEm2wLWLbnGkhC/1/nxlU883yllafDce256C+v9YWW+4T57Dl7qMR/mTa bDXWoezAuFys6RD2IiDn+TJnF9dhzNYDl3E5t6KA/Z9vkwcbZ+i2y5i+2hNXDe10V4WF HTiQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=ZzJ6PF3O; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bu28-20020a63295c000000b0055c1760dd8esi430142pgb.380.2023.08.02.19.21.49; Wed, 02 Aug 2023 19:22:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=ZzJ6PF3O; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231383AbjHCBzG (ORCPT + 99 others); Wed, 2 Aug 2023 21:55:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231144AbjHCBxZ (ORCPT ); Wed, 2 Aug 2023 21:53:25 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2068.outbound.protection.outlook.com [40.107.244.68]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2972F4C16; Wed, 2 Aug 2023 18:50:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GOSSRIbgxNI/10z05H3U49rRcFF1JbJl9SXQvzPQoRYDjil1FcK0XqWLEfq97kxBLTx17/gxdmzoqt2KnYi3k8fOBLsj+rKAF6UWfaC5jo7BOamd562MuJL/9RlVxa4MboNHrBy+IOZ+ExH9GaAROFyZJfQCRUYlj5DD39NtmX6b61GlHHjHDO6LCfjl7h96O2PhIqY2dYPWXAdKUpnhL7tf/WcjjZQb0h+gx/wMQNm15iVPz06ImigBN+LtHtzgwDlox7wv/k0fz+93C7ARQt377n29JfB3Jl+sTPqP4ry0CHILl5dHDeVu5nGpSoMXGHIwZF+V4KI51rhqfuF2pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Y6j7G0wHpGT5TV5mFGYDuSed9aFAeuI1Qx17cWQMASQ=; b=Ad3KlM6XtXGXMx9o9ozi4OzyFZPpXr33ZIfJBFbNKBNEURIxw3+mcsUtdCILpmI3xjwqU9FN3x8BLA2eY2WBE09HeQEzv946aEIOlhWPWkYZ6wkjboHZNl2NQsS338TKoCQCKFQyR+2Bjz7lb+u5DGD5lkE47iVF5iTTwa3y6u4DNy/HBGRWLrA8V3dHj1uqLM8hufNCatN+jETFlWBfVk4L8R90q3bZ8EoQ+w9yT5v+EUfJFSm2hYMmaiP0DQx8nbVh76nq7vVPeETLmC/FEP0AnkPeFattv6EpmcPeuNoib70dIQNg76Hp0WxaO83eLQ1gO8ZkcUj47HxAcovwqw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Y6j7G0wHpGT5TV5mFGYDuSed9aFAeuI1Qx17cWQMASQ=; b=ZzJ6PF3O11ONChv+vRKVjtgw2wNbX5Hhmbqici7WzYo8Cfe4IdWfebg5C4EmPLT/B1HG9+GNTkSgy7/DGqUTpFb5oladD9KYjsUTdd/Nb0ZysrxhwL0+ltcVv27MRt6ETe6crxZUpz0F9y+U9QpOfYwvWJtzELz/id/h2wssUvA= Received: from DM6PR14CA0064.namprd14.prod.outlook.com (2603:10b6:5:18f::41) by CYXPR12MB9427.namprd12.prod.outlook.com (2603:10b6:930:d6::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.47; Thu, 3 Aug 2023 01:50:34 +0000 Received: from CO1PEPF000044F7.namprd21.prod.outlook.com (2603:10b6:5:18f:cafe::a4) by DM6PR14CA0064.outlook.office365.com (2603:10b6:5:18f::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 3 Aug 2023 01:50:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1PEPF000044F7.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.20 via Frontend Transport; Thu, 3 Aug 2023 01:50:33 +0000 Received: from SITE-L-T34-2.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 2 Aug 2023 20:50:32 -0500 From: Mario Limonciello To: , CC: , , , , Mario Limonciello Subject: [PATCH 3/3] tpm: Drop CONFIG_HW_RANDOM_TPM Date: Wed, 2 Aug 2023 20:50:15 -0500 Message-ID: <20230803015015.915-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230803015015.915-1-mario.limonciello@amd.com> References: <20230803015015.915-1-mario.limonciello@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F7:EE_|CYXPR12MB9427:EE_ X-MS-Office365-Filtering-Correlation-Id: 11d319ca-2b16-4d24-530b-08db93c406be X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: leJya4SXqPzlT9O0LyNMTlqkCUGnMEY1nK77s9l3DIGIliNPeG8QqAmpGzGYWqUQUwy3X9TugxkOl5WLFlYCN4zoo/f6ucBxy7UuwrKCRWJoNSuZaKzxK2WrBdpoMLUT9jY3DBPsY/TrSFMCCwa+sxIRZy9kYjvvNb4RJjRJN+3uxekd7Z9OmQ3MIQK6qcnRg50hbX/v1YL+yHnTakj60nmJVpye9olBEfpyxXB/aToNcRJZ7pSBfkvpbeZ60SrR/BD2C03F2qoRaVGYDYVJBmsHIcUr0UHS9aTISWSjk6ymrExyyM+AWhqB47yBu2FczUF6keZU0G2XAWO0d88BQQr1Mo0aBn1ZhR7e2loY3e/DOL82FXKCSA4revm8QKOCcWqHRMdEkUT/qVubQz22HSssP3n2Z2MCLCTfJrX8hAJx6+F8nj781FWwtZ+SFchPW1EPJ7jT/KqgpfKoMZdVnBUCetGfFUrDrjKkaABhpvPRc/iwrMyWYTNfanoKIyUc/cN/fmUE6bvhqH9CL5CXJkt9XJqCwpHnaqlpPzU3Jx2b8kc3RN/iTY04dvjzcyAlr+vgviQuGXy/biXIW38bYX2DONEFFIW5Lli/SRdpWBkoVhqGMg7QRh/hklKDAJcpsvOycthpUTkH/L7F9hCBd3j8rfQWM8W64bLq5NPIsyh4C0A0cD2rUeYXGPBN4c6nZ0vOgGOqQ+tWg/wnaXXH0kko/Qb7EhdblkkV2Hvv4HXbr+0QxNNFpo/jFqe1czsW1hx13PSBnwNop5xih6VspA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(396003)(376002)(346002)(136003)(39860400002)(451199021)(82310400008)(46966006)(36840700001)(40470700004)(41300700001)(40460700003)(316002)(4326008)(2906002)(70586007)(70206006)(44832011)(8676002)(8936002)(5660300002)(54906003)(356005)(81166007)(82740400003)(1076003)(26005)(36756003)(186003)(86362001)(336012)(16526019)(2616005)(426003)(83380400001)(36860700001)(47076005)(478600001)(110136005)(7696005)(6666004)(40480700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2023 01:50:33.7347 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 11d319ca-2b16-4d24-530b-08db93c406be X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F7.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9427 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773172764732876764 X-GMAIL-MSGID: 1773172764732876764 As the behavior of whether a TPM is registered for hwrng can be controlled by command line, drop the kernel configuration option. Cc: Mateusz Schyboll Signed-off-by: Mario Limonciello --- drivers/char/tpm/Kconfig | 11 ----------- drivers/char/tpm/tpm-chip.c | 6 +++--- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 927088b2c3d3f..69aaa730dc208 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig @@ -27,17 +27,6 @@ menuconfig TCG_TPM if TCG_TPM -config HW_RANDOM_TPM - bool "TPM HW Random Number Generator support" - depends on TCG_TPM && HW_RANDOM && !(TCG_TPM=y && HW_RANDOM=m) - default y - help - This setting exposes the TPM's Random Number Generator as a hwrng - device. This allows the kernel to collect randomness from the TPM at - boot, and provides the TPM randomines in /dev/hwrng. - - If unsure, say Y. - config TCG_TIS_CORE tristate help diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index 8fb42232bd7a5..0d69335743469 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -533,7 +533,7 @@ static int tpm_add_hwrng(struct tpm_chip *chip) if (!trust_tpm) chip->flags |= TPM_CHIP_FLAG_HWRNG_DISABLED; - if (!IS_ENABLED(CONFIG_HW_RANDOM_TPM) || tpm_is_firmware_upgrade(chip) || + if (tpm_is_firmware_upgrade(chip) || chip->flags & TPM_CHIP_FLAG_HWRNG_DISABLED) return 0; @@ -639,7 +639,7 @@ int tpm_chip_register(struct tpm_chip *chip) return 0; out_hwrng: - if (IS_ENABLED(CONFIG_HW_RANDOM_TPM) && !tpm_is_firmware_upgrade(chip) && + if (!tpm_is_firmware_upgrade(chip) && !(chip->flags & TPM_CHIP_FLAG_HWRNG_DISABLED)) hwrng_unregister(&chip->hwrng); out_ppi: @@ -665,7 +665,7 @@ EXPORT_SYMBOL_GPL(tpm_chip_register); void tpm_chip_unregister(struct tpm_chip *chip) { tpm_del_legacy_sysfs(chip); - if (IS_ENABLED(CONFIG_HW_RANDOM_TPM) && !tpm_is_firmware_upgrade(chip) && + if (!tpm_is_firmware_upgrade(chip) && !(chip->flags & TPM_CHIP_FLAG_HWRNG_DISABLED)) hwrng_unregister(&chip->hwrng); tpm_bios_log_teardown(chip);