On Thu, Sep 14, 2023 at 4:52 PM Andrew Jones <ajones@xxxxxxxxxxxxxxxx> wrote: > > On Thu, Sep 14, 2023 at 09:36:59AM +0800, Haibo Xu wrote: > > Signed-off-by: Haibo Xu <haibo1.xu@xxxxxxxxx> > > --- > > tools/testing/selftests/kvm/include/riscv/processor.h | 8 +------- > > 1 file changed, 1 insertion(+), 7 deletions(-) > > > > diff --git a/tools/testing/selftests/kvm/include/riscv/processor.h b/tools/testing/selftests/kvm/include/riscv/processor.h > > index 5b62a3d2aa9b..67766baed4f7 100644 > > --- a/tools/testing/selftests/kvm/include/riscv/processor.h > > +++ b/tools/testing/selftests/kvm/include/riscv/processor.h > > @@ -8,6 +8,7 @@ > > #define SELFTEST_KVM_PROCESSOR_H > > > > #include "kvm_util.h" > > +#include <asm/csr.h> > > #include <linux/stringify.h> > > nit: Usually we try to keep the order of our includes separated into five > categories, listed below, where each category is sorted alphabetically. Of > course any dependencies the includes have on each other need to be > considered too. > > <library-includes-without-a-subdir> > <library-includes-with-subdir> > <linux/...> > <asm/...> > "local-includes" > It's very helpful. Thanks for sharing it! Will fix it in v4. > > > > static inline uint64_t __kvm_reg_id(uint64_t type, uint64_t idx, > > @@ -95,13 +96,6 @@ static inline uint64_t __kvm_reg_id(uint64_t type, uint64_t idx, > > #define PGTBL_PAGE_SIZE PGTBL_L0_BLOCK_SIZE > > #define PGTBL_PAGE_SIZE_SHIFT PGTBL_L0_BLOCK_SHIFT > > > > -#define SATP_PPN _AC(0x00000FFFFFFFFFFF, UL) > > -#define SATP_MODE_39 _AC(0x8000000000000000, UL) > > -#define SATP_MODE_48 _AC(0x9000000000000000, UL) > > -#define SATP_ASID_BITS 16 > > -#define SATP_ASID_SHIFT 44 > > -#define SATP_ASID_MASK _AC(0xFFFF, UL) > > - > > #define SBI_EXT_EXPERIMENTAL_START 0x08000000 > > #define SBI_EXT_EXPERIMENTAL_END 0x08FFFFFF > > > > -- > > 2.34.1 > > > > Assuming the CONFIG_64BIT patch will come before this, then > > Reviewed-by: Andrew Jones <ajones@xxxxxxxxxxxxxxxx> > > Thanks, > drew
