Commit e5897c7d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'riscv/for-v5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux 

Pull RISC-V fixes from Paul Walmsley:
 "One fix for PCIe users:

   - Fix legacy PCI I/O port access emulation

  One set of cleanups:

   - Resolve most of the warnings generated by sparse across arch/riscv.
     No functional changes

  And one MAINTAINERS update:

   - Update Palmer's E-mail address"

* tag 'riscv/for-v5.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
  MAINTAINERS: Change to my personal email address
  RISC-V: Add PCIe I/O BAR memory mapping
  riscv: for C functions called only from assembly, mark with __visible
  riscv: fp: add missing __user pointer annotations
  riscv: add missing header file includes
  riscv: mark some code and data as file-static
  riscv: init: merge split string literals in preprocessor directive
  riscv: add prototypes for assembly language functions from head.S
parents 31408fbe 1d9b0b66

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -13906,7 +13906,7 @@ F: drivers/mtd/nand/raw/r852.h 














RISC-V ARCHITECTURE















M:	Paul Walmsley <paul.walmsley@sifive.com>













M:	Palmer Dabbelt <palmer@sifive.com>













M:	Palmer Dabbelt <palmer@dabbelt.com>















M:	Albert Ou <aou@eecs.berkeley.edu>















L:	linux-riscv@lists.infradead.org















T:	git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git










@@ -14783,7 +14783,7 @@ F:	drivers/media/usb/siano/













F:	drivers/media/mmc/siano/





























SIFIVE DRIVERS













M:	Palmer Dabbelt <palmer@sifive.com>













M:	Palmer Dabbelt <palmer@dabbelt.com>















M:	Paul Walmsley <paul.walmsley@sifive.com>















L:	linux-riscv@lists.infradead.org















T:	git git://github.com/sifive/riscv-linux.git









@@ -14793,7 +14793,7 @@ N:	sifive



























SIFIVE FU540 SYSTEM-ON-CHIP















M:	Paul Walmsley <paul.walmsley@sifive.com>













M:	Palmer Dabbelt <palmer@sifive.com>













M:	Palmer Dabbelt <palmer@dabbelt.com>















L:	linux-riscv@lists.infradead.org















T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git















S:	Supported

































arch/riscv/include/asm/io.h



+7
−0






























Original line number
Diff line number
Diff line








@@ -13,6 +13,7 @@





























#include <linux/types.h>















#include <asm/mmiowb.h>













#include <asm/pgtable.h>































extern void __iomem *ioremap(phys_addr_t offset, unsigned long size);


























@@ -161,6 +162,12 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)













#define writeq(v,c)	({ __io_bw(); writeq_cpu((v),(c)); __io_aw(); })















#endif





























/*













 *  I/O port access constants.













 */













#define IO_SPACE_LIMIT		(PCI_IO_SIZE - 1)













#define PCI_IOBASE		((void __iomem *)PCI_IO_START)





























/*















 * Emulation routines for the port-mapped IO space used by some PCI drivers.















 * These are defined as being "fully synchronous", but also "not guaranteed to

































arch/riscv/include/asm/irq.h



+3
−0






























Original line number
Diff line number
Diff line








@@ -7,6 +7,9 @@













#ifndef _ASM_RISCV_IRQ_H















#define _ASM_RISCV_IRQ_H





























#include <linux/interrupt.h>













#include <linux/linkage.h>





























#define NR_IRQS         0































void riscv_timer_interrupt(void);

































arch/riscv/include/asm/pgtable.h



+6
−1






























Original line number
Diff line number
Diff line








@@ -7,6 +7,7 @@













#define _ASM_RISCV_PGTABLE_H































#include <linux/mmzone.h>













#include <linux/sizes.h>































#include <asm/pgtable-bits.h>


























@@ -86,6 +87,7 @@ extern pgd_t swapper_pg_dir[];













#define VMALLOC_SIZE     (KERN_VIRT_SIZE >> 1)















#define VMALLOC_END      (PAGE_OFFSET - 1)















#define VMALLOC_START    (PAGE_OFFSET - VMALLOC_SIZE)













#define PCI_IO_SIZE      SZ_16M































/*















 * Roughly size the vmemmap space to be large enough to fit enough









@@ -100,7 +102,10 @@ extern pgd_t swapper_pg_dir[];





























#define vmemmap		((struct page *)VMEMMAP_START)





























#define FIXADDR_TOP      (VMEMMAP_START)













#define PCI_IO_END       VMEMMAP_START













#define PCI_IO_START     (PCI_IO_END - PCI_IO_SIZE)













#define FIXADDR_TOP      PCI_IO_START





























#ifdef CONFIG_64BIT















#define FIXADDR_SIZE     PMD_SIZE















#else

































arch/riscv/include/asm/switch_to.h



+1
−0






























Original line number
Diff line number
Diff line








@@ -6,6 +6,7 @@













#ifndef _ASM_RISCV_SWITCH_TO_H















#define _ASM_RISCV_SWITCH_TO_H





























#include <linux/sched/task_stack.h>















#include <asm/processor.h>















#include <asm/ptrace.h>















#include <asm/csr.h>









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE