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 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 7048CD3E775 for ; Tue, 5 Nov 2024 22:15:17 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8RoK-00088N-My; Tue, 05 Nov 2024 17:14:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8RoI-00087j-Q1; Tue, 05 Nov 2024 17:14:02 -0500 Received: from mail-vk1-xa31.google.com ([2607:f8b0:4864:20::a31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t8RoH-0006my-0N; Tue, 05 Nov 2024 17:14:02 -0500 Received: by mail-vk1-xa31.google.com with SMTP id 71dfb90a1353d-512259c860eso1792355e0c.2; Tue, 05 Nov 2024 14:14:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730844839; x=1731449639; darn=nongnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=0AxF33yov5xMnc1Sy0Cc/fToN7BpkNuv1fqGM0EUXLw=; b=I1jL5LeMpOmS+DA/WZkiYJ74aigfpZbXwnW+0ukd7IFlA+kX8Bn5/l4DXVXV6AwKPn YwpErdK3WoQOkcqrMEdk0/zlUt8lalMgrYGEwbnhWP3LBUlLrj9TmxH+OobLBVj++QLr 1YO+pwPl0mH5HdWKzTUVZpPs1M3e1ZkYO3xX8k9kIFIqyXtNl3UGPzPS8hpzm85tnYKP AeXCJVrVwgzn4WTEZjjYyNDBrlQF3guVREYZpnmTpdhSY+YMiWecSEFZZDp0xRSl/+sm GeTLsaOetwWUOqXd3MCOpjbcIq5GTb9/SwrgxBk7GGnZKEN1kE5EUC3dq2bh6QDMPtQB mAYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730844839; x=1731449639; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0AxF33yov5xMnc1Sy0Cc/fToN7BpkNuv1fqGM0EUXLw=; b=DWvjrUDiPmoYAlQ991p+In+O8Ic2qp0fXsvJosYkNUhwNoboshhUflIJ4AzPzXOl/T 4ysDr1OM9G4udvQFmy7BnxPHBdq2y+/vUW/UxuPBi8rTfnTXYZddYv17yTeiJoT/L2hl FWiSqGTOYLIzz01thpRX2n3cbLkIBmiN+d+bZeh53WH0XA4r8oVkr3pc0V2a9RbGwo6G Nj7ZR9FEejy+CBhdl42C5jQ6A1Z2/f7n0uhedWQx2Y/old71LbCGLuZIE5R5zDq+8iaM QaFUQk9sIYG1NrWEuw3YU9txrabXtoBSsLMEuCnk6zmGAikCA8uwGGgaEITkG8lo127q VfRw== X-Forwarded-Encrypted: i=1; AJvYcCVApSQQKt3M67C6jl9xR/M3KVSRwSEze1YVKJc1nWS6G/vWDZIdUEUtGrEU198OkkBpVyOqNrePgg==@nongnu.org X-Gm-Message-State: AOJu0YxZS+nn2bB4nnM3SU85qbrmWvCtNvuvygGldDr6Gh4qtcZziKo0 Tz0aiC3VFQkpUOsFPzo9ymvvCScapzWQlJWvoDE+2JmPfPNBOJuyeqKpbP3/e7EbE2vC9RmY6IU ThKdxzLDFHHfNFXHO3bjA3rb9Dkw= X-Google-Smtp-Source: AGHT+IGwsyIUCmn8jYvjQqeMl/22EwWEGeO8qB4Po2CxRZLdoF92UsBHLDTvtSCDE3jjKH6zEsJPh2ykvzsonJPTstQ= X-Received: by 2002:a05:6122:1d4c:b0:50d:a31c:678c with SMTP id 71dfb90a1353d-5106ae6d944mr21304116e0c.2.1730844839208; Tue, 05 Nov 2024 14:13:59 -0800 (PST) MIME-Version: 1.0 References: <20241105130431.22564-1-philmd@linaro.org> <20241105130431.22564-9-philmd@linaro.org> In-Reply-To: <20241105130431.22564-9-philmd@linaro.org> From: Alistair Francis Date: Wed, 6 Nov 2024 08:13:33 +1000 Message-ID: Subject: Re: [PATCH 08/19] hw/microblaze: Propagate CPU endianness to microblaze_load_kernel() To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Cc: qemu-devel@nongnu.org, Anton Johansson , "Edgar E. Iglesias" , Peter Maydell , Alistair Francis , Thomas Huth , qemu-arm@nongnu.org, devel@lists.libvirt.org, =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= , Paolo Bonzini , Jason Wang , Richard Henderson Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::a31; envelope-from=alistair23@gmail.com; helo=mail-vk1-xa31.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Tue, Nov 5, 2024 at 11:06=E2=80=AFPM Philippe Mathieu-Daud=C3=A9 wrote: > > Pass vCPU endianness as argument so we can load kernels > with different endianness (different from the qemu-system-binary > builtin one). > > Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Alistair > --- > hw/microblaze/boot.h | 4 ++-- > hw/microblaze/boot.c | 8 ++++---- > hw/microblaze/petalogix_ml605_mmu.c | 2 +- > hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- > hw/microblaze/xlnx-zynqmp-pmu.c | 2 +- > 5 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/hw/microblaze/boot.h b/hw/microblaze/boot.h > index 5a8c2f79750..d179a551a69 100644 > --- a/hw/microblaze/boot.h > +++ b/hw/microblaze/boot.h > @@ -2,8 +2,8 @@ > #define MICROBLAZE_BOOT_H > > > -void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, > - uint32_t ramsize, > +void microblaze_load_kernel(MicroBlazeCPU *cpu, bool is_little_endian, > + hwaddr ddr_base, uint32_t ramsize, > const char *initrd_filename, > const char *dtb_filename, > void (*machine_cpu_reset)(MicroBlazeCPU *)); > diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c > index ed61e483ee8..3675489fa5b 100644 > --- a/hw/microblaze/boot.c > +++ b/hw/microblaze/boot.c > @@ -114,8 +114,8 @@ static uint64_t translate_kernel_address(void *opaque= , uint64_t addr) > return addr - 0x30000000LL; > } > > -void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, > - uint32_t ramsize, > +void microblaze_load_kernel(MicroBlazeCPU *cpu, bool is_little_endian, > + hwaddr ddr_base, uint32_t ramsize, > const char *initrd_filename, > const char *dtb_filename, > void (*machine_cpu_reset)(MicroBlazeCPU *)) > @@ -144,13 +144,13 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwa= ddr ddr_base, > /* Boots a kernel elf binary. */ > kernel_size =3D load_elf(kernel_filename, NULL, NULL, NULL, > &entry, NULL, &high, NULL, > - TARGET_BIG_ENDIAN, EM_MICROBLAZE, 0, 0); > + !is_little_endian, EM_MICROBLAZE, 0, 0); > base32 =3D entry; > if (base32 =3D=3D 0xc0000000) { > kernel_size =3D load_elf(kernel_filename, NULL, > translate_kernel_address, NULL, > &entry, NULL, NULL, NULL, > - TARGET_BIG_ENDIAN, EM_MICROBLAZE, 0, = 0); > + !is_little_endian, EM_MICROBLAZE, 0, = 0); > } > /* Always boot into physical ram. */ > boot_info.bootstrap_pc =3D (uint32_t)entry; > diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogi= x_ml605_mmu.c > index 61e47d83988..d2b2109065d 100644 > --- a/hw/microblaze/petalogix_ml605_mmu.c > +++ b/hw/microblaze/petalogix_ml605_mmu.c > @@ -204,7 +204,7 @@ petalogix_ml605_init(MachineState *machine) > cpu->cfg.pvr_regs[5] =3D 0xc56be000; > cpu->cfg.pvr_regs[10] =3D 0x0e000000; /* virtex 6 */ > > - microblaze_load_kernel(cpu, MEMORY_BASEADDR, ram_size, > + microblaze_load_kernel(cpu, true, MEMORY_BASEADDR, ram_size, > machine->initrd_filename, > BINARY_DEVICE_TREE_FILE, > NULL); > diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/pet= alogix_s3adsp1800_mmu.c > index 6c0f5c6c651..8110be83715 100644 > --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c > +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c > @@ -129,7 +129,7 @@ petalogix_s3adsp1800_init(MachineState *machine) > > create_unimplemented_device("xps_gpio", GPIO_BASEADDR, 0x10000); > > - microblaze_load_kernel(cpu, ddr_base, ram_size, > + microblaze_load_kernel(cpu, !TARGET_BIG_ENDIAN, ddr_base, ram_size, > machine->initrd_filename, > BINARY_DEVICE_TREE_FILE, > NULL); > diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-= pmu.c > index 567aad47bfc..bdbf7328bf4 100644 > --- a/hw/microblaze/xlnx-zynqmp-pmu.c > +++ b/hw/microblaze/xlnx-zynqmp-pmu.c > @@ -172,7 +172,7 @@ static void xlnx_zynqmp_pmu_init(MachineState *machin= e) > qdev_realize(DEVICE(pmu), NULL, &error_fatal); > > /* Load the kernel */ > - microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR, > + microblaze_load_kernel(&pmu->cpu, true, XLNX_ZYNQMP_PMU_RAM_ADDR, > machine->ram_size, > machine->initrd_filename, > machine->dtb, > -- > 2.45.2 > >