From patchwork Sat Feb 1 17:49:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 11361213 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CF9C713B4 for ; Sat, 1 Feb 2020 17:49:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA1EA20679 for ; Sat, 1 Feb 2020 17:49:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726270AbgBARtm (ORCPT ); Sat, 1 Feb 2020 12:49:42 -0500 Received: from mga17.intel.com ([192.55.52.151]:64397 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726169AbgBARtm (ORCPT ); Sat, 1 Feb 2020 12:49:42 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Feb 2020 09:49:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,390,1574150400"; d="scan'208";a="429034026" Received: from sjchrist-coffee.jf.intel.com ([10.54.74.202]) by fmsmga005.fm.intel.com with ESMTP; 01 Feb 2020 09:49:41 -0800 From: Sean Christopherson To: Jarkko Sakkinen Cc: linux-sgx@vger.kernel.org Subject: [PATCH for_v25 0/3] x86/sgx: Fix feature control rebase Date: Sat, 1 Feb 2020 09:49:37 -0800 Message-Id: <20200201174940.20984-1-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Sender: linux-sgx-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sgx@vger.kernel.org Two patches to fix the Feature Control MSR bit definitions, which didn't get correctly rebased. Patch 03 reworks SGX handling of Feature Control to use the new feat_ctl.c code, which was the entire point of that series. Patch 03 is a drop-in replacement for 4249f9b240b7 ("x86/cpu/intel: Detect SGX supprt"). *** DISCLAIMER *** These patches are untested against your master, as your master doesn't boot on my system. The fully tested version is available at https://github.com/sean-jc/linux.git, branch sgx/for_jarkko_v25_rebased. I'll dig into the boot issue next week. Sean Christopherson (3): x86/msr: Fixup "Add Intel SGX hardware bits" x86/msr: Fixup "Intel SGX Launch Control hardware bits" x86/cpu: Configure SGX support when initializing feature control MSR arch/x86/include/asm/msr-index.h | 9 ++------ arch/x86/kernel/cpu/feat_ctl.c | 29 +++++++++++++++++++++++- arch/x86/kernel/cpu/intel.c | 39 -------------------------------- 3 files changed, 30 insertions(+), 47 deletions(-)