From patchwork Fri Apr 26 21:21:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Herrenschmidt X-Patchwork-Id: 240050 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9CC112C011A for ; Sat, 27 Apr 2013 07:21:59 +1000 (EST) Received: from localhost ([::1]:40374 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVq5d-0004uB-Q3 for incoming@patchwork.ozlabs.org; Fri, 26 Apr 2013 17:21:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVq5F-0004rC-7g for qemu-devel@nongnu.org; Fri, 26 Apr 2013 17:21:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVq5E-0004cm-5f for qemu-devel@nongnu.org; Fri, 26 Apr 2013 17:21:33 -0400 Received: from gate.crashing.org ([63.228.1.57]:55069) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVq5B-0004bJ-HC; Fri, 26 Apr 2013 17:21:29 -0400 Received: from [127.0.0.1] (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id r3QLLLNR010120; Fri, 26 Apr 2013 16:21:22 -0500 Message-ID: <1367011280.17497.24.camel@pasglop> From: Benjamin Herrenschmidt To: Alexander Graf Date: Sat, 27 Apr 2013 07:21:20 +1000 X-Mailer: Evolution 3.6.2-0ubuntu0.1 Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 63.228.1.57 Cc: qemu-ppc List , qemu-devel , David Gibson Subject: [Qemu-devel] [PATCH] ppc/spapr: Fix cache related properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The properties in the CPU nodes for expressing the cache block size are spelled {d,i}-cache... not {d,i}cache... Also add the "line" variants in addition to the "block" variants for completeness (some OSes might require them). Signed-off-by: Benjamin Herrenschmidt diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7a42501..7582a05 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -333,9 +333,13 @@ static void *spapr_create_fdt_skel(const char *cpu_model, _FDT((fdt_property_string(fdt, "device_type", "cpu"))); _FDT((fdt_property_cell(fdt, "cpu-version", env->spr[SPR_PVR]))); - _FDT((fdt_property_cell(fdt, "dcache-block-size", + _FDT((fdt_property_cell(fdt, "d-cache-block-size", env->dcache_line_size))); - _FDT((fdt_property_cell(fdt, "icache-block-size", + _FDT((fdt_property_cell(fdt, "i-cache-block-size", + env->icache_line_size))); + _FDT((fdt_property_cell(fdt, "d-cache-line-size", + env->dcache_line_size))); + _FDT((fdt_property_cell(fdt, "i-cache-line-size", env->icache_line_size))); _FDT((fdt_property_cell(fdt, "timebase-frequency", tbfreq))); _FDT((fdt_property_cell(fdt, "clock-frequency", cpufreq)));