From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77B09C54FCE for ; Mon, 23 Mar 2020 19:28:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 481AD206F8 for ; Mon, 23 Mar 2020 19:28:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="W8SynKuL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 481AD206F8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGSkg-0000Qk-GM for qemu-devel@archiver.kernel.org; Mon, 23 Mar 2020 15:28:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45482) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGSjy-0008J3-An for qemu-devel@nongnu.org; Mon, 23 Mar 2020 15:28:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGSjw-0003xi-W3 for qemu-devel@nongnu.org; Mon, 23 Mar 2020 15:28:02 -0400 Received: from mail-io1-xd41.google.com ([2607:f8b0:4864:20::d41]:45250) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jGSjw-0003wy-PW; Mon, 23 Mar 2020 15:28:00 -0400 Received: by mail-io1-xd41.google.com with SMTP id e20so15192870ios.12; Mon, 23 Mar 2020 12:28:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=baIBv6VF/SVGWRh9jRcClqoT54bPPkrrJgnnfOBWU2c=; b=W8SynKuL1AAaNKs8S8jnH/IwC3oeF28oNv6TNJpynNpcrtM8uJHcQZ/PvDxySKRMwW TN6Fc4HwDtEWOtN3zdu2MvaRMEus2RsWy6vbvfDGrpRhrA82Pxlo2fanHJr4wGRIOp10 4M5PrV1WYG0vgPJKNVvQvFjLoc/XXfL99NhZVl9fjzwiLsWBUwzDtJ3RMnR1edFMUM+2 AS0B20hVi5v2gmA3YvTnhZ05xHgWzdnXXnZPGyCimCgl7FLznllyqlrezGnlG3cOpGVc BdcNUm1pkmRI+scyWMl1HgOgexknA5SzukAbQhqOqDR5lf4lxvToecC1GVt5xLaN7ro0 4oVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=baIBv6VF/SVGWRh9jRcClqoT54bPPkrrJgnnfOBWU2c=; b=g0IfDP3TFdWZFcSViPbPXNT/htadGTxK+kH7exafHeRirJxl+FgDb1dyjPKpN6Z+r3 RcqcMpVOBhAJQUitX92bJtt2E2Re9siqNPhN2rXRnN6nWx99HP/aPwHQP4RT3ISSMyai 7U9L7Ih/P09G9hEGCuaYyHmjqi/eb93fyr163JVbgXe/MEvRCdlgzrOAKdZSi3rhPg3G uJLL+63xZ51xETBiXnBIomc7WEJlkoDtJEEBjpvZWTzCoWQ/g/Z9Ec36LwZW+OWEcll/ ezsJNq211sHeo2CpP3qDaIbarIaz/KtqnJwIW4RNZeu1oQbVXKi/swEfX2VXRIPaLKlg SVrw== X-Gm-Message-State: ANhLgQ1eZM12s/gnVg0zAMxE6OUGgeIwGMpHJn3itj1YBrLYSA4GokV/ W7hDssLSnUaM8iifnk3sdMFgBQl35NYveI0PBJ4= X-Google-Smtp-Source: ADFU+vvt2D/XmzEebgpPJJ0tGrP3NvXB48cKwEYFGXbrtoyXL2M59G7rpYM32CoPZg3jrAsmZWaHdAj5CdWsm5ru0BM= X-Received: by 2002:a02:6669:: with SMTP id l41mr10776576jaf.126.1584991679835; Mon, 23 Mar 2020 12:27:59 -0700 (PDT) MIME-Version: 1.0 References: <20200322205439.15231-1-nieklinnenbank@gmail.com> <20200322205439.15231-2-nieklinnenbank@gmail.com> In-Reply-To: From: Niek Linnenbank Date: Mon, 23 Mar 2020 20:27:48 +0100 Message-ID: Subject: Re: [PATCH 2/2] hw/misc/allwinner-h3-dramc: enforce 64-bit multiply when calculating row mirror address To: Peter Maydell Content-Type: multipart/alternative; boundary="0000000000000c760d05a18aa275" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::d41 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: qemu-arm , QEMU Developers Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --0000000000000c760d05a18aa275 Content-Type: text/plain; charset="UTF-8" Hi Peter, On Sun, Mar 22, 2020 at 10:18 PM Peter Maydell wrote: > On Sun, 22 Mar 2020 at 20:54, Niek Linnenbank > wrote: > > > > The allwinner_h3_dramc_map_rows function simulates row addressing > behavior > > when bootloader software attempts to detect the amount of available > SDRAM. > > > > Currently the line that calculates the 64-bit address of the mirrored row > > uses a signed 32-bit multiply operation that in theory could result in > the > > upper 32-bit be all 1s. This commit ensures that the row mirror address > > is calculated using only 64-bit operations. > > > > Reported-by: Peter Maydell > > Signed-off-by: Niek Linnenbank > > --- > > hw/misc/allwinner-h3-dramc.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/hw/misc/allwinner-h3-dramc.c b/hw/misc/allwinner-h3-dramc.c > > index 2b5260260e..f9f05b5384 100644 > > --- a/hw/misc/allwinner-h3-dramc.c > > +++ b/hw/misc/allwinner-h3-dramc.c > > @@ -85,8 +85,8 @@ static void > allwinner_h3_dramc_map_rows(AwH3DramCtlState *s, uint8_t row_bits, > > > > } else if (row_bits_actual) { > > /* Row bits not matching ram_size, install the rows mirror */ > > - hwaddr row_mirror = s->ram_addr + ((1 << (row_bits_actual + > > - bank_bits)) * > page_size); > > + hwaddr row_mirror = s->ram_addr + ((1UL << (row_bits_actual + > > + bank_bits)) * > page_size); > > This needs to be a "ULL" suffix... (I just sent a different email > with the rationale). > Ah ofcourse, it should be ULL indeed. And I can't think of any reason why I made this mistake. I simply overlooked it, thanks. I'm resending this patch with the proper ULL suffix. Regards, Niek > > thanks > -- PMM > -- Niek Linnenbank --0000000000000c760d05a18aa275 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Peter,

