diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2023-09-20 13:56:01 -0400 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2023-09-20 13:56:01 -0400 |
| commit | cb8a8b2ca9b25fdf561b0fd887df8344fe7927fd (patch) | |
| tree | 5626418bbf0415ed01f1ba9a7581c5b68dd6b8f8 /hw | |
| parent | 4907644841e3200aea6475c0f72d3d987e9f3d93 (diff) | |
| parent | 5b1270ef1477bb7f240c3bfe2cd8b0fe4721fd51 (diff) | |
| download | focaccia-qemu-cb8a8b2ca9b25fdf561b0fd887df8344fe7927fd.tar.gz focaccia-qemu-cb8a8b2ca9b25fdf561b0fd887df8344fe7927fd.zip | |
Merge tag 'hppa-btlb-pull-request' of https://github.com/hdeller/qemu-hppa into staging
Block-TLB support and linux-user fixes for hppa target All 32-bit hppa CPUs allow a fixed number of TLB entries to have a different page size than the default 4k. Those are called "Block-TLBs" and are created at startup by the operating system and managed by the firmware of hppa machines through the firmware PDC_BLOCK_TLB call. This patchset adds the necessary glue to SeaBIOS-hppa and qemu to allow up to 16 BTLB entries in the emulation. Two patches from Mikulas Patocka fix signal delivery issues in linux-user on hppa. # -----BEGIN PGP SIGNATURE----- # # iHUEABYKAB0WIQS86RI+GtKfB8BJu973ErUQojoPXwUCZQnz0wAKCRD3ErUQojoP # X6NDAP9F1Huhceot8peohGodRDOhnXWfDcjQZSDvadieKv/rJQEA60Z5QV5VlQgw # SyUT4AcoiB7N4nvS+iDa+6dKfRH/YQM= # =kqqt # -----END PGP SIGNATURE----- # gpg: Signature made Tue 19 Sep 2023 15:17:39 EDT # 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-btlb-pull-request' of https://github.com/hdeller/qemu-hppa: linux-user/hppa: lock both words of function descriptor linux-user/hppa: clear the PSW 'N' bit when delivering signals target/hppa: Wire up diag instruction to support BTLB target/hppa: Extract diagnose immediate value target/hppa: Add BTLB support to hppa TLB functions target/hppa: Report and clear BTLBs via fw_cfg at startup target/hppa: Allow up to 16 BTLB entries target/hppa: Update to SeaBIOS-hppa version 9 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/hppa/machine.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index 866e11d208..cf28cb9586 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -133,14 +133,10 @@ static FWCfgState *create_fw_cfg(MachineState *ms) fw_cfg_add_file(fw_cfg, "/etc/firmware-min-version", g_memdup(&val, sizeof(val)), sizeof(val)); - val = cpu_to_le64(HPPA_TLB_ENTRIES); + val = cpu_to_le64(HPPA_TLB_ENTRIES - HPPA_BTLB_ENTRIES); fw_cfg_add_file(fw_cfg, "/etc/cpu/tlb_entries", g_memdup(&val, sizeof(val)), sizeof(val)); - val = cpu_to_le64(HPPA_BTLB_ENTRIES); - fw_cfg_add_file(fw_cfg, "/etc/cpu/btlb_entries", - g_memdup(&val, sizeof(val)), sizeof(val)); - val = cpu_to_le64(HPA_POWER_BUTTON); fw_cfg_add_file(fw_cfg, "/etc/power-button-addr", g_memdup(&val, sizeof(val)), sizeof(val)); @@ -433,6 +429,10 @@ static void hppa_machine_reset(MachineState *ms, ShutdownCause reason) cs->exception_index = -1; cs->halted = 0; + + /* clear any existing TLB and BTLB entries */ + memset(cpu[i]->env.tlb, 0, sizeof(cpu[i]->env.tlb)); + cpu[i]->env.tlb_last = HPPA_BTLB_ENTRIES; } /* already initialized by machine_hppa_init()? */ |