Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 3b62de26 authored by Palmer Dabbelt's avatar Palmer Dabbelt
Browse files

RISC-V: Fixes for clean allmodconfig build 

Olaf said: Here's a short series of patches that produces a working
allmodconfig. Would be nice to see them go in so we can add build
coverage.

I've dropped patches 8 and 10 from the original set:

* [PATCH 08/10] (RISC-V: Set __ARCH_WANT_RENAMEAT to pick up generic
  version) has a better fix that I've sent out for review, we don't want
  renameat.
* [PATCH 10/10] (input: joystick: riscv has get_cycles) has already been
  taken into Dmitry Torokhov's tree.
parents 185e788c 741fc3ff

arch/riscv/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ generic-y += resource.h 
generic-y += scatterlist.h

generic-y += sections.h

generic-y += sembuf.h

generic-y += serial.h

generic-y += setup.h

generic-y += shmbuf.h

generic-y += shmparam.h

arch/riscv/include/asm/asm.h

+6 −6
Original line number Diff line number Diff line
@@ -58,17 +58,17 @@ 
#endif



#if (__SIZEOF_INT__ == 4)

#define INT		__ASM_STR(.word)

#define SZINT		__ASM_STR(4)

#define LGINT		__ASM_STR(2)

#define RISCV_INT		__ASM_STR(.word)

#define RISCV_SZINT		__ASM_STR(4)

#define RISCV_LGINT		__ASM_STR(2)

#else

#error "Unexpected __SIZEOF_INT__"

#endif



#if (__SIZEOF_SHORT__ == 2)

#define SHORT		__ASM_STR(.half)

#define SZSHORT		__ASM_STR(2)

#define LGSHORT		__ASM_STR(1)

#define RISCV_SHORT		__ASM_STR(.half)

#define RISCV_SZSHORT		__ASM_STR(2)

#define RISCV_LGSHORT		__ASM_STR(1)

#else

#error "Unexpected __SIZEOF_SHORT__"

#endif

arch/riscv/include/asm/bug.h

+3 −3
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
typedef u32 bug_insn_t;



#ifdef CONFIG_GENERIC_BUG_RELATIVE_POINTERS

#define __BUG_ENTRY_ADDR	INT " 1b - 2b"

#define __BUG_ENTRY_FILE	INT " %0 - 2b"

#define __BUG_ENTRY_ADDR	RISCV_INT " 1b - 2b"

#define __BUG_ENTRY_FILE	RISCV_INT " %0 - 2b"

#else

#define __BUG_ENTRY_ADDR	RISCV_PTR " 1b"

#define __BUG_ENTRY_FILE	RISCV_PTR " %0"
@@ -38,7 +38,7 @@ typedef u32 bug_insn_t; 
#define __BUG_ENTRY			\

	__BUG_ENTRY_ADDR "\n\t"		\

	__BUG_ENTRY_FILE "\n\t"		\

	SHORT " %1"

	RISCV_SHORT " %1"

#else

#define __BUG_ENTRY			\

	__BUG_ENTRY_ADDR

arch/riscv/include/asm/io.h

+9 −7
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#ifndef _ASM_RISCV_IO_H

#define _ASM_RISCV_IO_H



#include <linux/types.h>



#ifdef CONFIG_MMU



extern void __iomem *ioremap(phys_addr_t offset, unsigned long size);
@@ -32,7 +34,7 @@ extern void __iomem *ioremap(phys_addr_t offset, unsigned long size); 
#define ioremap_wc(addr, size) ioremap((addr), (size))

#define ioremap_wt(addr, size) ioremap((addr), (size))



extern void iounmap(void __iomem *addr);

extern void iounmap(volatile void __iomem *addr);



#endif /* CONFIG_MMU */
@@ -266,9 +268,9 @@ __io_reads_ins(reads, u32, l, __io_br(), __io_ar()) 
__io_reads_ins(ins,  u8, b, __io_pbr(), __io_par())

__io_reads_ins(ins, u16, w, __io_pbr(), __io_par())

__io_reads_ins(ins, u32, l, __io_pbr(), __io_par())

#define insb(addr, buffer, count) __insb((void __iomem *)addr, buffer, count)

#define insw(addr, buffer, count) __insw((void __iomem *)addr, buffer, count)

#define insl(addr, buffer, count) __insl((void __iomem *)addr, buffer, count)

#define insb(addr, buffer, count) __insb((void __iomem *)(long)addr, buffer, count)

#define insw(addr, buffer, count) __insw((void __iomem *)(long)addr, buffer, count)

#define insl(addr, buffer, count) __insl((void __iomem *)(long)addr, buffer, count)



__io_writes_outs(writes,  u8, b, __io_bw(), __io_aw())

__io_writes_outs(writes, u16, w, __io_bw(), __io_aw())
@@ -280,9 +282,9 @@ __io_writes_outs(writes, u32, l, __io_bw(), __io_aw()) 
__io_writes_outs(outs,  u8, b, __io_pbw(), __io_paw())

__io_writes_outs(outs, u16, w, __io_pbw(), __io_paw())

__io_writes_outs(outs, u32, l, __io_pbw(), __io_paw())

#define outsb(addr, buffer, count) __outsb((void __iomem *)addr, buffer, count)

#define outsw(addr, buffer, count) __outsw((void __iomem *)addr, buffer, count)

#define outsl(addr, buffer, count) __outsl((void __iomem *)addr, buffer, count)

#define outsb(addr, buffer, count) __outsb((void __iomem *)(long)addr, buffer, count)

#define outsw(addr, buffer, count) __outsw((void __iomem *)(long)addr, buffer, count)

#define outsl(addr, buffer, count) __outsl((void __iomem *)(long)addr, buffer, count)



#ifdef CONFIG_64BIT

__io_reads_ins(reads, u64, q, __io_br(), __io_ar())

arch/riscv/include/asm/mmu_context.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#ifndef _ASM_RISCV_MMU_CONTEXT_H

#define _ASM_RISCV_MMU_CONTEXT_H



#include <linux/mm_types.h>

#include <asm-generic/mm_hooks.h>



#include <linux/mm.h>