vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-arm queue: 

* hw/intc/arm_gicv3_its: Add missing newlines to process_mapc() logging
  * target/arm: Fix sve_ld1_z and sve_st1_z vs MMIO
 -----BEGIN PGP SIGNATURE-----
 
 iQJNBAABCAA3FiEE4aXFk81BneKOgxXPPCUl7RQ2DN4FAmI92DAZHHBldGVyLm1h
 eWRlbGxAbGluYXJvLm9yZwAKCRA8JSXtFDYM3lSeD/9PDSi2QzYjwR5nMJarNMdk
 EBino607q6QJMzLHGwx8T1rBL2F0J/5hsyZEtIB6jeOMKPSTv2eX0ONT9wDJ4FK4
 fvXBPt0dTbij4zhBV3pSjPNMvnORpZNyeuHC6nz2ClrbY1ZcbWqxLllxm/rNpkcO
 tD8o2kQIUHRBVS9o3od9n8VoL+b6KBn9+zwmV88/Z1CQYrmXLhrDhZPuWtO/2oIR
 N+DprCUoWiY64j2N/eMxIYPok0/Syz7pN8SGkkNE6nKXv9r+cLOW+22xolSHMl12
 t4E8+caI52PjthN1Mf0hOVW6MCyPnjV/5hF1tmN9dOY0D16KTdSQqmWCDerCTxCa
 dB7F5IN7XOv/Llf6qPnaqmYNhrB289VkoFQSoao9zoQUdx9qUkhPxmIgKynGyEpf
 qZCmmPD1MDSADSff7FnoxpF2z9wwenX2hqc8luBGHzLGTDFlyWD6GxqGS21gRvfw
 gfqSIGZOKs1f9S0tMvR6i1ItemHdwRc0mccuoPrEweav6x87yc1AqhJPOACKkdO7
 4d2ULbW8aPUYhn6Wamkl7FX+eD8NslQhOxC++TV65yq5ZTppJiKJUBTYh1UNfNN6
 5icGbbSbCfPZcYaJTBkf75LPNKvmh3o6kJzI0Q1wuzGsVoKJMjV4+RjxUJJUY5Au
 SEsye6u6CWCSbyKXXnMEGw==
 =lCfE
 -----END PGP SIGNATURE-----

Merge tag 'pull-target-arm-20220325' of https://git.linaro.org/people/pmaydell/qemu-arm into staging

target-arm queue:
 * hw/intc/arm_gicv3_its: Add missing newlines to process_mapc() logging
 * target/arm: Fix sve_ld1_z and sve_st1_z vs MMIO

# gpg: Signature made Fri 25 Mar 2022 14:56:48 GMT
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* tag 'pull-target-arm-20220325' of https://git.linaro.org/people/pmaydell/qemu-arm:
  hw/intc/arm_gicv3_its: Add missing newlines to process_mapc() logging
  target/arm: Fix sve_ld1_z and sve_st1_z vs MMIO

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
master
Peter Maydell 2022-03-25 15:02:39 +00:00
parent f345abe365 c7ca3ad5e7
commit 3d31fe4d66
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/intc/arm_gicv3_its.c
View File

@ -524,12 +524,12 @@ static ItsCmdResult process_mapc(GICv3ITSState *s, const uint64_t *cmdpkt)
trace_gicv3_its_cmd_mapc(icid, cte.rdbase, cte.valid);
if (icid >= s->ct.num_entries) {
qemu_log_mask(LOG_GUEST_ERROR, "ITS MAPC: invalid ICID 0x%d", icid);
qemu_log_mask(LOG_GUEST_ERROR, "ITS MAPC: invalid ICID 0x%x\n", icid);
return CMD_CONTINUE;
}
if (cte.valid && cte.rdbase >= s->gicv3->num_cpu) {
qemu_log_mask(LOG_GUEST_ERROR,
"ITS MAPC: invalid RDBASE %u ", cte.rdbase);
"ITS MAPC: invalid RDBASE %u\n", cte.rdbase);
return CMD_CONTINUE;
}

10
target/arm/sve_helper.c
View File

@ -6734,7 +6734,11 @@ void sve_ld1_z(CPUARMState *env, void *vd, uint64_t *vg, void *vm,
if (mtedesc && arm_tlb_mte_tagged(&info.attrs)) {
mte_check(env, mtedesc, addr, retaddr);
}
host_fn(&scratch, reg_off, info.host);
if (unlikely(info.flags & TLB_MMIO)) {
tlb_fn(env, &scratch, reg_off, addr, retaddr);
} else {
host_fn(&scratch, reg_off, info.host);
}
} else {
/* Element crosses the page boundary. */
sve_probe_page(&info2, false, env, addr + in_page, 0,
@ -7112,7 +7116,9 @@ void sve_st1_z(CPUARMState *env, void *vd, uint64_t *vg, void *vm,
if (likely(in_page >= msize)) {
sve_probe_page(&info, false, env, addr, 0, MMU_DATA_STORE,
mmu_idx, retaddr);
host[i] = info.host;
if (!(info.flags & TLB_MMIO)) {
host[i] = info.host;
}
} else {
/*
* Element crosses the page boundary.