On Sun, Mar 22, 2020 at 10:1= 8 PM Peter Maydell <peter.ma= ydell@linaro.org> wrote:
On Sun, 22 Mar 2020 at 20:54, Niek Linnenbank <nieklinnenbank@gmail= .com> wrote:
>
> The allwinner_h3_dramc_map_rows function simulates row addressing beha= vior
> when bootloader software attempts to detect the amount of available SD= RAM.
>
> Currently the line that calculates the 64-bit address of the mirrored = row
> uses a signed 32-bit multiply operation that in theory could result in= the
> upper 32-bit be all 1s. This commit ensures that the row mirror addres= s
> is calculated using only 64-bit operations.
>
> Reported-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com>
> ---
>=C2=A0 hw/misc/allwinner-h3-dramc.c | 4 ++--
>=C2=A0 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/misc/allwinner-h3-dramc.c b/hw/misc/allwinner-h3-dramc= .c
> index 2b5260260e..f9f05b5384 100644
> --- a/hw/misc/allwinner-h3-dramc.c
> +++ b/hw/misc/allwinner-h3-dramc.c
> @@ -85,8 +85,8 @@ static void allwinner_h3_dramc_map_rows(AwH3DramCtlS= tate *s, uint8_t row_bits,
>
>=C2=A0 =C2=A0 =C2=A0 } else if (row_bits_actual) {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* Row bits not matching ram_size, i= nstall the rows mirror */
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 hwaddr row_mirror =3D s->ram_addr + ((= 1 << (row_bits_actual +
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 bank_bits)) * page_size);
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 hwaddr row_mirror =3D s->ram_addr + ((= 1UL << (row_bits_actual +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 bank_bits)) * page_size);

This needs to be a "ULL" suffix... (I just sent a different email=
with the rationale).

Ah ofcourse, it sh= ould be ULL indeed. And I can't think of any reason why I made this mis= take.
I simply overlooked it, thanks. I'm resending this patc= h with the proper ULL suffix.

Regards,
N= iek
=C2=A0

thanks
-- PMM


--
Niek Linnenbank

--0000000000000c760d05a18aa275--