From nobody Tue Apr 23 06:16:49 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.50 as permitted sender) client-ip=209.85.218.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1617836172; cv=none; d=zohomail.com; s=zohoarc; b=H7uOo0kjcfGII6POAEbd2vleJc2wfqvSorniHfB4B8/vwarrp1MlomAwKpP4exC3vPAgM9dL6k7r2bTPaV7+d5Kqoc5wwb37IBLQV21BY0CA8hMp7DTCw5pDPX7yZj02sYtE2AQlEvBiJ/zDLCV4ZVRTCCbdQHGfu1YU0ZBGk4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617836172; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=wi3bMRy77Fy5wfLWhEljFj4gYssd4093UZKsi/E/ioU=; b=WjX6DKQVLYp2Cfl2dTnKE1MkWMIQ8bV1zIFAFjCZdTMHNesW9sE5xX09vnvbziyNLcrkMchQW/BpSRBNaVObPzZh7CLE31Vwlah90JI5emaTymDvNJklUCgrHRNbiba5ZdhY7rSb8mnyLE0y6Mk+ULbmgOo2ZmMmqffpflk9yUk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.zohomail.com with SMTPS id 1617836172316779.2003470597739; Wed, 7 Apr 2021 15:56:12 -0700 (PDT) Received: by mail-ej1-f50.google.com with SMTP id a7so1825367eju.1 for ; Wed, 07 Apr 2021 15:56:11 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id e15sm7069613ejh.56.2021.04.07.15.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Apr 2021 15:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wi3bMRy77Fy5wfLWhEljFj4gYssd4093UZKsi/E/ioU=; b=L5U9QzS2iSeRUlwW263zsx5IotFdDZUVd6nugq1/V6wGZATsriajUelwuCEhRndqHQ EETeu8MlaeW9cag2/wQujdz4PKIUDrftwUA4xn0FlUvTuNaOc9FvykZVuWrhEzGUWTk7 jSsxghTZfcyJIRtgFZ0vGHaK/uYed5OL3O47atXMDkflEitUJVsxao7qGVr7Seok8GcL vbyDnOSERk/AxYYoEW/pm+bkAGEtCBa+3IzCiiN/fnOQm/Rrofu3HWIEQFGuXL4pBw3M TJjdSEu61YTWbX5xexYp6ABVR6w0Zu5Vq3Kif0YHbWL9Y/BUGJ5l5rmKvRs1X3mp/OTK lSzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=wi3bMRy77Fy5wfLWhEljFj4gYssd4093UZKsi/E/ioU=; b=McTMc3v3F1dSILE70o6Rg7Fj7JSrgj0fUtq5SITp4UGSqcyqewi4JLW3tVQ4Tt/es8 5gI5aBKm5tL6wUAK9j0B50jFIsfUmIkEfkeHHqJkMTYJVFeIIeS49izkeE6wc7rH+WGO y/UkeIfxXgKZsArDwZ/PLlVfKdk1GnG0HOsc29sr656V0CntnAIe2tKzDozcJ5JrYxUM 9ZpDZzFXJKzjsIK3gPVqJJaW0fmJsD9sBGvxvdTH8kRX4hQuUglLsHob8sn7wKx4RvJG EpsqjW5jwTiEiu3/kCNBiRei5apD2rZb48BrT6rGdVprAO90MCPL6WTPZXQvKidRmV7F ypbg== X-Gm-Message-State: AOAM533tAdfYzGIrPyKZkVHcGvPe2/WsOrdjbpkGxLw8mpLk3SaS5qI0 TG8UenSHdcZA6ARms/OQqJQ= X-Google-Smtp-Source: ABdhPJxOh3G/WBf5DPgbq7rVZmrQkPVdWlCPvjTobaubngZOQ+NaqfIJboxNh7vxviHT67ymHTMImg== X-Received: by 2002:a17:906:811:: with SMTP id e17mr6345560ejd.535.1617836170587; Wed, 07 Apr 2021 15:56:10 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jean-Christophe Dubois , Igor Mammedov , Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-6.0?] hw/arm/imx25_pdk: Fix error message for invalid RAM size Date: Thu, 8 Apr 2021 00:56:08 +0200 Message-Id: <20210407225608.1882855-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The i.MX25 PDK board has 2 banks for SDRAM, each can address up to 256 MiB. So the total RAM usable for this board is 512M. When we ask for more we get a misleading error message: $ qemu-system-arm -M imx25-pdk -m 513M qemu-system-arm: Invalid RAM size, should be 128 MiB Update the error message to better match the reality: $ qemu-system-arm -M imx25-pdk -m 513M qemu-system-arm: RAM size more than 512 MiB is not supported Fixes: bf350daae02 ("arm/imx25_pdk: drop RAM size fixup") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Igor Mammedov Reviewed-by: Richard Henderson --- hw/arm/imx25_pdk.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index 1c201d0d8ed..51fde71b1bd 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -67,7 +67,6 @@ static struct arm_boot_info imx25_pdk_binfo; =20 static void imx25_pdk_init(MachineState *machine) { - MachineClass *mc =3D MACHINE_GET_CLASS(machine); IMX25PDK *s =3D g_new0(IMX25PDK, 1); unsigned int ram_size; unsigned int alias_offset; @@ -79,8 +78,8 @@ static void imx25_pdk_init(MachineState *machine) =20 /* We need to initialize our memory */ if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE= )) { - char *sz =3D size_to_str(mc->default_ram_size); - error_report("Invalid RAM size, should be %s", sz); + char *sz =3D size_to_str(FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_= SIZE); + error_report("RAM size more than %s is not supported", sz); g_free(sz); exit(EXIT_FAILURE); } --=20 2.26.3