Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 50BC4C54EE9 for ; Sun, 18 Sep 2022 10:00:02 +0000 (UTC) Received: from localhost ([::1]:52742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZr5k-0004Bx-S5 for qemu-devel@archiver.kernel.org; Sun, 18 Sep 2022 06:00:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZr51-0003MQ-SJ; Sun, 18 Sep 2022 05:59:15 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:31655) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZr4x-0007zr-Uz; Sun, 18 Sep 2022 05:59:15 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 19E88759B50; Sun, 18 Sep 2022 11:59:05 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id BDEDB74638A; Sun, 18 Sep 2022 11:59:04 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zero.eik.bme.hu (Postfix) with ESMTP id BB27F74633D; Sun, 18 Sep 2022 11:59:04 +0200 (CEST) Date: Sun, 18 Sep 2022 11:59:04 +0200 (CEST) From: BALATON Zoltan To: =?ISO-8859-15?Q?Philippe_Mathieu-Daud=E9?= cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, clg@kaod.org, Daniel Henrique Barboza , Peter Maydell Subject: Re: [PATCH v4 14/21] ppc440_sdram: Move RAM size check to ppc440_sdram_init In-Reply-To: Message-ID: References: <1e6385a288c0756cb8ec3b2a526393b509fdba40.1663154398.git.balaton@eik.bme.hu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="3866299591-1304776995-1663495144=:53072" Received-SPF: pass client-ip=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --3866299591-1304776995-1663495144=:53072 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Sun, 18 Sep 2022, Philippe Mathieu-Daudé wrote: > On 14/9/22 13:34, BALATON Zoltan wrote: >> Move the check for valid memory sizes from board to sdram controller >> init. Board now only checks for additional restrictions imposed by >> firmware then sdram init checks for valid sizes for SoC. >> >> Signed-off-by: BALATON Zoltan >> --- >> 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 fa313f979d..bd2a489557 100644 >> --- a/hw/ppc/ppc440_uc.c >> +++ b/hw/ppc/ppc440_uc.c >> @@ -486,7 +486,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; >> @@ -732,18 +732,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, >> + 32 * MiB, 16 * MiB, 8 * MiB, 0 > > Where 16/8 come from? From sdram_ddr2_bcr(). This array now has the missing 4 GB, 16 and 8 MB the SoC can handle but the board can't and added separate checks for the board restrictions in the board code. Probably isn't worth splitting this out in a separate patch but I should more explicitly mention it in the commit message to make it clearer. Regards, BALATON Zoltan >> + }; >> s = g_malloc0(sizeof(*s)); >> s->nbanks = nbanks; >> - for (i = 0; i < nbanks; i++) { >> - s->bank[i].ram = ram_banks[i].ram; >> - s->bank[i].base = ram_banks[i].base; >> - s->bank[i].size = ram_banks[i].size; >> - } >> + ppc4xx_sdram_banks(ram, s->nbanks, s->bank, valid_bank_sizes); >> qemu_register_reset(&sdram_ddr2_reset, s); >> ppc_dcr_register(env, SDRAM0_CFGADDR, >> s, &sdram_ddr2_dcr_read, &sdram_ddr2_dcr_write); >> diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c >> index dac329d482..9b850808a3 100644 >> --- a/hw/ppc/sam460ex.c >> +++ b/hw/ppc/sam460ex.c >> @@ -74,13 +74,6 @@ >> #define EBC_FREQ 115000000 >> #define UART_FREQ 11059200 >> -/* The SoC could also handle 4 GiB but firmware does not work with that. >> */ >> -/* Maybe it overflows a signed 32 bit number somewhere? */ >> -static const ram_addr_t ppc460ex_sdram_bank_sizes[] = { >> - 2 * GiB, 1 * GiB, 512 * MiB, 256 * MiB, 128 * MiB, 64 * MiB, >> - 32 * MiB, 0 >> -}; >> - >> struct boot_info { >> uint32_t dt_base; >> uint32_t dt_size; >> @@ -273,7 +266,6 @@ static void sam460ex_init(MachineState *machine) >> { >> MemoryRegion *address_space_mem = get_system_memory(); >> MemoryRegion *isa = g_new(MemoryRegion, 1); >> - Ppc4xxSdramBank *ram_banks = g_new0(Ppc4xxSdramBank, 1); >> MemoryRegion *l2cache_ram = g_new(MemoryRegion, 1); >> DeviceState *uic[4]; >> int i; >> @@ -340,12 +332,22 @@ static void sam460ex_init(MachineState *machine) >> } >> /* SDRAM controller */ >> - /* put all RAM on first bank because board has one slot >> - * and firmware only checks that */ >> - ppc4xx_sdram_banks(machine->ram, 1, ram_banks, >> ppc460ex_sdram_bank_sizes); >> - >> + /* The SoC could also handle 4 GiB but firmware does not work with >> that. */ >> + if (machine->ram_size > 2 * GiB) { >> + error_report("Memory over 2 GiB is not supported"); >> + exit(1); >> + } >> + /* Firmware needs at least 64 MiB */ >> + if (machine->ram_size < 64 * MiB) { >> + error_report("Memory below 64 MiB is not supported"); >> + exit(1); >> + } >> + /* >> + * Put all RAM on first bank because board has one slot >> + * and firmware only checks that >> + */ >> + ppc440_sdram_init(env, 1, machine->ram); >> /* FIXME: does 460EX have ECC interrupts? */ >> - ppc440_sdram_init(env, 1, ram_banks); >> /* Enable SDRAM memory regions as we may boot without firmware */ >> if (ppc_dcr_write(env->dcr_env, SDRAM0_CFGADDR, 0x21) || >> ppc_dcr_write(env->dcr_env, SDRAM0_CFGDATA, 0x08000000)) { >> @@ -358,8 +360,8 @@ static void sam460ex_init(MachineState *machine) >> qdev_get_gpio_in(uic[0], 2)); >> i2c = PPC4xx_I2C(dev)->bus; >> /* SPD EEPROM on RAM module */ >> - spd_data = spd_data_generate(ram_banks->size < 128 * MiB ? DDR : DDR2, >> - ram_banks->size); >> + spd_data = spd_data_generate(machine->ram_size < 128 * MiB ? DDR : >> DDR2, >> + machine->ram_size); >> spd_data[20] = 4; /* SO-DIMM module */ >> smbus_eeprom_init_one(i2c, 0x50, spd_data); >> /* RTC */ > > --3866299591-1304776995-1663495144=:53072--