From: Laurent Dufour Date: Tue, 26 May 2020 17:51:15 +0000 Subject: Re: [PATCH] KVM: PPC: Book3S HV: read ibm,secure-memory nodes Message-Id: <09a71476-1e15-e49b-3536-dabed9d881c0@linux.ibm.com> List-Id: References: <20200416162715.45846-1-ldufour@linux.ibm.com> In-Reply-To: <20200416162715.45846-1-ldufour@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, paulus@samba.org Cc: Alexey Kardashevskiy , linux-kernel@vger.kernel.org Paul, could you please take that patch? Le 16/04/2020 à 18:27, Laurent Dufour a écrit : > 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: Laurent Dufour > --- > arch/powerpc/kvm/book3s_hv_uvmem.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_hv_uvmem.c > index 53b88cae3e73..ad950f8996e0 100644 > --- a/arch/powerpc/kvm/book3s_hv_uvmem.c > +++ b/arch/powerpc/kvm/book3s_hv_uvmem.c > @@ -735,6 +735,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 somes, no need to read the deprecated one. > + */ > + 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; >