Re: [PATCH v6 14/25] ppc440_sdram: Move RAM size check to ppc440_sdram_init

[BALATON Zoltan <balaton@eik.bme.hu>]

[-- Attachment #1: Type: text/plain, Size: 5769 bytes --]

On Sat, 15 Oct 2022, Daniel Henrique Barboza wrote:
> On 10/14/22 19:52, BALATON Zoltan wrote:
>> On Fri, 14 Oct 2022, Daniel Henrique Barboza wrote:
>>> Zoltan,
>>> 
>>> Gitlab didn't like this patch. It broke all 32 bits builds due to an 
>>> overflow
>>> down there:
>>> 
>>> On 9/24/22 09:28, BALATON Zoltan wrote:
>>>> Move the check for valid memory sizes from board to sdram controller
>>>> init. This adds the missing valid memory sizes of 4 GiB, 16 and 8 MiB
>>>> to the DoC and the board now only checks for additional restrictions
>>>> imposed by its firmware then sdram init checks for valid sizes for SoC.
>>>> 
>>>> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
>>>> ---
>>>>   hw/ppc/ppc440.h    |  4 ++--
>>>>   hw/ppc/ppc440_uc.c | 15 +++++++--------
>>>>   hw/ppc/sam460ex.c  | 32 +++++++++++++++++---------------
>>>>   3 files changed, 26 insertions(+), 25 deletions(-)
>>>> 
>>>> diff --git a/hw/ppc/ppc440.h b/hw/ppc/ppc440.h
>>>> index 01d76b8000..29f6f14ed7 100644
>>>> --- a/hw/ppc/ppc440.h
>>>> +++ b/hw/ppc/ppc440.h
>>>> @@ -11,13 +11,13 @@
>>>>   #ifndef PPC440_H
>>>>   #define PPC440_H
>>>>   -#include "hw/ppc/ppc4xx.h"
>>>> +#include "hw/ppc/ppc.h"
>>>>     void ppc4xx_l2sram_init(CPUPPCState *env);
>>>>   void ppc4xx_cpr_init(CPUPPCState *env);
>>>>   void ppc4xx_sdr_init(CPUPPCState *env);
>>>>   void ppc440_sdram_init(CPUPPCState *env, int nbanks,
>>>> -                       Ppc4xxSdramBank *ram_banks);
>>>> +                       MemoryRegion *ram);
>>>>   void ppc4xx_ahb_init(CPUPPCState *env);
>>>>   void ppc4xx_dma_init(CPUPPCState *env, int dcr_base);
>>>>   void ppc460ex_pcie_init(CPUPPCState *env);
>>>> diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
>>>> index edd0781eb7..2b9d666b71 100644
>>>> --- a/hw/ppc/ppc440_uc.c
>>>> +++ b/hw/ppc/ppc440_uc.c
>>>> @@ -487,7 +487,7 @@ void ppc4xx_sdr_init(CPUPPCState *env)
>>>>   typedef struct ppc440_sdram_t {
>>>>       uint32_t addr;
>>>>       uint32_t mcopt2;
>>>> -    int nbanks;
>>>> +    int nbanks; /* Banks to use from the 4, e.g. when board has less 
>>>> slots */
>>>>       Ppc4xxSdramBank bank[4];
>>>>   } ppc440_sdram_t;
>>>>   @@ -733,18 +733,17 @@ static void sdram_ddr2_reset(void *opaque)
>>>>   }
>>>>     void ppc440_sdram_init(CPUPPCState *env, int nbanks,
>>>> -                       Ppc4xxSdramBank *ram_banks)
>>>> +                       MemoryRegion *ram)
>>>>   {
>>>>       ppc440_sdram_t *s;
>>>> -    int i;
>>>> +    const ram_addr_t valid_bank_sizes[] = {
>>>> +        4 * GiB, 2 * GiB, 1 * GiB, 512 * MiB, 256 * MiB, 128 * MiB, 64 * 
>>>> MiB,
>>> 
>>> 
>>> ^ here. ram_addr_t will be a 32 bit var in a 32 bit host, and assigning 4 
>>> * GiB will
>>> overflow it back to zero.
>>> 
>>> Here's the Gitlab error from the 'cross-win32-system' runner:
>>> 
>>> FAILED: libqemu-ppc64-softmmu.fa.p/hw_ppc_ppc440_uc.c.obj
>>> 2725i686-w64-mingw32-gcc -m32 -Ilibqemu-ppc64-softmmu.fa.p -I. -I.. 
>>> -Itarget/ppc -I../target/ppc -I../dtc/libfdt -Iqapi -Itrace -Iui 
>>> -Iui/shader -I/usr/i686-w64-mingw32/sys-root/mingw/include/pixman-1 
>>> -I/usr/i686-w64-mingw32/sys-root/mingw/include/glib-2.0 
>>> -I/usr/i686-w64-mingw32/sys-root/mingw/lib/glib-2.0/include 
>>> -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g 
>>> -iquote . -iquote /builds/danielhb/qemu -iquote 
>>> /builds/danielhb/qemu/include -iquote /builds/danielhb/qemu/tcg/i386 
>>> -mms-bitfields -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fno-pie -no-pie 
>>> -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 
>>> -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings 
>>> -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv 
>>> -Wold-style-declaration -Wold-style-definition -Wtype-limits 
>>> -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers 
>>> -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined 
>>> -Wimplicit-fallthrough=2 -Wno-missing-include-dirs 
>>> -Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -DNEED_CPU_H 
>>> '-DCONFIG_TARGET="ppc64-softmmu-config-target.h"' 
>>> '-DCONFIG_DEVICES="ppc64-softmmu-config-devices.h"' -MD -MQ 
>>> libqemu-ppc64-softmmu.fa.p/hw_ppc_ppc440_uc.c.obj -MF 
>>> libqemu-ppc64-softmmu.fa.p/hw_ppc_ppc440_uc.c.obj.d -o 
>>> libqemu-ppc64-softmmu.fa.p/hw_ppc_ppc440_uc.c.obj -c ../hw/ppc/ppc440_uc.c
>>> 2726../hw/ppc/ppc440_uc.c: In function 'ppc4xx_sdram_ddr2_realize':
>>> 2727../hw/ppc/ppc440_uc.c:729:9: error: unsigned conversion from 'long 
>>> long int' to 'unsigned int' changes value from '4294967296' to '0' 
>>> [-Werror=overflow]
>>> 2728  729 |         4 * GiB, 2 * GiB, 1 * GiB, 512 * MiB, 256 * MiB, 128 * 
>>> MiB, 64 * MiB,
>>> 2729      |         ^
>>> 2730cc1: all warnings being treated as errors
>>> 2731
>>> 
>>> A quick fix that I can make in-tree is to avoid the overflow by doing (4 * 
>>> GiB) - 1.
>>> But since this might affect some logic in the model I figured I should ask 
>>> you
>>> first.
>> 
>> I think in that case we can just drop the 4*GiB value from the 
>> valid_bank_sizes[] array for now because while it's valid for the SoC the 
>> sam460ex firmware also has problems with it so having 2 GiB as largest 
>> value is OK.
>
> Got it.
>
>> Can you change the patch accordingly or should I send an updated version 
>> with this change?
>
> I'll fix it in-tree, no need to re-send. I'll also amend the commit msg
> accordingly.

Thank you for taking care of it.

> Do you want a TODO marker in that line mentioning that we're pending
> support for the 4GiB value?

Up to you, maybe does not need to be TODO just a comment saying

/* SoC also has 4 GiB but that causes problem with 32 bit build */

or something like that which is enough to remind why it's missing.

Regards,
BALATON Zoltan