Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3295720pxj; Tue, 1 Jun 2021 01:50:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfh2GmsmA9DdQLnyTS4AGc++NnHe/odYmhgVX52eyTj2npWYbKbnuDyfjedJj1Vmvk4/Z9 X-Received: by 2002:a02:6d13:: with SMTP id m19mr24326968jac.65.1622537431900; Tue, 01 Jun 2021 01:50:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622537431; cv=none; d=google.com; s=arc-20160816; b=iwIiKB0kDMK6zYIAL9zIKu+CtdtuSQw2XqLYl9HWYXn3/vbDUzFn9zr7OtxuicRdKD t+oPfpdUtCFH0AoljRd27DtpXrq8PEVTg7/3npNbq/jQv1AERvoaNi644s/g5I/hieNt DmrlF0H0X43si2blAKIqGM2lNleaxkZ4mMKdjSoi2PoYFCkRgGEVcXa3TGql2e+i4TyV x/GO9ZLcwQA1GWNT0hpCJ+w41zqB9vss42md7+3mxfwddboi9GW57OEoOAMwL2DUSxJV Qp+ElJB/2kjcPGTexsjfOXIRnigFk44SVUbKD0r7FxHNY/duS1ko6vLS1LSb9y/t8xQc 9xYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:ironport-sdr:ironport-sdr; bh=nBI2owPN4RcdwyVvsndaJAcc46B+RpJF3mcqWku6NK4=; b=sTbK6OUoy0SEiwpGJaDaQV5DVok39jC85jmzjtyRqE70tVKG5kZJQCPxmjIE2w2g7H p0m/6M35GGapopw2jrhXpkZj3IN6uRKo8iacR42D6fjtvmZuTEy+ThdKLedZO8vM0k3M hcbetmbWpb+9k/DB0ZImsX8XWYpjxfyOW/gKvjyezFsvXrNjn5wz6tttRGs3b8VAkDkQ ift+FyXI5VW5utAmAusdjo1fkwwvWNRh+itdLqDOo8upoW5l9X78UoeQlK4uSF7G1dk6 N7YyCeGlDs+3ZCDxOv/d4F3BWrL4HRTgseSZ/BB70+De/5sRbuN7pPG08jXD5B6m7f97 YXZA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j6si16415075iow.6.2021.06.01.01.50.19; Tue, 01 Jun 2021 01:50:31 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233805AbhFAItt (ORCPT + 99 others); Tue, 1 Jun 2021 04:49:49 -0400 Received: from mga07.intel.com ([134.134.136.100]:45142 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233773AbhFAItm (ORCPT ); Tue, 1 Jun 2021 04:49:42 -0400 IronPort-SDR: 31+FrmYbTJBIL4YUs0STaZNqG1zZLmGZObYRn/5VMehe58Y+TxbzmDO1th8b8EncfG5LWXjqtO OU7DqLmgwwNg== X-IronPort-AV: E=McAfee;i="6200,9189,10001"; a="267381287" X-IronPort-AV: E=Sophos;i="5.83,239,1616482800"; d="scan'208";a="267381287" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2021 01:48:00 -0700 IronPort-SDR: eMj/DQuW6Kh5rgYb2frTv4AumtMZRkwm3a+lNo3hyRsEX0HKk9NUScYkg7NZxm9MYwbYDANEQ2 rcA/M+K2jQCw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,239,1616482800"; d="scan'208";a="437967736" Received: from sqa-gate.sh.intel.com (HELO robert-ivt.tsp.org) ([10.239.48.212]) by orsmga007.jf.intel.com with ESMTP; 01 Jun 2021 01:47:58 -0700 From: Robert Hoo To: pbonzini@redhat.com, seanjc@google.com, vkuznets@redhat.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, kvm@vger.kernel.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, chang.seok.bae@intel.com, robert.hu@intel.com, robert.hu@linux.intel.com Subject: [PATCH 01/15] x86/keylocker: Move KEYSRC_{SW,HW}RAND to keylocker.h Date: Tue, 1 Jun 2021 16:47:40 +0800 Message-Id: <1622537274-146420-2-git-send-email-robert.hu@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1622537274-146420-1-git-send-email-robert.hu@linux.intel.com> References: <1622537274-146420-1-git-send-email-robert.hu@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org KVM needs the KEYSRC_SWRAND and KEYSRC_HWRAND macro definitions. Move them to Signed-off-by: Robert Hoo Reviewed-by: Tony Luck Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org --- arch/x86/include/asm/keylocker.h | 3 +++ arch/x86/kernel/keylocker.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/keylocker.h b/arch/x86/include/asm/keylocker.h index 74b8063..9836e68 100644 --- a/arch/x86/include/asm/keylocker.h +++ b/arch/x86/include/asm/keylocker.h @@ -9,6 +9,9 @@ #include #include +#define KEYSRC_SWRAND 0 +#define KEYSRC_HWRAND BIT(1) + #define KEYLOCKER_CPUID 0x019 #define KEYLOCKER_CPUID_EAX_SUPERVISOR BIT(0) #define KEYLOCKER_CPUID_EBX_AESKLE BIT(0) diff --git a/arch/x86/kernel/keylocker.c b/arch/x86/kernel/keylocker.c index 5a784492..17bb2e8 100644 --- a/arch/x86/kernel/keylocker.c +++ b/arch/x86/kernel/keylocker.c @@ -66,8 +66,6 @@ void flush_keylocker_data(void) keydata.valid = false; } -#define KEYSRC_SWRAND 0 -#define KEYSRC_HWRAND BIT(1) #define KEYSRC_HWRAND_RETRY 10 /** -- 1.8.3.1