From nobody Thu Oct 2 03:24:59 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=1584439803; cv=none; d=zohomail.com; s=zohoarc; b=ABI27CprEspfIKNohFtpwEjKeX/MFvDfHpO7WVrSAPvIQeb0mbWcbIdBhx2K27Lffqrc5ckI+cKv4DRhq1uemHLykB5HHx9e8Q54zDhgqFM53eh8K2S19me/zOdFkOKHQDHlhTqU8fchiK59hRdWDaNr1OGOX5mH7+nic1fWn/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584439803; h=Content-Type: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=B3s1kqST88v3rrrEFeCjTVbVkA1v0i8wzkgEifzntss=; b=HeRc6Z7k5LNAKs7TWGM40fF9ds4KSMyZbxzZXz+RdYPtZEwbHIvSHuASXInMd6APKE3oMQLI9IWzqNGyQLtHzdtZ32W64QxkFxmi9179F/JvOU4PCS6xb67YbuPwVppxWGub11YoKBk/eisG/Mw2pNgsaI0frhkiDE5xVazBEGo= 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 158443980387955.65227430331379; Tue, 17 Mar 2020 03:10:03 -0700 (PDT) Received: from localhost ([::1]:55582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jE9Ag-0002Pj-Nn for importer@patchew.org; Tue, 17 Mar 2020 06:10:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45325) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jE95j-00013j-V2 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 06:05:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jE95h-0002lH-L5 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 06:04:55 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:41927 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jE95h-0001uK-6s; Tue, 17 Mar 2020 06:04:53 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 48hTKw4v3Gz9sSt; Tue, 17 Mar 2020 21:04:36 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1584439476; bh=ahf6kPUdTFlVRzytiUCLwUm2hqrLDJD3Di+JZ1vbp30=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HZNnyV1hmaH/QbFp9bsKZ311WiT5hxSo64ZaLebi1GN6l/LfRWjPT1Y85N7bvDdJO /ndfFNtKYTma9/azWRt802tssBmRs7TG8qP65clcGeFZkC8qxrt3YNp/wldCN0zhrm M+1hHy0tNRLoXF02R1+Fp6S+nVY9q1CabquRba4I= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 17/45] spapr: Don't use weird units for MIN_RMA_SLOF Date: Tue, 17 Mar 2020 21:03:55 +1100 Message-Id: <20200317100423.622643-18-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317100423.622643-1-david@gibson.dropbear.id.au> References: <20200317100423.622643-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, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, 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" 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 cc10798be4..510494ad87 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 @@ -2956,10 +2956,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