Commit 512721d2 authored by Laurent Dufour's avatar Laurent Dufour Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S HV: Read ibm,secure-memory nodes 



The newly introduced ibm,secure-memory nodes supersede the
ibm,uv-firmware's property secure-memory-ranges.

Firmware will no more expose the secure-memory-ranges property so first
read the new one and if not found rollback to the older one.

Signed-off-by: default avatarLaurent Dufour <ldufour@linux.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 32e594f9

arch/powerpc/kvm/book3s_hv_uvmem.c

+14 −0
Original line number Diff line number Diff line
@@ -749,6 +749,20 @@ static u64 kvmppc_get_secmem_size(void) 
	const __be32 *prop;

	u64 size = 0;



	/*

	 * First try the new ibm,secure-memory nodes which supersede the

	 * secure-memory-ranges property.

	 * If we found some, no need to read the deprecated ones.

	 */

	for_each_compatible_node(np, NULL, "ibm,secure-memory") {

		prop = of_get_property(np, "reg", &len);

		if (!prop)

			continue;

		size += of_read_number(prop + 2, 2);

	}

	if (size)

		return size;



	np = of_find_compatible_node(NULL, NULL, "ibm,uv-firmware");

	if (!np)

		goto out;