From nobody Wed Nov 27 19:50:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1697835292; cv=none; d=zohomail.com; s=zohoarc; b=Vvub2elvwebmjRj2wZXr41eBmN8w+syj4Hpc0624oaiqmYU7i2HN8YqAxuA/L7V7cON/BZOeYppAQB0fZd2Yuag9TuWmoqcdC1zb4oa64ZJZYF9DevoPRYagj2XrTb1Wd4NLWSWEWbYBIY7G7BMmr3jENerA+WMtpbrt5XkRc8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697835292; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3YpfUmyUa6m05sFckuJpc1CvhipgVeCi72arXwnoozE=; b=K+oTe2ImqoLNq28efS9PEMcodkQ0P3wgAKiPm073+BuPM3LyZCteJXb9CO5cIQ51aO387gsKnug1bUpCc45Mh5MhGO0bP01QNDXBtYT4E4fsv6OkV1X1bY/VAZ4oW1JvgnU5r/0YGSb2Gn4Ya4Qpj8GhYZZ6h/lH+EXUY9uP1KE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169783529225076.7666985068073; Fri, 20 Oct 2023 13:54:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtwP9-00028e-W6; Fri, 20 Oct 2023 16:47:36 -0400 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 1qtwP6-00024o-2Q for qemu-devel@nongnu.org; Fri, 20 Oct 2023 16:47:32 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtwP3-0001Ef-Sb for qemu-devel@nongnu.org; Fri, 20 Oct 2023 16:47:31 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6b201a93c9cso1117461b3a.0 for ; Fri, 20 Oct 2023 13:47:29 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id u7-20020aa78487000000b00694fee1011asm1946775pfn.208.2023.10.20.13.47.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 13:47:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697834848; x=1698439648; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3YpfUmyUa6m05sFckuJpc1CvhipgVeCi72arXwnoozE=; b=c2sAHm9LspCn4deFQhICb7m7ekTtEpOKxqcKiy/b6AYyo/2jPOQU70yV8LDR+vXFC3 SmY3LbcSyzWL8uCaezLMZtsZ47UCoCu6pSPISxeF/htx/HzQWs/dEkjE6rRhC0bpsXdD jJgeYsJGCkujNHcBPrcxvkhftv5GjO7vV7lJqmegGds+jeZj/qLlLLsYfG5o6T9LMz7q a28VsUmiizaReN3b5drBNQkpjQw2VKchkSTvEfEwKbjo/FeiBr/mt+P5+4iMC8jOyh+5 Si7gcs5PqWLVVTqlu8XZcKRHf6AwXF2GBCXinKf8OCnWQJ6SC4LItxeHdC0fvptgfvVP BMAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697834848; x=1698439648; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3YpfUmyUa6m05sFckuJpc1CvhipgVeCi72arXwnoozE=; b=Fz9pypLLucFNt9bAVjLpIT48gwcWwqn68Ct6xb/9Aqn7FwtecmcpUi4Dk24KX0bft1 EB2AC0Y7HpChz2/9qvypgXIOe7xPmohPC9t4FVlU8BuOZqROz7+nc7jOhIYLZWhCvlK/ /Bkmlf8uABm8y+LLpwjCmrrlaIlf2p81SkYyz+rHyz9lXEJmxEku4lee50OHWLFQRcoK zrxO2tqQQY6NlNRDpBJ8i48niModHvd8PQpK99m3tS7AEsoMlAoVaxkK6VmPpyBoxH6v Tro8l+tfjNzhj/OUEQsGqkjucAwdJi1IrsNgY3cjuGDa2CNraKUOg/ZgLhXvNtLRj3LJ SuzA== X-Gm-Message-State: AOJu0YzHsBiao279BQirN7rzK8CRVq4BAab+BuVPihpzNkXNq5nCwnPT Nz/YpCjH3zJ5/vVHJtqmrMNthBOgI5u1tOeitcA= X-Google-Smtp-Source: AGHT+IEgOJhI6j7yLmze3HsWAqKUxR9sRj0trXxzFu7mO/7wBaFzRmXtyBsFdD42OgLfpr3hVQ1/TA== X-Received: by 2002:a05:6a20:3ca8:b0:179:f858:784d with SMTP id b40-20020a056a203ca800b00179f858784dmr3237205pzj.21.1697834848419; Fri, 20 Oct 2023 13:47:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: deller@gmx.de Subject: [PATCH v2 64/65] hw/hppa: Translate phys addresses for the cpu Date: Fri, 20 Oct 2023 13:43:30 -0700 Message-Id: <20231020204331.139847-65-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231020204331.139847-1-richard.henderson@linaro.org> References: <20231020204331.139847-1-richard.henderson@linaro.org> MIME-Version: 1.0 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=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1697835294023100001 Content-Type: text/plain; charset="utf-8" Hack the machine to use pa2.0 physical layout when required, using the PSW.W=3D0 absolute to physical mapping. Signed-off-by: Richard Henderson --- hw/hppa/machine.c | 117 ++++++++++++++++++++++++++++------------------ 1 file changed, 71 insertions(+), 46 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 1f09b4b490..43c7afb89d 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -87,7 +87,7 @@ static const MemoryRegionOps hppa_pci_ignore_ops =3D { }, }; =20 -static ISABus *hppa_isa_bus(void) +static ISABus *hppa_isa_bus(hwaddr addr) { ISABus *isa_bus; qemu_irq *isa_irqs; @@ -96,8 +96,7 @@ static ISABus *hppa_isa_bus(void) isa_region =3D g_new(MemoryRegion, 1); memory_region_init_io(isa_region, NULL, &hppa_pci_ignore_ops, NULL, "isa-io", 0x800); - memory_region_add_subregion(get_system_memory(), IDE_HPA, - isa_region); + memory_region_add_subregion(get_system_memory(), addr, isa_region); =20 isa_bus =3D isa_bus_new(NULL, get_system_memory(), isa_region, &error_abort); @@ -163,13 +162,24 @@ static const MemoryRegionOps hppa_io_helper_ops =3D { }, }; =20 +typedef uint64_t TranslateFn(void *opaque, uint64_t addr); =20 -static uint64_t cpu_hppa_to_phys(void *opaque, uint64_t addr) +static uint64_t linux_kernel_virt_to_phys(void *opaque, uint64_t addr) { addr &=3D (0x10000000 - 1); return addr; } =20 +static uint64_t translate_pa10(void *dummy, uint64_t addr) +{ + return (uint32_t)addr; +} + +static uint64_t translate_pa20(void *dummy, uint64_t addr) +{ + return hppa_abs_to_phys_pa2_w0(addr); +} + static HPPACPU *cpu[HPPA_MAX_CPUS]; static uint64_t firmware_entry; =20 @@ -179,7 +189,8 @@ static void fw_cfg_boot_set(void *opaque, const char *b= oot_device, fw_cfg_modify_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]); } =20 -static FWCfgState *create_fw_cfg(MachineState *ms, PCIBus *pci_bus) +static FWCfgState *create_fw_cfg(MachineState *ms, PCIBus *pci_bus, + hwaddr addr) { FWCfgState *fw_cfg; uint64_t val; @@ -188,7 +199,7 @@ static FWCfgState *create_fw_cfg(MachineState *ms, PCIB= us *pci_bus) int btlb_entries =3D HPPA_BTLB_ENTRIES(&cpu[0]->env); int len; =20 - fw_cfg =3D fw_cfg_init_mem(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4); + fw_cfg =3D fw_cfg_init_mem(addr, addr + 4); fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, ms->smp.cpus); fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, HPPA_MAX_CPUS); fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, ms->ram_size); @@ -258,32 +269,45 @@ static DinoState *dino_init(MemoryRegion *addr_space) /* * Step 1: Create CPUs and Memory */ -static void machine_HP_common_init_cpus(MachineState *machine) +static TranslateFn *machine_HP_common_init_cpus(MachineState *machine) { MemoryRegion *addr_space =3D get_system_memory(); - MemoryRegion *cpu_region; - long i; unsigned int smp_cpus =3D machine->smp.cpus; - char *name; + TranslateFn *translate; + MemoryRegion *cpu_region; =20 /* Create CPUs. */ - for (i =3D 0; i < smp_cpus; i++) { - name =3D g_strdup_printf("cpu%ld-io-eir", i); + for (unsigned int i =3D 0; i < smp_cpus; i++) { cpu[i] =3D HPPA_CPU(cpu_create(machine->cpu_type)); + } + + /* + * For now, treat address layout as if PSW_W is clear. + * TODO: create a proper hppa64 board model and load elf64 firmware. + */ + if (hppa_is_pa20(&cpu[0]->env)) { + translate =3D translate_pa20; + } else { + translate =3D translate_pa10; + } + + for (unsigned int i =3D 0; i < smp_cpus; i++) { + g_autofree char *name =3D g_strdup_printf("cpu%u-io-eir", i); =20 cpu_region =3D g_new(MemoryRegion, 1); memory_region_init_io(cpu_region, OBJECT(cpu[i]), &hppa_io_eir_ops, cpu[i], name, 4); - memory_region_add_subregion(addr_space, CPU_HPA + i * 0x1000, + memory_region_add_subregion(addr_space, + translate(NULL, CPU_HPA + i * 0x1000), cpu_region); - g_free(name); } =20 /* RTC and DebugOutputPort on CPU #0 */ cpu_region =3D g_new(MemoryRegion, 1); memory_region_init_io(cpu_region, OBJECT(cpu[0]), &hppa_io_helper_ops, cpu[0], "cpu0-io-rtc", 2 * sizeof(uint64_t)); - memory_region_add_subregion(addr_space, CPU_HPA + 16, cpu_region); + memory_region_add_subregion(addr_space, translate(NULL, CPU_HPA + 16), + cpu_region); =20 /* Main memory region. */ if (machine->ram_size > 3 * GiB) { @@ -291,12 +315,15 @@ static void machine_HP_common_init_cpus(MachineState = *machine) exit(EXIT_FAILURE); } memory_region_add_subregion_overlap(addr_space, 0, machine->ram, -1); + + return translate; } =20 /* * Last creation step: Add SCSI discs, NICs, graphics & load firmware */ -static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci= _bus) +static void machine_HP_common_init_tail(MachineState *machine, PCIBus *pci= _bus, + TranslateFn *translate) { const char *kernel_filename =3D machine->kernel_filename; const char *kernel_cmdline =3D machine->kernel_cmdline; @@ -324,13 +351,13 @@ static void machine_HP_common_init_tail(MachineState = *machine, PCIBus *pci_bus) dev =3D qdev_new("artist"); s =3D SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(s, &error_fatal); - sysbus_mmio_map(s, 0, LASI_GFX_HPA); - sysbus_mmio_map(s, 1, ARTIST_FB_ADDR); + sysbus_mmio_map(s, 0, translate(NULL, LASI_GFX_HPA)); + sysbus_mmio_map(s, 1, translate(NULL, ARTIST_FB_ADDR)); } =20 /* Network setup. */ if (enable_lasi_lan()) { - lasi_82596_init(addr_space, LASI_LAN_HPA, + lasi_82596_init(addr_space, translate(NULL, LASI_LAN_HPA), qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA)); } =20 @@ -374,7 +401,7 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus) qemu_register_powerdown_notifier(&hppa_system_powerdown_notifier); =20 /* fw_cfg configuration interface */ - create_fw_cfg(machine, pci_bus); + create_fw_cfg(machine, pci_bus, translate(NULL, FW_CFG_IO_BASE)); =20 /* Load firmware. Given that this is not "real" firmware, but one explicitly written for the emulation, we might as @@ -386,15 +413,10 @@ static void machine_HP_common_init_tail(MachineState = *machine, PCIBus *pci_bus) exit(1); } =20 - size =3D load_elf(firmware_filename, NULL, NULL, NULL, + size =3D load_elf(firmware_filename, NULL, translate, NULL, &firmware_entry, &firmware_low, &firmware_high, NULL, true, EM_PARISC, 0, 0); =20 - /* Unfortunately, load_elf sign-extends reading elf32. */ - firmware_entry =3D (uint32_t)firmware_entry; - firmware_low =3D (uint32_t)firmware_low; - firmware_high =3D (uint32_t)firmware_high; - if (size < 0) { error_report("could not load firmware '%s'", firmware_filename); exit(1); @@ -402,7 +424,8 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus) qemu_log_mask(CPU_LOG_PAGE, "Firmware loaded at 0x%08" PRIx64 "-0x%08" PRIx64 ", entry at 0x%08" PRIx64 ".\n", firmware_low, firmware_high, firmware_entry); - if (firmware_low < FIRMWARE_START || firmware_high >=3D FIRMWARE_END) { + if (firmware_low < translate(NULL, FIRMWARE_START) || + firmware_high >=3D translate(NULL, FIRMWARE_END)) { error_report("Firmware overlaps with memory or IO space"); exit(1); } @@ -411,18 +434,16 @@ static void machine_HP_common_init_tail(MachineState = *machine, PCIBus *pci_bus) rom_region =3D g_new(MemoryRegion, 1); memory_region_init_ram(rom_region, NULL, "firmware", (FIRMWARE_END - FIRMWARE_START), &error_fatal); - memory_region_add_subregion(addr_space, FIRMWARE_START, rom_region); + memory_region_add_subregion(addr_space, + translate(NULL, FIRMWARE_START), rom_regio= n); =20 /* Load kernel */ if (kernel_filename) { - size =3D load_elf(kernel_filename, NULL, &cpu_hppa_to_phys, + size =3D load_elf(kernel_filename, NULL, linux_kernel_virt_to_phys, NULL, &kernel_entry, &kernel_low, &kernel_high, NU= LL, true, EM_PARISC, 0, 0); =20 - /* Unfortunately, load_elf sign-extends reading elf32. */ - kernel_entry =3D (uint32_t) cpu_hppa_to_phys(NULL, kernel_entry); - kernel_low =3D (uint32_t)kernel_low; - kernel_high =3D (uint32_t)kernel_high; + kernel_entry =3D linux_kernel_virt_to_phys(NULL, kernel_entry); =20 if (size < 0) { error_report("could not load kernel '%s'", kernel_filename); @@ -500,41 +521,42 @@ static void machine_HP_B160L_init(MachineState *machi= ne) { DeviceState *dev, *dino_dev; MemoryRegion *addr_space =3D get_system_memory(); + TranslateFn *translate; ISABus *isa_bus; PCIBus *pci_bus; =20 /* Create CPUs and RAM. */ - machine_HP_common_init_cpus(machine); + translate =3D machine_HP_common_init_cpus(machine); =20 /* Init Lasi chip */ lasi_dev =3D DEVICE(lasi_init()); - memory_region_add_subregion(addr_space, LASI_HPA, + memory_region_add_subregion(addr_space, translate(NULL, LASI_HPA), sysbus_mmio_get_region( SYS_BUS_DEVICE(lasi_dev), 0)); =20 /* Init Dino (PCI host bus chip). */ dino_dev =3D DEVICE(dino_init(addr_space)); - memory_region_add_subregion(addr_space, DINO_HPA, + memory_region_add_subregion(addr_space, translate(NULL, DINO_HPA), sysbus_mmio_get_region( SYS_BUS_DEVICE(dino_dev), 0)); pci_bus =3D PCI_BUS(qdev_get_child_bus(dino_dev, "pci")); assert(pci_bus); =20 /* Create ISA bus, needed for PS/2 kbd/mouse port emulation */ - isa_bus =3D hppa_isa_bus(); + isa_bus =3D hppa_isa_bus(translate(NULL, IDE_HPA)); assert(isa_bus); =20 /* Serial ports: Lasi and Dino use a 7.272727 MHz clock. */ - serial_mm_init(addr_space, LASI_UART_HPA + 0x800, 0, + serial_mm_init(addr_space, translate(NULL, LASI_UART_HPA + 0x800), 0, qdev_get_gpio_in(lasi_dev, LASI_IRQ_UART_HPA), 7272727 / 16, serial_hd(0), DEVICE_BIG_ENDIAN); =20 - serial_mm_init(addr_space, DINO_UART_HPA + 0x800, 0, + serial_mm_init(addr_space, translate(NULL, DINO_UART_HPA + 0x800), 0, qdev_get_gpio_in(dino_dev, DINO_IRQ_RS232INT), 7272727 / 16, serial_hd(1), DEVICE_BIG_ENDIAN); =20 /* Parallel port */ - parallel_mm_init(addr_space, LASI_LPT_HPA + 0x800, 0, + parallel_mm_init(addr_space, translate(NULL, LASI_LPT_HPA + 0x800), 0, qdev_get_gpio_in(lasi_dev, LASI_IRQ_LAN_HPA), parallel_hds[0]); =20 @@ -543,15 +565,17 @@ static void machine_HP_B160L_init(MachineState *machi= ne) sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, qdev_get_gpio_in(lasi_dev, LASI_IRQ_PS2KBD_HPA)); - memory_region_add_subregion(addr_space, LASI_PS2KBD_HPA, + memory_region_add_subregion(addr_space, + translate(NULL, LASI_PS2KBD_HPA), sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0)); - memory_region_add_subregion(addr_space, LASI_PS2KBD_HPA + 0x100, + memory_region_add_subregion(addr_space, + translate(NULL, LASI_PS2KBD_HPA + 0x100), sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1)); =20 /* Add SCSI discs, NICs, graphics & load firmware */ - machine_HP_common_init_tail(machine, pci_bus); + machine_HP_common_init_tail(machine, pci_bus, translate); } =20 static AstroState *astro_init(void) @@ -573,21 +597,22 @@ static void machine_HP_C3700_init(MachineState *machi= ne) AstroState *astro; DeviceState *astro_dev; MemoryRegion *addr_space =3D get_system_memory(); + TranslateFn *translate; =20 /* Create CPUs and RAM. */ - machine_HP_common_init_cpus(machine); + translate =3D machine_HP_common_init_cpus(machine); =20 /* Init Astro and the Elroys (PCI host bus chips). */ astro =3D astro_init(); astro_dev =3D DEVICE(astro); - memory_region_add_subregion(addr_space, ASTRO_HPA, + memory_region_add_subregion(addr_space, translate(NULL, ASTRO_HPA), sysbus_mmio_get_region( SYS_BUS_DEVICE(astro_dev), 0)); pci_bus =3D PCI_BUS(qdev_get_child_bus(DEVICE(astro->elroy[0]), "pci")= ); assert(pci_bus); =20 /* Add SCSI discs, NICs, graphics & load firmware */ - machine_HP_common_init_tail(machine, pci_bus); + machine_HP_common_init_tail(machine, pci_bus, translate); } =20 static void hppa_machine_reset(MachineState *ms, ShutdownCause reason) --=20 2.34.1