SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/ppc/spapr: Convert CLEAN_HPTE() macro as hpte_set_clean() method

Browse Source 
Convert CLEAN_HPTE() macro as hpte_set_clean() method.

sPAPR data structures including the hash page table are big-endian
regardless of current CPU endian mode, so use the big-endian LD/ST
API to access the hash PTEs.

Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Message-ID: <20241220213103.6314-5-philmd@linaro.org>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-12-20 22:31:01 +01:00 committed by Nicholas Piggin
parent 9087929887
commit 735f9c878a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/ppc/spapr.c
View File

@ -1419,7 +1419,12 @@ static bool hpte_is_dirty(SpaprMachineState *s, unsigned index)
return ldq_be_p(hpte_get_ptr(s, index)) & HPTE64_V_HPTE_DIRTY; return ldq_be_p(hpte_get_ptr(s, index)) & HPTE64_V_HPTE_DIRTY;
} }
#define CLEAN_HPTE(_hpte) ((*(uint64_t *)(_hpte)) &= tswap64(~HPTE64_V_HPTE_DIRTY)) static void hpte_set_clean(SpaprMachineState *s, unsigned index)
{
stq_be_p(hpte_get_ptr(s, index),
ldq_be_p(hpte_get_ptr(s, index)) & ~HPTE64_V_HPTE_DIRTY);
}
#define DIRTY_HPTE(_hpte) ((*(uint64_t *)(_hpte)) |= tswap64(HPTE64_V_HPTE_DIRTY)) #define DIRTY_HPTE(_hpte) ((*(uint64_t *)(_hpte)) |= tswap64(HPTE64_V_HPTE_DIRTY))
/* /*
@ -2215,7 +2220,7 @@ static void htab_save_first_pass(QEMUFile *f, SpaprMachineState *spapr,
/* Consume invalid HPTEs */ /* Consume invalid HPTEs */
while ((index < htabslots) while ((index < htabslots)
&& !hpte_is_valid(spapr, index)) { && !hpte_is_valid(spapr, index)) {
CLEAN_HPTE(hpte_get_ptr(spapr, index)); hpte_set_clean(spapr, index);
index++; index++;
} }
@ -2223,7 +2228,7 @@ static void htab_save_first_pass(QEMUFile *f, SpaprMachineState *spapr,
chunkstart = index; chunkstart = index;
while ((index < htabslots) && (index - chunkstart < USHRT_MAX) while ((index < htabslots) && (index - chunkstart < USHRT_MAX)
&& hpte_is_valid(spapr, index)) { && hpte_is_valid(spapr, index)) {
CLEAN_HPTE(hpte_get_ptr(spapr, index)); hpte_set_clean(spapr, index);
index++; index++;
} }
@ -2273,7 +2278,7 @@ static int htab_save_later_pass(QEMUFile *f, SpaprMachineState *spapr,
while ((index < htabslots) && (index - chunkstart < USHRT_MAX) while ((index < htabslots) && (index - chunkstart < USHRT_MAX)
&& hpte_is_dirty(spapr, index) && hpte_is_dirty(spapr, index)
&& hpte_is_valid(spapr, index)) { && hpte_is_valid(spapr, index)) {
CLEAN_HPTE(hpte_get_ptr(spapr, index)); hpte_set_clean(spapr, index);
index++; index++;
examined++; examined++;
} }
@ -2283,7 +2288,7 @@ static int htab_save_later_pass(QEMUFile *f, SpaprMachineState *spapr,
while ((index < htabslots) && (index - invalidstart < USHRT_MAX) while ((index < htabslots) && (index - invalidstart < USHRT_MAX)
&& hpte_is_dirty(spapr, index) && hpte_is_dirty(spapr, index)
&& !hpte_is_valid(spapr, index)) { && !hpte_is_valid(spapr, index)) {
CLEAN_HPTE(hpte_get_ptr(spapr, index)); hpte_set_clean(spapr, index);
index++; index++;
examined++; examined++;
} }