Virtualization
/
opensbi
mirror of https://gitlab.com/qemu-project/opensbi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib: sbi: Remove redundant sbi_hart_pmp_xyz() functions 

The sbi_hart_pmp_get() and sbi_hart_pmp_check_addr() functions
are not used anymore hence this patch removes these functions.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
This commit is contained in:
Anup Patel 2020-09-22 11:12:51 +05:30 committed by Anup Patel
parent 5fd99dbdaa
commit e856462ac2
2 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sbi/sbi_hart.h
View File

@ -38,13 +38,7 @@ static inline ulong sbi_hart_expected_trap_addr(void)
unsigned int sbi_hart_mhpm_count(struct sbi_scratch *scratch); unsigned int sbi_hart_mhpm_count(struct sbi_scratch *scratch);
void sbi_hart_delegation_dump(struct sbi_scratch *scratch); void sbi_hart_delegation_dump(struct sbi_scratch *scratch);
unsigned int sbi_hart_pmp_count(struct sbi_scratch *scratch); unsigned int sbi_hart_pmp_count(struct sbi_scratch *scratch);
int sbi_hart_pmp_get(struct sbi_scratch *scratch, unsigned int n,
unsigned long *prot_out, unsigned long *addr_out,
unsigned long *size);
void sbi_hart_pmp_dump(struct sbi_scratch *scratch); void sbi_hart_pmp_dump(struct sbi_scratch *scratch);
int sbi_hart_pmp_check_addr(struct sbi_scratch *scratch,
unsigned long daddr, unsigned long mode,
unsigned long attr);
int sbi_hart_pmp_configure(struct sbi_scratch *scratch); int sbi_hart_pmp_configure(struct sbi_scratch *scratch);
bool sbi_hart_has_feature(struct sbi_scratch *scratch, unsigned long feature); bool sbi_hart_has_feature(struct sbi_scratch *scratch, unsigned long feature);
void sbi_hart_get_features_str(struct sbi_scratch *scratch, void sbi_hart_get_features_str(struct sbi_scratch *scratch,

42
lib/sbi/sbi_hart.c
View File

@ -153,24 +153,6 @@ unsigned int sbi_hart_pmp_count(struct sbi_scratch *scratch)
return hfeatures->pmp_count; return hfeatures->pmp_count;
} }
int sbi_hart_pmp_get(struct sbi_scratch *scratch, unsigned int n,
unsigned long *prot_out, unsigned long *addr_out,
unsigned long *size)
{
int err;
unsigned long log2size;
if (sbi_hart_pmp_count(scratch) <= n)
return SBI_EINVAL;
err = pmp_get(n, prot_out, addr_out, &log2size);
if (err)
return err;
*size = (log2size < __riscv_xlen) ? 1UL << log2size : 0;
return 0;
}
void sbi_hart_pmp_dump(struct sbi_scratch *scratch) void sbi_hart_pmp_dump(struct sbi_scratch *scratch)
{ {
unsigned long prot, addr, size, log2size; unsigned long prot, addr, size, log2size;
@ -200,30 +182,6 @@ void sbi_hart_pmp_dump(struct sbi_scratch *scratch)
} }
} }
int sbi_hart_pmp_check_addr(struct sbi_scratch *scratch,
unsigned long addr, unsigned long mode,
unsigned long attr)
{
unsigned long prot, size, log2size, tempaddr;
unsigned int i, pmp_count;
pmp_count = sbi_hart_pmp_count(scratch);
for (i = 0; i < pmp_count; i++) {
pmp_get(i, &prot, &tempaddr, &log2size);
if (!(prot & PMP_A))
continue;
if (mode == PRV_M && !(prot & PMP_L))
continue;
size = 1UL << log2size;
if ((log2size >= __riscv_xlen) ||
((tempaddr <= addr && addr <= tempaddr + size)))
if (!(prot & attr))
return SBI_EINVALID_ADDR;
}
return SBI_OK;
}
int sbi_hart_pmp_configure(struct sbi_scratch *scratch) int sbi_hart_pmp_configure(struct sbi_scratch *scratch)
{ {
u32 pmp_idx = 0; u32 pmp_idx = 0;