motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 18:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/ppc/spapr: Convert HPTE_VALID() macro as hpte_is_valid() method

Browse source 
Convert HPTE_VALID() macro as hpte_is_valid() 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.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Message-ID: <20241220213103.6314-3-philmd@linaro.org>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-12-20 22:30:59 +01:00 • committed by Nicholas Piggin
parent c894bdf78b
commit c5411a0653
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hw/ppc/spapr.c
View file

@ -1409,7 +1409,11 @@ static uint64_t *hpte_get_ptr(SpaprMachineState *s, unsigned index)
return &table[2 * index]; return &table[2 * index];
} }
#define HPTE_VALID(_hpte) (tswap64(*((uint64_t *)(_hpte))) & HPTE64_V_VALID) static bool hpte_is_valid(SpaprMachineState *s, unsigned index)
{
return ldq_be_p(hpte_get_ptr(s, index)) & HPTE64_V_VALID;
}
#define HPTE_DIRTY(_hpte) (tswap64(*((uint64_t *)(_hpte))) & HPTE64_V_HPTE_DIRTY) #define HPTE_DIRTY(_hpte) (tswap64(*((uint64_t *)(_hpte))) & HPTE64_V_HPTE_DIRTY)
#define CLEAN_HPTE(_hpte) ((*(uint64_t *)(_hpte)) &= tswap64(~HPTE64_V_HPTE_DIRTY)) #define CLEAN_HPTE(_hpte) ((*(uint64_t *)(_hpte)) &= tswap64(~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))
@ -2206,7 +2210,7 @@ static void htab_save_first_pass(QEMUFile *f, SpaprMachineState *spapr,
/* Consume invalid HPTEs */ /* Consume invalid HPTEs */
while ((index < htabslots) while ((index < htabslots)
&& !HPTE_VALID(hpte_get_ptr(spapr, index))) { && !hpte_is_valid(spapr, index)) {
CLEAN_HPTE(hpte_get_ptr(spapr, index)); CLEAN_HPTE(hpte_get_ptr(spapr, index));
index++; index++;
} }
@ -2214,7 +2218,7 @@ static void htab_save_first_pass(QEMUFile *f, SpaprMachineState *spapr,
/* Consume valid HPTEs */ /* Consume valid HPTEs */
chunkstart = index; chunkstart = index;
while ((index < htabslots) && (index - chunkstart < USHRT_MAX) while ((index < htabslots) && (index - chunkstart < USHRT_MAX)
&& HPTE_VALID(hpte_get_ptr(spapr, index))) { && hpte_is_valid(spapr, index)) {
CLEAN_HPTE(hpte_get_ptr(spapr, index)); CLEAN_HPTE(hpte_get_ptr(spapr, index));
index++; index++;
} }
@ -2264,7 +2268,7 @@ static int htab_save_later_pass(QEMUFile *f, SpaprMachineState *spapr,
/* Consume valid dirty HPTEs */ /* Consume valid dirty HPTEs */
while ((index < htabslots) && (index - chunkstart < USHRT_MAX) while ((index < htabslots) && (index - chunkstart < USHRT_MAX)
&& HPTE_DIRTY(hpte_get_ptr(spapr, index)) && HPTE_DIRTY(hpte_get_ptr(spapr, index))
&& HPTE_VALID(hpte_get_ptr(spapr, index))) { && hpte_is_valid(spapr, index)) {
CLEAN_HPTE(hpte_get_ptr(spapr, index)); CLEAN_HPTE(hpte_get_ptr(spapr, index));
index++; index++;
examined++; examined++;
@ -2274,7 +2278,7 @@ static int htab_save_later_pass(QEMUFile *f, SpaprMachineState *spapr,
/* Consume invalid dirty HPTEs */ /* Consume invalid dirty HPTEs */
while ((index < htabslots) && (index - invalidstart < USHRT_MAX) while ((index < htabslots) && (index - invalidstart < USHRT_MAX)
&& HPTE_DIRTY(hpte_get_ptr(spapr, index)) && HPTE_DIRTY(hpte_get_ptr(spapr, index))
&& !HPTE_VALID(hpte_get_ptr(spapr, index))) { && !hpte_is_valid(spapr, index)) {
CLEAN_HPTE(hpte_get_ptr(spapr, index)); CLEAN_HPTE(hpte_get_ptr(spapr, index));
index++; index++;
examined++; examined++;