[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 3/8] target/hppa: Report and clear BTLBs via fw_cfg at startup
From: |
deller |
Subject: |
[PULL v2 3/8] target/hppa: Report and clear BTLBs via fw_cfg at startup |
Date: |
Tue, 19 Sep 2023 21:17:51 +0200 |
From: Helge Deller <deller@gmx.de>
Report the new number of TLB entries (without BTLBs) to the
guest and drop reporting of BTLB entries which weren't used at all.
Clear all BTLB and TLB entries at machine reset.
Signed-off-by: Helge Deller <deller@gmx.de>
---
hw/hppa/machine.c | 10 +++++-----
1 file 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()? */
--
2.41.0
- [PULL v2 0/8] Hppa btlb patches, deller, 2023/09/19
- [PULL v2 2/8] target/hppa: Allow up to 16 BTLB entries, deller, 2023/09/19
- [PULL v2 3/8] target/hppa: Report and clear BTLBs via fw_cfg at startup,
deller <=
- [PULL v2 4/8] target/hppa: Add BTLB support to hppa TLB functions, deller, 2023/09/19
- [PULL v2 1/8] target/hppa: Update to SeaBIOS-hppa version 9, deller, 2023/09/19
- [PULL v2 6/8] target/hppa: Wire up diag instruction to support BTLB, deller, 2023/09/19
- [PULL v2 7/8] linux-user/hppa: clear the PSW 'N' bit when delivering signals, deller, 2023/09/19
- [PULL v2 8/8] linux-user/hppa: lock both words of function descriptor, deller, 2023/09/19
- [PULL v2 5/8] target/hppa: Extract diagnose immediate value, deller, 2023/09/19
- Re: [PULL v2 0/8] Hppa btlb patches, Stefan Hajnoczi, 2023/09/20