riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

hppa: Get physical address space bits from HPPACPUDef 

Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20260305-hppa-c3600-v6-2-d51526e5269c@rev.ng>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
master
Anton Johansson 5 months ago
committed by Philippe Mathieu-Daudé
parent
dd6bee2707
commit
1a80a03a40
6 changed files with 43 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      hw/hppa/machine.c
  2. 8
      hw/pci-host/astro.c
  3. 2
      include/hw/pci-host/astro.h
  4. 5
      target/hppa/cpu.c
  5. 11
      target/hppa/cpu.h
  6. 39
      target/hppa/mem_helper.c

15
hw/hppa/machine.c
View File

@ -179,19 +179,21 @@ static uint64_t linux_kernel_virt_to_phys(void *opaque, uint64_t addr)
return addr;
}
static HPPACPU *cpu[HPPA_MAX_CPUS];
static uint64_t firmware_entry;
static uint64_t translate_pa10(void *dummy, uint64_t addr)
{
return hppa_abs_to_phys_pa1x(addr);
const uint8_t pa_bits = hppa_phys_addr_bits(&cpu[0]->env);
return hppa_abs_to_phys_pa1x(pa_bits, addr);
}
static uint64_t translate_pa20(void *dummy, uint64_t addr)
{
return hppa_abs_to_phys_pa2_w0(addr);
const uint8_t pa_bits = hppa_phys_addr_bits(&cpu[0]->env);
return hppa_abs_to_phys_pa2_w0(pa_bits, addr);
}
static HPPACPU *cpu[HPPA_MAX_CPUS];
static uint64_t firmware_entry;
static void fw_cfg_boot_set(void *opaque, const char *boot_device,
Error **errp)
{
@ -685,6 +687,9 @@ static AstroState *astro_init(void)
DeviceState *dev;
dev = qdev_new(TYPE_ASTRO_CHIP);
object_property_set_int(OBJECT(dev), "phys-addr-bits",
hppa_phys_addr_bits(&cpu[0]->env),
&error_abort);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
return ASTRO_CHIP(dev);

8
hw/pci-host/astro.c
View File

@ -303,7 +303,7 @@ static IOMMUTLBEntry astro_translate_iommu(IOMMUMemoryRegion *iommu,
* language which not-coincidentally matches the PSW.W=0 mapping.
*/
if (addr <= UINT32_MAX) {
entry = hppa_abs_to_phys_pa2_w0(addr);
entry = hppa_abs_to_phys_pa2_w0(s->phys_addr_bits, addr);
} else {
entry = addr;
}
@ -910,6 +910,10 @@ static void astro_realize(DeviceState *obj, Error **errp)
}
}
static const Property astro_props[] = {
DEFINE_PROP_UINT8("phys-addr-bits", AstroState, phys_addr_bits, 32),
};
static void astro_class_init(ObjectClass *klass, const void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@ -922,6 +926,8 @@ static void astro_class_init(ObjectClass *klass, const void *data)
* be created without that hardware
*/
dc->user_creatable = false;
device_class_set_props(dc, astro_props);
}
static const TypeInfo astro_chip_info = {

2
include/hw/pci-host/astro.h
View File

@ -82,6 +82,8 @@ struct AstroState {
uint64_t tlb_tcnfg;
uint64_t tlb_pdir_base;
uint8_t phys_addr_bits;
struct ElroyState *elroy[ELROY_NUM];
MemoryRegion this_mem;

5
target/hppa/cpu.c
View File

@ -283,6 +283,11 @@ static void hppa_cpu_class_base_init(ObjectClass *oc, const void *data)
/* Make sure all CPU models define a HPPACPUDef */
g_assert(!object_class_is_abstract(oc) && data != NULL);
acc->def = data;
/*
* Verify assumptions made in hppa_abs_to_phys_pa2_w1() on the size
* of the physical address space.
*/
g_assert(acc->def->phys_addr_bits <= 54);
}
static void hppa_cpu_class_init(ObjectClass *oc, const void *data)

11
target/hppa/cpu.h
View File

@ -320,6 +320,11 @@ static inline const HPPACPUDef *hppa_def(CPUHPPAState *env)
return HPPA_CPU_GET_CLASS(env_cpu(env))->def;
}
static inline uint8_t hppa_phys_addr_bits(CPUHPPAState *env)
{
return hppa_def(env)->phys_addr_bits;
}
static inline bool hppa_is_pa20(CPUHPPAState *env)
{
return hppa_def(env)->is_pa20;
@ -352,9 +357,9 @@ static inline vaddr hppa_form_gva(CPUHPPAState *env, uint64_t spc,
return hppa_form_gva_mask(env->gva_offset_mask, spc, off);
}
hwaddr hppa_abs_to_phys_pa1x(vaddr addr);
hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr);
hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr);
hwaddr hppa_abs_to_phys_pa1x(uint8_t phys_addr_bits, vaddr addr);
hwaddr hppa_abs_to_phys_pa2_w0(uint8_t phys_addr_bits, vaddr addr);
hwaddr hppa_abs_to_phys_pa2_w1(uint8_t phys_addr_bits, vaddr addr);
/*
* Since PSW_{I,CB} will never need to be in tb->flags, reuse them.

39
target/hppa/mem_helper.c
View File

@ -29,29 +29,12 @@
#include "hw/core/cpu.h"
#include "trace.h"
/*
* 64-bit (PA-RISC 2.0) machines are assumed to run PA-8700, and 32-bit
* machines 7300LC. This should give 44 and 32 bits of physical address
* space respectively.
*
* CPU model Physical address space bits
* PA-7000--7300LC 32
* PA-8000--8600 40
* PA-8700--8900 44
*
* FIXME: However, the SeaBIOS firmware that is that tested against
* uses 40-bit physical addresses, despite supposedly running a C3700
* with a PA-8700 cpu, so use 40-bits for 64-bit.
*/
#define HPPA_PHYS_ADDR_SPACE_BITS_PA20 40
#define HPPA_PHYS_ADDR_SPACE_BITS_PA1X 32
hwaddr hppa_abs_to_phys_pa1x(vaddr addr)
hwaddr hppa_abs_to_phys_pa1x(uint8_t phys_addr_bits, vaddr addr)
{
return extract64(addr, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA1X);
return extract64(addr, 0, phys_addr_bits);
}
hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr)
hwaddr hppa_abs_to_phys_pa2_w1(uint8_t phys_addr_bits, vaddr addr)
{
/*
* Figure H-8 "62-bit Absolute Accesses when PSW W-bit is 1" describes
@ -64,11 +47,10 @@ hwaddr hppa_abs_to_phys_pa2_w1(vaddr addr)
* Since the supported physical address space is below 54 bits, the
* H-8 algorithm is moot and all that is left is to truncate.
*/
QEMU_BUILD_BUG_ON(HPPA_PHYS_ADDR_SPACE_BITS_PA20 > 54);
return sextract64(addr, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA20);
return sextract64(addr, 0, phys_addr_bits);
}
hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr)
hwaddr hppa_abs_to_phys_pa2_w0(uint8_t phys_addr_bits, vaddr addr)
{
/*
* See Figure H-10, "Absolute Accesses when PSW W-bit is 0",
@ -89,7 +71,7 @@ hwaddr hppa_abs_to_phys_pa2_w0(vaddr addr)
* is what can be seen on physical machines too.
*/
addr = (uint32_t)addr;
addr |= -1ull << (HPPA_PHYS_ADDR_SPACE_BITS_PA20 - 4);
addr |= -1ull << (phys_addr_bits - 4);
}
return addr;
}
@ -231,15 +213,16 @@ int hppa_get_physical_address(CPUHPPAState *env, vaddr addr, int mmu_idx,
/* Virtual translation disabled. Map absolute to physical. */
if (MMU_IDX_MMU_DISABLED(mmu_idx)) {
const uint8_t phys_addr_bits = hppa_phys_addr_bits(env);
switch (mmu_idx) {
case MMU_ABS_W_IDX:
phys = hppa_abs_to_phys_pa2_w1(addr);
phys = hppa_abs_to_phys_pa2_w1(phys_addr_bits, addr);
break;
case MMU_ABS_IDX:
if (hppa_is_pa20(env)) {
phys = hppa_abs_to_phys_pa2_w0(addr);
phys = hppa_abs_to_phys_pa2_w0(phys_addr_bits, addr);
} else {
phys = hppa_abs_to_phys_pa1x(addr);
phys = hppa_abs_to_phys_pa1x(phys_addr_bits, addr);
}
break;
default:
@ -580,7 +563,7 @@ static void itlbt_pa20(CPUHPPAState *env, target_ulong r1,
/* Align per the page size. */
ent->pa &= TARGET_PAGE_MASK << mask_shift;
/* Ignore the bits beyond physical address space. */
ent->pa = sextract64(ent->pa, 0, HPPA_PHYS_ADDR_SPACE_BITS_PA20);
ent->pa = sextract64(ent->pa, 0, hppa_phys_addr_bits(env));
ent->t = extract64(r2, 61, 1);
ent->d = extract64(r2, 60, 1);

Write Preview
Loading…
Cancel
Save