From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4836C4360C for ; Fri, 4 Oct 2019 10:10:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6DD5F20867 for ; Fri, 4 Oct 2019 10:10:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="SzXoGtwr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6DD5F20867 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGKXh-0004Ty-Qt for qemu-devel@archiver.kernel.org; Fri, 04 Oct 2019 06:10:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52687) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iGK2f-0005HQ-3x for qemu-devel@nongnu.org; Fri, 04 Oct 2019 05:38:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iGK2e-0005QT-2Q for qemu-devel@nongnu.org; Fri, 04 Oct 2019 05:38:29 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:43047) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iGK2d-00054o-L0; Fri, 04 Oct 2019 05:38:27 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 46l4YH7459z9sRh; Fri, 4 Oct 2019 19:37:55 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1570181876; bh=AEoLWeLd9AOwHmqcsLlE//fc+RQgpEU22pqwOzc2tHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SzXoGtwrhWAlHwtw0qlM2dp+eZt8B0vTBJDjG9K7KdGAqp+2CxJVhDNAtEk541nC/ Rgh+dlNGSLvfIkETwzK2F9HU/sdX/Z4nGh/A8OS6YYs/QqiiZtocsoXsZMhBHnJgVU lU1s0tcdq4CdrManCvTgdjaDf/W6KlD6oAjQE4+k= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 18/53] spapr: Skip leading zeroes from memory@ DT node names Date: Fri, 4 Oct 2019 19:37:12 +1000 Message-Id: <20191004093747.31350-19-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191004093747.31350-1-david@gibson.dropbear.id.au> References: <20191004093747.31350-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Alexey Kardashevskiy The device tree build by QEMU at the machine reset time is used by SLOF to build its internal device tree but the node names are not preserved exactly so when QEMU provides a device tree update in response to H_CAS, it might become tricky to match a node from the update blob to the actual node in SLOF. This removed leading zeroes from "memory@" nodes and makes the DTC checker happy. Signed-off-by: Alexey Kardashevskiy Signed-off-by: David Gibson Reviewed-by: Greg Kurz --- hw/ppc/spapr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c69c034183..42a5b8d2fd 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -388,7 +388,7 @@ static int spapr_populate_memory_node(void *fdt, int = nodeid, hwaddr start, mem_reg_property[0] =3D cpu_to_be64(start); mem_reg_property[1] =3D cpu_to_be64(size); =20 - sprintf(mem_name, "memory@" TARGET_FMT_lx, start); + sprintf(mem_name, "memory@%" HWADDR_PRIx, start); off =3D fdt_add_subnode(fdt, 0, mem_name); _FDT(off); _FDT((fdt_setprop_string(fdt, off, "device_type", "memory"))); --=20 2.21.0