{"id":701325,"url":"http://patchwork.ozlabs.org/api/1.2/patches/701325/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20161201033004.2yh4txylpayxzmpu@oak.ozlabs.ibm.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.2/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<20161201033004.2yh4txylpayxzmpu@oak.ozlabs.ibm.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20161201033004.2yh4txylpayxzmpu@oak.ozlabs.ibm.com/","date":"2016-12-01T03:30:04","name":"KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"b0f6567977a339f66492922e362f582fcdede0ce","submitter":{"id":67079,"url":"http://patchwork.ozlabs.org/api/1.2/people/67079/?format=json","name":"Paul Mackerras","email":"paulus@ozlabs.org"},"delegate":{"id":13,"url":"http://patchwork.ozlabs.org/api/1.2/users/13/?format=json","username":"paulus","first_name":"Paul","last_name":"Mackerras","email":"paulus@samba.org"},"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20161201033004.2yh4txylpayxzmpu@oak.ozlabs.ibm.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/701325/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/701325/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org","linuxppc-dev@ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3tTjVc13Gsz9t0t\n\tfor ;\n\tThu, 1 Dec 2016 14:31:04 +1100 (AEDT)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3tTjVc01B0zDw2F\n\tfor ;\n\tThu, 1 Dec 2016 14:31:04 +1100 (AEDT)","from ozlabs.org (ozlabs.org [103.22.144.67])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3tTjTV3B7GzDvyT\n\tfor ;\n\tThu, 1 Dec 2016 14:30:06 +1100 (AEDT)","by ozlabs.org (Postfix)\n\tid 3tTjTV2Vy1z9t0t; Thu, 1 Dec 2016 14:30:06 +1100 (AEDT)","by ozlabs.org (Postfix, from userid 1003)\n\tid 3tTjTV2C8Gz9t37; Thu, 1 Dec 2016 14:30:06 +1100 (AEDT)"],"Date":"Thu, 1 Dec 2016 14:30:04 +1100","From":"Paul Mackerras ","To":"linuxppc-dev@ozlabs.org","Subject":"[PATCH] KVM: PPC: Book3S: Move prototypes for KVM functions into\n\tkvm_ppc.h","Message-ID":"<20161201033004.2yh4txylpayxzmpu@oak.ozlabs.ibm.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","User-Agent":"NeoMutt/20161104 (1.7.1)","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"This moves the prototypes for functions that are only called from\nassembler code out of asm/asm-prototypes.h into asm/kvm_ppc.h.\nThe prototypes were added in commit ebe4535fbe7a (\"KVM: PPC:\nBook3S HV: sparse: prototypes for functions called from assembler\",\n2016-10-10), but given that the functions are KVM functions,\nhaving them in a KVM header will be better for long-term\nmaintenance.\n\nSigned-off-by: Paul Mackerras \n---\n[For information; I intend to merge this through the KVM tree.]\n\n arch/powerpc/include/asm/asm-prototypes.h | 44 -------------------------------\n arch/powerpc/include/asm/kvm_ppc.h | 42 +++++++++++++++++++++++++++++\n arch/powerpc/kvm/book3s_64_vio_hv.c | 1 -\n arch/powerpc/kvm/book3s_hv_builtin.c | 1 -\n arch/powerpc/kvm/book3s_hv_ras.c | 2 +-\n arch/powerpc/kvm/book3s_hv_rm_mmu.c | 1 -\n arch/powerpc/kvm/book3s_hv_rm_xics.c | 1 -\n 7 files changed, 43 insertions(+), 49 deletions(-)","diff":"diff --git a/arch/powerpc/include/asm/asm-prototypes.h b/arch/powerpc/include/asm/asm-prototypes.h\nindex 6c853bc..d149273 100644\n--- a/arch/powerpc/include/asm/asm-prototypes.h\n+++ b/arch/powerpc/include/asm/asm-prototypes.h\n@@ -14,9 +14,6 @@\n \n #include \n #include \n-#ifdef CONFIG_KVM\n-#include \n-#endif\n \n #include \n \n@@ -112,45 +109,4 @@ void early_setup_secondary(void);\n /* time */\n void accumulate_stolen_time(void);\n \n-/* kvm */\n-#ifdef CONFIG_KVM\n-long kvmppc_rm_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,\n-\t\t\t unsigned long ioba, unsigned long tce);\n-long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu,\n-\t\t\t\t unsigned long liobn, unsigned long ioba,\n-\t\t\t\t unsigned long tce_list, unsigned long npages);\n-long kvmppc_rm_h_stuff_tce(struct kvm_vcpu *vcpu,\n-\t\t\t unsigned long liobn, unsigned long ioba,\n-\t\t\t unsigned long tce_value, unsigned long npages);\n-long int kvmppc_rm_h_confer(struct kvm_vcpu *vcpu, int target,\n- unsigned int yield_count);\n-long kvmppc_h_random(struct kvm_vcpu *vcpu);\n-void kvmhv_commence_exit(int trap);\n-long kvmppc_realmode_machine_check(struct kvm_vcpu *vcpu);\n-void kvmppc_subcore_enter_guest(void);\n-void kvmppc_subcore_exit_guest(void);\n-long kvmppc_realmode_hmi_handler(void);\n-long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,\n- long pte_index, unsigned long pteh, unsigned long ptel);\n-long kvmppc_h_remove(struct kvm_vcpu *vcpu, unsigned long flags,\n- unsigned long pte_index, unsigned long avpn);\n-long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu);\n-long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,\n- unsigned long pte_index, unsigned long avpn,\n- unsigned long va);\n-long kvmppc_h_read(struct kvm_vcpu *vcpu, unsigned long flags,\n- unsigned long pte_index);\n-long kvmppc_h_clear_ref(struct kvm_vcpu *vcpu, unsigned long flags,\n- unsigned long pte_index);\n-long kvmppc_h_clear_mod(struct kvm_vcpu *vcpu, unsigned long flags,\n- unsigned long pte_index);\n-long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr,\n- unsigned long slb_v, unsigned int status, bool data);\n-unsigned long kvmppc_rm_h_xirr(struct kvm_vcpu *vcpu);\n-int kvmppc_rm_h_ipi(struct kvm_vcpu *vcpu, unsigned long server,\n- unsigned long mfrr);\n-int kvmppc_rm_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr);\n-int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr);\n-#endif\n-\n #endif /* _ASM_POWERPC_ASM_PROTOTYPES_H */\ndiff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h\nindex a5b94be..2da67bf 100644\n--- a/arch/powerpc/include/asm/kvm_ppc.h\n+++ b/arch/powerpc/include/asm/kvm_ppc.h\n@@ -511,6 +511,48 @@ static inline int kvmppc_xics_hcall(struct kvm_vcpu *vcpu, u32 cmd)\n #endif\n \n /*\n+ * Prototypes for functions called only from assembler code.\n+ * Having prototypes reduces sparse errors.\n+ */\n+long kvmppc_rm_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,\n+\t\t\t unsigned long ioba, unsigned long tce);\n+long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu,\n+\t\t\t\t unsigned long liobn, unsigned long ioba,\n+\t\t\t\t unsigned long tce_list, unsigned long npages);\n+long kvmppc_rm_h_stuff_tce(struct kvm_vcpu *vcpu,\n+\t\t\t unsigned long liobn, unsigned long ioba,\n+\t\t\t unsigned long tce_value, unsigned long npages);\n+long int kvmppc_rm_h_confer(struct kvm_vcpu *vcpu, int target,\n+ unsigned int yield_count);\n+long kvmppc_h_random(struct kvm_vcpu *vcpu);\n+void kvmhv_commence_exit(int trap);\n+long kvmppc_realmode_machine_check(struct kvm_vcpu *vcpu);\n+void kvmppc_subcore_enter_guest(void);\n+void kvmppc_subcore_exit_guest(void);\n+long kvmppc_realmode_hmi_handler(void);\n+long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,\n+ long pte_index, unsigned long pteh, unsigned long ptel);\n+long kvmppc_h_remove(struct kvm_vcpu *vcpu, unsigned long flags,\n+ unsigned long pte_index, unsigned long avpn);\n+long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu);\n+long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,\n+ unsigned long pte_index, unsigned long avpn,\n+ unsigned long va);\n+long kvmppc_h_read(struct kvm_vcpu *vcpu, unsigned long flags,\n+ unsigned long pte_index);\n+long kvmppc_h_clear_ref(struct kvm_vcpu *vcpu, unsigned long flags,\n+ unsigned long pte_index);\n+long kvmppc_h_clear_mod(struct kvm_vcpu *vcpu, unsigned long flags,\n+ unsigned long pte_index);\n+long kvmppc_hpte_hv_fault(struct kvm_vcpu *vcpu, unsigned long addr,\n+ unsigned long slb_v, unsigned int status, bool data);\n+unsigned long kvmppc_rm_h_xirr(struct kvm_vcpu *vcpu);\n+int kvmppc_rm_h_ipi(struct kvm_vcpu *vcpu, unsigned long server,\n+ unsigned long mfrr);\n+int kvmppc_rm_h_cppr(struct kvm_vcpu *vcpu, unsigned long cppr);\n+int kvmppc_rm_h_eoi(struct kvm_vcpu *vcpu, unsigned long xirr);\n+\n+/*\n * Host-side operations we want to set up while running in real\n * mode in the guest operating on the xics.\n * Currently only VCPU wakeup is supported.\ndiff --git a/arch/powerpc/kvm/book3s_64_vio_hv.c b/arch/powerpc/kvm/book3s_64_vio_hv.c\nindex 66e9827..e4c4ea9 100644\n--- a/arch/powerpc/kvm/book3s_64_vio_hv.c\n+++ b/arch/powerpc/kvm/book3s_64_vio_hv.c\n@@ -39,7 +39,6 @@\n #include \n #include \n #include \n-#include \n \n #define TCES_PER_PAGE\t(PAGE_SIZE / sizeof(u64))\n \ndiff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c\nindex 11561f0..5bb24be 100644\n--- a/arch/powerpc/kvm/book3s_hv_builtin.c\n+++ b/arch/powerpc/kvm/book3s_hv_builtin.c\n@@ -26,7 +26,6 @@\n #include \n #include \n #include \n-#include \n #include \n #include \n \ndiff --git a/arch/powerpc/kvm/book3s_hv_ras.c b/arch/powerpc/kvm/book3s_hv_ras.c\nindex be1cee5..7ef0993 100644\n--- a/arch/powerpc/kvm/book3s_hv_ras.c\n+++ b/arch/powerpc/kvm/book3s_hv_ras.c\n@@ -16,7 +16,7 @@\n #include \n #include \n #include \n-#include \n+#include \n \n /* SRR1 bits for machine check on POWER7 */\n #define SRR1_MC_LDSTERR\t\t(1ul << (63-42))\ndiff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c\nindex 378b962..9ef3c4b 100644\n--- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c\n+++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c\n@@ -21,7 +21,6 @@\n #include \n #include \n #include \n-#include \n \n /* Translate address of a vmalloc'd thing to a linear map address */\n static void *real_vmalloc_addr(void *x)\ndiff --git a/arch/powerpc/kvm/book3s_hv_rm_xics.c b/arch/powerpc/kvm/book3s_hv_rm_xics.c\nindex 6a4c4d75..06edc43 100644\n--- a/arch/powerpc/kvm/book3s_hv_rm_xics.c\n+++ b/arch/powerpc/kvm/book3s_hv_rm_xics.c\n@@ -24,7 +24,6 @@\n #include \n #include \n #include \n-#include \n \n #include \"book3s_xics.h\"\n \n","prefixes":[]}