Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1887229ybz; Thu, 30 Apr 2020 07:14:23 -0700 (PDT) X-Google-Smtp-Source: APiQypKM1zdPTy0F89TYyKKPXzo408RlSD+4a0g4BZk30bhGonwDbe2ZCd7cv7oxEXXJDWkB1jRq X-Received: by 2002:a17:906:8611:: with SMTP id o17mr2767993ejx.221.1588256063133; Thu, 30 Apr 2020 07:14:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588256063; cv=none; d=google.com; s=arc-20160816; b=BO2LTiq7r5gDXF3eBCEsiEuemFnvbz2fmJLje8Wi5T3izvFbFpea/mSeFgn9fQwCKn VmihEZHfUJrGlwZXrRjfUTfbmqb+488Jtcp4ccrMsUeqa4w2MOGlIQAUkSsJEZNTzm50 Wd9jY70amFuYT4JVEcGDAPtMJJxZ58Voww81VU7qttKoy+e2dDuxNTodr7RlptAv0o1h 4BsEoEY4SuW46l+QrbicAL2YI8OMjZrcBOFKGZMehZidbqADjnGWjEHN/+quvyDI3WCX BXFvfWsziPlJU7xrKLvsXpUriHWxZHnDVh813ALPfNJFvoDqZVV/YuYPeA95X76No3WT H/Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WbsWQ97VmOf29nxfc7AudpX0rjA3ZHTqjvUg08GZNCE=; b=YZldYbqPaAHCau0iIlyFO5gAfQ1GIanbiLajdHyRWAc4TUec+Z0NK/HnWr5jf/VwU5 TuKO3Ugfp4wARh1auHaDtkWVrs5aUQCf7T/hh//i9IevFmX9+pHijpG9qRrZ/tDGIrhi gcbv1Cj98eD1j6Whq4sqk6KvS3agJxj7+spd3SzYkMwu/DhgvnlpRWdUiuEXH6D2VXxz 7h+duNdITPvi0XzSnl9iC+QwOxrUmW2P26U7PiIFBaswKEGBIBobhZ3icd7h0+62Vza+ WnVe7mqYOiMZWb9yjs1tjWbBtvhuE7jimuwDfTRIZYeYDx/5nptvH4Z8oBckyCEHW8UU S3HQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wmqG9RGE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k10si5195477eds.461.2020.04.30.07.13.59; Thu, 30 Apr 2020 07:14:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wmqG9RGE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1727969AbgD3NvO (ORCPT + 99 others); Thu, 30 Apr 2020 09:51:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:58980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727887AbgD3NvG (ORCPT ); Thu, 30 Apr 2020 09:51:06 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1176E24954; Thu, 30 Apr 2020 13:51:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254665; bh=pNDq+qA0a6AeHHaZ1+wh57H8blS3M82LwnhCyrgPei8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wmqG9RGED98L/rX3qYChQfInbO2hMoWdwBwCgL6HGBiw/9WVGUniHHgsbjalvJDKj z3ptY+puGMZV9tL6nhcqzrWvznwFPfCQn3pEBWrmJ/HeziC1pbf19kOse3Us6kM5Tk 5trv2rZ1+L0s80eBAb49o5dmyN5BoYfOX4iF8xMg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jarkko Sakkinen , Nikita Sobolev , Shuah Khan , Sasha Levin , linux-api@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 18/79] Revert "Kernel selftests: tpm2: check for tpm support" Date: Thu, 30 Apr 2020 09:49:42 -0400 Message-Id: <20200430135043.19851-18-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135043.19851-1-sashal@kernel.org> References: <20200430135043.19851-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jarkko Sakkinen [ Upstream commit aaa2d92efe1f972567f1691b423ab8dc606ab3a9 ] This reverts commit b32694cd0724d4ceca2c62cc7c3d3a8d1ffa11fc. The original comment was neither reviewed nor tested. Thus, this the *only* possible action to take. Cc: Nikita Sobolev Signed-off-by: Jarkko Sakkinen Signed-off-by: Shuah Khan Signed-off-by: Sasha Levin --- tools/testing/selftests/tpm2/test_smoke.sh | 13 ++----------- tools/testing/selftests/tpm2/test_space.sh | 9 +-------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/tools/testing/selftests/tpm2/test_smoke.sh b/tools/testing/selftests/tpm2/test_smoke.sh index b630c7b5950a9..8155c2ea7ccbb 100755 --- a/tools/testing/selftests/tpm2/test_smoke.sh +++ b/tools/testing/selftests/tpm2/test_smoke.sh @@ -1,17 +1,8 @@ #!/bin/bash # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) -self.flags = flags -# Kselftest framework requirement - SKIP code is 4. -ksft_skip=4 - - -if [ -f /dev/tpm0 ] ; then - python -m unittest -v tpm2_tests.SmokeTest - python -m unittest -v tpm2_tests.AsyncTest -else - exit $ksft_skip -fi +python -m unittest -v tpm2_tests.SmokeTest +python -m unittest -v tpm2_tests.AsyncTest CLEAR_CMD=$(which tpm2_clear) if [ -n $CLEAR_CMD ]; then diff --git a/tools/testing/selftests/tpm2/test_space.sh b/tools/testing/selftests/tpm2/test_space.sh index 180b469c53b47..a6f5e346635e5 100755 --- a/tools/testing/selftests/tpm2/test_space.sh +++ b/tools/testing/selftests/tpm2/test_space.sh @@ -1,11 +1,4 @@ #!/bin/bash # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) -# Kselftest framework requirement - SKIP code is 4. -ksft_skip=4 - -if [ -f /dev/tpmrm0 ] ; then - python -m unittest -v tpm2_tests.SpaceTest -else - exit $ksft_skip -fi +python -m unittest -v tpm2_tests.SpaceTest -- 2.20.1