| Message ID | 1443706207-29420-1-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Oct 01, 2015 at 03:30:07PM +0200, Thomas Huth wrote: > According to a commit message in the Linux kernel (see here > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=b60c31d85a2a > for example), the name of the property that carries the information > about the number of SLB entries should be called "slb-size", and > not "ibm,slb-size". The Linux kernel can deal with both names, but > to be on the safe side we should support the official name, too. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Merged to spapr-next, thanks.
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index a9b5f2a..ba6b273 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -625,6 +625,7 @@ static void spapr_populate_cpu_dt(CPUState *cs, void *fdt, int offset, _FDT((fdt_setprop_cell(fdt, offset, "timebase-frequency", tbfreq))); _FDT((fdt_setprop_cell(fdt, offset, "clock-frequency", cpufreq))); + _FDT((fdt_setprop_cell(fdt, offset, "slb-size", env->slb_nr))); _FDT((fdt_setprop_cell(fdt, offset, "ibm,slb-size", env->slb_nr))); _FDT((fdt_setprop_string(fdt, offset, "status", "okay"))); _FDT((fdt_setprop(fdt, offset, "64-bit", NULL, 0)));
According to a commit message in the Linux kernel (see here https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=b60c31d85a2a for example), the name of the property that carries the information about the number of SLB entries should be called "slb-size", and not "ibm,slb-size". The Linux kernel can deal with both names, but to be on the safe side we should support the official name, too. Signed-off-by: Thomas Huth <thuth@redhat.com> --- hw/ppc/spapr.c | 1 + 1 file changed, 1 insertion(+)