From nobody Sun May 5 05:39:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1617159212; cv=none; d=zohomail.com; s=zohoarc; b=I5rmihFSwgpMRxDwGML3lv/0qZqPdwGqbHUwl6lTH7j3Rs0AHSQzJjyIm6YRvy03YD7U92TfXXOB97xRzeQJGmQ7U15X891HRqsO/26a5gFZUl4O8BzQixYfmTbR9cn+e5b089v2H5w40yajGlXKx0IgVYRq03Pz7UZ/mimEN1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617159212; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=cpOJYh9VvS91N7uACV77g61yt6zTk0NtkPRfrwvuhgY=; b=ghWdLT3YY971u1T0/KwnvKq44O9ildxrFfUYEip3OYVhdgKXJ5FZyHoOEAB3YvdK/ZuvFHsuB2yc9f38Ec7I6zPRI5w3AHwtMhRwoRGkW6VkmiS+Akq4oCQx9zIOHr6gbnmYwlQf5pL3+DLC5urLbx4qNSTvpPNNg9HAWKVaA/8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617159212298272.46605646411695; Tue, 30 Mar 2021 19:53:32 -0700 (PDT) Received: from localhost ([::1]:52652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRQyZ-0004W8-43 for importer@patchew.org; Tue, 30 Mar 2021 22:52:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRQxg-0003zW-1h; Tue, 30 Mar 2021 22:52:04 -0400 Received: from ozlabs.ru ([107.174.27.60]:58200) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRQxc-0004QH-Pr; Tue, 30 Mar 2021 22:52:03 -0400 Received: from fstn1-p1.ozlabs.ibm.com (localhost [IPv6:::1]) by ozlabs.ru (Postfix) with ESMTP id 67D10AE8002D; Tue, 30 Mar 2021 22:51:25 -0400 (EDT) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Subject: [PATCH qemu] spapr: Rename RTAS_MAX_ADDR to FDT_MAX_ADDR Date: Wed, 31 Mar 2021 13:51:23 +1100 Message-Id: <20210331025123.29310-1-aik@ozlabs.ru> X-Mailer: git-send-email 2.17.1 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=107.174.27.60; envelope-from=aik@ozlabs.ru; helo=ozlabs.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Alexey Kardashevskiy , qemu-ppc@nongnu.org, Greg Kurz , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" SLOF instantiates RTAS since 744a928ccee9 ("spapr: Stop providing RTAS blob") so the max address applies to the FDT only. This renames the macro and fixes up the comment. This should not cause any behavioral change. Signed-off-by: Alexey Kardashevskiy Reviewed-by: Greg Kurz --- hw/ppc/spapr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 73a06df3b1b1..1e18a0a62839 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -100,7 +100,7 @@ * * We load our kernel at 4M, leaving space for SLOF initial image */ -#define RTAS_MAX_ADDR 0x80000000 /* RTAS must stay below that */ +#define FDT_MAX_ADDR 0x80000000 /* FDT must stay below that */ #define FW_MAX_SIZE 0x400000 #define FW_FILE_NAME "slof.bin" #define FW_OVERHEAD 0x2800000 @@ -1617,11 +1617,11 @@ static void spapr_machine_reset(MachineState *machi= ne) spapr_clear_pending_events(spapr); =20 /* - * We place the device tree and RTAS just below either the top of the = RMA, + * We place the device tree just below either the top of the RMA, * or just below 2GB, whichever is lower, so that it can be * processed with 32-bit real mode code if necessary */ - fdt_addr =3D MIN(spapr->rma_size, RTAS_MAX_ADDR) - FDT_MAX_SIZE; + fdt_addr =3D MIN(spapr->rma_size, FDT_MAX_ADDR) - FDT_MAX_SIZE; =20 fdt =3D spapr_build_fdt(spapr, true, FDT_MAX_SIZE); =20 @@ -2694,7 +2694,7 @@ static void spapr_machine_init(MachineState *machine) spapr->rma_size =3D spapr_rma_size(spapr, &error_fatal); =20 /* Setup a load limit for the ramdisk leaving room for SLOF and FDT */ - load_limit =3D MIN(spapr->rma_size, RTAS_MAX_ADDR) - FW_OVERHEAD; + load_limit =3D MIN(spapr->rma_size, FDT_MAX_ADDR) - FW_OVERHEAD; =20 /* * VSMT must be set in order to be able to compute VCPU ids, ie to --=20 2.17.1