From: Michael Ellerman <mpe@ellerman.id.au>
Date: Wed, 12 Apr 2017 12:25:02 +0000 (+1000)
Subject: Merge branch 'topic/xive' (early part) into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3c19d5ada1bec8b97119215298df7669d3ffb3db;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'topic/xive' (early part) into next

This merges the arch part of the XIVE support, leaving the final commit
with the KVM specific pieces dangling on the branch for Paul to merge
via the kvm-ppc tree.
---

3c19d5ada1bec8b97119215298df7669d3ffb3db
diff --cc arch/powerpc/include/asm/opal-api.h
index a599a2c893c3,bc8ac3c0e649..cb3e6242a78c
--- a/arch/powerpc/include/asm/opal-api.h
+++ b/arch/powerpc/include/asm/opal-api.h
@@@ -168,10 -170,24 +170,27 @@@
  #define OPAL_INT_SET_MFRR			125
  #define OPAL_PCI_TCE_KILL			126
  #define OPAL_NMMU_SET_PTCR			127
+ #define OPAL_XIVE_RESET				128
+ #define OPAL_XIVE_GET_IRQ_INFO			129
+ #define OPAL_XIVE_GET_IRQ_CONFIG		130
+ #define OPAL_XIVE_SET_IRQ_CONFIG		131
+ #define OPAL_XIVE_GET_QUEUE_INFO		132
+ #define OPAL_XIVE_SET_QUEUE_INFO		133
+ #define OPAL_XIVE_DONATE_PAGE			134
+ #define OPAL_XIVE_ALLOCATE_VP_BLOCK		135
+ #define OPAL_XIVE_FREE_VP_BLOCK			136
+ #define OPAL_XIVE_GET_VP_INFO			137
+ #define OPAL_XIVE_SET_VP_INFO			138
+ #define OPAL_XIVE_ALLOCATE_IRQ			139
+ #define OPAL_XIVE_FREE_IRQ			140
+ #define OPAL_XIVE_SYNC				141
+ #define OPAL_XIVE_DUMP				142
+ #define OPAL_XIVE_RESERVED3			143
+ #define OPAL_XIVE_RESERVED4			144
 -#define OPAL_LAST				144
 +#define OPAL_NPU_INIT_CONTEXT			146
 +#define OPAL_NPU_DESTROY_CONTEXT		147
 +#define OPAL_NPU_MAP_LPAR			148
 +#define OPAL_LAST				148
  
  /* Device tree flags */
  
diff --cc arch/powerpc/platforms/powernv/opal-wrappers.S
index 5e1527eea8f7,085605a73168..f620572f891f
--- a/arch/powerpc/platforms/powernv/opal-wrappers.S
+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
@@@ -292,6 -301,18 +292,21 @@@ OPAL_CALL(opal_int_eoi,				OPAL_INT_EOI
  OPAL_CALL(opal_int_set_mfrr,			OPAL_INT_SET_MFRR);
  OPAL_CALL(opal_pci_tce_kill,			OPAL_PCI_TCE_KILL);
  OPAL_CALL(opal_nmmu_set_ptcr,			OPAL_NMMU_SET_PTCR);
+ OPAL_CALL(opal_xive_reset,			OPAL_XIVE_RESET);
+ OPAL_CALL(opal_xive_get_irq_info,		OPAL_XIVE_GET_IRQ_INFO);
+ OPAL_CALL(opal_xive_get_irq_config,		OPAL_XIVE_GET_IRQ_CONFIG);
+ OPAL_CALL(opal_xive_set_irq_config,		OPAL_XIVE_SET_IRQ_CONFIG);
+ OPAL_CALL(opal_xive_get_queue_info,		OPAL_XIVE_GET_QUEUE_INFO);
+ OPAL_CALL(opal_xive_set_queue_info,		OPAL_XIVE_SET_QUEUE_INFO);
+ OPAL_CALL(opal_xive_donate_page,		OPAL_XIVE_DONATE_PAGE);
+ OPAL_CALL(opal_xive_alloc_vp_block,		OPAL_XIVE_ALLOCATE_VP_BLOCK);
+ OPAL_CALL(opal_xive_free_vp_block,		OPAL_XIVE_FREE_VP_BLOCK);
+ OPAL_CALL(opal_xive_allocate_irq,		OPAL_XIVE_ALLOCATE_IRQ);
+ OPAL_CALL(opal_xive_free_irq,			OPAL_XIVE_FREE_IRQ);
+ OPAL_CALL(opal_xive_get_vp_info,		OPAL_XIVE_GET_VP_INFO);
+ OPAL_CALL(opal_xive_set_vp_info,		OPAL_XIVE_SET_VP_INFO);
+ OPAL_CALL(opal_xive_sync,			OPAL_XIVE_SYNC);
+ OPAL_CALL(opal_xive_dump,			OPAL_XIVE_DUMP);
 +OPAL_CALL(opal_npu_init_context,		OPAL_NPU_INIT_CONTEXT);
 +OPAL_CALL(opal_npu_destroy_context,		OPAL_NPU_DESTROY_CONTEXT);
 +OPAL_CALL(opal_npu_map_lpar,			OPAL_NPU_MAP_LPAR);
diff --cc arch/powerpc/xmon/xmon.c
index fddc857af772,67435b9bf98d..f77a104abf9f
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@@ -29,8 -29,8 +29,9 @@@
  #include <linux/nmi.h>
  #include <linux/ctype.h>
  
 +#include <asm/debugfs.h>
  #include <asm/ptrace.h>
+ #include <asm/smp.h>
  #include <asm/string.h>
  #include <asm/prom.h>
  #include <asm/machdep.h>