d0f4aa7d50
There were some regressions introduced with Qemu v8.2 on the hppa/hppa64 target, e.g.: - 32-bit HP-UX crashes on B160L (32-bit) machine - NetBSD boot failure due to power button in page zero - NetBSD FPU detection failure - OpenBSD 7.4 boot failure This patch series fixes those known regressions and additionally: - allows usage of the max. 3840MB of memory (instead of 3GB), - adds support for the qemu --nodefaults option (to debug other devices) This patch set will not fix those known (non-regression) bugs: - HP-UX and NetBSD still fail to boot on the new 64-bit C3700 machine - Linux kernel will still fail to boot on C3700 as long as kernel modules are used. Changes v2->v3: - Added comment about Figures H-10 and H-11 in the parisc2.0 spec in patch which calculate PDC address translation if PSW.W=0 - Introduce and use hppa_set_ior_and_isr() - Use drive_get_max_bus(IF_SCSI), nd_table[] and serial_hd() to check if default devices should be created - Added Tested-by and Reviewed-by tags Changes v1->v2: - fix OpenBSD boot with SeaBIOS v15 instead of v14 - commit message enhancements suggested by BALATON Zoltan - use uint64_t for ram_max in patch #1 -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQS86RI+GtKfB8BJu973ErUQojoPXwUCZaImPQAKCRD3ErUQojoP X2C5AP9fbIkCni45JU6KC6OmFsCbAReRQCPwLO+MzR8/us2ywgD+PsGxSBk8ASxM nqtv3J9JC3i+XSnbtwLV+qChnO+IXwc= =FAMY -----END PGP SIGNATURE----- Merge tag 'hppa-fixes-8.2-pull-request' of https://github.com/hdeller/qemu-hppa into staging target/hppa qemu v8.2 regression fixes There were some regressions introduced with Qemu v8.2 on the hppa/hppa64 target, e.g.: - 32-bit HP-UX crashes on B160L (32-bit) machine - NetBSD boot failure due to power button in page zero - NetBSD FPU detection failure - OpenBSD 7.4 boot failure This patch series fixes those known regressions and additionally: - allows usage of the max. 3840MB of memory (instead of 3GB), - adds support for the qemu --nodefaults option (to debug other devices) This patch set will not fix those known (non-regression) bugs: - HP-UX and NetBSD still fail to boot on the new 64-bit C3700 machine - Linux kernel will still fail to boot on C3700 as long as kernel modules are used. Changes v2->v3: - Added comment about Figures H-10 and H-11 in the parisc2.0 spec in patch which calculate PDC address translation if PSW.W=0 - Introduce and use hppa_set_ior_and_isr() - Use drive_get_max_bus(IF_SCSI), nd_table[] and serial_hd() to check if default devices should be created - Added Tested-by and Reviewed-by tags Changes v1->v2: - fix OpenBSD boot with SeaBIOS v15 instead of v14 - commit message enhancements suggested by BALATON Zoltan - use uint64_t for ram_max in patch #1 # -----BEGIN PGP SIGNATURE----- # # iHUEABYKAB0WIQS86RI+GtKfB8BJu973ErUQojoPXwUCZaImPQAKCRD3ErUQojoP # X2C5AP9fbIkCni45JU6KC6OmFsCbAReRQCPwLO+MzR8/us2ywgD+PsGxSBk8ASxM # nqtv3J9JC3i+XSnbtwLV+qChnO+IXwc= # =FAMY # -----END PGP SIGNATURE----- # gpg: Signature made Sat 13 Jan 2024 05:57:17 GMT # gpg: using EDDSA key BCE9123E1AD29F07C049BBDEF712B510A23A0F5F # gpg: Good signature from "Helge Deller <deller@gmx.de>" [unknown] # gpg: aka "Helge Deller <deller@kernel.org>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 4544 8228 2CD9 10DB EF3D 25F8 3E5F 3D04 A7A2 4603 # Subkey fingerprint: BCE9 123E 1AD2 9F07 C049 BBDE F712 B510 A23A 0F5F * tag 'hppa-fixes-8.2-pull-request' of https://github.com/hdeller/qemu-hppa: target/hppa: Update SeaBIOS-hppa to version 15 target/hppa: Fix IOR and ISR on error in probe target/hppa: Fix IOR and ISR on unaligned access trap target/hppa: Export function hppa_set_ior_and_isr() target/hppa: Avoid accessing %gr0 when raising exception hw/hppa: Move software power button address back into PDC target/hppa: Fix PDC address translation on PA2.0 with PSW.W=0 hw/pci-host/astro: Add missing astro & elroy registers for NetBSD hw/hppa/machine: Disable default devices with --nodefaults option hw/hppa/machine: Allow up to 3840 MB total memory Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
229 lines
6.2 KiB
C
229 lines
6.2 KiB
C
/*
|
|
* QEMU HPPA CPU
|
|
*
|
|
* Copyright (c) 2016 Richard Henderson <rth@twiddle.net>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see
|
|
* <http://www.gnu.org/licenses/lgpl-2.1.html>
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/qemu-print.h"
|
|
#include "qemu/timer.h"
|
|
#include "cpu.h"
|
|
#include "qemu/module.h"
|
|
#include "exec/exec-all.h"
|
|
#include "fpu/softfloat.h"
|
|
#include "tcg/tcg.h"
|
|
|
|
static void hppa_cpu_set_pc(CPUState *cs, vaddr value)
|
|
{
|
|
HPPACPU *cpu = HPPA_CPU(cs);
|
|
|
|
cpu->env.iaoq_f = value;
|
|
cpu->env.iaoq_b = value + 4;
|
|
}
|
|
|
|
static vaddr hppa_cpu_get_pc(CPUState *cs)
|
|
{
|
|
HPPACPU *cpu = HPPA_CPU(cs);
|
|
|
|
return cpu->env.iaoq_f;
|
|
}
|
|
|
|
static void hppa_cpu_synchronize_from_tb(CPUState *cs,
|
|
const TranslationBlock *tb)
|
|
{
|
|
HPPACPU *cpu = HPPA_CPU(cs);
|
|
|
|
tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL));
|
|
|
|
#ifdef CONFIG_USER_ONLY
|
|
cpu->env.iaoq_f = tb->pc;
|
|
cpu->env.iaoq_b = tb->cs_base;
|
|
#else
|
|
/* Recover the IAOQ values from the GVA + PRIV. */
|
|
uint32_t priv = (tb->flags >> TB_FLAG_PRIV_SHIFT) & 3;
|
|
target_ulong cs_base = tb->cs_base;
|
|
target_ulong iasq_f = cs_base & ~0xffffffffull;
|
|
int32_t diff = cs_base;
|
|
|
|
cpu->env.iasq_f = iasq_f;
|
|
cpu->env.iaoq_f = (tb->pc & ~iasq_f) + priv;
|
|
if (diff) {
|
|
cpu->env.iaoq_b = cpu->env.iaoq_f + diff;
|
|
}
|
|
#endif
|
|
|
|
cpu->env.psw_n = (tb->flags & PSW_N) != 0;
|
|
}
|
|
|
|
static void hppa_restore_state_to_opc(CPUState *cs,
|
|
const TranslationBlock *tb,
|
|
const uint64_t *data)
|
|
{
|
|
HPPACPU *cpu = HPPA_CPU(cs);
|
|
|
|
cpu->env.iaoq_f = data[0];
|
|
if (data[1] != (target_ulong)-1) {
|
|
cpu->env.iaoq_b = data[1];
|
|
}
|
|
cpu->env.unwind_breg = data[2];
|
|
/*
|
|
* Since we were executing the instruction at IAOQ_F, and took some
|
|
* sort of action that provoked the cpu_restore_state, we can infer
|
|
* that the instruction was not nullified.
|
|
*/
|
|
cpu->env.psw_n = 0;
|
|
}
|
|
|
|
static bool hppa_cpu_has_work(CPUState *cs)
|
|
{
|
|
return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
|
|
}
|
|
|
|
static void hppa_cpu_disas_set_info(CPUState *cs, disassemble_info *info)
|
|
{
|
|
info->mach = bfd_mach_hppa20;
|
|
info->print_insn = print_insn_hppa;
|
|
}
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
static G_NORETURN
|
|
void hppa_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
|
|
MMUAccessType access_type, int mmu_idx,
|
|
uintptr_t retaddr)
|
|
{
|
|
HPPACPU *cpu = HPPA_CPU(cs);
|
|
CPUHPPAState *env = &cpu->env;
|
|
|
|
cs->exception_index = EXCP_UNALIGN;
|
|
hppa_set_ior_and_isr(env, addr, MMU_IDX_MMU_DISABLED(mmu_idx));
|
|
|
|
cpu_loop_exit_restore(cs, retaddr);
|
|
}
|
|
#endif /* CONFIG_USER_ONLY */
|
|
|
|
static void hppa_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
{
|
|
CPUState *cs = CPU(dev);
|
|
HPPACPUClass *acc = HPPA_CPU_GET_CLASS(dev);
|
|
Error *local_err = NULL;
|
|
|
|
cpu_exec_realizefn(cs, &local_err);
|
|
if (local_err != NULL) {
|
|
error_propagate(errp, local_err);
|
|
return;
|
|
}
|
|
|
|
qemu_init_vcpu(cs);
|
|
acc->parent_realize(dev, errp);
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
{
|
|
HPPACPU *cpu = HPPA_CPU(cs);
|
|
|
|
cpu->alarm_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
|
|
hppa_cpu_alarm_timer, cpu);
|
|
hppa_ptlbe(&cpu->env);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
static void hppa_cpu_initfn(Object *obj)
|
|
{
|
|
CPUState *cs = CPU(obj);
|
|
HPPACPU *cpu = HPPA_CPU(obj);
|
|
CPUHPPAState *env = &cpu->env;
|
|
|
|
cs->exception_index = -1;
|
|
cpu_hppa_loaded_fr0(env);
|
|
cpu_hppa_put_psw(env, PSW_W);
|
|
}
|
|
|
|
static ObjectClass *hppa_cpu_class_by_name(const char *cpu_model)
|
|
{
|
|
g_autofree char *typename = g_strconcat(cpu_model, "-cpu", NULL);
|
|
|
|
return object_class_by_name(typename);
|
|
}
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
#include "hw/core/sysemu-cpu-ops.h"
|
|
|
|
static const struct SysemuCPUOps hppa_sysemu_ops = {
|
|
.get_phys_page_debug = hppa_cpu_get_phys_page_debug,
|
|
};
|
|
#endif
|
|
|
|
#include "hw/core/tcg-cpu-ops.h"
|
|
|
|
static const struct TCGCPUOps hppa_tcg_ops = {
|
|
.initialize = hppa_translate_init,
|
|
.synchronize_from_tb = hppa_cpu_synchronize_from_tb,
|
|
.restore_state_to_opc = hppa_restore_state_to_opc,
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
.tlb_fill = hppa_cpu_tlb_fill,
|
|
.cpu_exec_interrupt = hppa_cpu_exec_interrupt,
|
|
.do_interrupt = hppa_cpu_do_interrupt,
|
|
.do_unaligned_access = hppa_cpu_do_unaligned_access,
|
|
#endif /* !CONFIG_USER_ONLY */
|
|
};
|
|
|
|
static void hppa_cpu_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
CPUClass *cc = CPU_CLASS(oc);
|
|
HPPACPUClass *acc = HPPA_CPU_CLASS(oc);
|
|
|
|
device_class_set_parent_realize(dc, hppa_cpu_realizefn,
|
|
&acc->parent_realize);
|
|
|
|
cc->class_by_name = hppa_cpu_class_by_name;
|
|
cc->has_work = hppa_cpu_has_work;
|
|
cc->dump_state = hppa_cpu_dump_state;
|
|
cc->set_pc = hppa_cpu_set_pc;
|
|
cc->get_pc = hppa_cpu_get_pc;
|
|
cc->gdb_read_register = hppa_cpu_gdb_read_register;
|
|
cc->gdb_write_register = hppa_cpu_gdb_write_register;
|
|
#ifndef CONFIG_USER_ONLY
|
|
dc->vmsd = &vmstate_hppa_cpu;
|
|
cc->sysemu_ops = &hppa_sysemu_ops;
|
|
#endif
|
|
cc->disas_set_info = hppa_cpu_disas_set_info;
|
|
cc->gdb_num_core_regs = 128;
|
|
cc->tcg_ops = &hppa_tcg_ops;
|
|
}
|
|
|
|
static const TypeInfo hppa_cpu_type_infos[] = {
|
|
{
|
|
.name = TYPE_HPPA_CPU,
|
|
.parent = TYPE_CPU,
|
|
.instance_size = sizeof(HPPACPU),
|
|
.instance_align = __alignof(HPPACPU),
|
|
.instance_init = hppa_cpu_initfn,
|
|
.abstract = false,
|
|
.class_size = sizeof(HPPACPUClass),
|
|
.class_init = hppa_cpu_class_init,
|
|
},
|
|
{
|
|
.name = TYPE_HPPA64_CPU,
|
|
.parent = TYPE_HPPA_CPU,
|
|
},
|
|
};
|
|
|
|
DEFINE_TYPES(hppa_cpu_type_infos)
|