From patchwork Fri Aug 11 23:40:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 134778 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1423610vqi; Fri, 11 Aug 2023 16:49:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHXK/gsl2aveEb3uKD91VX2xpmIonTEDvAgXyndjd5RAlJyEaCiAwU+PcMItsU45qF9Ldsa X-Received: by 2002:a17:90a:664a:b0:268:34b1:a5a9 with SMTP id f10-20020a17090a664a00b0026834b1a5a9mr2816346pjm.8.1691797774183; Fri, 11 Aug 2023 16:49:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691797774; cv=none; d=google.com; s=arc-20160816; b=NFrZx4Fz84J0KxPMyLSin62FyBHbakWv1gc+CsddfF3fxJydRlY2IZVRFjgm3c/wc1 uXDBkmVzpxN0PQ94QPLLG67NlF3L8jUT44WQba4Yjte0Sk1ZjpJm4PL8+JGkwF0DnidT PNJ6w0W7ZTcgzmtF6gqqnGpEAwHVZyAI8p5lY/a2eZDp2OhK4auZ3oa3/Gz5ORPj1Ipj jb2qAQ5CwJsXioVixDhNYO9Nkke6FqTm1HmBzX5biIAbvWShZuuPC2QmI8LIqVdI9QVu jdflBz2r7wtx7SLp1lD5EMzuDYDugoYTKr4Rk6sDbdLBKiNxRQgqi1UbXy3oKhK9bjN1 IKzw== ARC-Message-Signature: i=1; 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=FqOMcXziVUO7DLiTKSLZSull1+Ds5EMtyd4kxIZE0ng=; fh=VzGccbf5gggVWOtyoIMWYT+dpRIibXUx22YKQygPFZc=; b=qgaJjmvOrN4WF2UtBAwDPAeFxPFa6i8H7XLn3MdsclMhkXSNwwVLJr3sFhpnVHS0Sa SiOvFTsKsDjaOdjykhl8c7+mMn6JT3FgbZhNA6CqFoyHFQwhSa3sy8RiAEYNJM0aGZWY 77jLXYH6xaVsuMkweXupNdCIboU8CCFlB8FeVzxyTM6/3FGkZO1oJQhfTIEPP9GfHb0Z Mv4wYllWVlOYGQsQzAg16JX9BK1/BAq60zRL4sBBsoCyO8CFHWfER+j0NmaW1RkCsepJ Lyn6rmsRxkdiElq4ELaP8Wh+nUBiqZ9B3cfmNZ1SpIM5yEtx2mDk6po3T9q5yoNrKXzH DB5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Uq3xkCyE; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id le6-20020a170902fb0600b001b23d721059si3868055plb.317.2023.08.11.16.49.21; Fri, 11 Aug 2023 16:49:34 -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=@kernel.org header.s=k20201202 header.b=Uq3xkCyE; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237261AbjHKXkQ (ORCPT + 99 others); Fri, 11 Aug 2023 19:40:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237253AbjHKXkP (ORCPT ); Fri, 11 Aug 2023 19:40:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93F4610FE; Fri, 11 Aug 2023 16:40:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1DFBC67BF6; Fri, 11 Aug 2023 23:40:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A79CC433C7; Fri, 11 Aug 2023 23:40:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691797213; bh=R2sg8Db9dBVponQJLVp+BrZA8E82CBv1tB6TGddHoN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uq3xkCyExr0bAf02PkbcC409sZ8cxS1DxQ077j7t81RnQrHuQWGqD61Kjzbw4iGAy osnXYnbQPKkDkRocy0dLSsE6g4mjgplWyvHTfps1/yHrMuU8l12yd4Jz06l3UhBRta Lz3HVMqZUAYcUKgn3fLDdfFven/MjaKgJ4N3VasBaJ0c+zXi0GC02JwGlczDokgzuY aT9jG+99ppj8P1wT0HzIeoCRUHsVyhTzibT6OE0IBgoKSOMrtf/MUSU7DgsAGFBfJ6 ZmFnkf8mDDQwnOmR19JQTfEmfnXGht80yA+CfvAjtdX0+deKZTbdM7sN5Aqwj72Xm2 eWGx9fpgBsk9g== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: Linus Torvalds , Peter Ujfalusi , stable@vger.kernel.org, Jarkko Sakkinen , Peter Huewe , Jason Gunthorpe , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] tpm: tpm_tis: Fix UPX-i11 DMI_MATCH condition Date: Sat, 12 Aug 2023 02:40:01 +0300 Message-Id: <20230811234002.2656180-2-jarkko@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230811234002.2656180-1-jarkko@kernel.org> References: <20230811234002.2656180-1-jarkko@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham 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: 1773978542827788314 X-GMAIL-MSGID: 1773978542827788314 From: Peter Ujfalusi The patch which made it to the kernel somehow changed the match condition from DMI_MATCH(DMI_PRODUCT_NAME, "UPX-TGL01") to DMI_MATCH(DMI_PRODUCT_VERSION, "UPX-TGL") Revert back to the correct match condition to disable the interrupt mode on the board. Cc: stable@vger.kernel.org # v6.4+ Fixes: edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11") Link: https://lore.kernel.org/lkml/20230524085844.11580-1-peter.ujfalusi@linux.intel.com/ Signed-off-by: Peter Ujfalusi Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_tis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index ac4daaf294a3..3c0f68b9e44f 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -183,7 +183,7 @@ static const struct dmi_system_id tpm_tis_dmi_table[] = { .ident = "UPX-TGL", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "AAEON"), - DMI_MATCH(DMI_PRODUCT_VERSION, "UPX-TGL"), + DMI_MATCH(DMI_PRODUCT_NAME, "UPX-TGL01"), }, }, {} From patchwork Fri Aug 11 23:40:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 134774 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1423206vqi; Fri, 11 Aug 2023 16:48:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG83wbPOoNGK1RebWfW9J9gzERTihNJIer92ATiUO/SXI3UFmSgSUN5iMk1gK9wFGnprbWt X-Received: by 2002:a05:6870:e990:b0:1bb:8483:a807 with SMTP id r16-20020a056870e99000b001bb8483a807mr3648451oao.44.1691797703076; Fri, 11 Aug 2023 16:48:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691797703; cv=none; d=google.com; s=arc-20160816; b=OP6wgw5iaGpKdpztGCenflG7M/DlcQO9mHGPo03hLN29fQBKBKlPIShf6MHDGRC6o8 s2WfrXOm9RUCostElpKxAVKbYw9AWDe2/Lq+uqV7rjr2QOrkD6IAKm2ThAPevHf/OYKp QcxZFTMARE0Y2VyXPJSgI8D+6vDkxwlJMSgcIgb2ZwLqzq7ctNo2LdsX+cFMFkEF4s+X cw2XdijZENvfmz4U7SXczmQbBpqSU2/5yVjUgDsfxFpu6+LU4Ayxfzxe9HJ+R/dDJMXj KjfAtXW1/hV3yEJdOAgjjE78hm7qOWAbIcrM2BzA9p6yW70zSc+741q9BskAUZ1P5I5B OO4w== ARC-Message-Signature: i=1; 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=bMr2uEh1fxBdh2BrccEeU5IfXv0mYp13g4S7u/CDyEI=; fh=yk2sHyyIeC7qlikX2XjzY2TXaxxeRdVPvMVOykQ8NP0=; b=empXKUZnER57nrPgWCwjKcYcPlA7pDKI4lJoCmfhHl3VzcO3Vs7ZLNgfp1H5PdKKSZ 73tDMQ0Ipw06OSR+/3KkGDVDFezVyrmYae7GPwGdys2HPPy/+qMv8vgR7YqnftIfL4tC OvZJ2JA6X6QkowQoJa5NGMhfNMzvl+uOaBOnfHeb1rJp3ihu7VknrI9npl3PpGzYnyqN zfQcOpeGoNjW4h3ov8KhMMtoYCU7z7pGhfebbwGK3FIToq5qgExBfCxNS82xu8OehMT0 ZBJGOGxmXmrt5zkGlEw3Ok8WMFgcUto66dKdjA+dbrlFx5Yi5Qa830bX7bRDuIGVIWu4 5O8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pPzegMV3; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 6-20020a17090a08c600b002692f3b7567si6107211pjn.150.2023.08.11.16.48.09; Fri, 11 Aug 2023 16:48:23 -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=@kernel.org header.s=k20201202 header.b=pPzegMV3; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237271AbjHKXkX (ORCPT + 99 others); Fri, 11 Aug 2023 19:40:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237269AbjHKXkS (ORCPT ); Fri, 11 Aug 2023 19:40:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 570A010FE; Fri, 11 Aug 2023 16:40:18 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D3BB6637A7; Fri, 11 Aug 2023 23:40:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3F7DC433C7; Fri, 11 Aug 2023 23:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691797217; bh=aV2LJbtr8NPZCiOq8BIk41FJhgohqOqu0LS4nEr0uvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pPzegMV35VO8/6lfUmFitMOeXOXQlxTtJSYEEEUs072M5HMy7ZlwLp+ThLKXkM58a ZGwSmrWv5ryjCypWVw29kdV33ksGUtDQ2bPaH3VSdPYvmlAc+IAD8ozkMlwk6GjoxU Ie6GqQikR28FN8jX1n36DowvVmlDveyVvFvurZlFoVQwuzaFvNIvQPfjMjze8ybKvS XNoAkJLRi0BEmbslbouybFecovD3DeD9DER5yxvPH6itnDFYKelihtkhaeOqmT4zy5 40kR0UupcJuKAiShCB9kglBcHpJoTz7/NeHFGH3rKdmZsGIj3S6sQ5xWP9R6Gw5wUi 9yVsqFceY6sBQ== From: Jarkko Sakkinen To: linux-integrity@vger.kernel.org Cc: Linus Torvalds , Jarkko Sakkinen , stable@vger.kernel.org, Peter Huewe , Jason Gunthorpe , Lino Sanfilippo , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] tpm_tis: Opt-in interrupts Date: Sat, 12 Aug 2023 02:40:02 +0300 Message-Id: <20230811234002.2656180-3-jarkko@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230811234002.2656180-1-jarkko@kernel.org> References: <20230811234002.2656180-1-jarkko@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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: 1773978467879304054 X-GMAIL-MSGID: 1773978467879304054 Cc: stable@vger.kernel.org # v6.4+ Link: https://lore.kernel.org/linux-integrity/CAHk-=whRVp4h8uWOX1YO+Y99+44u4s=XxMK4v00B6F1mOfqPLg@mail.gmail.com/ Fixes: e644b2f498d2 ("tpm, tpm_tis: Enable interrupt test") Signed-off-by: Jarkko Sakkinen --- drivers/char/tpm/tpm_tis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 3c0f68b9e44f..7fa3d91042b2 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c @@ -89,7 +89,7 @@ static inline void tpm_tis_iowrite32(u32 b, void __iomem *iobase, u32 addr) tpm_tis_flush(iobase); } -static int interrupts = -1; +static int interrupts; module_param(interrupts, int, 0444); MODULE_PARM_DESC(interrupts, "Enable interrupts");