| Message ID | 20181019220743.15020-14-lukas.auer@aisec.fraunhofer.de |
|---|---|
| State | Superseded |
| Delegated to: | Andes |
| Headers | show |
| Series | General fixes / cleanup for RISC-V and improvements to qemu-riscv | expand |
Hi Lukas, On Sat, Oct 20, 2018 at 6:10 AM Lukas Auer <lukas.auer@aisec.fraunhofer.de> wrote: > > RISC-V u-boot reimplements the generic io functions from nits: U-Boot > asm-generic/io.h. Remove the redundant implementation and include the > generic io.h instead. > > Signed-off-by: Lukas Auer <lukas.auer@aisec.fraunhofer.de> > --- > > arch/riscv/include/asm/io.h | 31 +++---------------------------- > 1 file changed, 3 insertions(+), 28 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Regards, Bin
> > Hi Lukas, > > > > On Sat, Oct 20, 2018 at 6:10 AM Lukas Auer <lukas.auer@aisec.fraunhofer.de> > > wrote: > > > > > > RISC-V u-boot reimplements the generic io functions from > > > > nits: U-Boot > > > > > asm-generic/io.h. Remove the redundant implementation and include the > > > generic io.h instead. > > > > > > Signed-off-by: Lukas Auer <lukas.auer@aisec.fraunhofer.de> > > > --- > > > > > > arch/riscv/include/asm/io.h | 31 +++---------------------------- > > > 1 file changed, 3 insertions(+), 28 deletions(-) > > > > > > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Rick Chen <rick@andestech.com> > > > > Regards, > > Bin
Hi Bin, On Mon, 2018-10-22 at 15:36 +0800, Bin Meng wrote: > Hi Lukas, > > On Sat, Oct 20, 2018 at 6:10 AM Lukas Auer > <lukas.auer@aisec.fraunhofer.de> wrote: > > > > RISC-V u-boot reimplements the generic io functions from > > nits: U-Boot > Fixed in v2. Thanks, Lukas > > asm-generic/io.h. Remove the redundant implementation and include > > the > > generic io.h instead. > > > > Signed-off-by: Lukas Auer <lukas.auer@aisec.fraunhofer.de> > > --- > > > > arch/riscv/include/asm/io.h | 31 +++---------------------------- > > 1 file changed, 3 insertions(+), 28 deletions(-) > > > > Reviewed-by: Bin Meng <bmeng.cn@gmail.com> > > Regards, > Bin
diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h index d01ed5bc9f..acf5a96449 100644 --- a/arch/riscv/include/asm/io.h +++ b/arch/riscv/include/asm/io.h @@ -17,16 +17,6 @@ static inline void sync(void) { } -/* - * Given a physical address and a length, return a virtual address - * that can be used to access the memory range with the caching - * properties specified by "flags". - */ -#define MAP_NOCACHE (0) -#define MAP_WRCOMBINE (0) -#define MAP_WRBACK (0) -#define MAP_WRTHROUGH (0) - #ifdef CONFIG_ARCH_MAP_SYSMEM static inline void *map_sysmem(phys_addr_t paddr, unsigned long len) { @@ -49,24 +39,6 @@ static inline phys_addr_t map_to_sysmem(const void *ptr) } #endif -static inline void * -map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) -{ - return (void *)paddr; -} - -/* - * Take down a mapping set up by map_physmem(). - */ -static inline void unmap_physmem(void *vaddr, unsigned long flags) -{ -} - -static inline phys_addr_t virt_to_phys(void *vaddr) -{ - return (phys_addr_t)(vaddr); -} - /* * Generic virtual read/write. Note that we don't support half-word * read/writes. We define __arch_*[bl] here, and leave __arch_*w @@ -484,4 +456,7 @@ out: #endif /* __mem_isa */ #endif /* __KERNEL__ */ + +#include <asm-generic/io.h> + #endif /* __ASM_RISCV_IO_H */
RISC-V u-boot reimplements the generic io functions from asm-generic/io.h. Remove the redundant implementation and include the generic io.h instead. Signed-off-by: Lukas Auer <lukas.auer@aisec.fraunhofer.de> --- arch/riscv/include/asm/io.h | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-)