From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754972AbdCBR4W (ORCPT ); Thu, 2 Mar 2017 12:56:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49482 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751589AbdCBRz1 (ORCPT ); Thu, 2 Mar 2017 12:55:27 -0500 From: Vitaly Kuznetsov To: xen-devel@lists.xenproject.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Boris Ostrovsky , Juergen Gross , Andrew Jones Subject: [PATCH v2 15/21] x86/xen: put setup.c, pmu.c and apic.c under CONFIG_XEN_PV Date: Thu, 2 Mar 2017 18:53:51 +0100 Message-Id: <20170302175357.8222-16-vkuznets@redhat.com> In-Reply-To: <20170302175357.8222-1-vkuznets@redhat.com> References: <20170302175357.8222-1-vkuznets@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 02 Mar 2017 17:54:28 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org xen_pmu_init/finish() functions are used in suspend.c and enlighten.c, add stubs for now. Reviewed-by: Juergen Gross Signed-off-by: Vitaly Kuznetsov --- arch/x86/xen/Kconfig | 2 +- arch/x86/xen/Makefile | 6 +++--- arch/x86/xen/pmu.h | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index dae8dc6..04284d9 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -6,7 +6,6 @@ config XEN bool "Xen guest support" depends on PARAVIRT select PARAVIRT_CLOCK - select XEN_HAVE_VPMU depends on X86_64 || (X86_32 && X86_PAE) depends on X86_LOCAL_APIC && X86_TSC help @@ -18,6 +17,7 @@ config XEN_PV bool "Xen PV guest support" default y depends on XEN + select XEN_HAVE_VPMU help Support running as a Xen PV guest. diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index cf8d6c5..f610651 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -10,13 +10,13 @@ nostackp := $(call cc-option, -fno-stack-protector) CFLAGS_enlighten_pv.o := $(nostackp) CFLAGS_mmu_pv.o := $(nostackp) -obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ +obj-y := enlighten.o multicalls.o mmu.o irq.o \ time.o xen-asm.o xen-asm_$(BITS).o \ grant-table.o suspend.o platform-pci-unplug.o \ - p2m.o apic.o pmu.o enlighten_pv.o mmu_pv.o + p2m.o enlighten_pv.o mmu_pv.o obj-$(CONFIG_XEN_PVHVM) += enlighten_hvm.o mmu_hvm.o suspend_hvm.o -obj-$(CONFIG_XEN_PV) += suspend_pv.o +obj-$(CONFIG_XEN_PV) += setup.o apic.o pmu.o suspend_pv.o obj-$(CONFIG_XEN_PVH) += enlighten_pvh.o obj-$(CONFIG_EVENT_TRACING) += trace.o diff --git a/arch/x86/xen/pmu.h b/arch/x86/xen/pmu.h index af5f0ad..4be5355 100644 --- a/arch/x86/xen/pmu.h +++ b/arch/x86/xen/pmu.h @@ -4,8 +4,13 @@ #include irqreturn_t xen_pmu_irq_handler(int irq, void *dev_id); +#ifdef CONFIG_XEN_HAVE_VPMU void xen_pmu_init(int cpu); void xen_pmu_finish(int cpu); +#else +static inline void xen_pmu_init(int cpu) {} +static inline void xen_pmu_finish(int cpu) {} +#endif bool is_xen_pmu(int cpu); bool pmu_msr_read(unsigned int msr, uint64_t *val, int *err); bool pmu_msr_write(unsigned int msr, uint32_t low, uint32_t high, int *err); -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vitaly Kuznetsov Subject: [PATCH v2 15/21] x86/xen: put setup.c, pmu.c and apic.c under CONFIG_XEN_PV Date: Thu, 2 Mar 2017 18:53:51 +0100 Message-ID: <20170302175357.8222-16-vkuznets@redhat.com> References: <20170302175357.8222-1-vkuznets@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjUvt-0003j9-Je for xen-devel@lists.xenproject.org; Thu, 02 Mar 2017 17:54:29 +0000 In-Reply-To: <20170302175357.8222-1-vkuznets@redhat.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Boris Ostrovsky , x86@kernel.org, Andrew Jones , linux-kernel@vger.kernel.org List-Id: xen-devel@lists.xenproject.org eGVuX3BtdV9pbml0L2ZpbmlzaCgpIGZ1bmN0aW9ucyBhcmUgdXNlZCBpbiBzdXNwZW5kLmMgYW5k CmVubGlnaHRlbi5jLCBhZGQgc3R1YnMgZm9yIG5vdy4KClJldmlld2VkLWJ5OiBKdWVyZ2VuIEdy b3NzIDxqZ3Jvc3NAc3VzZS5jb20+ClNpZ25lZC1vZmYtYnk6IFZpdGFseSBLdXpuZXRzb3YgPHZr dXpuZXRzQHJlZGhhdC5jb20+Ci0tLQogYXJjaC94ODYveGVuL0tjb25maWcgIHwgMiArLQogYXJj aC94ODYveGVuL01ha2VmaWxlIHwgNiArKystLS0KIGFyY2gveDg2L3hlbi9wbXUuaCAgICB8IDUg KysrKysKIDMgZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2FyY2gveDg2L3hlbi9LY29uZmlnIGIvYXJjaC94ODYveGVuL0tjb25maWcK aW5kZXggZGFlOGRjNi4uMDQyODRkOSAxMDA2NDQKLS0tIGEvYXJjaC94ODYveGVuL0tjb25maWcK KysrIGIvYXJjaC94ODYveGVuL0tjb25maWcKQEAgLTYsNyArNiw2IEBAIGNvbmZpZyBYRU4KIAli b29sICJYZW4gZ3Vlc3Qgc3VwcG9ydCIKIAlkZXBlbmRzIG9uIFBBUkFWSVJUCiAJc2VsZWN0IFBB UkFWSVJUX0NMT0NLCi0Jc2VsZWN0IFhFTl9IQVZFX1ZQTVUKIAlkZXBlbmRzIG9uIFg4Nl82NCB8 fCAoWDg2XzMyICYmIFg4Nl9QQUUpCiAJZGVwZW5kcyBvbiBYODZfTE9DQUxfQVBJQyAmJiBYODZf VFNDCiAJaGVscApAQCAtMTgsNiArMTcsNyBAQCBjb25maWcgWEVOX1BWCiAJYm9vbCAiWGVuIFBW IGd1ZXN0IHN1cHBvcnQiCiAJZGVmYXVsdCB5CiAJZGVwZW5kcyBvbiBYRU4KKwlzZWxlY3QgWEVO X0hBVkVfVlBNVQogCWhlbHAKIAkgIFN1cHBvcnQgcnVubmluZyBhcyBhIFhlbiBQViBndWVzdC4K IApkaWZmIC0tZ2l0IGEvYXJjaC94ODYveGVuL01ha2VmaWxlIGIvYXJjaC94ODYveGVuL01ha2Vm aWxlCmluZGV4IGNmOGQ2YzUuLmY2MTA2NTEgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L3hlbi9NYWtl ZmlsZQorKysgYi9hcmNoL3g4Ni94ZW4vTWFrZWZpbGUKQEAgLTEwLDEzICsxMCwxMyBAQCBub3N0 YWNrcCA6PSAkKGNhbGwgY2Mtb3B0aW9uLCAtZm5vLXN0YWNrLXByb3RlY3RvcikKIENGTEFHU19l bmxpZ2h0ZW5fcHYubwkJOj0gJChub3N0YWNrcCkKIENGTEFHU19tbXVfcHYubwkJOj0gJChub3N0 YWNrcCkKIAotb2JqLXkJCTo9IGVubGlnaHRlbi5vIHNldHVwLm8gbXVsdGljYWxscy5vIG1tdS5v IGlycS5vIFwKK29iai15CQk6PSBlbmxpZ2h0ZW4ubyBtdWx0aWNhbGxzLm8gbW11Lm8gaXJxLm8g XAogCQkJdGltZS5vIHhlbi1hc20ubyB4ZW4tYXNtXyQoQklUUykubyBcCiAJCQlncmFudC10YWJs ZS5vIHN1c3BlbmQubyBwbGF0Zm9ybS1wY2ktdW5wbHVnLm8gXAotCQkJcDJtLm8gYXBpYy5vIHBt dS5vIGVubGlnaHRlbl9wdi5vIG1tdV9wdi5vCisJCQlwMm0ubyBlbmxpZ2h0ZW5fcHYubyBtbXVf cHYubwogCiBvYmotJChDT05GSUdfWEVOX1BWSFZNKQkJKz0gZW5saWdodGVuX2h2bS5vIG1tdV9o dm0ubyBzdXNwZW5kX2h2bS5vCi1vYmotJChDT05GSUdfWEVOX1BWKQkJCSs9IHN1c3BlbmRfcHYu bworb2JqLSQoQ09ORklHX1hFTl9QVikJCQkrPSBzZXR1cC5vIGFwaWMubyBwbXUubyBzdXNwZW5k X3B2Lm8KIG9iai0kKENPTkZJR19YRU5fUFZIKQkJCSs9IGVubGlnaHRlbl9wdmgubwogCiBvYmot JChDT05GSUdfRVZFTlRfVFJBQ0lORykgKz0gdHJhY2UubwpkaWZmIC0tZ2l0IGEvYXJjaC94ODYv eGVuL3BtdS5oIGIvYXJjaC94ODYveGVuL3BtdS5oCmluZGV4IGFmNWYwYWQuLjRiZTUzNTUgMTAw NjQ0Ci0tLSBhL2FyY2gveDg2L3hlbi9wbXUuaAorKysgYi9hcmNoL3g4Ni94ZW4vcG11LmgKQEAg LTQsOCArNCwxMyBAQAogI2luY2x1ZGUgPHhlbi9pbnRlcmZhY2UveGVucG11Lmg+CiAKIGlycXJl dHVybl90IHhlbl9wbXVfaXJxX2hhbmRsZXIoaW50IGlycSwgdm9pZCAqZGV2X2lkKTsKKyNpZmRl ZiBDT05GSUdfWEVOX0hBVkVfVlBNVQogdm9pZCB4ZW5fcG11X2luaXQoaW50IGNwdSk7CiB2b2lk IHhlbl9wbXVfZmluaXNoKGludCBjcHUpOworI2Vsc2UKK3N0YXRpYyBpbmxpbmUgdm9pZCB4ZW5f cG11X2luaXQoaW50IGNwdSkge30KK3N0YXRpYyBpbmxpbmUgdm9pZCB4ZW5fcG11X2ZpbmlzaChp bnQgY3B1KSB7fQorI2VuZGlmCiBib29sIGlzX3hlbl9wbXUoaW50IGNwdSk7CiBib29sIHBtdV9t c3JfcmVhZCh1bnNpZ25lZCBpbnQgbXNyLCB1aW50NjRfdCAqdmFsLCBpbnQgKmVycik7CiBib29s IHBtdV9tc3Jfd3JpdGUodW5zaWduZWQgaW50IG1zciwgdWludDMyX3QgbG93LCB1aW50MzJfdCBo aWdoLCBpbnQgKmVycik7Ci0tIAoyLjkuMwoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3Rz Lnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=