@@ -1261,7 +1261,7 @@ static void __init prom_parse_platform_support(u8 index, u8 val,
}
}
-static void __init prom_check_platform_support(void)
+struct ibm_arch_vec __init *prom_check_platform_support(int prop_len)
{
struct platform_support supported = {
.hash_mmu = false,
@@ -1269,8 +1269,6 @@ static void __init prom_check_platform_support(void)
.radix_gtse = false,
.xive = false
};
- int prop_len = prom_getproplen(prom.chosen,
- "ibm,arch-vec-5-platform-support");
/*
* First copy the architecture vec template
@@ -1319,7 +1317,12 @@ static void __init prom_check_platform_support(void)
prom_debug("Asking for XIVE\n");
ibm_architecture_vec.vec5.intarch = OV5_FEAT(OV5_XIVE_EXPLOIT);
}
+
+ ibm_architecture_vec.vec5.max_cpus = cpu_to_be32(NR_CPUS);
+
+ return &ibm_architecture_vec;
}
+EXPORT_SYMBOL_GPL(prom_check_platform_support);
static void __init prom_send_capabilities(void)
{
@@ -1328,7 +1331,8 @@ static void __init prom_send_capabilities(void)
u32 cores;
/* Check ibm,arch-vec-5-platform-support and fixup vec5 if required */
- prom_check_platform_support();
+ prom_check_platform_support(prom_getproplen(prom.chosen,
+ "ibm,arch-vec-5-platform-support"));
root = call_prom("open", 1, 1, ADDR("/"));
if (root != 0) {
@@ -284,12 +284,53 @@ void __init record_spr_defaults(void)
* device-tree is not accessible via normal means at this point.
*/
+/*
+ * The architecture vector has an array of PVR mask/value pairs,
+ * followed by # option vectors - 1, followed by the option vectors.
+ *
+ * See prom.h for the definition of the bits specified in the
+ * architecture vector.
+ */
+
+extern struct ibm_arch_vec __init *prom_check_platform_support(
+ int vec5_prop_len);
+
+int __init early_init_dt_scan_chosen_h_cas(unsigned long node,
+ const char *uname, int depth, void *data)
+{
+ int l;
+ const char *p;
+
+ if (depth != 1 || !data ||
+ (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))
+ return 0;
+ p = of_get_flat_dt_prop(node, "qemu,h_cas", &l);
+ if (p != NULL && l > 0)
+ *(bool *) data = be32_to_cpu(*(uint32_t *) p) != 0;
+
+ return 1;
+}
+
void __init early_setup(unsigned long dt_ptr)
{
static __initdata struct paca_struct boot_paca;
+ struct ibm_arch_vec *vec = prom_check_platform_support(0);
/* -------- printk is _NOT_ safe to use here ! ------- */
+ /* ibm,client-architecture-support support */
+#define KVMPPC_HCALL_BASE 0xf000
+#define KVMPPC_H_CAS (KVMPPC_HCALL_BASE + 0x2)
+#define FDT_MAX_SIZE 0x100000
+ bool do_h_cas = false;
+
+ if (early_init_dt_verify(__va(dt_ptr))) {
+ of_scan_flat_dt(early_init_dt_scan_chosen_h_cas, &do_h_cas);
+ if (do_h_cas)
+ plpar_hcall_norets(KVMPPC_H_CAS, vec, dt_ptr,
+ FDT_MAX_SIZE);
+ }
+
/* Try new device tree based feature discovery ... */
if (!dt_cpu_ftrs_init(__va(dt_ptr)))
/* Otherwise use the old style CPU table */
This checks the FDT for "/chosen/qemu,h_cas" and calls H_CAS when present. The H_CAS hcall is implemented in QEMU for ages and currently returns an FDT with a diff to the initial FDT which SLOF updates and returns to the OS. For this patch to work, QEMU needs to provide the full tree instead, so when QEMU is run with the "-machine pseries,bios=no", it reads the existing FDT from the OS, updats it and writes back on top. This changes prom_check_platform_support() not to call the client interface's prom_getproplen() as the kexec-style boot does not provide the client interface services. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- arch/powerpc/kernel/prom_init.c | 12 ++++++---- arch/powerpc/kernel/setup_64.c | 41 +++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-)