Commit 4cad6719 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-unaligned-5.14' of... 

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

Pull asm/unaligned.h unification from Arnd Bergmann:
 "Unify asm/unaligned.h around struct helper

  The get_unaligned()/put_unaligned() helpers are traditionally
  architecture specific, with the two main variants being the
  "access-ok.h" version that assumes unaligned pointer accesses always
  work on a particular architecture, and the "le-struct.h" version that
  casts the data to a byte aligned type before dereferencing, for
  architectures that cannot always do unaligned accesses in hardware.

  Based on the discussion linked below, it appears that the access-ok
  version is not realiable on any architecture, but the struct version
  probably has no downsides. This series changes the code to use the
  same implementation on all architectures, addressing the few
  exceptions separately"

Link: https://lore.kernel.org/lkml/75d07691-1e4f-741f-9852-38c0b4f520bc@synopsys.com/
Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100363
Link: https://lore.kernel.org/lkml/20210507220813.365382-14-arnd@kernel.org/
Link: git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git unaligned-rework-v2
Link: https://lore.kernel.org/lkml/CAHk-=whGObOKruA_bU3aPGZfoDqZM1_9wBkwREp0H0FgR-90uQ@mail.gmail.com/

* tag 'asm-generic-unaligned-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: simplify asm/unaligned.h
  asm-generic: uaccess: 1-byte access is always aligned
  netpoll: avoid put_unaligned() on single character
  mwifiex: re-fix for unaligned accesses
  apparmor: use get_unaligned() only for multi-byte words
  partitions: msdos: fix one-byte get_unaligned()
  asm-generic: unaligned always use struct helpers
  asm-generic: unaligned: remove byteshift helpers
  powerpc: use linux/unaligned/le_struct.h on LE power7
  m68k: select CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
  sh: remove unaligned access for sh4a
  openrisc: always use unaligned-struct header
  asm-generic: use asm-generic/unaligned.h for most architectures
parents 40625491 803f4e1e

arch/alpha/include/asm/unaligned.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_ALPHA_UNALIGNED_H

#define _ASM_ALPHA_UNALIGNED_H



#include <linux/unaligned/le_struct.h>

#include <linux/unaligned/be_byteshift.h>

#include <linux/unaligned/generic.h>



#define get_unaligned __get_unaligned_le

#define put_unaligned __put_unaligned_le



#endif /* _ASM_ALPHA_UNALIGNED_H */

arch/arm/include/asm/unaligned.h

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
#ifndef __ASM_ARM_UNALIGNED_H

#define __ASM_ARM_UNALIGNED_H



/*

 * We generally want to set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS on ARMv6+,

 * but we don't want to use linux/unaligned/access_ok.h since that can lead

 * to traps on unaligned stm/ldm or strd/ldrd.

 */

#include <asm/byteorder.h>



#if defined(__LITTLE_ENDIAN)

# include <linux/unaligned/le_struct.h>

# include <linux/unaligned/be_byteshift.h>

# include <linux/unaligned/generic.h>

# define get_unaligned	__get_unaligned_le

# define put_unaligned	__put_unaligned_le

#elif defined(__BIG_ENDIAN)

# include <linux/unaligned/be_struct.h>

# include <linux/unaligned/le_byteshift.h>

# include <linux/unaligned/generic.h>

# define get_unaligned	__get_unaligned_be

# define put_unaligned	__put_unaligned_be

#else

# error need to define endianess

#endif



#endif /* __ASM_ARM_UNALIGNED_H */

arch/ia64/include/asm/unaligned.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_IA64_UNALIGNED_H

#define _ASM_IA64_UNALIGNED_H



#include <linux/unaligned/le_struct.h>

#include <linux/unaligned/be_byteshift.h>

#include <linux/unaligned/generic.h>



#define get_unaligned	__get_unaligned_le

#define put_unaligned	__put_unaligned_le



#endif /* _ASM_IA64_UNALIGNED_H */

arch/m68k/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config M68K 
	select HAVE_AOUT if MMU

	select HAVE_ASM_MODVERSIONS

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_EFFICIENT_UNALIGNED_ACCESS if !CPU_HAS_NO_UNALIGNED

	select HAVE_FUTEX_CMPXCHG if MMU && FUTEX

	select HAVE_IDE

	select HAVE_MOD_ARCH_SPECIFIC

arch/m68k/include/asm/unaligned.h

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_M68K_UNALIGNED_H

#define _ASM_M68K_UNALIGNED_H





#ifdef CONFIG_CPU_HAS_NO_UNALIGNED

#include <linux/unaligned/be_struct.h>

#include <linux/unaligned/le_byteshift.h>

#include <linux/unaligned/generic.h>



#define get_unaligned	__get_unaligned_be

#define put_unaligned	__put_unaligned_be



#else

/*

 * The m68k can do unaligned accesses itself.

 */

#include <linux/unaligned/access_ok.h>

#include <linux/unaligned/generic.h>



#define get_unaligned	__get_unaligned_be

#define put_unaligned	__put_unaligned_be



#endif



#endif /* _ASM_M68K_UNALIGNED_H */