From nobody Sat Nov 15 12:45:32 2025 Delivered-To: importer@patchew.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=1595267442; cv=none; d=zohomail.com; s=zohoarc; b=hTQMYBXa0v+6gUzAq33EZkne6gcqv9NGBLLLMrI3a6SlS2RuZcE+TtPUusfFFVJOE4J4/9UpLirJkBznf/zT8RE15kBk9DzwGHr4ewQ7OIIULmngauKkY0ZX+fwk7F6FSvxpHacnNYOjifD6FjbdtOTz4NVz6XAlo8+yLbG0Rus= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595267442; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=AJn3EPMi5risgGeTitpR29/MpANRfQ+7uGn+a0i6Wus=; b=XZ9V56nh5xJt22a1YoL+RQpH4Tbjt7g4z+Zn58ezB2fjh07vQn3G3pwDG5U62gvPL/6yTQMbaeV3O6JLoKtFOnR2/4qkQI/4HlAiZt1aJvzmCDs/yI0R6ea5x4IYVSTZj6nyAMYNsNgJI5NiUZk7e/2HRJkLepisRzc1BXIKKuQ= 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 1595267442737322.0561336139607; Mon, 20 Jul 2020 10:50:42 -0700 (PDT) Received: from localhost ([::1]:46024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxZw1-0006VX-HK for importer@patchew.org; Mon, 20 Jul 2020 13:50:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxZuq-0005CX-KT; Mon, 20 Jul 2020 13:49:28 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:38343) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jxZup-0007CJ-5K; Mon, 20 Jul 2020 13:49:28 -0400 Received: by mail-wm1-x343.google.com with SMTP id f18so352937wml.3; Mon, 20 Jul 2020 10:49:26 -0700 (PDT) Received: from localhost.localdomain (138.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.138]) by smtp.gmail.com with ESMTPSA id z8sm271183wmg.39.2020.07.20.10.49.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 10:49:23 -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=AJn3EPMi5risgGeTitpR29/MpANRfQ+7uGn+a0i6Wus=; b=Q4RTsxLN6g0PDldAw7wr5DsTEVWvSL0nKJfQR9YaShBb+pcOBGCF8P947cruP3TKp6 WpVTKsjeG4ENa5chLgqwP6WGPjMkvirEdPaFNKbwm2h/0ipYqOpoeoZOA7e4ThFeof9c +2IMQd4FilhQKr8LpnYeDcbmoRnt0S057dRSX8ocuZ6PaMEdl9sIpieg/iqoDqnn4K4v KU2UX84+mV3MeyaaX/iFVqt6HR2URjQy431GUnaAYgVRxBLjnnIkPfPNl64Ms05RS3x0 v8pzT1IbTYhejZiT+gPK/bNajYLZpitmSgAIMdDfszuPwNnt2A1zKxEJZnrRegZf+YNQ wB2Q== 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=AJn3EPMi5risgGeTitpR29/MpANRfQ+7uGn+a0i6Wus=; b=tbFKEOBuDrSLq5Xf6TnV9Txt99JWsktDVgMaBUN5ooPNLjIRP+H5/1bJiKfUeFZOGw fVMSKiD+sxDikfSgNUNHS2gTUMq5M36kVx9S12ZRi4Hxtb4C+87lMxYhLZzqef2R6nIg NYp0DUd0wOve/dlkj0TQeAaXN3EypR4GBGLkwjleblNrQg/B7ZTRjbnXd9RKFqkYN2y1 maku0EZNN7zU6Thbdk35fCEYKX4h9jgz2xsu5uqa/t1e7UEHdPbql5V9zaIgk5tLn+Mx jd3N+IX6RNJH/U4QBMHkAt3wWViy+m8I77h608M2B4cY+BfXcnpxV6xVdxoUjksYrnh8 CJJw== X-Gm-Message-State: AOAM531Y+t4tDLgMUQzfjcw7aKd//EVmdb4R+r1EqjD8tOkGBqb2Aln6 4sg9uyk4+xb1/rUjb7ucp6SQBoqEQO0= X-Google-Smtp-Source: ABdhPJzkQfBPXvhxzeQ4hsl2516LL3cvxqkiDlnPrz2HOPs7lueicNRnm3l29GxfVeY49PMb/EhSvg== X-Received: by 2002:a1c:3245:: with SMTP id y66mr420514wmy.64.1595267364821; Mon, 20 Jul 2020 10:49:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1 v2] hw/misc/aspeed_sdmc: Fix incorrect memory size Date: Mon, 20 Jul 2020 19:49:22 +0200 Message-Id: <20200720174922.16303-1-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Peter Maydell , Andrew Jeffery , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Joel Stanley Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The SDRAM Memory Controller has a 32-bit address bus, thus supports up to 4 GiB of DRAM. There is a signed to unsigned conversion error with the AST2600 maximum memory size: (uint64_t)(2048 << 20) =3D (uint64_t)(-2147483648) =3D 0xffffffff40000000 =3D 16 EiB - 2 GiB Fix by using the IEC suffixes which are usually safer, and add an assertion check to verify the memory is valid. This would have catched this bug: $ qemu-system-arm -M ast2600-evb qemu-system-arm: hw/misc/aspeed_sdmc.c:258: aspeed_sdmc_realize: Assertio= n `asc->max_ram_size < 4 * GiB' failed. Aborted (core dumped) Fixes: 1550d72679 ("aspeed/sdmc: Add AST2600 support") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: C=C3=A9dric Le Goater --- v2: Assert (C=C3=A9dric) --- hw/misc/aspeed_sdmc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c index 0737d8de81..855848b7d2 100644 --- a/hw/misc/aspeed_sdmc.c +++ b/hw/misc/aspeed_sdmc.c @@ -255,6 +255,7 @@ static void aspeed_sdmc_realize(DeviceState *dev, Error= **errp) AspeedSDMCState *s =3D ASPEED_SDMC(dev); AspeedSDMCClass *asc =3D ASPEED_SDMC_GET_CLASS(s); =20 + assert(asc->max_ram_size < 4 * GiB); /* 32-bit address bus */ s->max_ram_size =3D asc->max_ram_size; =20 memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_sdmc_ops, s, @@ -341,7 +342,7 @@ static void aspeed_2400_sdmc_class_init(ObjectClass *kl= ass, void *data) AspeedSDMCClass *asc =3D ASPEED_SDMC_CLASS(klass); =20 dc->desc =3D "ASPEED 2400 SDRAM Memory Controller"; - asc->max_ram_size =3D 512 << 20; + asc->max_ram_size =3D 512 * MiB; asc->compute_conf =3D aspeed_2400_sdmc_compute_conf; asc->write =3D aspeed_2400_sdmc_write; asc->valid_ram_sizes =3D aspeed_2400_ram_sizes; @@ -408,7 +409,7 @@ static void aspeed_2500_sdmc_class_init(ObjectClass *kl= ass, void *data) AspeedSDMCClass *asc =3D ASPEED_SDMC_CLASS(klass); =20 dc->desc =3D "ASPEED 2500 SDRAM Memory Controller"; - asc->max_ram_size =3D 1024 << 20; + asc->max_ram_size =3D 1 * GiB; asc->compute_conf =3D aspeed_2500_sdmc_compute_conf; asc->write =3D aspeed_2500_sdmc_write; asc->valid_ram_sizes =3D aspeed_2500_ram_sizes; @@ -485,7 +486,7 @@ static void aspeed_2600_sdmc_class_init(ObjectClass *kl= ass, void *data) AspeedSDMCClass *asc =3D ASPEED_SDMC_CLASS(klass); =20 dc->desc =3D "ASPEED 2600 SDRAM Memory Controller"; - asc->max_ram_size =3D 2048 << 20; + asc->max_ram_size =3D 2 * GiB; asc->compute_conf =3D aspeed_2600_sdmc_compute_conf; asc->write =3D aspeed_2600_sdmc_write; asc->valid_ram_sizes =3D aspeed_2600_ram_sizes; --=20 2.21.3