mirror of
https://github.com/qemu/qemu.git
synced 2026-07-08 17:46:10 +00:00
Merge tag 'hppa-fixes-for-v11.1-pull-request' of https://github.com/hdeller/qemu-hppa into staging
Updates for hppa architecture for qemu v11.1 A few patches to fix TLB for HP-UX 9, and a lasi irq fix, as well as a new SeaBIOS-hppa v25 firmware. # -----BEGIN PGP SIGNATURE----- # # iHUEABYKAB0WIQS86RI+GtKfB8BJu973ErUQojoPXwUCakp8eQAKCRD3ErUQojoP # X0S0AP9snfMLNer3zkojMLVsUNJtNUGmcRSNpmapiEN59lHRJwEAv30x2P3CnXLZ # ObN+XV79pTNHtrBAGRYKHUtaLPddlgQ= # =RRlH # -----END PGP SIGNATURE----- # gpg: Signature made Sun 05 Jul 2026 17:47:05 CEST # gpg: using EDDSA key BCE9123E1AD29F07C049BBDEF712B510A23A0F5F # gpg: Good signature from "Helge Deller <deller@gmx.de>" [unknown] # gpg: aka "Helge Deller <deller@kernel.org>" [unknown] # gpg: aka "Helge Deller <deller@debian.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-for-v11.1-pull-request' of https://github.com/hdeller/qemu-hppa: target/hppa: Update SeaBIOS-hppa to version 25 hw/misc/lasi: derive IRR from pending and unmasked requests target/hppa: Delay MMU update until TLB protection bits were set target/hppa: Work-around for Fast TLB insert instruction on HP-UX 9 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
@@ -164,6 +164,8 @@ ixtlbx 000001 b:5 r:5 ... 000000 addr:1 0 00000 \
|
||||
|
||||
# pcxl and pcxl2 Fast TLB Insert instructions
|
||||
ixtlbxf 000001 00000 r:5 00 0 data:1 01000 addr:1 0 00000
|
||||
# workaround for non-standard encoding as used in HP-UX 9
|
||||
ixtlbxf 000001 01001 r:5 01 0 data:1 01000 addr:1 0 00000
|
||||
|
||||
# pa2.0 tlb insert idtlbt and iitlbt instructions
|
||||
ixtlbt 000001 r2:5 r1:5 000 data:1 100000 0 00000 # idtlbt
|
||||
|
||||
@@ -2570,7 +2570,7 @@ static bool trans_ixtlbx(DisasContext *ctx, arg_ixtlbx *a)
|
||||
}
|
||||
|
||||
/* Exit TB for TLB change if mmu is enabled. */
|
||||
if (ctx->tb_flags & PSW_C) {
|
||||
if (ctx->tb_flags & PSW_C && !a->addr) {
|
||||
ctx->base.is_jmp = DISAS_IAQ_N_STALE;
|
||||
}
|
||||
return nullify_end(ctx);
|
||||
@@ -2687,7 +2687,7 @@ static bool trans_ixtlbxf(DisasContext *ctx, arg_ixtlbxf *a)
|
||||
}
|
||||
|
||||
/* Exit TB for TLB change if mmu is enabled. */
|
||||
if (ctx->tb_flags & PSW_C) {
|
||||
if (ctx->tb_flags & PSW_C && !a->addr) {
|
||||
ctx->base.is_jmp = DISAS_IAQ_N_STALE;
|
||||
}
|
||||
return nullify_end(ctx);
|
||||
|
||||
Reference in New Issue
Block a user