From nobody Thu Nov 13 20:41:56 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=1582587740; cv=none; d=zohomail.com; s=zohoarc; b=aPoAe0zAcXGa4vGJESdKIyy6T3HCMcs4o57lo8wSb8yKhJEuIZO71zWvQtV/+DfztzLHS3gm/BTODGuhfFS4gYEFuFTDtdvd90egC/a3rSv8KaJUAqacObTWKNrbUtJFCXXG6c7b4nb81Y3s1DffH5LI0TBF9NJK0vrbO/ZveXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582587740; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YMZN8MrK3ixQNJ85drZUHhCcw6MCIg7LA+8uI+mTbr8=; b=O0AuG9R8jsKOoKlivtMmR0vAFokEfgo/XB58gCKcAni+JmqgMdfm/Ksncmp5TdcpYZNhCbzUL+azK22TlVTOgKUt8d6cM2UeKm7T5RjUUHOwv6DR2bewV4zoZgFhK04BjgAnReNcNU8+60Q/1ZMsP4nEopbnZC6lTVlWRU8DIgQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1582587740315746.1815680543464; Mon, 24 Feb 2020 15:42:20 -0800 (PST) Received: from localhost ([::1]:46178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6NMh-000720-5U for importer@patchew.org; Mon, 24 Feb 2020 18:42:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47227) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6NIP-0006Wv-Lp for qemu-devel@nongnu.org; Mon, 24 Feb 2020 18:37:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6NIO-00089M-BL for qemu-devel@nongnu.org; Mon, 24 Feb 2020 18:37:53 -0500 Received: from ozlabs.org ([203.11.71.1]:45531) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6NIN-00086R-VT; Mon, 24 Feb 2020 18:37:52 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 48RJQ45mbLz9sSQ; Tue, 25 Feb 2020 10:37:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1582587452; bh=aBsVfkPLqtLYAJVvSFLlYU9uQn9tdTvG94/i9S6mjsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=McfMWxPW19Kby1wByDIvcbGGCAr5vunIN1oepyQqdBDUXTnrPn8QNWsjlAF7H1r/R OpcHyuIfvD2ClHJm2+BkduHkRJGMg3Gy4ZzJdc3wXps9gdCwrl7o3c1Snmvbeo6FJ7 CndnIwI8NdFjBanBpFRFOkHCay6YAiRp+5W+p6oo= From: David Gibson To: groug@kaod.org, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, clg@kaod.org Subject: [PATCH v6 13/18] spapr: Don't use weird units for MIN_RMA_SLOF Date: Tue, 25 Feb 2020 10:37:19 +1100 Message-Id: <20200224233724.46415-14-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200224233724.46415-1-david@gibson.dropbear.id.au> References: <20200224233724.46415-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 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, Thomas Huth , Xiao Guangrong , "Michael S. Tsirkin" , aik@ozlabs.ru, farosas@linux.ibm.com, Mark Cave-Ayland , Igor Mammedov , paulus@samba.org, Paolo Bonzini , "Edgar E. Iglesias" , 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" MIN_RMA_SLOF records the minimum about of RMA that the SLOF firmware requires. It lets us give a meaningful error if the RMA ends up too small, rather than just letting SLOF crash. It's currently stored as a number of megabytes, which is strange for global constants. Move that megabyte scaling into the definition of the constant like most other things use. Change from M to MiB in the associated message while we're at it. Signed-off-by: David Gibson Reviewed-by: C=C3=A9dric Le Goater 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 828e2cc135..272a270b7a 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -103,7 +103,7 @@ #define FW_OVERHEAD 0x2800000 #define KERNEL_LOAD_ADDR FW_MAX_SIZE =20 -#define MIN_RMA_SLOF 128UL +#define MIN_RMA_SLOF (128 * MiB) =20 #define PHANDLE_INTC 0x00001111 =20 @@ -2959,10 +2959,10 @@ static void spapr_machine_init(MachineState *machin= e) } } =20 - if (spapr->rma_size < (MIN_RMA_SLOF * MiB)) { + if (spapr->rma_size < MIN_RMA_SLOF) { error_report( - "pSeries SLOF firmware requires >=3D %ldM guest RMA (Real Mode= Area memory)", - MIN_RMA_SLOF); + "pSeries SLOF firmware requires >=3D %ldMiB guest RMA (Real Mo= de Area memory)", + MIN_RMA_SLOF / MiB); exit(1); } =20 --=20 2.24.1