Received: by 2002:a05:6359:6284:b0:131:369:b2a3 with SMTP id se4csp4592768rwb; Tue, 8 Aug 2023 10:37:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFvAD6pgBshhIQPXXcy0M5yL69aiXo9SczR+z2WFLjIrK1jNrPWDAkICGEAbZaIt/wSO4W1 X-Received: by 2002:aa7:c153:0:b0:523:264e:eee3 with SMTP id r19-20020aa7c153000000b00523264eeee3mr440467edp.11.1691516263045; Tue, 08 Aug 2023 10:37:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691516263; cv=none; d=google.com; s=arc-20160816; b=LYSgkP3YXLUpG1DSelnU04vzEbFtPrCDc07kC/KZdQVjEMDtt2vV+vq14KhP1PfQhA zxGqL85umDukBnBRLdNp2p9+XOT1de/02lsgrxAoGsjjpDcGDskBN5daGMH9MlejWcGQ jbC9DY8DOgLqmSmNH87qhftPY9Ghl2ryFDDs8eTx+bRdVuINV/9C2BOfv4cGzj2j3Aqe M+N/U+tKeEdNbkfXkCsKgYXH/8sgPhZuls+CWJWctkaxZFIZHu3p7L5cBnt7frTsWLIz y8uDQarIznlWYnDv9hsnT3T4EoKhXtdGWFetM7p3Egdaz9jczX7R4qg/AoewpPLZf1Da XFIQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=3kdktpIIk/h5ynonIjBFXI3q45+UWWiXFeVlEaTI7xQ=; fh=UfEwTlpxLOhE6cQFSR6JRRWQS0m3QpabdkTW82ss1Fw=; b=pBbmdpmN/qzdp3NHtpVyZg6mDiLFIsZZPwFsb41hLMylEfO683XUNnDQCONUgycDw2 TdFA9n126tqtfUnCXzboHcjMxN3DEZw/uTyN/4Oi/wyOraIiceL7NvUWqDmpk30oMMJC RNYttwlbr8E2WyekzSdbP/0tGbs/4HG05BYXmQoiaQgg9YdqhK/9jhgaY9R1/bcRICup tNOR8GVI5MTkc7gDcJ8OpkxHsSh/nmu9IOkx65zAb91i/vp36TeT7q9I6gXQJpOlQSwn OOGgtaNtXkqkA9eWawd4H0aG9VeB+0dD1uiUPi5P9JGwJZ7m4cIMe031kd2du7AQjesm XY9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NGWtKyle; 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=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bo2-20020a0564020b2200b005227e5499e1si6083223edb.180.2023.08.08.10.37.18; Tue, 08 Aug 2023 10:37:43 -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=@intel.com header.s=Intel header.b=NGWtKyle; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229685AbjHHREA (ORCPT + 99 others); Tue, 8 Aug 2023 13:04:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229646AbjHHRDH (ORCPT ); Tue, 8 Aug 2023 13:03:07 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3351119763; Tue, 8 Aug 2023 09:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691510491; x=1723046491; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=9CE+7ZXBx0kDEsrZcd8WmXKJp5Uc9a7coM9bHeY+W38=; b=NGWtKyleihfGlLsrmKwqP5TSq0taBaniKg5kzURT+NCn5VS1J2RzJGmQ oDOHKeET7N0m9eMu3A8iWsFQcUGXtlVAqQj/+CdgqBd0yYF5ej66reyi+ GyPXjJhZ69vfm27VHdf8ktoCi1qUME3W0czGsk2WsClWbRCc32RyufLg7 Chf4dt7K9uTa5O+36oZ532IN7HC5jb9ygzU60H1ukU29KDt2V9nm7NakA RJtduB0O7Yi/h37C5t/DRg21pb5JxeCGjk8+Sjsb57cEpTHfNh8XMVxKT HfHSYykAC8zon2E7WmTO8TS50U8d5uIlGSAleorAAwtJ0nvtswxK71vYz A==; X-IronPort-AV: E=McAfee;i="6600,9927,10795"; a="373486331" X-IronPort-AV: E=Sophos;i="6.01,263,1684825200"; d="scan'208";a="373486331" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2023 23:16:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.01,202,1684825200"; d="scan'208";a="874608255" Received: from romanagn-mobl1.ger.corp.intel.com (HELO pujfalus-desk.ger.corp.intel.com) ([10.252.49.59]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Aug 2023 23:16:55 -0700 From: Peter Ujfalusi To: peterhuewe@gmx.de, jarkko@kernel.org Cc: jgg@ziepe.ca, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, l.sanfilippo@kunbus.com, peter.ujfalusi@linux.intel.com, jsnitsel@redhat.com, pmenzel@molgen.mpg.de Subject: [PATCH] tpm: tpm_tis: Fix UPX-i11 DMI_PRODUCT_VERSION string Date: Tue, 8 Aug 2023 09:18:16 +0300 Message-ID: <20230808061816.15695-1-peter.ujfalusi@linux.intel.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED 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 The patch which made it to the kernel somehow lost the "01" from the string, making the match to not work anymore. Link: https://lore.kernel.org/lkml/20230524085844.11580-1-peter.ujfalusi@linux.intel.com/ Fixes: edb13d7bb034 ("tpm: tpm_tis: Disable interrupts *only* for AEON UPX-i11") --- Hi Jarkko, Can you send this patch for the 6.5 cycle? edb13d7bb034 was applied in 6.5-rc3 and I just updated my work tree to notice the regression. Thank you, Peter 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..2bb9901a329a 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_VERSION, "UPX-TGL01"), }, }, {} -- 2.41.0