From patchwork Wed Feb 28 18:27:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maran Wilson X-Patchwork-Id: 10249303 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DBC8960365 for ; Wed, 28 Feb 2018 18:30:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8E5F28E10 for ; Wed, 28 Feb 2018 18:30:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD2E828E20; Wed, 28 Feb 2018 18:30:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69C7D28E10 for ; Wed, 28 Feb 2018 18:30:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932923AbeB1SaN (ORCPT ); Wed, 28 Feb 2018 13:30:13 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:57848 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932238AbeB1SaK (ORCPT ); Wed, 28 Feb 2018 13:30:10 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w1SIQiLS030912; Wed, 28 Feb 2018 18:29:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2017-10-26; bh=B2ZDVtxRY+D7f4mgpdBLsBmA6WczaMYhBO/mCnrBA1U=; b=TrbPeGi4G2Rv1Fmu7+EbKuFwk4fYPm6/7u3hKYJuRbn+hUcU7lSAw3xTF5Tp8n40YILI HA5fhgxBAzfaPOTz0FNkydoFXmBoOtgUg5Ap71Ch/SDL84iHA+qT6iDjpgl3ZNQQFtG3 jkZFNsVQ50Y9Vp+GYwBYhILurq60m6wOKpefq+MsIMio5G8StYBbv+X2y454mWL+EfIj IgCZhflnYAKpixI1iA+DyTtrbbyS2PDgTPy5I1xjC/OMsFX6EyMB/RxLTs4dhZMi/jil w5BSgEoyiF097lyT7NlwyPOSfyKAhtuyrkpyyLM1pnkC+/5iKIEq/C+JRNIbLV+KQWud yg== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2130.oracle.com with ESMTP id 2gdygbrw7t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 28 Feb 2018 18:29:32 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w1SISi9R018591 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 28 Feb 2018 18:28:44 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w1SIShmn029737; Wed, 28 Feb 2018 18:28:43 GMT Received: from marawils-linux.us.oracle.com (/10.141.197.9) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 28 Feb 2018 10:28:42 -0800 From: Maran Wilson To: pbonzini@redhat.com, jgross@suse.com, boris.ostrovsky@oracle.com, roger.pau@citrix.com, andrew.cooper3@citrix.com, hch@infradead.org, JBeulich@suse.com, x86@kernel.org, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, rkrcmar@redhat.com, jpoimboe@redhat.com, bp@suse.de, kirill.shutemov@linux.intel.com, thomas.lendacky@amd.com, luto@kernel.org, maran.wilson@oracle.com, dave.hansen@linux.intel.com, davem@davemloft.net, gregkh@linuxfoundation.org, mchehab@kernel.org, linus.walleij@linaro.org, rdunlap@infradead.org Subject: [RFC PATCH v4 2/7] xen/pvh: Move PVH entry code out of Xen specific tree Date: Wed, 28 Feb 2018 10:27:58 -0800 Message-Id: <1519842483-8887-3-git-send-email-maran.wilson@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1519842483-8887-1-git-send-email-maran.wilson@oracle.com> References: <1519842483-8887-1-git-send-email-maran.wilson@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8818 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1802280224 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Once hypervisors other than Xen start using the PVH entry point for starting VMs, we would like the option of being able to compile PVH entry capable kernels without enabling CONFIG_XEN and all the code that comes along with that. To allow that, we are moving the PVH code out of Xen and into files sitting at a higher level in the tree. This patch is not introducing any code or functional changes, just moving files from one location to another. Signed-off-by: Maran Wilson Reviewed-by: Konrad Rzeszutek Wilk --- MAINTAINERS | 1 + arch/x86/Kbuild | 3 +++ arch/x86/{xen/xen-pvh.S => pvh-head.S} | 0 arch/x86/{xen/enlighten_pvh.c => pvh.c} | 0 arch/x86/xen/Makefile | 2 -- 5 files changed, 4 insertions(+), 2 deletions(-) rename arch/x86/{xen/xen-pvh.S => pvh-head.S} (100%) rename arch/x86/{xen/enlighten_pvh.c => pvh.c} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 93a12af4f180..dc89f3a279bd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15210,6 +15210,7 @@ L: xen-devel@lists.xenproject.org (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git S: Supported F: arch/x86/xen/ +F: arch/x86/*pvh* F: drivers/*/xen-*front.c F: drivers/xen/ F: arch/x86/include/asm/xen/ diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 0038a2d10a7a..a4e5e3d348dc 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild @@ -7,6 +7,9 @@ obj-$(CONFIG_KVM) += kvm/ # Xen paravirtualization support obj-$(CONFIG_XEN) += xen/ +obj-$(CONFIG_XEN_PVH) += pvh.o +obj-$(CONFIG_XEN_PVH) += pvh-head.o + # Hyper-V paravirtualization support obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/ diff --git a/arch/x86/xen/xen-pvh.S b/arch/x86/pvh-head.S similarity index 100% rename from arch/x86/xen/xen-pvh.S rename to arch/x86/pvh-head.S diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/pvh.c similarity index 100% rename from arch/x86/xen/enlighten_pvh.c rename to arch/x86/pvh.c diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index d83cb5478f54..7e8145b33997 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -21,7 +21,6 @@ obj-y := enlighten.o multicalls.o mmu.o irq.o \ obj-$(CONFIG_XEN_PVHVM) += enlighten_hvm.o mmu_hvm.o suspend_hvm.o obj-$(CONFIG_XEN_PV) += setup.o apic.o pmu.o suspend_pv.o \ p2m.o enlighten_pv.o mmu_pv.o -obj-$(CONFIG_XEN_PVH) += enlighten_pvh.o obj-$(CONFIG_EVENT_TRACING) += trace.o @@ -33,4 +32,3 @@ obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o obj-$(CONFIG_XEN_DOM0) += vga.o obj-$(CONFIG_SWIOTLB_XEN) += pci-swiotlb-xen.o obj-$(CONFIG_XEN_EFI) += efi.o -obj-$(CONFIG_XEN_PVH) += xen-pvh.o