akku1139 · akku1139 · Feb 2, 2020 · Oct 29, 2024 · Jan 31, 2017 · Mar 13, 2017
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
@@ -58,7 +58,8 @@ prototypes:
 	int (*permission) (struct inode *, int, unsigned int);
 	int (*get_acl)(struct inode *, int);
 	int (*setattr) (struct dentry *, struct iattr *);
-	int (*getattr) (struct vfsmount *, struct dentry *, struct kstat *);
+	int (*getattr) (const struct path *, struct dentry *, struct kstat *,
+			u32, unsigned int);
 	ssize_t (*listxattr) (struct dentry *, char *, size_t);
 	int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len);
 	void (*update_time)(struct inode *, struct timespec *, int);

diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
@@ -382,7 +382,8 @@ struct inode_operations {
 	int (*permission) (struct inode *, int);
 	int (*get_acl)(struct inode *, int);
 	int (*setattr) (struct dentry *, struct iattr *);
-	int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
+	int (*getattr) (const struct path *, struct dentry *, struct kstat *,
+			u32, unsigned int);
 	ssize_t (*listxattr) (struct dentry *, char *, size_t);
 	void (*update_time)(struct inode *, struct timespec *, int);
 	int (*atomic_open)(struct inode *, struct dentry *, struct file *,

diff --git a/Documentation/kbuild/00-INDEX b/Documentation/kbuild/00-INDEX
@@ -1,5 +1,7 @@
 00-INDEX
 	- this file: info on the kernel build process
+llvm.txt
+	- how to compile Linux with llvm
 headers_install.txt
 	- how to export Linux headers for use by userspace
 kbuild.txt

diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt
@@ -238,3 +238,8 @@ KBUILD_VMLINUX_MAIN
 All object files for the main part of vmlinux.
 KBUILD_VMLINUX_INIT and KBUILD_VMLINUX_MAIN together specify
 all the object files used to link vmlinux.
+
+LLVM
+----
+If this variable is set to 1, Kbuild will use Clang and LLVM utilities instead
+of GCC and GNU binutils to build the kernel.
diff --git a/Documentation/kbuild/llvm.txt b/Documentation/kbuild/llvm.txt
@@ -0,0 +1,86 @@
+Building Linux with Clang/LLVM
+==============================
+
+This document covers how to build the Linux kernel with Clang and LLVM
+utilities.
+
+About
+-----
+
+The Linux kernel has always traditionally been compiled with GNU
+toolchains such as GCC and binutils. Ongoing work has allowed for
+[Clang](https://clang.llvm.org/) and [LLVM](https://llvm.org/) utilities
+to be used as viable substitutes. Distributions such as
+[Android](https://www.android.com/),
+[ChromeOS](https://www.chromium.org/chromium-os), and
+[OpenMandriva](https://www.openmandriva.org/) use Clang built kernels.
+[LLVM is a collection of toolchain components implemented in terms of
+C++ objects](https://www.aosabook.org/en/llvm.html). Clang is a
+front-end to LLVM that supports C and the GNU C extensions required by
+the kernel, and is pronounced "klang," not "see-lang."
+
+Clang
+-----
+
+The compiler used can be swapped out via [CC=]{.title-ref} command line
+argument to [make]{.title-ref}. [CC=]{.title-ref} should be set when
+selecting a config and during a build.
+
+> make CC=clang defconfig
+>
+> make CC=clang
+
+Cross Compiling
+---------------
+
+A single Clang compiler binary will typically contain all supported
+backends, which can help simplify cross compiling.
+
+> ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make CC=clang
+
+[CROSS\_COMPILE]{.title-ref} is not used to prefix the Clang compiler
+binary, instead [CROSS\_COMPILE]{.title-ref} is used to set a command
+line flag: [--target <triple>]{.title-ref}. For example:
+
+> clang --target aarch64-linux-gnu foo.c
+
+LLVM Utilities
+--------------
+
+LLVM has substitutes for GNU binutils utilities. These can be invoked as
+additional parameters to [make]{.title-ref}.
+
+>    make CC=clang LD=ld.lld AR=llvm-ar NM=llvm-nm STRIP=llvm-strip \\
+>     OBJCOPY=llvm-objcopy OBJDUMP=llvm-objdump OBJSIZE=llvm-size \\
+>     READELF=llvm-readelf HOSTCC=clang HOSTCXX=clang++ HOSTAR=llvm-ar \\
+>     HOSTLD=ld.lld
+
+Currently, the integrated assembler is disabled by default. You can pass
+`LLVM_IAS=1` to enable it.
+
+Getting Help
+------------
+
+-   [Website](https://clangbuiltlinux.github.io/)
+-   [Mailing
+    List](https://groups.google.com/forum/#!forum/clang-built-linux):
+    <clang-built-linux@googlegroups.com>
+-   [Issue Tracker](https://github.com/ClangBuiltLinux/linux/issues)
+-   IRC: \#clangbuiltlinux on chat.freenode.net
+-   [Telegram](https://t.me/ClangBuiltLinux): \@ClangBuiltLinux
+-   [Wiki](https://github.com/ClangBuiltLinux/linux/wiki)
+-   [Beginner
+    Bugs](https://github.com/ClangBuiltLinux/linux/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22)
+
+Getting LLVM
+------------
+
+-   <http://releases.llvm.org/download.html>
+-   <https://github.com/llvm/llvm-project>
+-   <https://llvm.org/docs/GettingStarted.html>
+-   <https://llvm.org/docs/CMake.html>
+-   <https://apt.llvm.org/>
+-   <https://www.archlinux.org/packages/extra/x86_64/llvm/>
+-   <https://github.com/ClangBuiltLinux/tc-build>
+-   <https://github.com/ClangBuiltLinux/linux/wiki/Building-Clang-from-source>
+-   <https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/>
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -13102,6 +13102,14 @@ F:	include/net/wimax.h
 F:	include/uapi/linux/wimax.h
 F:	net/wimax/
 
+WIREGUARD SECURE NETWORK TUNNEL
+M:	Jason A. Donenfeld <Jason@zx2c4.com>
+S:	Maintained
+F:	drivers/net/wireguard/
+F:	tools/testing/selftests/wireguard/
+L:	wireguard@lists.zx2c4.com
+L:	netdev@vger.kernel.org
+
 WISTRON LAPTOP BUTTON DRIVER
 M:	Miloslav Trmac <mitr@volny.cz>
 S:	Maintained

diff --git a/Makefile b/Makefile
@@ -301,8 +301,14 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
 	  else if [ -x /bin/bash ]; then echo /bin/bash; \
 	  else echo sh; fi ; fi)
 
+ifneq ($(LLVM),)
+HOSTCC       = clang
+HOSTCXX      = clang++
+else
 HOSTCC       = gcc
 HOSTCXX      = g++
+endif
+
 HOSTCFLAGS   := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
 HOSTCXXFLAGS = -O2
 
@@ -337,16 +343,28 @@ scripts/Kbuild.include: ;
 include scripts/Kbuild.include
 
 # Make variables (CC, etc...)
+LDGOLD		= $(CROSS_COMPILE)ld.gold
+CPP		= $(CC) -E
+ifneq ($(LLVM),)
+CC		= clang
+LD		= ld.lld
+AR		= llvm-ar
+NM		= llvm-nm
+OBJCOPY	= llvm-objcopy
+OBJDUMP	= llvm-objdump
+READELF	= llvm-readelf
+OBJSIZE	= llvm-size
+STRIP		= llvm-strip
+else
 AS		= $(CROSS_COMPILE)as
 LD		= $(CROSS_COMPILE)ld
-LDGOLD		= $(CROSS_COMPILE)ld.gold
 CC		= $(CROSS_COMPILE)gcc
-CPP		= $(CC) -E
 AR		= $(CROSS_COMPILE)ar
 NM		= $(CROSS_COMPILE)nm
 STRIP		= $(CROSS_COMPILE)strip
 OBJCOPY		= $(CROSS_COMPILE)objcopy
 OBJDUMP		= $(CROSS_COMPILE)objdump
+endif
 AWK		= awk
 GENKSYMS	= scripts/genksyms/genksyms
 INSTALLKERNEL  := installkernel
@@ -380,7 +398,8 @@ LINUXINCLUDE    := \
 		-I$(objtree)/arch/$(hdr-arch)/include/generated/uapi \
 		-I$(objtree)/arch/$(hdr-arch)/include/generated \
 		$(if $(KBUILD_SRC), -I$(srctree)/include) \
-		-I$(objtree)/include
+		-I$(objtree)/include \
+                -I$(srctree)/drivers/misc/mediatek/include
 
 LINUXINCLUDE	+= $(filter-out $(LINUXINCLUDE),$(USERINCLUDE))
 
@@ -397,6 +416,7 @@ KBUILD_AFLAGS_MODULE  := -DMODULE
 KBUILD_CFLAGS_MODULE  := -DMODULE
 KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
 GCC_PLUGINS_CFLAGS :=
+LDFLAGS :=
 CLANG_FLAGS :=
 
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)
@@ -516,7 +536,9 @@ endif
 ifneq ($(GCC_TOOLCHAIN),)
 CLANG_FLAGS	+= --gcc-toolchain=$(GCC_TOOLCHAIN)
 endif
+ifneq ($(LLVM_IAS),1)
 CLANG_FLAGS	+= -no-integrated-as
+endif
 CLANG_FLAGS	+= -Werror=unknown-warning-option
 KBUILD_CFLAGS	+= $(CLANG_FLAGS)
 KBUILD_AFLAGS	+= $(CLANG_FLAGS)
@@ -813,8 +835,11 @@ KBUILD_CFLAGS   += $(call cc-option, -gsplit-dwarf, -g)
 else
 KBUILD_CFLAGS	+= -g
 endif
+ifneq ($(LLVM_IAS),1)
 KBUILD_AFLAGS	+= -Wa,-gdwarf-2
 endif
+endif
+
 ifdef CONFIG_DEBUG_INFO_DWARF4
 KBUILD_CFLAGS	+= $(call cc-option, -gdwarf-4,)
 endif

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -1176,6 +1176,19 @@ config ARM_ERRATA_773022
 	  loop buffer may deliver incorrect instructions. This
 	  workaround disables the loop buffer to avoid the erratum.
 
+config ARM_ERRATA_814220
+	bool "ARM errata: L2 cache maintenance operation can overtake a L1 cache maintenance operation"
+	depends on CPU_V7
+	help
+	  This option enables the workaround for erratum 814220
+	  Code that intends to clean dirty data from L1 to L2 and then
+	  from L2 to L3 using set/way operations might not behave as
+	  expected. The L2 to L3 operation might happen first and
+	  result in dirty data remaining in L2 after the L1 to L2
+	  operation has completed.
+
+	  This workaround put a DSB before changing cache levels
+
 config ARM_ERRATA_818325_852422
 	bool "ARM errata: A12: some seqs of opposed cond code instrs => deadlock or corruption"
 	depends on CPU_V7
@@ -1230,6 +1243,24 @@ config ARM_ERRATA_852423
 	  config option from the A12 erratum due to the way errata are checked
 	  for and handled.
 
+config ARM_ERRATA_855873
+	bool "ARM errata: An eviction might overtake a cache clean operation"
+	help
+	  This option enables the workaround for the 855873 Cortex-A53
+	  (up to r0p4) erratum. Because of this erratum, the processor
+	  might issue an eviction and an L2 cache clean operation to
+	  the interconnect in the wrong order.
+
+config ARM_ERRATA_824069
+	bool "ARM errata: Cache line might not be marked as clean after a CleanShared snoop"
+	help
+	  This option enables the workaround for the 824069 Cortex-A53
+	  (up to r0p2) erratum. If a Cortex-A53 processor is executing
+	  a store or PLDW instruction at the same time as a processor
+	  in another cluster is executing a cache maintenance operation
+	  to the same address, then this erratum might cause
+	  a clean cache line to be incorrectly marked as dirty.
+
 endmenu
 
 source "arch/arm/common/Kconfig"

diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h
@@ -17,6 +17,11 @@
 #include <linux/types.h>
 
 #define COMMAND_LINE_SIZE 1024
+#define MBLOCK_RESERVED_NAME_SIZE 128
+#define MBLOCK_RESERVED_NUM_MAX  128
+#define MBLOCK_NUM_MAX 128
+#define MBLOCK_MAGIC 0x99999999
+#define MBLOCK_VERSION 0x2
 
 /* The list ends with an ATAG_NONE node. */
 #define ATAG_NONE	0x00000000
@@ -173,6 +178,41 @@ struct tagtable {
 	int (*parse)(const struct tag *);
 };
 
+/* general memory descriptor */
+struct mem_desc {
+	u64 start;
+	u64 size;
+};
+
+/* mblock is used by CPU */
+struct mblock {
+	u64 start;
+	u64 size;
+	u32 rank;	/* rank the mblock belongs to */
+};
+
+struct mblock_reserved {
+	u64 start;
+	u64 size;
+	u32 mapping;   /* mapping or unmap*/
+	char name[MBLOCK_RESERVED_NAME_SIZE];
+};
+
+struct mblock_info {
+	u32 mblock_num;
+	struct mblock mblock[MBLOCK_NUM_MAX];
+	u32 mblock_magic;
+	u32 mblock_version;
+	u32 reserved_num;
+	struct mblock_reserved reserved[MBLOCK_RESERVED_NUM_MAX];
+};
+
+struct dram_info {
+	u32 rank_num;
+	struct mem_desc rank_info[4];
+};
+
+
 #define tag_member_present(tag,member)				\
 	((unsigned long)(&((struct tag *)0L)->member + 1)	\
 		<= (tag)->hdr.size * 4)

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
@@ -1079,7 +1079,11 @@ void __init setup_arch(char **cmdline_p)
 	if (!mdesc)
 		mdesc = setup_machine_tags(__atags_pointer, __machine_arch_type);
 	machine_desc = mdesc;
+#ifdef CONFIG_OF
+	machine_name = of_flat_dt_get_machine_name();
+#else
 	machine_name = mdesc->name;
+#endif
 	dump_stack_set_arch_desc("%s", mdesc->name);
 
 	if (mdesc->reboot_mode != REBOOT_HARD)
@@ -1228,6 +1232,9 @@ static int c_show(struct seq_file *m, void *v)
 	int i, j;
 	u32 cpuid;
 
+	/* a hint message to notify that some process reads /proc/cpuinfo */
+	pr_debug("Dump cpuinfo\n");
+
 	for_each_online_cpu(i) {
 		/*
 		 * glibc reads /proc/cpuinfo to determine the number of
@@ -1236,6 +1243,10 @@ static int c_show(struct seq_file *m, void *v)
 		 */
 		seq_printf(m, "processor\t: %d\n", i);
 		cpuid = is_smp() ? per_cpu(cpu_data, i).cpuid : read_cpuid_id();
+
+		/* backward-compatibility for thrid-party applications */
+		seq_printf(m, "Processor\t: %s rev %d (%s)\n",
+			   cpu_name, cpuid & 15, elf_platform);
 		seq_printf(m, "model name\t: %s rev %d (%s)\n",
 			   cpu_name, cpuid & 15, elf_platform);
 

diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
@@ -131,6 +131,9 @@ flush_levels:
 	blt	skip				@ skip if no cache, or just i-cache
 #ifdef CONFIG_PREEMPT
 	save_and_disable_irqs_notrace r9	@ make cssr&csidr read atomic
+#endif
+#ifdef CONFIG_ARM_ERRATA_814220
+	dsb
 #endif
 	mcr	p15, 2, r10, c0, c0, 0		@ select current cache level in cssr
 	isb					@ isb to sych the new cssr&csidr
@@ -278,7 +281,11 @@ ENTRY(v7_coherent_user_range)
 	ALT_UP(W(nop))
 #endif
 1:
+#if defined(CONFIG_ARM_ERRATA_855873) || defined(CONFIG_ARM_ERRATA_824069)
+ USER(	mcr	p15, 0, r12, c7, c14, 1	)	@ clean D line to the point of unification
+#else
  USER(	mcr	p15, 0, r12, c7, c11, 1	)	@ clean D line to the point of unification
+#endif
 	add	r12, r12, r2
 	cmp	r12, r1
 	blo	1b
@@ -388,7 +395,11 @@ v7_dma_clean_range:
 	ALT_UP(W(nop))
 #endif
 1:
+#if defined(CONFIG_ARM_ERRATA_855873) || defined(CONFIG_ARM_ERRATA_824069)
+	mcr	p15, 0, r0, c7, c14, 1		@ clean and invalidate D / U line
+#else
 	mcr	p15, 0, r0, c7, c10, 1		@ clean D / U line
+#endif
 	add	r0, r0, r2
 	cmp	r0, r1
 	blo	1b