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

Merge tag 'asm-generic-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic 

Pull asm-generic cleanups from Arnd Bergmann:
 "A series from Baoquan He cleans up the asm-generic/io.h to remove the
  ioremap_uc() definition from everything except x86, which still needs
  it for pre-PAT systems. This series notably contains a patch from
  Jiaxun Yang that converts MIPS to use asm-generic/io.h like every
  other architecture does, enabling future cleanups.

  Some of my own patches fix -Wmissing-prototype warnings in
  architecture specific code across several architectures. This is now
  needed as the warning is enabled by default. There are still some
  remaining warnings in minor platforms, but the series should catch
  most of the widely used ones make them more consistent with one
  another.

  David McKay fixes a bug in __generic_cmpxchg_local() when this is used
  on 64-bit architectures. This could currently only affect parisc64 and
  sparc64.

  Additional cleanups address from Linus Walleij, Uwe Kleine-König,
  Thomas Huth, and Kefeng Wang help reduce unnecessary inconsistencies
  between architectures"

* tag 'asm-generic-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: Fix 32 bit __generic_cmpxchg_local
  Hexagon: Make pfn accessors statics inlines
  ARC: mm: Make virt_to_pfn() a static inline
  mips: remove extraneous asm-generic/iomap.h include
  sparc: Use $(kecho) to announce kernel images being ready
  arm64: vdso32: Define BUILD_VDSO32_64 to correct prototypes
  csky: fix arch_jump_label_transform_static override
  arch: add do_page_fault prototypes
  arch: add missing prepare_ftrace_return() prototypes
  arch: vdso: consolidate gettime prototypes
  arch: include linux/cpu.h for trap_init() prototype
  arch: fix asm-offsets.c building with -Wmissing-prototypes
  arch: consolidate arch_irq_work_raise prototypes
  hexagon: Remove CONFIG_HEXAGON_ARCH_VERSION from uapi header
  asm/io: remove unnecessary xlate_dev_mem_ptr() and unxlate_dev_mem_ptr()
  mips: io: remove duplicated codes
  arch/*/io.h: remove ioremap_uc in some architectures
  mips: add <asm-generic/io.h> including
parents 4cd083d5 d93cca2f

Documentation/driver-api/device-io.rst

+5 −4
Original line number Diff line number Diff line
@@ -408,11 +408,12 @@ functions for details on the CPU side of things. 
ioremap_uc()

------------



ioremap_uc() behaves like ioremap() except that on the x86 architecture without

'PAT' mode, it marks memory as uncached even when the MTRR has designated

it as cacheable, see Documentation/arch/x86/pat.rst.

ioremap_uc() is only meaningful on old x86-32 systems with the PAT extension,

and on ia64 with its slightly unconventional ioremap() behavior, everywhere

elss ioremap_uc() defaults to return NULL.



Portable drivers should avoid the use of ioremap_uc().



Portable drivers should avoid the use of ioremap_uc(), use ioremap() instead.



ioremap_cache()

---------------

arch/alpha/include/asm/io.h

+0 −7
Original line number Diff line number Diff line
@@ -308,7 +308,6 @@ static inline void __iomem *ioremap(unsigned long port, unsigned long size) 
}



#define ioremap_wc ioremap

#define ioremap_uc ioremap



static inline void iounmap(volatile void __iomem *addr)

{
@@ -651,12 +650,6 @@ extern void outsl (unsigned long port, const void *src, unsigned long count); 
#endif

#define RTC_ALWAYS_BCD	0



/*

 * Convert a physical pointer to a virtual kernel pointer for /dev/mem

 * access

 */

#define xlate_dev_mem_ptr(p)	__va(p)



/*

 * These get provided from <asm-generic/iomap.h> since alpha does not

 * select GENERIC_IOMAP.

arch/alpha/include/asm/mmu_context.h

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ ev4_switch_mm(struct mm_struct *prev_mm, struct mm_struct *next_mm, 
}



extern void __load_new_mm_context(struct mm_struct *);

asmlinkage void do_page_fault(unsigned long address, unsigned long mmcsr,

			      long cause, struct pt_regs *regs);



#ifdef CONFIG_SMP

#define check_mmu_context()					\

arch/alpha/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <linux/kbuild.h>

#include <asm/io.h>



void foo(void)

static void __used foo(void)

{

	DEFINE(TI_TASK, offsetof(struct thread_info, task));

	DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));

arch/alpha/kernel/traps.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * This file initializes the trap entry points

 */



#include <linux/cpu.h>

#include <linux/jiffies.h>

#include <linux/mm.h>

#include <linux/sched/signal.h>