From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx48BoiAQ2NEwQ5XNLZVA3kV0XwFIFRD7apWU1xdV8egcVnpAzRxzZIAyQ/GQjTn5ImHmeGqS ARC-Seal: i=1; a=rsa-sha256; t=1523920345; cv=none; d=google.com; s=arc-20160816; b=tPEwowkZZSl4qgq3/ensmcOE66jYdQJ5aGuA5cHcKtUKKMKXezaJMlRbDBmhMorxjB 7dvkj1a6psASxzjE3crqasxhT/ohFpJf6z/n3xkunhVg2HbapwxeNPbvKdnkD+xhLhfb W4WxKP8u+ijxJI2sQQv2z/YIO7avhyogTOmYYg79HU6fMJBOV6IbqyZirXUHp+bftZhP M3xQRlGTino6Ydzk34qwzt/StAYMh0YAmOqtk+zzzaTbGEfsf7j9/ozuE4DPeraJzKFq BgjeZOY/3C711lJg5jn14/bPVTLYVFQwiwsm51jQInDut6bqgBGh0kaa/Wa9gTPuGfRP Pztg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=Ul6Dgu2i/W+6QVvRetR9xZUKe8gJs3nB3/QKDkOY/u4=; b=u3WpfrZMTf3WDT2P69gZGZZhh+HImrQPCliA8fZsx5jl50V8S/KGQEa4ciRJhwySdU LdpYxSF5h25aWIS+CtQq78guTVaBOdWioh8QUH8To5z1ozQb56VrvgwjAF3+ZGAgXdZh 3rFotHx244tgKO7jD/ZQ4prti0//772AZjJZb51NYoV9AFrGnhT3PGOY8wSlt59ArHjJ sxV8beCpqVL+Zzkq65OcReVCunE8kCWmNs7m3L6IjAvl5AK0PTBoRDJ2KuT8RuVB72Uz cI/hTcxJw4fMc6HBv/eRSsQFbj4lgvUzbRHEx5Xgm75lYncojJ4vbMGQ3pVbxjxhSAEk hGUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2017-10-26 header.b=iL91CRdo; spf=pass (google.com: domain of maran.wilson@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=maran.wilson@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2017-10-26 header.b=iL91CRdo; spf=pass (google.com: domain of maran.wilson@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=maran.wilson@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com From: Maran Wilson To: x86@kernel.org, linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, kvm@vger.kernel.org, pbonzini@redhat.com, jgross@suse.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, boris.ostrovsky@oracle.com, davem@davemloft.net, gregkh@linuxfoundation.org, mchehab@kernel.org, linus.walleij@linaro.org, rdunlap@infradead.org, roger.pau@citrix.com, rkrcmar@redhat.com, maran.wilson@oracle.com Subject: [PATCH v7 2/7] xen/pvh: Move PVH entry code out of Xen specific tree Date: Mon, 16 Apr 2018 16:11:50 -0700 Message-Id: <1523920310-27620-1-git-send-email-maran.wilson@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1523920175-27287-1-git-send-email-maran.wilson@oracle.com> References: <1523920175-27287-1-git-send-email-maran.wilson@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8865 signatures=668698 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-1804160192 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1597946300170778618?= X-GMAIL-MSGID: =?utf-8?q?1597946300170778618?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 | 2 ++ arch/x86/platform/pvh/Makefile | 5 +++++ arch/x86/{xen/enlighten_pvh.c => platform/pvh/enlighten.c} | 0 arch/x86/{xen/xen-pvh.S => platform/pvh/head.S} | 0 arch/x86/xen/Makefile | 3 --- 6 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 arch/x86/platform/pvh/Makefile rename arch/x86/{xen/enlighten_pvh.c => platform/pvh/enlighten.c} (100%) rename arch/x86/{xen/xen-pvh.S => platform/pvh/head.S} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 7bb2e9595f14..0b816f588fe1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15385,6 +15385,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/platform/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..2089e4414300 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild @@ -7,6 +7,8 @@ obj-$(CONFIG_KVM) += kvm/ # Xen paravirtualization support obj-$(CONFIG_XEN) += xen/ +obj-$(CONFIG_XEN_PVH) += platform/pvh/ + # Hyper-V paravirtualization support obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/ diff --git a/arch/x86/platform/pvh/Makefile b/arch/x86/platform/pvh/Makefile new file mode 100644 index 000000000000..9fd25efcd2a3 --- /dev/null +++ b/arch/x86/platform/pvh/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 +OBJECT_FILES_NON_STANDARD_head.o := y + +obj-$(CONFIG_XEN_PVH) += enlighten.o +obj-$(CONFIG_XEN_PVH) += head.o diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/platform/pvh/enlighten.c similarity index 100% rename from arch/x86/xen/enlighten_pvh.c rename to arch/x86/platform/pvh/enlighten.c diff --git a/arch/x86/xen/xen-pvh.S b/arch/x86/platform/pvh/head.S similarity index 100% rename from arch/x86/xen/xen-pvh.S rename to arch/x86/platform/pvh/head.S diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index d83cb5478f54..f1b850607212 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -1,6 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 OBJECT_FILES_NON_STANDARD_xen-asm_$(BITS).o := y -OBJECT_FILES_NON_STANDARD_xen-pvh.o := y ifdef CONFIG_FUNCTION_TRACER # Do not profile debug and lowlevel utilities @@ -21,7 +20,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 +31,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 -- 2.16.1