From nobody Thu Sep 19 02:10:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549272128375755.487648217727; Mon, 4 Feb 2019 01:22:08 -0800 (PST) Received: from localhost ([127.0.0.1]:39227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqaS2-00008x-AY for importer@patchew.org; Mon, 04 Feb 2019 04:22:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqa8y-0000rn-T6 for qemu-devel@nongnu.org; Mon, 04 Feb 2019 04:02:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqa8k-0007s5-VA for qemu-devel@nongnu.org; Mon, 04 Feb 2019 04:02:14 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:39983) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gqa8k-0007lO-DC; Mon, 04 Feb 2019 04:02:06 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 43tMC93Jzyz9sPW; Mon, 4 Feb 2019 20:01:38 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1549270901; bh=Zb0hKcBfkYk5qy8K91noLrf+ai0+GHdBRPkSUYTyqOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ljdjWyIFlPvHWDtK2jfDFtu6dRBBneM4bVX0D5y3lLh8YCICOSci2+Mx/13f15syc 3lnljAhXh6jAlz6owiCYye+ybGlsHpf/3KDOeo0vd8T7afedC2R9bh7MP4YShQcPD+ 4d5pojis5KQBSfDhCZR/TufyHn86Vv4bkMSJu1Kw= From: David Gibson To: peter.maydell@linaro.org Date: Mon, 4 Feb 2019 20:01:10 +1100 Message-Id: <20190204090124.26191-24-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204090124.26191-1-david@gibson.dropbear.id.au> References: <20190204090124.26191-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 Subject: [Qemu-devel] [PULL 23/37] spapr: Drop unused parameters from fdt building helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, Alexey Kardashevskiy , qemu-devel@nongnu.org, groug@kaod.org, spopovyc@redhat.com, qemu-ppc@nongnu.org, clg@kaod.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Alexey Kardashevskiy spapr_load_rtas() handles now RTAS address and size information in the FDT so drop them from spapr_build_fdt(). While we are here, fix a small typo. Fixes: 3f5dabceba24 "pseries: Consolidate construction of /rtas device tree= node" Signed-off-by: Alexey Kardashevskiy Reviewed-by: Greg Kurz Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: David Gibson --- hw/ppc/spapr.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 487cdf2f3a..c66e7d8e0a 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1225,9 +1225,7 @@ static void spapr_dt_hypervisor(sPAPRMachineState *sp= apr, void *fdt) } } =20 -static void *spapr_build_fdt(sPAPRMachineState *spapr, - hwaddr rtas_addr, - hwaddr rtas_size) +static void *spapr_build_fdt(sPAPRMachineState *spapr) { MachineState *machine =3D MACHINE(spapr); MachineClass *mc =3D MACHINE_GET_CLASS(machine); @@ -1644,14 +1642,14 @@ static void spapr_machine_reset(void) =20 /* * We place the device tree and RTAS just below either the top of the = RMA, - * or just below 2GB, whichever is lowere, so that it can be + * or just below 2GB, whichever is lower, so that it can be * processed with 32-bit real mode code if necessary */ rtas_limit =3D MIN(spapr->rma_size, RTAS_MAX_ADDR); rtas_addr =3D rtas_limit - RTAS_MAX_SIZE; fdt_addr =3D rtas_addr - FDT_MAX_SIZE; =20 - fdt =3D spapr_build_fdt(spapr, rtas_addr, spapr->rtas_size); + fdt =3D spapr_build_fdt(spapr); =20 spapr_load_rtas(spapr, fdt, rtas_addr); =20 --=20 2.20.1