2 years ago · 25b8343bd4
--- a/Documentation/ABI/testing/sysfs-ata
+++ b/Documentation/ABI/testing/sysfs-ata
@@ -107,13 +107,14 @@ Description:
 
															 				described in ATA8 7.16 and 7.17. Only valid if
														
 
															 				the device is not a PM.
														
 
															-		pio_mode:	(RO) Transfer modes supported by the device when
														
 
															-				in PIO mode. Mostly used by PATA device.
														
 
															+		pio_mode:	(RO) PIO transfer mode used by the device.
														
 
															+				Mostly used by PATA devices.
														
 
															-		xfer_mode:	(RO) Current transfer mode
														
 
															+		xfer_mode:	(RO) Current transfer mode. Mostly used by
														
 
															+				PATA devices.
														
 
															-		dma_mode:	(RO) Transfer modes supported by the device when
														
 
															-				in DMA mode. Mostly used by PATA device.
														
 
															+		dma_mode:	(RO) DMA transfer mode used by the device.
														
 
															+				Mostly used by PATA devices.
														
 
															 		class:		(RO) Device class. Can be "ata" for disk,
														
 
															 				"atapi" for packet device, "pmp" for PM, or
														
--- a/Documentation/ABI/testing/sysfs-bus-iio-vf610
+++ b/Documentation/ABI/testing/sysfs-bus-iio-vf610
@@ -1,4 +1,4 @@
 
															-What:		/sys/bus/iio/devices/iio:deviceX/conversion_mode
														
 
															+What:		/sys/bus/iio/devices/iio:deviceX/in_conversion_mode
														
 
															 KernelVersion:	4.2
														
 
															 Contact:	[email protected]
														
 
															 Description:
														
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -519,6 +519,7 @@ What:		/sys/devices/system/cpu/vulnerabilities
 
															 		/sys/devices/system/cpu/vulnerabilities/srbds
														
 
															 		/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
														
 
															 		/sys/devices/system/cpu/vulnerabilities/itlb_multihit
														
 
															+		/sys/devices/system/cpu/vulnerabilities/mmio_stale_data
														
 
															 Date:		January 2018
														
 
															 Contact:	Linux kernel mailing list <[email protected]>
														
 
															 Description:	Information about CPU vulnerabilities
														
--- a/Documentation/admin-guide/hw-vuln/index.rst
+++ b/Documentation/admin-guide/hw-vuln/index.rst
@@ -15,3 +15,4 @@ are configurable at compile, boot or run time.
 
															    tsx_async_abort
														
 
															    multihit.rst
														
 
															    special-register-buffer-data-sampling.rst
														
 
															+   processor_mmio_stale_data.rst
														
--- a/Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst
+++ b/Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst
@@ -0,0 +1,246 @@
 
															+=========================================
														
 
															+Processor MMIO Stale Data Vulnerabilities
														
 
															+=========================================
														
 
															+
														
 
															+Processor MMIO Stale Data Vulnerabilities are a class of memory-mapped I/O
														
 
															+(MMIO) vulnerabilities that can expose data. The sequences of operations for
														
 
															+exposing data range from simple to very complex. Because most of the
														
 
															+vulnerabilities require the attacker to have access to MMIO, many environments
														
 
															+are not affected. System environments using virtualization where MMIO access is
														
 
															+provided to untrusted guests may need mitigation. These vulnerabilities are
														
 
															+not transient execution attacks. However, these vulnerabilities may propagate
														
 
															+stale data into core fill buffers where the data can subsequently be inferred
														
 
															+by an unmitigated transient execution attack. Mitigation for these
														
 
															+vulnerabilities includes a combination of microcode update and software
														
 
															+changes, depending on the platform and usage model. Some of these mitigations
														
 
															+are similar to those used to mitigate Microarchitectural Data Sampling (MDS) or
														
 
															+those used to mitigate Special Register Buffer Data Sampling (SRBDS).
														
 
															+
														
 
															+Data Propagators
														
 
															+================
														
 
															+Propagators are operations that result in stale data being copied or moved from
														
 
															+one microarchitectural buffer or register to another. Processor MMIO Stale Data
														
 
															+Vulnerabilities are operations that may result in stale data being directly
														
 
															+read into an architectural, software-visible state or sampled from a buffer or
														
 
															+register.
														
 
															+
														
 
															+Fill Buffer Stale Data Propagator (FBSDP)
														
 
															+-----------------------------------------
														
 
															+Stale data may propagate from fill buffers (FB) into the non-coherent portion
														
 
															+of the uncore on some non-coherent writes. Fill buffer propagation by itself
														
 
															+does not make stale data architecturally visible. Stale data must be propagated
														
 
															+to a location where it is subject to reading or sampling.
														
 
															+
														
 
															+Sideband Stale Data Propagator (SSDP)
														
 
															+-------------------------------------
														
 
															+The sideband stale data propagator (SSDP) is limited to the client (including
														
 
															+Intel Xeon server E3) uncore implementation. The sideband response buffer is
														
 
															+shared by all client cores. For non-coherent reads that go to sideband
														
 
															+destinations, the uncore logic returns 64 bytes of data to the core, including
														
 
															+both requested data and unrequested stale data, from a transaction buffer and
														
 
															+the sideband response buffer. As a result, stale data from the sideband
														
 
															+response and transaction buffers may now reside in a core fill buffer.
														
 
															+
														
 
															+Primary Stale Data Propagator (PSDP)
														
 
															+------------------------------------
														
 
															+The primary stale data propagator (PSDP) is limited to the client (including
														
 
															+Intel Xeon server E3) uncore implementation. Similar to the sideband response
														
 
															+buffer, the primary response buffer is shared by all client cores. For some
														
 
															+processors, MMIO primary reads will return 64 bytes of data to the core fill
														
 
															+buffer including both requested data and unrequested stale data. This is
														
 
															+similar to the sideband stale data propagator.
														
 
															+
														
 
															+Vulnerabilities
														
 
															+===============
														
 
															+Device Register Partial Write (DRPW) (CVE-2022-21166)
														
 
															+-----------------------------------------------------
														
 
															+Some endpoint MMIO registers incorrectly handle writes that are smaller than
														
 
															+the register size. Instead of aborting the write or only copying the correct
														
 
															+subset of bytes (for example, 2 bytes for a 2-byte write), more bytes than
														
 
															+specified by the write transaction may be written to the register. On
														
 
															+processors affected by FBSDP, this may expose stale data from the fill buffers
														
 
															+of the core that created the write transaction.
														
 
															+
														
 
															+Shared Buffers Data Sampling (SBDS) (CVE-2022-21125)
														
 
															+----------------------------------------------------
														
 
															+After propagators may have moved data around the uncore and copied stale data
														
 
															+into client core fill buffers, processors affected by MFBDS can leak data from
														
 
															+the fill buffer. It is limited to the client (including Intel Xeon server E3)
														
 
															+uncore implementation.
														
 
															+
														
 
															+Shared Buffers Data Read (SBDR) (CVE-2022-21123)
														
 
															+------------------------------------------------
														
 
															+It is similar to Shared Buffer Data Sampling (SBDS) except that the data is
														
 
															+directly read into the architectural software-visible state. It is limited to
														
 
															+the client (including Intel Xeon server E3) uncore implementation.
														
 
															+
														
 
															+Affected Processors
														
 
															+===================
														
 
															+Not all the CPUs are affected by all the variants. For instance, most
														
 
															+processors for the server market (excluding Intel Xeon E3 processors) are
														
 
															+impacted by only Device Register Partial Write (DRPW).
														
 
															+
														
 
															+Below is the list of affected Intel processors [#f1]_:
														
 
															+
														
 
															+   ===================  ============  =========
														
 
															+   Common name          Family_Model  Steppings
														
 
															+   ===================  ============  =========
														
 
															+   HASWELL_X            06_3FH        2,4
														
 
															+   SKYLAKE_L            06_4EH        3
														
 
															+   BROADWELL_X          06_4FH        All
														
 
															+   SKYLAKE_X            06_55H        3,4,6,7,11
														
 
															+   BROADWELL_D          06_56H        3,4,5
														
 
															+   SKYLAKE              06_5EH        3
														
 
															+   ICELAKE_X            06_6AH        4,5,6
														
 
															+   ICELAKE_D            06_6CH        1
														
 
															+   ICELAKE_L            06_7EH        5
														
 
															+   ATOM_TREMONT_D       06_86H        All
														
 
															+   LAKEFIELD            06_8AH        1
														
 
															+   KABYLAKE_L           06_8EH        9 to 12
														
 
															+   ATOM_TREMONT         06_96H        1
														
 
															+   ATOM_TREMONT_L       06_9CH        0
														
 
															+   KABYLAKE             06_9EH        9 to 13
														
 
															+   COMETLAKE            06_A5H        2,3,5
														
 
															+   COMETLAKE_L          06_A6H        0,1
														
 
															+   ROCKETLAKE           06_A7H        1
														
 
															+   ===================  ============  =========
														
 
															+
														
 
															+If a CPU is in the affected processor list, but not affected by a variant, it
														
 
															+is indicated by new bits in MSR IA32_ARCH_CAPABILITIES. As described in a later
														
 
															+section, mitigation largely remains the same for all the variants, i.e. to
														
 
															+clear the CPU fill buffers via VERW instruction.
														
 
															+
														
 
															+New bits in MSRs
														
 
															+================
														
 
															+Newer processors and microcode update on existing affected processors added new
														
 
															+bits to IA32_ARCH_CAPABILITIES MSR. These bits can be used to enumerate
														
 
															+specific variants of Processor MMIO Stale Data vulnerabilities and mitigation
														
 
															+capability.
														
 
															+
														
 
															+MSR IA32_ARCH_CAPABILITIES
														
 
															+--------------------------
														
 
															+Bit 13 - SBDR_SSDP_NO - When set, processor is not affected by either the
														
 
															+	 Shared Buffers Data Read (SBDR) vulnerability or the sideband stale
														
 
															+	 data propagator (SSDP).
														
 
															+Bit 14 - FBSDP_NO - When set, processor is not affected by the Fill Buffer
														
 
															+	 Stale Data Propagator (FBSDP).
														
 
															+Bit 15 - PSDP_NO - When set, processor is not affected by Primary Stale Data
														
 
															+	 Propagator (PSDP).
														
 
															+Bit 17 - FB_CLEAR - When set, VERW instruction will overwrite CPU fill buffer
														
 
															+	 values as part of MD_CLEAR operations. Processors that do not
														
 
															+	 enumerate MDS_NO (meaning they are affected by MDS) but that do
														
 
															+	 enumerate support for both L1D_FLUSH and MD_CLEAR implicitly enumerate
														
 
															+	 FB_CLEAR as part of their MD_CLEAR support.
														
 
															+Bit 18 - FB_CLEAR_CTRL - Processor supports read and write to MSR
														
 
															+	 IA32_MCU_OPT_CTRL[FB_CLEAR_DIS]. On such processors, the FB_CLEAR_DIS
														
 
															+	 bit can be set to cause the VERW instruction to not perform the
														
 
															+	 FB_CLEAR action. Not all processors that support FB_CLEAR will support
														
 
															+	 FB_CLEAR_CTRL.
														
 
															+
														
 
															+MSR IA32_MCU_OPT_CTRL
														
 
															+---------------------
														
 
															+Bit 3 - FB_CLEAR_DIS - When set, VERW instruction does not perform the FB_CLEAR
														
 
															+action. This may be useful to reduce the performance impact of FB_CLEAR in
														
 
															+cases where system software deems it warranted (for example, when performance
														
 
															+is more critical, or the untrusted software has no MMIO access). Note that
														
 
															+FB_CLEAR_DIS has no impact on enumeration (for example, it does not change
														
 
															+FB_CLEAR or MD_CLEAR enumeration) and it may not be supported on all processors
														
 
															+that enumerate FB_CLEAR.
														
 
															+
														
 
															+Mitigation
														
 
															+==========
														
 
															+Like MDS, all variants of Processor MMIO Stale Data vulnerabilities  have the
														
 
															+same mitigation strategy to force the CPU to clear the affected buffers before
														
 
															+an attacker can extract the secrets.
														
 
															+
														
 
															+This is achieved by using the otherwise unused and obsolete VERW instruction in
														
 
															+combination with a microcode update. The microcode clears the affected CPU
														
 
															+buffers when the VERW instruction is executed.
														
 
															+
														
 
															+Kernel reuses the MDS function to invoke the buffer clearing:
														
 
															+
														
 
															+	mds_clear_cpu_buffers()
														
 
															+
														
 
															+On MDS affected CPUs, the kernel already invokes CPU buffer clear on
														
 
															+kernel/userspace, hypervisor/guest and C-state (idle) transitions. No
														
 
															+additional mitigation is needed on such CPUs.
														
 
															+
														
 
															+For CPUs not affected by MDS or TAA, mitigation is needed only for the attacker
														
 
															+with MMIO capability. Therefore, VERW is not required for kernel/userspace. For
														
 
															+virtualization case, VERW is only needed at VMENTER for a guest with MMIO
														
 
															+capability.
														
 
															+
														
 
															+Mitigation points
														
 
															+-----------------
														
 
															+Return to user space
														
 
															+^^^^^^^^^^^^^^^^^^^^
														
 
															+Same mitigation as MDS when affected by MDS/TAA, otherwise no mitigation
														
 
															+needed.
														
 
															+
														
 
															+C-State transition
														
 
															+^^^^^^^^^^^^^^^^^^
														
 
															+Control register writes by CPU during C-state transition can propagate data
														
 
															+from fill buffer to uncore buffers. Execute VERW before C-state transition to
														
 
															+clear CPU fill buffers.
														
 
															+
														
 
															+Guest entry point
														
 
															+^^^^^^^^^^^^^^^^^
														
 
															+Same mitigation as MDS when processor is also affected by MDS/TAA, otherwise
														
 
															+execute VERW at VMENTER only for MMIO capable guests. On CPUs not affected by
														
 
															+MDS/TAA, guest without MMIO access cannot extract secrets using Processor MMIO
														
 
															+Stale Data vulnerabilities, so there is no need to execute VERW for such guests.
														
 
															+
														
 
															+Mitigation control on the kernel command line
														
 
															+---------------------------------------------
														
 
															+The kernel command line allows to control the Processor MMIO Stale Data
														
 
															+mitigations at boot time with the option "mmio_stale_data=". The valid
														
 
															+arguments for this option are:
														
 
															+
														
 
															+  ==========  =================================================================
														
 
															+  full        If the CPU is vulnerable, enable mitigation; CPU buffer clearing
														
 
															+              on exit to userspace and when entering a VM. Idle transitions are
														
 
															+              protected as well. It does not automatically disable SMT.
														
 
															+  full,nosmt  Same as full, with SMT disabled on vulnerable CPUs. This is the
														
 
															+              complete mitigation.
														
 
															+  off         Disables mitigation completely.
														
 
															+  ==========  =================================================================
														
 
															+
														
 
															+If the CPU is affected and mmio_stale_data=off is not supplied on the kernel
														
 
															+command line, then the kernel selects the appropriate mitigation.
														
 
															+
														
 
															+Mitigation status information
														
 
															+-----------------------------
														
 
															+The Linux kernel provides a sysfs interface to enumerate the current
														
 
															+vulnerability status of the system: whether the system is vulnerable, and
														
 
															+which mitigations are active. The relevant sysfs file is:
														
 
															+
														
 
															+	/sys/devices/system/cpu/vulnerabilities/mmio_stale_data
														
 
															+
														
 
															+The possible values in this file are:
														
 
															+
														
 
															+  .. list-table::
														
 
															+
														
 
															+     * - 'Not affected'
														
 
															+       - The processor is not vulnerable
														
 
															+     * - 'Vulnerable'
														
 
															+       - The processor is vulnerable, but no mitigation enabled
														
 
															+     * - 'Vulnerable: Clear CPU buffers attempted, no microcode'
														
 
															+       - The processor is vulnerable, but microcode is not updated. The
														
 
															+         mitigation is enabled on a best effort basis.
														
 
															+     * - 'Mitigation: Clear CPU buffers'
														
 
															+       - The processor is vulnerable and the CPU buffer clearing mitigation is
														
 
															+         enabled.
														
 
															+
														
 
															+If the processor is vulnerable then the following information is appended to
														
 
															+the above information:
														
 
															+
														
 
															+  ========================  ===========================================
														
 
															+  'SMT vulnerable'          SMT is enabled
														
 
															+  'SMT disabled'            SMT is disabled
														
 
															+  'SMT Host state unknown'  Kernel runs in a VM, Host SMT state unknown
														
 
															+  ========================  ===========================================
														
 
															+
														
 
															+References
														
 
															+----------
														
 
															+.. [#f1] Affected Processors
														
 
															+   https://www.intel.com/content/www/us/en/developer/topic-technology/software-security-guidance/processors-affected-consolidated-product-cpu-model.html
														
--- a/Documentation/admin-guide/hw-vuln/spectre.rst
+++ b/Documentation/admin-guide/hw-vuln/spectre.rst
@@ -422,6 +422,14 @@ The possible values in this file are:
 
															   'RSB filling'   Protection of RSB on context switch enabled
														
 
															   =============   ===========================================
														
 
															+  - EIBRS Post-barrier Return Stack Buffer (PBRSB) protection status:
														
 
															+
														
 
															+  ===========================  =======================================================
														
 
															+  'PBRSB-eIBRS: SW sequence'   CPU is affected and protection of RSB on VMEXIT enabled
														
 
															+  'PBRSB-eIBRS: Vulnerable'    CPU is vulnerable
														
 
															+  'PBRSB-eIBRS: Not affected'  CPU is not affected by PBRSB
														
 
															+  ===========================  =======================================================
														
 
															+
														
 
															 Full mitigation might require a microcode update from the CPU
														
 
															 vendor. When the necessary microcode is not available, the kernel will
														
 
															 report vulnerability.
														
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2936,6 +2936,8 @@
 
															 					       kvm.nx_huge_pages=off [X86]
														
 
															 					       no_entry_flush [PPC]
														
 
															 					       no_uaccess_flush [PPC]
														
 
															+					       mmio_stale_data=off [X86]
														
 
															+					       retbleed=off [X86]
														
 
															 				Exceptions:
														
 
															 					       This does not have any effect on
														
@@ -2957,6 +2959,8 @@
 
															 				Equivalent to: l1tf=flush,nosmt [X86]
														
 
															 					       mds=full,nosmt [X86]
														
 
															 					       tsx_async_abort=full,nosmt [X86]
														
 
															+					       mmio_stale_data=full,nosmt [X86]
														
 
															+					       retbleed=auto,nosmt [X86]
														
 
															 	mminit_loglevel=
														
 
															 			[KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this
														
@@ -2966,6 +2970,40 @@
 
															 			log everything. Information is printed at KERN_DEBUG
														
 
															 			so loglevel=8 may also need to be specified.
														
 
															+	mmio_stale_data=
														
 
															+			[X86,INTEL] Control mitigation for the Processor
														
 
															+			MMIO Stale Data vulnerabilities.
														
 
															+
														
 
															+			Processor MMIO Stale Data is a class of
														
 
															+			vulnerabilities that may expose data after an MMIO
														
 
															+			operation. Exposed data could originate or end in
														
 
															+			the same CPU buffers as affected by MDS and TAA.
														
 
															+			Therefore, similar to MDS and TAA, the mitigation
														
 
															+			is to clear the affected CPU buffers.
														
 
															+
														
 
															+			This parameter controls the mitigation. The
														
 
															+			options are:
														
 
															+
														
 
															+			full       - Enable mitigation on vulnerable CPUs
														
 
															+
														
 
															+			full,nosmt - Enable mitigation and disable SMT on
														
 
															+				     vulnerable CPUs.
														
 
															+
														
 
															+			off        - Unconditionally disable mitigation
														
 
															+
														
 
															+			On MDS or TAA affected machines,
														
 
															+			mmio_stale_data=off can be prevented by an active
														
 
															+			MDS or TAA mitigation as these vulnerabilities are
														
 
															+			mitigated with the same mechanism so in order to
														
 
															+			disable this mitigation, you need to specify
														
 
															+			mds=off and tsx_async_abort=off too.
														
 
															+
														
 
															+			Not specifying this option is equivalent to
														
 
															+			mmio_stale_data=full.
														
 
															+
														
 
															+			For details see:
														
 
															+			Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst
														
 
															+
														
 
															 	module.sig_enforce
														
 
															 			[KNL] When CONFIG_MODULE_SIG is set, this means that
														
 
															 			modules without (valid) signatures will fail to load.
														
@@ -4140,6 +4178,12 @@
 
															 			fully seed the kernel's CRNG. Default is controlled
														
 
															 			by CONFIG_RANDOM_TRUST_CPU.
														
 
															+	random.trust_bootloader={on,off}
														
 
															+			[KNL] Enable or disable trusting the use of a
														
 
															+			seed passed by the bootloader (if available) to
														
 
															+			fully seed the kernel's CRNG. Default is controlled
														
 
															+			by CONFIG_RANDOM_TRUST_BOOTLOADER.
														
 
															+
														
 
															 	ras=option[,option,...]	[KNL] RAS-specific options
														
 
															 		cec_disable	[X86]
														
@@ -4719,6 +4763,30 @@
 
															 	retain_initrd	[RAM] Keep initrd memory after extraction
														
 
															+	retbleed=	[X86] Control mitigation of RETBleed (Arbitrary
														
 
															+			Speculative Code Execution with Return Instructions)
														
 
															+			vulnerability.
														
 
															+
														
 
															+			off          - no mitigation
														
 
															+			auto         - automatically select a migitation
														
 
															+			auto,nosmt   - automatically select a mitigation,
														
 
															+				       disabling SMT if necessary for
														
 
															+				       the full mitigation (only on Zen1
														
 
															+				       and older without STIBP).
														
 
															+			ibpb	     - mitigate short speculation windows on
														
 
															+				       basic block boundaries too. Safe, highest
														
 
															+				       perf impact.
														
 
															+			unret        - force enable untrained return thunks,
														
 
															+				       only effective on AMD f15h-f17h
														
 
															+				       based systems.
														
 
															+			unret,nosmt  - like unret, will disable SMT when STIBP
														
 
															+			               is not available.
														
 
															+
														
 
															+			Selecting 'auto' will choose a mitigation method at run
														
 
															+			time according to the CPU.
														
 
															+
														
 
															+			Not specifying this option is equivalent to retbleed=auto.
														
 
															+
														
 
															 	rfkill.default_state=
														
 
															 		0	"airplane mode".  All wifi, bluetooth, wimax, gps, fm,
														
 
															 			etc. communication is blocked by default.
														
@@ -5068,6 +5136,7 @@
 
															 			eibrs		  - enhanced IBRS
														
 
															 			eibrs,retpoline   - enhanced IBRS + Retpolines
														
 
															 			eibrs,lfence      - enhanced IBRS + LFENCE
														
 
															+			ibrs		  - use IBRS to protect kernel
														
 
															 			Not specifying this option is equivalent to
														
 
															 			spectre_v2=auto.
														
--- a/Documentation/admin-guide/sysctl/kernel.rst
+++ b/Documentation/admin-guide/sysctl/kernel.rst
@@ -1006,28 +1006,22 @@ This is a directory, with the following entries:
 
															 * ``boot_id``: a UUID generated the first time this is retrieved, and
														
 
															   unvarying after that;
														
 
															+* ``uuid``: a UUID generated every time this is retrieved (this can
														
 
															+  thus be used to generate UUIDs at will);
														
 
															+
														
 
															 * ``entropy_avail``: the pool's entropy count, in bits;
														
 
															 * ``poolsize``: the entropy pool size, in bits;
														
 
															 * ``urandom_min_reseed_secs``: obsolete (used to determine the minimum
														
 
															-  number of seconds between urandom pool reseeding).
														
 
															-
														
 
															-* ``uuid``: a UUID generated every time this is retrieved (this can
														
 
															-  thus be used to generate UUIDs at will);
														
 
															+  number of seconds between urandom pool reseeding). This file is
														
 
															+  writable for compatibility purposes, but writing to it has no effect
														
 
															+  on any RNG behavior;
														
 
															 * ``write_wakeup_threshold``: when the entropy count drops below this
														
 
															   (as a number of bits), processes waiting to write to ``/dev/random``
														
 
															-  are woken up.
														
 
															-
														
 
															-If ``drivers/char/random.c`` is built with ``ADD_INTERRUPT_BENCH``
														
 
															-defined, these additional entries are present:
														
 
															-
														
 
															-* ``add_interrupt_avg_cycles``: the average number of cycles between
														
 
															-  interrupts used to feed the pool;
														
 
															-
														
 
															-* ``add_interrupt_avg_deviation``: the standard deviation seen on the
														
 
															-  number of cycles between interrupts used to feed the pool.
														
 
															+  are woken up. This file is writable for compatibility purposes, but
														
 
															+  writing to it has no effect on any RNG behavior.
														
 
															 randomize_va_space
														
--- a/Documentation/arm64/silicon-errata.rst
+++ b/Documentation/arm64/silicon-errata.rst
@@ -166,6 +166,9 @@ stable kernels.
 
															 +----------------+-----------------+-----------------+-----------------------------+
														
 
															 | Qualcomm Tech. | Kryo4xx Silver  | N/A             | ARM64_ERRATUM_1024718       |
														
 
															 +----------------+-----------------+-----------------+-----------------------------+
														
 
															+| Qualcomm Tech. | Kryo4xx Gold    | N/A             | ARM64_ERRATUM_1286807       |
														
 
															++----------------+-----------------+-----------------+-----------------------------+
														
 
															+
														
 
															 +----------------+-----------------+-----------------+-----------------------------+
														
 
															 | Fujitsu        | A64FX           | E#010001        | FUJITSU_ERRATUM_010001      |
														
 
															 +----------------+-----------------+-----------------+-----------------------------+
														
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -176,7 +176,7 @@ finally:
 
															 #
														
 
															 # This is also used if you do content translation via gettext catalogs.
														
 
															 # Usually you set "language" from the command line for these cases.
														
 
															-language = None
														
 
															+language = 'en'
														
 
															 # There are two options for replacing |today|: either, you set today to some
														
 
															 # non-false value, then it is used:
														
--- a/Documentation/core-api/dma-attributes.rst
+++ b/Documentation/core-api/dma-attributes.rst
@@ -130,11 +130,3 @@ accesses to DMA buffers in both privileged "supervisor" and unprivileged
 
															 subsystem that the buffer is fully accessible at the elevated privilege
														
 
															 level (and ideally inaccessible or at least read-only at the
														
 
															 lesser-privileged levels).
														
 
															-
														
 
															-DMA_ATTR_OVERWRITE
														
 
															-------------------
														
 
															-
														
 
															-This is a hint to the DMA-mapping subsystem that the device is expected to
														
 
															-overwrite the entire mapped size, thus the caller does not require any of the
														
 
															-previous buffer contents to be preserved. This allows bounce-buffering
														
 
															-implementations to optimise DMA_FROM_DEVICE transfers.
														
--- a/Documentation/networking/ip-sysctl.rst
+++ b/Documentation/networking/ip-sysctl.rst
@@ -988,7 +988,7 @@ cipso_cache_enable - BOOLEAN
 
															 cipso_cache_bucket_size - INTEGER
														
 
															 	The CIPSO label cache consists of a fixed size hash table with each
														
 
															 	hash bucket containing a number of cache entries.  This variable limits
														
 
															-	the number of entries in each hash bucket; the larger the value the
														
 
															+	the number of entries in each hash bucket; the larger the value is, the
														
 
															 	more CIPSO label mappings that can be cached.  When the number of
														
 
															 	entries in a given hash bucket reaches this limit adding new entries
														
 
															 	causes the oldest entry in the bucket to be removed to make room.
														
@@ -1093,7 +1093,7 @@ ip_autobind_reuse - BOOLEAN
 
															 	option should only be set by experts.
														
 
															 	Default: 0
														
 
															-ip_dynaddr - BOOLEAN
														
 
															+ip_dynaddr - INTEGER
														
 
															 	If set non-zero, enables support for dynamic addresses.
														
 
															 	If set to a non-zero value larger than 1, a kernel log
														
 
															 	message will be printed when dynamic address rewriting
														
@@ -2642,7 +2642,14 @@ sctp_rmem - vector of 3 INTEGERs: min, default, max
 
															 	Default: 4K
														
 
															 sctp_wmem  - vector of 3 INTEGERs: min, default, max
														
 
															-	Currently this tunable has no effect.
														
 
															+	Only the first value ("min") is used, "default" and "max" are
														
 
															+	ignored.
														
 
															+
														
 
															+	min: Minimum size of send buffer that can be used by SCTP sockets.
														
 
															+	It is guaranteed to each SCTP socket (but not association) even
														
 
															+	under moderate memory pressure.
														
 
															+
														
 
															+	Default: 4K
														
 
															 addr_scope_policy - INTEGER
														
 
															 	Control IPv4 address scoping - draft-stewart-tsvwg-sctp-ipv4-00
														
--- a/Documentation/networking/netdevices.rst
+++ b/Documentation/networking/netdevices.rst
@@ -10,18 +10,177 @@ Introduction
 
															 The following is a random collection of documentation regarding
														
 
															 network devices.
														
 
															-struct net_device allocation rules
														
 
															-==================================
														
 
															+struct net_device lifetime rules
														
 
															+================================
														
 
															 Network device structures need to persist even after module is unloaded and
														
 
															 must be allocated with alloc_netdev_mqs() and friends.
														
 
															 If device has registered successfully, it will be freed on last use
														
 
															-by free_netdev(). This is required to handle the pathologic case cleanly
														
 
															-(example: rmmod mydriver </sys/class/net/myeth/mtu )
														
 
															+by free_netdev(). This is required to handle the pathological case cleanly
														
 
															+(example: ``rmmod mydriver </sys/class/net/myeth/mtu``)
														
 
															-alloc_netdev_mqs()/alloc_netdev() reserve extra space for driver
														
 
															+alloc_netdev_mqs() / alloc_netdev() reserve extra space for driver
														
 
															 private data which gets freed when the network device is freed. If
														
 
															 separately allocated data is attached to the network device
														
 
															-(netdev_priv(dev)) then it is up to the module exit handler to free that.
														
 
															+(netdev_priv()) then it is up to the module exit handler to free that.
														
 
															+
														
 
															+There are two groups of APIs for registering struct net_device.
														
 
															+First group can be used in normal contexts where ``rtnl_lock`` is not already
														
 
															+held: register_netdev(), unregister_netdev().
														
 
															+Second group can be used when ``rtnl_lock`` is already held:
														
 
															+register_netdevice(), unregister_netdevice(), free_netdevice().
														
 
															+
														
 
															+Simple drivers
														
 
															+--------------
														
 
															+
														
 
															+Most drivers (especially device drivers) handle lifetime of struct net_device
														
 
															+in context where ``rtnl_lock`` is not held (e.g. driver probe and remove paths).
														
 
															+
														
 
															+In that case the struct net_device registration is done using
														
 
															+the register_netdev(), and unregister_netdev() functions:
														
 
															+
														
 
															+.. code-block:: c
														
 
															+
														
 
															+  int probe()
														
 
															+  {
														
 
															+    struct my_device_priv *priv;
														
 
															+    int err;
														
 
															+
														
 
															+    dev = alloc_netdev_mqs(...);
														
 
															+    if (!dev)
														
 
															+      return -ENOMEM;
														
 
															+    priv = netdev_priv(dev);
														
 
															+
														
 
															+    /* ... do all device setup before calling register_netdev() ...
														
 
															+     */
														
 
															+
														
 
															+    err = register_netdev(dev);
														
 
															+    if (err)
														
 
															+      goto err_undo;
														
 
															+
														
 
															+    /* net_device is visible to the user! */
														
 
															+
														
 
															+  err_undo:
														
 
															+    /* ... undo the device setup ... */
														
 
															+    free_netdev(dev);
														
 
															+    return err;
														
 
															+  }
														
 
															+
														
 
															+  void remove()
														
 
															+  {
														
 
															+    unregister_netdev(dev);
														
 
															+    free_netdev(dev);
														
 
															+  }
														
 
															+
														
 
															+Note that after calling register_netdev() the device is visible in the system.
														
 
															+Users can open it and start sending / receiving traffic immediately,
														
 
															+or run any other callback, so all initialization must be done prior to
														
 
															+registration.
														
 
															+
														
 
															+unregister_netdev() closes the device and waits for all users to be done
														
 
															+with it. The memory of struct net_device itself may still be referenced
														
 
															+by sysfs but all operations on that device will fail.
														
 
															+
														
 
															+free_netdev() can be called after unregister_netdev() returns on when
														
 
															+register_netdev() failed.
														
 
															+
														
 
															+Device management under RTNL
														
 
															+----------------------------
														
 
															+
														
 
															+Registering struct net_device while in context which already holds
														
 
															+the ``rtnl_lock`` requires extra care. In those scenarios most drivers
														
 
															+will want to make use of struct net_device's ``needs_free_netdev``
														
 
															+and ``priv_destructor`` members for freeing of state.
														
 
															+
														
 
															+Example flow of netdev handling under ``rtnl_lock``:
														
 
															+
														
 
															+.. code-block:: c
														
 
															+
														
 
															+  static void my_setup(struct net_device *dev)
														
 
															+  {
														
 
															+    dev->needs_free_netdev = true;
														
 
															+  }
														
 
															+
														
 
															+  static void my_destructor(struct net_device *dev)
														
 
															+  {
														
 
															+    some_obj_destroy(priv->obj);
														
 
															+    some_uninit(priv);
														
 
															+  }
														
 
															+
														
 
															+  int create_link()
														
 
															+  {
														
 
															+    struct my_device_priv *priv;
														
 
															+    int err;
														
 
															+
														
 
															+    ASSERT_RTNL();
														
 
															+
														
 
															+    dev = alloc_netdev(sizeof(*priv), "net%d", NET_NAME_UNKNOWN, my_setup);
														
 
															+    if (!dev)
														
 
															+      return -ENOMEM;
														
 
															+    priv = netdev_priv(dev);
														
 
															+
														
 
															+    /* Implicit constructor */
														
 
															+    err = some_init(priv);
														
 
															+    if (err)
														
 
															+      goto err_free_dev;
														
 
															+
														
 
															+    priv->obj = some_obj_create();
														
 
															+    if (!priv->obj) {
														
 
															+      err = -ENOMEM;
														
 
															+      goto err_some_uninit;
														
 
															+    }
														
 
															+    /* End of constructor, set the destructor: */
														
 
															+    dev->priv_destructor = my_destructor;
														
 
															+
														
 
															+    err = register_netdevice(dev);
														
 
															+    if (err)
														
 
															+      /* register_netdevice() calls destructor on failure */
														
 
															+      goto err_free_dev;
														
 
															+
														
 
															+    /* If anything fails now unregister_netdevice() (or unregister_netdev())
														
 
															+     * will take care of calling my_destructor and free_netdev().
														
 
															+     */
														
 
															+
														
 
															+    return 0;
														
 
															+
														
 
															+  err_some_uninit:
														
 
															+    some_uninit(priv);
														
 
															+  err_free_dev:
														
 
															+    free_netdev(dev);
														
 
															+    return err;
														
 
															+  }
														
 
															+
														
 
															+If struct net_device.priv_destructor is set it will be called by the core
														
 
															+some time after unregister_netdevice(), it will also be called if
														
 
															+register_netdevice() fails. The callback may be invoked with or without
														
 
															+``rtnl_lock`` held.
														
 
															+
														
 
															+There is no explicit constructor callback, driver "constructs" the private
														
 
															+netdev state after allocating it and before registration.
														
 
															+
														
 
															+Setting struct net_device.needs_free_netdev makes core call free_netdevice()
														
 
															+automatically after unregister_netdevice() when all references to the device
														
 
															+are gone. It only takes effect after a successful call to register_netdevice()
														
 
															+so if register_netdevice() fails driver is responsible for calling
														
 
															+free_netdev().
														
 
															+
														
 
															+free_netdev() is safe to call on error paths right after unregister_netdevice()
														
 
															+or when register_netdevice() fails. Parts of netdev (de)registration process
														
 
															+happen after ``rtnl_lock`` is released, therefore in those cases free_netdev()
														
 
															+will defer some of the processing until ``rtnl_lock`` is released.
														
 
															+
														
 
															+Devices spawned from struct rtnl_link_ops should never free the
														
 
															+struct net_device directly.
														
 
															+
														
 
															+.ndo_init and .ndo_uninit
														
 
															+~~~~~~~~~~~~~~~~~~~~~~~~~
														
 
															+
														
 
															+``.ndo_init`` and ``.ndo_uninit`` callbacks are called during net_device
														
 
															+registration and de-registration, under ``rtnl_lock``. Drivers can use
														
 
															+those e.g. when parts of their init process need to run under ``rtnl_lock``.
														
 
															+
														
 
															+``.ndo_init`` runs before device is visible in the system, ``.ndo_uninit``
														
 
															+runs during de-registering after device is closed but other subsystems
														
 
															+may still have outstanding references to the netdevice.
														
 
															 MTU
														
 
															 ===
														
--- a/Documentation/process/submitting-patches.rst
+++ b/Documentation/process/submitting-patches.rst
@@ -71,7 +71,7 @@ as you intend it to.
 
															 The maintainer will thank you if you write your patch description in a
														
 
															 form which can be easily pulled into Linux's source code management
														
 
															-system, ``git``, as a "commit log".  See :ref:`explicit_in_reply_to`.
														
 
															+system, ``git``, as a "commit log".  See :ref:`the_canonical_patch_format`.
														
 
															 Solve only one problem per patch.  If your description starts to get
														
 
															 long, that's a sign that you probably need to split up your patch.
														
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14702,6 +14702,8 @@ F:	arch/mips/generic/board-ranchu.c
 
															 RANDOM NUMBER DRIVER
														
 
															 M:	"Theodore Ts'o" <[email protected]>
														
 
															+M:	Jason A. Donenfeld <[email protected]>
														
 
															+T:	git https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git
														
 
															 S:	Maintained
														
 
															 F:	drivers/char/random.c
														
@@ -19277,7 +19279,8 @@ F:	arch/x86/xen/*swiotlb*
 
															 F:	drivers/xen/*swiotlb*
														
 
															 XFS FILESYSTEM
														
 
															-M:	Darrick J. Wong <[email protected]>
														
 
															+M:	Amir Goldstein <[email protected]>
														
 
															+M:	Darrick J. Wong <[email protected]>
														
 
															 M:	[email protected]
														
 
															 L:	[email protected]
														
 
															 S:	Supported
														
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 
															 # SPDX-License-Identifier: GPL-2.0
														
 
															 VERSION = 5
														
 
															 PATCHLEVEL = 10
														
 
															-SUBLEVEL = 117
														
 
															+SUBLEVEL = 136
														
 
															 EXTRAVERSION =
														
 
															 NAME = Dare mighty things
														
@@ -694,12 +694,21 @@ ifdef CONFIG_FUNCTION_TRACER
 
															   CC_FLAGS_FTRACE := -pg
														
 
															 endif
														
 
															-RETPOLINE_CFLAGS_GCC := -mindirect-branch=thunk-extern -mindirect-branch-register
														
 
															-RETPOLINE_VDSO_CFLAGS_GCC := -mindirect-branch=thunk-inline -mindirect-branch-register
														
 
															-RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk
														
 
															-RETPOLINE_VDSO_CFLAGS_CLANG := -mretpoline
														
 
															-RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))
														
 
															-RETPOLINE_VDSO_CFLAGS := $(call cc-option,$(RETPOLINE_VDSO_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_VDSO_CFLAGS_CLANG)))
														
 
															+ifdef CONFIG_CC_IS_GCC
														
 
															+RETPOLINE_CFLAGS	:= $(call cc-option,-mindirect-branch=thunk-extern -mindirect-branch-register)
														
 
															+RETPOLINE_CFLAGS	+= $(call cc-option,-mindirect-branch-cs-prefix)
														
 
															+RETPOLINE_VDSO_CFLAGS	:= $(call cc-option,-mindirect-branch=thunk-inline -mindirect-branch-register)
														
 
															+endif
														
 
															+ifdef CONFIG_CC_IS_CLANG
														
 
															+RETPOLINE_CFLAGS	:= -mretpoline-external-thunk
														
 
															+RETPOLINE_VDSO_CFLAGS	:= -mretpoline
														
 
															+endif
														
 
															+
														
 
															+ifdef CONFIG_RETHUNK
														
 
															+RETHUNK_CFLAGS         := -mfunction-return=thunk-extern
														
 
															+RETPOLINE_CFLAGS       += $(RETHUNK_CFLAGS)
														
 
															+endif
														
 
															+
														
 
															 export RETPOLINE_CFLAGS
														
 
															 export RETPOLINE_VDSO_CFLAGS
														
@@ -1321,7 +1330,7 @@ KBUILD_MODULES := 1
 
															 autoksyms_recursive: descend modules.order
														
 
															 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \
														
 
															-	  "$(MAKE) -f $(srctree)/Makefile vmlinux"
														
 
															+	  "$(MAKE) -f $(srctree)/Makefile autoksyms_recursive"
														
 
															 endif
														
 
															 autoksyms_h := $(if $(CONFIG_TRIM_UNUSED_KSYMS), include/generated/autoksyms.h)
														
--- a/android/ACK_SHA
+++ b/android/ACK_SHA
@@ -1,3 +1,5 @@
 
															-android12-5.10-2022-09
														
 
															+android12-5.10-2022-10_r3
														
 
															-95279078149abf6684fadbc7bb6a2ab49efeea18
														
 
															+
														
 
															+
														
 
															+9171bbdc05b9daca374bf27449298dcf1fc21ecb
														
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
--- a/android/abi_gki_aarch64_exynos
+++ b/android/abi_gki_aarch64_exynos
@@ -144,6 +144,7 @@
 
															   clk_set_rate
														
 
															   clk_unprepare
														
 
															   clockevents_config_and_register
														
 
															+  clocks_calc_mult_shift
														
 
															   __clocksource_register_scale
														
 
															   __close_fd
														
 
															   cma_alloc
														
@@ -198,6 +199,8 @@
 
															   cpufreq_table_index_unsorted
														
 
															   cpufreq_this_cpu_can_update
														
 
															   cpufreq_unregister_notifier
														
 
															+  cpu_hotplug_disable
														
 
															+  cpu_hotplug_enable
														
 
															   __cpuhp_remove_state
														
 
															   __cpuhp_setup_state
														
 
															   __cpuhp_setup_state_cpuslocked
														
@@ -235,6 +238,7 @@
 
															   crypto_shash_update
														
 
															   crypto_unregister_alg
														
 
															   crypto_unregister_scomp
														
 
															+  csum_ipv6_magic
														
 
															   csum_partial
														
 
															   csum_tcpudp_nofold
														
 
															   _ctype
														
@@ -385,6 +389,7 @@
 
															   dev_pm_opp_add
														
 
															   dev_pm_opp_disable
														
 
															   dev_pm_opp_find_freq_ceil
														
 
															+  dev_pm_opp_find_freq_ceil_by_volt
														
 
															   dev_pm_opp_find_freq_exact
														
 
															   dev_pm_opp_find_freq_floor
														
 
															   dev_pm_opp_get_freq
														
@@ -428,6 +433,7 @@
 
															   dma_buf_export
														
 
															   dma_buf_fd
														
 
															   dma_buf_get
														
 
															+  dma_buf_get_flags
														
 
															   dma_buf_map_attachment
														
 
															   dma_buf_mmap
														
 
															   dma_buf_move_notify
														
@@ -509,6 +515,7 @@
 
															   drm_atomic_add_affected_connectors
														
 
															   drm_atomic_add_affected_planes
														
 
															   drm_atomic_commit
														
 
															+  drm_atomic_get_connector_state
														
 
															   drm_atomic_get_crtc_state
														
 
															   drm_atomic_get_plane_state
														
 
															   drm_atomic_get_private_obj_state
														
@@ -552,6 +559,7 @@
 
															   drm_atomic_set_fb_for_plane
														
 
															   drm_atomic_set_mode_for_crtc
														
 
															   drm_atomic_state_alloc
														
 
															+  drm_atomic_state_clear
														
 
															   __drm_atomic_state_free
														
 
															   drm_bridge_add
														
 
															   drm_bridge_attach
														
@@ -584,6 +592,7 @@
 
															   drm_crtc_vblank_off
														
 
															   drm_crtc_vblank_on
														
 
															   drm_crtc_vblank_put
														
 
															+  drm_crtc_wait_one_vblank
														
 
															   drm_cvt_mode
														
 
															   __drm_dbg
														
 
															   __drm_debug
														
@@ -745,6 +754,7 @@
 
															   drm_vma_node_allow
														
 
															   drm_vma_node_is_allowed
														
 
															   drm_vma_node_revoke
														
 
															+  drm_wait_one_vblank
														
 
															   drm_writeback_connector_init
														
 
															   drm_writeback_queue_job
														
 
															   drm_writeback_signal_completion
														
@@ -824,6 +834,7 @@
 
															   __get_free_pages
														
 
															   get_net_ns_by_fd
														
 
															   get_net_ns_by_pid
														
 
															+  get_options
														
 
															   get_random_bytes
														
 
															   get_random_u32
														
 
															   __get_task_comm
														
@@ -966,6 +977,7 @@
 
															   input_set_capability
														
 
															   input_unregister_device
														
 
															   input_unregister_handle
														
 
															+  int_pow
														
 
															   int_sqrt
														
 
															   iomem_resource
														
 
															   iommu_alloc_resv_region
														
@@ -975,6 +987,7 @@
 
															   iommu_device_sysfs_remove
														
 
															   iommu_device_unlink
														
 
															   iommu_device_unregister
														
 
															+  iommu_dma_enable_best_fit_algo
														
 
															   iommu_dma_reserve_iova
														
 
															   iommu_domain_alloc
														
 
															   iommu_fwspec_add_ids
														
@@ -1009,6 +1022,7 @@
 
															   irq_domain_set_info
														
 
															   irq_domain_xlate_onetwocell
														
 
															   irq_domain_xlate_twocell
														
 
															+  irq_do_set_affinity
														
 
															   irq_find_mapping
														
 
															   irq_get_irqchip_state
														
 
															   irq_get_irq_data
														
@@ -1038,6 +1052,7 @@
 
															   kasan_flag_enabled
														
 
															   kasprintf
														
 
															   kernel_kobj
														
 
															+  kernfs_path_from_node
														
 
															   kern_mount
														
 
															   kern_unmount
														
 
															   key_create_or_update
														
@@ -1074,6 +1089,8 @@
 
															   kobject_uevent
														
 
															   kobject_uevent_env
														
 
															   krealloc
														
 
															+  kset_create_and_add
														
 
															+  kset_unregister
														
 
															   kstat
														
 
															   kstrdup
														
 
															   kstrndup
														
@@ -1091,6 +1108,7 @@
 
															   kstrtoull_from_user
														
 
															   ksys_sync_helper
														
 
															   kthread_bind
														
 
															+  kthread_bind_mask
														
 
															   kthread_cancel_delayed_work_sync
														
 
															   kthread_cancel_work_sync
														
 
															   kthread_create_on_node
														
@@ -1120,6 +1138,8 @@
 
															   kvfree
														
 
															   kvfree_call_rcu
														
 
															   kvmalloc_node
														
 
															+  led_classdev_register_ext
														
 
															+  led_classdev_unregister
														
 
															   __list_add_valid
														
 
															   __list_del_entry_valid
														
 
															   list_sort
														
@@ -1144,6 +1164,7 @@
 
															   __memcpy_toio
														
 
															   memdup_user
														
 
															   memmove
														
 
															+  memory_read_from_buffer
														
 
															   memparse
														
 
															   memremap
														
 
															   memset
														
@@ -1159,6 +1180,7 @@
 
															   mii_nway_restart
														
 
															   mipi_dsi_attach
														
 
															   mipi_dsi_compression_mode
														
 
															+  mipi_dsi_dcs_get_display_brightness
														
 
															   mipi_dsi_dcs_read
														
 
															   mipi_dsi_dcs_set_column_address
														
 
															   mipi_dsi_dcs_set_display_brightness
														
@@ -1316,6 +1338,7 @@
 
															   of_property_read_string_helper
														
 
															   of_property_read_u32_index
														
 
															   of_property_read_u64
														
 
															+  of_property_read_u64_index
														
 
															   of_property_read_variable_u16_array
														
 
															   of_property_read_variable_u32_array
														
 
															   of_property_read_variable_u8_array
														
@@ -1331,6 +1354,9 @@
 
															   oops_in_progress
														
 
															   orderly_poweroff
														
 
															   page_endio
														
 
															+  page_frag_alloc
														
 
															+  __page_frag_cache_drain
														
 
															+  page_frag_free
														
 
															   page_mapping
														
 
															   __page_pinner_migration_failed
														
 
															   panic
														
@@ -1378,9 +1404,11 @@
 
															   pci_read_config_dword
														
 
															   pci_read_config_word
														
 
															   __pci_register_driver
														
 
															+  pci_release_regions
														
 
															   pci_release_resource
														
 
															   pci_rescan_bus
														
 
															   pci_resize_resource
														
 
															+  pci_restore_msi_state
														
 
															   pci_restore_state
														
 
															   pci_save_state
														
 
															   pci_set_master
														
@@ -1388,6 +1416,7 @@
 
															   pci_store_saved_state
														
 
															   pci_unmap_rom
														
 
															   pci_unregister_driver
														
 
															+  pci_wake_from_d3
														
 
															   pci_write_config_dword
														
 
															   pci_write_config_word
														
 
															   PDE_DATA
														
@@ -1418,6 +1447,7 @@
 
															   pinctrl_utils_free_map
														
 
															   pin_get_name
														
 
															   pin_user_pages
														
 
															+  pin_user_pages_fast
														
 
															   pin_user_pages_remote
														
 
															   platform_bus_type
														
 
															   platform_device_add
														
@@ -1506,6 +1536,8 @@
 
															   pwm_set_chip_data
														
 
															   queue_delayed_work_on
														
 
															   queue_work_on
														
 
															+  radix_tree_delete
														
 
															+  radix_tree_lookup
														
 
															   radix_tree_tagged
														
 
															   ___ratelimit
														
 
															   raw_notifier_call_chain
														
@@ -1647,11 +1679,13 @@
 
															   sched_set_normal
														
 
															   sched_setscheduler
														
 
															   sched_setscheduler_nocheck
														
 
															+  sched_uclamp_used
														
 
															   schedule
														
 
															   schedule_timeout
														
 
															   schedule_timeout_interruptible
														
 
															   scnprintf
														
 
															   scsi_block_when_processing_errors
														
 
															+  scsi_dma_unmap
														
 
															   scsi_eh_ready_devs
														
 
															   __scsi_execute
														
 
															   scsi_print_sense_hdr
														
@@ -1712,6 +1746,7 @@
 
															   skb_realloc_headroom
														
 
															   skb_trim
														
 
															   smp_call_function
														
 
															+  smp_call_function_any
														
 
															   smp_call_function_many
														
 
															   smp_call_function_single
														
 
															   smp_call_on_cpu
														
@@ -1783,6 +1818,7 @@
 
															   snd_soc_info_volsw_range
														
 
															   snd_soc_info_volsw_sx
														
 
															   snd_soc_info_xr_sx
														
 
															+  snd_soc_lookup_component
														
 
															   snd_soc_new_compress
														
 
															   snd_soc_of_get_dai_link_codecs
														
 
															   snd_soc_of_get_dai_name
														
@@ -1832,6 +1868,7 @@
 
															   __stack_chk_guard
														
 
															   static_key_slow_dec
														
 
															   static_key_slow_inc
														
 
															+  stop_machine
														
 
															   stop_one_cpu_nowait
														
 
															   stpcpy
														
 
															   strcasecmp
														
@@ -1903,7 +1940,15 @@
 
															   tasklet_init
														
 
															   tasklet_kill
														
 
															   __tasklet_schedule
														
 
															+  tasklet_setup
														
 
															   task_rq_lock
														
 
															+  tcp_register_congestion_control
														
 
															+  tcp_reno_cong_avoid
														
 
															+  tcp_reno_ssthresh
														
 
															+  tcp_reno_undo_cwnd
														
 
															+  tcp_slow_start
														
 
															+  tcp_unregister_congestion_control
														
 
															+  thermal_cdev_update
														
 
															   thermal_cooling_device_unregister
														
 
															   thermal_of_cooling_device_register
														
 
															   thermal_zone_device_disable
														
@@ -1925,11 +1970,13 @@
 
															   trace_event_reg
														
 
															   trace_handle_return
														
 
															   __traceiter_android_rvh_can_migrate_task
														
 
															+  __traceiter_android_rvh_cpu_cgroup_attach
														
 
															   __traceiter_android_rvh_cpu_cgroup_can_attach
														
 
															   __traceiter_android_rvh_dequeue_task
														
 
															   __traceiter_android_rvh_enqueue_task
														
 
															   __traceiter_android_rvh_find_lowest_rq
														
 
															   __traceiter_android_rvh_find_new_ilb
														
 
															+  __traceiter_android_rvh_flush_task
														
 
															   __traceiter_android_rvh_gic_v3_set_affinity
														
 
															   __traceiter_android_rvh_post_init_entity_util_avg
														
 
															   __traceiter_android_rvh_replace_next_task_fair
														
@@ -1937,18 +1984,24 @@
 
															   __traceiter_android_rvh_sched_newidle_balance
														
 
															   __traceiter_android_rvh_sched_nohz_balancer_kick
														
 
															   __traceiter_android_rvh_sched_rebalance_domains
														
 
															+  __traceiter_android_rvh_schedule
														
 
															   __traceiter_android_rvh_select_fallback_rq
														
 
															   __traceiter_android_rvh_select_task_rq_fair
														
 
															   __traceiter_android_rvh_select_task_rq_rt
														
 
															+  __traceiter_android_rvh_wake_up_new_task
														
 
															+  __traceiter_android_vh_cgroup_attach
														
 
															   __traceiter_android_vh_cpu_idle_enter
														
 
															   __traceiter_android_vh_cpu_idle_exit
														
 
															   __traceiter_android_vh_do_wake_up_sync
														
 
															   __traceiter_android_vh_ipi_stop
														
 
															+  __traceiter_android_vh_is_fpsimd_save
														
 
															   __traceiter_android_vh_scheduler_tick
														
 
															   __traceiter_android_vh_set_wake_flags
														
 
															   __traceiter_android_vh_show_mem
														
 
															+  __traceiter_android_vh_ufs_check_int_errors
														
 
															   __traceiter_android_vh_ufs_compl_command
														
 
															   __traceiter_android_vh_ufs_prepare_command
														
 
															+  __traceiter_android_vh_ufs_send_tm_command
														
 
															   __traceiter_cpu_idle
														
 
															   __traceiter_device_pm_callback_end
														
 
															   __traceiter_device_pm_callback_start
														
@@ -1976,11 +2029,13 @@
 
															   __traceiter_workqueue_execute_start
														
 
															   trace_output_call
														
 
															   __tracepoint_android_rvh_can_migrate_task
														
 
															+  __tracepoint_android_rvh_cpu_cgroup_attach
														
 
															   __tracepoint_android_rvh_cpu_cgroup_can_attach
														
 
															   __tracepoint_android_rvh_dequeue_task
														
 
															   __tracepoint_android_rvh_enqueue_task
														
 
															   __tracepoint_android_rvh_find_lowest_rq
														
 
															   __tracepoint_android_rvh_find_new_ilb
														
 
															+  __tracepoint_android_rvh_flush_task
														
 
															   __tracepoint_android_rvh_gic_v3_set_affinity
														
 
															   __tracepoint_android_rvh_post_init_entity_util_avg
														
 
															   __tracepoint_android_rvh_replace_next_task_fair
														
@@ -1988,18 +2043,24 @@
 
															   __tracepoint_android_rvh_sched_newidle_balance
														
 
															   __tracepoint_android_rvh_sched_nohz_balancer_kick
														
 
															   __tracepoint_android_rvh_sched_rebalance_domains
														
 
															+  __tracepoint_android_rvh_schedule
														
 
															   __tracepoint_android_rvh_select_fallback_rq
														
 
															   __tracepoint_android_rvh_select_task_rq_fair
														
 
															   __tracepoint_android_rvh_select_task_rq_rt
														
 
															+  __tracepoint_android_rvh_wake_up_new_task
														
 
															+  __tracepoint_android_vh_cgroup_attach
														
 
															   __tracepoint_android_vh_cpu_idle_enter
														
 
															   __tracepoint_android_vh_cpu_idle_exit
														
 
															   __tracepoint_android_vh_do_wake_up_sync
														
 
															   __tracepoint_android_vh_ipi_stop
														
 
															+  __tracepoint_android_vh_is_fpsimd_save
														
 
															   __tracepoint_android_vh_scheduler_tick
														
 
															   __tracepoint_android_vh_set_wake_flags
														
 
															   __tracepoint_android_vh_show_mem
														
 
															+  __tracepoint_android_vh_ufs_check_int_errors
														
 
															   __tracepoint_android_vh_ufs_compl_command
														
 
															   __tracepoint_android_vh_ufs_prepare_command
														
 
															+  __tracepoint_android_vh_ufs_send_tm_command
														
 
															   __tracepoint_cpu_idle
														
 
															   __tracepoint_device_pm_callback_end
														
 
															   __tracepoint_device_pm_callback_start
														
@@ -2129,6 +2190,7 @@
 
															   unregister_shrinker
														
 
															   up
														
 
															   update_devfreq
														
 
															+  update_rq_clock
														
 
															   up_read
														
 
															   up_write
														
 
															   usb_add_function
														
@@ -2301,6 +2363,7 @@
 
															   wakeup_source_add
														
 
															   wakeup_source_destroy
														
 
															   wakeup_source_register
														
 
															+  wakeup_source_remove
														
 
															   wakeup_source_unregister
														
 
															   __wake_up_sync
														
 
															   __wake_up_sync_key
														
@@ -2322,6 +2385,7 @@
 
															   xhci_gen_setup
														
 
															   xhci_get_endpoint_index
														
 
															   xhci_get_ep_ctx
														
 
															+  xhci_get_slot_ctx
														
 
															   xhci_init_driver
														
 
															   xhci_initialize_ring_info
														
 
															   xhci_link_segments
														
--- a/android/abi_gki_aarch64_fips140
+++ b/android/abi_gki_aarch64_fips140
@@ -112,6 +112,7 @@
 
															   _raw_spin_lock
														
 
															   _raw_spin_unlock
														
 
															   refcount_warn_saturate
														
 
															+  rng_is_initialized
														
 
															   scatterwalk_ffwd
														
 
															   scatterwalk_map_and_copy
														
 
															   sg_init_one
														
--- a/android/abi_gki_aarch64_mtk
+++ b/android/abi_gki_aarch64_mtk
@@ -3216,6 +3216,7 @@
 
															   update_devfreq
														
 
															   usb_add_phy_dev
														
 
															   usb_assign_descriptors
														
 
															+  usb_clear_halt
														
 
															   usb_copy_descriptors
														
 
															   usb_ep_alloc_request
														
 
															   usb_ep_autoconfig
														
@@ -3239,6 +3240,7 @@
 
															   usb_phy_set_charger_current
														
 
															   usb_remove_phy
														
 
															   usb_role_switch_set_role
														
 
															+  usb_unlink_urb
														
 
															   v4l2_async_notifier_add_subdev
														
 
															   v4l2_async_notifier_cleanup
														
 
															   v4l2_async_subdev_notifier_register
														
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -2684,6 +2684,7 @@
 
															   __traceiter_android_rvh_build_perf_domains
														
 
															   __traceiter_android_rvh_can_migrate_task
														
 
															   __traceiter_android_rvh_check_preempt_wakeup
														
 
															+  __traceiter_android_rvh_check_preempt_tick
														
 
															   __traceiter_android_rvh_cpu_cgroup_attach
														
 
															   __traceiter_android_rvh_cpu_cgroup_online
														
 
															   __traceiter_android_rvh_cpu_overutilized
														
@@ -2783,6 +2784,7 @@
 
															   __traceiter_android_vh_cpu_idle_enter
														
 
															   __traceiter_android_vh_cpu_idle_exit
														
 
															   __traceiter_android_vh_cpu_up
														
 
															+  __traceiter_android_vh_check_page_look_around_ref
														
 
															   __traceiter_android_vh_do_futex
														
 
															   __traceiter_android_vh_do_send_sig_info
														
 
															   __traceiter_android_vh_drain_all_pages_bypass
														
@@ -2816,6 +2818,8 @@
 
															   __traceiter_android_vh_killed_process
														
 
															   __traceiter_android_vh_kmalloc_slab
														
 
															   __traceiter_android_vh_logbuf
														
 
															+  __traceiter_android_vh_look_around
														
 
															+  __traceiter_android_vh_look_around_migrate_page
														
 
															   __traceiter_android_vh_mem_cgroup_alloc
														
 
															   __traceiter_android_vh_mem_cgroup_css_offline
														
 
															   __traceiter_android_vh_mem_cgroup_css_online
														
@@ -2849,7 +2853,7 @@
 
															   __traceiter_android_vh_record_mutex_lock_starttime
														
 
															   __traceiter_android_vh_record_rtmutex_lock_starttime
														
 
															   __traceiter_android_vh_record_rwsem_lock_starttime
														
 
															-  __traceiter_android_vh_record_percpu_rwsem_lock_starttime
														
 
															+  __traceiter_android_vh_record_pcpu_rwsem_starttime
														
 
															   __traceiter_android_vh_rmqueue
														
 
															   __traceiter_android_vh_rwsem_init
														
 
															   __traceiter_android_vh_rwsem_mark_wake_readers
														
@@ -2917,12 +2921,14 @@
 
															   __traceiter_suspend_resume
														
 
															   __traceiter_task_newtask
														
 
															   __traceiter_task_rename
														
 
															+  __traceiter_android_vh_test_clear_look_around_ref
														
 
															   __traceiter_xhci_urb_giveback
														
 
															   __tracepoint_android_rvh_account_irq
														
 
															   __tracepoint_android_rvh_after_enqueue_task
														
 
															   __tracepoint_android_rvh_build_perf_domains
														
 
															   __tracepoint_android_rvh_can_migrate_task
														
 
															   __tracepoint_android_rvh_check_preempt_wakeup
														
 
															+  __tracepoint_android_rvh_check_preempt_tick
														
 
															   __tracepoint_android_rvh_cpu_cgroup_attach
														
 
															   __tracepoint_android_rvh_cpu_cgroup_online
														
 
															   __tracepoint_android_rvh_cpu_overutilized
														
@@ -3022,6 +3028,7 @@
 
															   __tracepoint_android_vh_cpu_idle_enter
														
 
															   __tracepoint_android_vh_cpu_idle_exit
														
 
															   __tracepoint_android_vh_cpu_up
														
 
															+  __tracepoint_android_vh_check_page_look_around_ref
														
 
															   __tracepoint_android_vh_do_futex
														
 
															   __tracepoint_android_vh_do_send_sig_info
														
 
															   __tracepoint_android_vh_drain_all_pages_bypass
														
@@ -3055,6 +3062,8 @@
 
															   __tracepoint_android_vh_killed_process
														
 
															   __tracepoint_android_vh_kmalloc_slab
														
 
															   __tracepoint_android_vh_logbuf
														
 
															+  __tracepoint_android_vh_look_around
														
 
															+  __tracepoint_android_vh_look_around_migrate_page
														
 
															   __tracepoint_android_vh_mem_cgroup_alloc
														
 
															   __tracepoint_android_vh_mem_cgroup_css_offline
														
 
															   __tracepoint_android_vh_mem_cgroup_css_online
														
@@ -3088,7 +3097,7 @@
 
															   __tracepoint_android_vh_record_mutex_lock_starttime
														
 
															   __tracepoint_android_vh_record_rtmutex_lock_starttime
														
 
															   __tracepoint_android_vh_record_rwsem_lock_starttime
														
 
															-  __tracepoint_android_vh_record_percpu_rwsem_lock_starttime
														
 
															+  __tracepoint_android_vh_record_pcpu_rwsem_starttime
														
 
															   __tracepoint_android_vh_rmqueue
														
 
															   __tracepoint_android_vh_rwsem_init
														
 
															   __tracepoint_android_vh_rwsem_mark_wake_readers
														
@@ -3128,6 +3137,7 @@
 
															   __tracepoint_android_vh_tune_inactive_ratio
														
 
															   __tracepoint_android_vh_tune_scan_type
														
 
															   __tracepoint_android_vh_tune_swappiness
														
 
															+  __tracepoint_android_vh_test_clear_look_around_ref
														
 
															   __tracepoint_android_vh_ufs_compl_command
														
 
															   __tracepoint_android_vh_ufs_send_command
														
 
															   __tracepoint_android_vh_ufs_send_tm_command
														
@@ -3140,6 +3150,10 @@
 
															   __tracepoint_ipi_entry
														
 
															   __tracepoint_ipi_raise
														
 
															   __tracepoint_irq_handler_entry
														
 
															+  __tracepoint_net_dev_queue
														
 
															+  __tracepoint_net_dev_xmit
														
 
															+  __tracepoint_netif_receive_skb
														
 
															+  __tracepoint_netif_rx
														
 
															   __tracepoint_pelt_se_tp
														
 
															   tracepoint_probe_register
														
 
															   tracepoint_probe_register_prio
														
@@ -3622,3 +3636,4 @@
 
															   xhci_ring_cmd_db
														
 
															   xhci_ring_free
														
 
															   xhci_trb_virt_to_dma
														
 
															+  zero_pfn
														
--- a/android/abi_gki_aarch64_qcom
+++ b/android/abi_gki_aarch64_qcom
@@ -881,6 +881,7 @@
 
															   extcon_get_edev_name
														
 
															   extcon_get_extcon_dev
														
 
															   extcon_get_property
														
 
															+  extcon_get_property_capability
														
 
															   extcon_get_state
														
 
															   extcon_register_notifier
														
 
															   extcon_set_state_sync
														
@@ -2701,6 +2702,7 @@
 
															   __tracepoint_android_vh_jiffies_update
														
 
															   __tracepoint_android_vh_logbuf
														
 
															   __tracepoint_android_vh_logbuf_pr_cont
														
 
															+  __tracepoint_android_vh_madvise_cold_or_pageout
														
 
															   __tracepoint_android_vh_oom_check_panic
														
 
															   __tracepoint_android_vh_printk_hotplug
														
 
															   __tracepoint_android_vh_process_killed
														
@@ -3024,6 +3026,7 @@
 
															   wait_for_completion_interruptible_timeout
														
 
															   wait_for_completion_killable
														
 
															   wait_for_completion_timeout
														
 
															+  wait_on_page_bit
														
 
															   __wait_rcu_gp
														
 
															   wait_woken
														
 
															   __wake_up
														
--- a/android/abi_gki_aarch64_transsion
+++ b/android/abi_gki_aarch64_transsion
@@ -34,6 +34,7 @@
 
															   __traceiter_android_vh_alloc_si
														
 
															   __traceiter_android_vh_free_pages
														
 
															   __traceiter_android_vh_set_shmem_page_flag
														
 
															+  __traceiter_android_vh_ra_tuning_max_page
														
 
															   __tracepoint_android_vh_handle_pte_fault_end
														
 
															   __tracepoint_android_vh_cow_user_page
														
 
															   __tracepoint_android_vh_swapin_add_anon_rmap
														
@@ -57,4 +58,5 @@
 
															   __tracepoint_android_vh_si_swapinfo
														
 
															   __tracepoint_android_vh_alloc_si
														
 
															   __tracepoint_android_vh_free_pages
														
 
															-  __tracepoint_android_vh_set_shmem_page_flag
														
 
															+  __tracepoint_android_vh_set_shmem_page_flag
														
 
															+  __tracepoint_android_vh_ra_tuning_max_page
														
--- a/android/abi_gki_aarch64_type_visibility
+++ b/android/abi_gki_aarch64_type_visibility
@@ -0,0 +1,6 @@
 
															+[abi_symbol_list]
														
 
															+
														
 
															+# for type visibility
														
 
															+  GKI_struct_selinux_state
														
 
															+  GKI_struct_gic_chip_data
														
 
															+  GKI_struct_swap_slots_cache
														
--- a/arch/alpha/include/asm/timex.h
+++ b/arch/alpha/include/asm/timex.h
@@ -28,5 +28,6 @@ static inline cycles_t get_cycles (void)
 
															 	__asm__ __volatile__ ("rpcc %0" : "=r"(ret));
														
 
															 	return ret;
														
 
															 }
														
 
															+#define get_cycles get_cycles
														
 
															 #endif
														
--- a/arch/alpha/kernel/srmcons.c
+++ b/arch/alpha/kernel/srmcons.c
@@ -59,7 +59,7 @@ srmcons_do_receive_chars(struct tty_port *port)
 
															 	} while((result.bits.status & 1) && (++loops < 10));
														
 
															 	if (count)
														
 
															-		tty_schedule_flip(port);
														
 
															+		tty_flip_buffer_push(port);
														
 
															 	return count;
														
 
															 }
														
--- a/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi
+++ b/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi
@@ -117,11 +117,6 @@
 
															 		groups = "FWSPID";
														
 
															 	};
														
 
															-	pinctrl_fwqspid_default: fwqspid_default {
														
 
															-		function = "FWSPID";
														
 
															-		groups = "FWQSPID";
														
 
															-	};
														
 
															-
														
 
															 	pinctrl_fwspiwp_default: fwspiwp_default {
														
 
															 		function = "FWSPIWP";
														
 
															 		groups = "FWSPIWP";
														
@@ -653,12 +648,12 @@
 
															 	};
														
 
															 	pinctrl_qspi1_default: qspi1_default {
														
 
															-		function = "QSPI1";
														
 
															+		function = "SPI1";
														
 
															 		groups = "QSPI1";
														
 
															 	};
														
 
															 	pinctrl_qspi2_default: qspi2_default {
														
 
															-		function = "QSPI2";
														
 
															+		function = "SPI2";
														
 
															 		groups = "QSPI2";
														
 
															 	};
														
--- a/arch/arm/boot/dts/at91-sam9x60ek.dts
+++ b/arch/arm/boot/dts/at91-sam9x60ek.dts
@@ -233,10 +233,9 @@
 
															 		status = "okay";
														
 
															 		eeprom@53 {
														
 
															-			compatible = "atmel,24c32";
														
 
															+			compatible = "atmel,24c02";
														
 
															 			reg = <0x53>;
														
 
															 			pagesize = <16>;
														
 
															-			size = <128>;
														
 
															 			status = "okay";
														
 
															 		};
														
 
															 	};
														
--- a/arch/arm/boot/dts/at91-sama5d2_icp.dts
+++ b/arch/arm/boot/dts/at91-sama5d2_icp.dts
@@ -317,21 +317,21 @@
 
															 	status = "okay";
														
 
															 	eeprom@50 {
														
 
															-		compatible = "atmel,24c32";
														
 
															+		compatible = "atmel,24c02";
														
 
															 		reg = <0x50>;
														
 
															 		pagesize = <16>;
														
 
															 		status = "okay";
														
 
															 	};
														
 
															 	eeprom@52 {
														
 
															-		compatible = "atmel,24c32";
														
 
															+		compatible = "atmel,24c02";
														
 
															 		reg = <0x52>;
														
 
															 		pagesize = <16>;
														
 
															 		status = "disabled";
														
 
															 	};
														
 
															 	eeprom@53 {
														
 
															-		compatible = "atmel,24c32";
														
 
															+		compatible = "atmel,24c02";
														
 
															 		reg = <0x53>;
														
 
															 		pagesize = <16>;
														
 
															 		status = "disabled";
														
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -53,18 +53,17 @@
 
															 			  "GPIO18",
														
 
															 			  "NC", /* GPIO19 */
														
 
															 			  "NC", /* GPIO20 */
														
 
															-			  "GPIO21",
														
 
															+			  "CAM_GPIO0",
														
 
															 			  "GPIO22",
														
 
															 			  "GPIO23",
														
 
															 			  "GPIO24",
														
 
															 			  "GPIO25",
														
 
															 			  "NC", /* GPIO26 */
														
 
															-			  "CAM_GPIO0",
														
 
															-			  /* Binary number representing build/revision */
														
 
															-			  "CONFIG0",
														
 
															-			  "CONFIG1",
														
 
															-			  "CONFIG2",
														
 
															-			  "CONFIG3",
														
 
															+			  "GPIO27",
														
 
															+			  "GPIO28",
														
 
															+			  "GPIO29",
														
 
															+			  "GPIO30",
														
 
															+			  "GPIO31",
														
 
															 			  "NC", /* GPIO32 */
														
 
															 			  "NC", /* GPIO33 */
														
 
															 			  "NC", /* GPIO34 */
														
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -74,16 +74,18 @@
 
															 			  "GPIO27",
														
 
															 			  "SDA0",
														
 
															 			  "SCL0",
														
 
															-			  "NC", /* GPIO30 */
														
 
															-			  "NC", /* GPIO31 */
														
 
															-			  "NC", /* GPIO32 */
														
 
															-			  "NC", /* GPIO33 */
														
 
															-			  "NC", /* GPIO34 */
														
 
															-			  "NC", /* GPIO35 */
														
 
															-			  "NC", /* GPIO36 */
														
 
															-			  "NC", /* GPIO37 */
														
 
															-			  "NC", /* GPIO38 */
														
 
															-			  "NC", /* GPIO39 */
														
 
															+			  /* Used by BT module */
														
 
															+			  "CTS0",
														
 
															+			  "RTS0",
														
 
															+			  "TXD0",
														
 
															+			  "RXD0",
														
 
															+			  /* Used by Wifi */
														
 
															+			  "SD1_CLK",
														
 
															+			  "SD1_CMD",
														
 
															+			  "SD1_DATA0",
														
 
															+			  "SD1_DATA1",
														
 
															+			  "SD1_DATA2",
														
 
															+			  "SD1_DATA3",
														
 
															 			  "CAM_GPIO1", /* GPIO40 */
														
 
															 			  "WL_ON", /* GPIO41 */
														
 
															 			  "NC", /* GPIO42 */
														
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -45,7 +45,7 @@
 
															 		#gpio-cells = <2>;
														
 
															 		gpio-line-names = "BT_ON",
														
 
															 				  "WL_ON",
														
 
															-				  "STATUS_LED_R",
														
 
															+				  "PWR_LED_R",
														
 
															 				  "LAN_RUN",
														
 
															 				  "",
														
 
															 				  "CAM_GPIO0",
														
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
@@ -63,8 +63,8 @@
 
															 			  "GPIO43",
														
 
															 			  "GPIO44",
														
 
															 			  "GPIO45",
														
 
															-			  "GPIO46",
														
 
															-			  "GPIO47",
														
 
															+			  "SMPS_SCL",
														
 
															+			  "SMPS_SDA",
														
 
															 			  /* Used by eMMC */
														
 
															 			  "SD_CLK_R",
														
 
															 			  "SD_CMD_R",
														
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -129,7 +129,7 @@
 
															 	samsung,i2c-max-bus-freq = <20000>;
														
 
															 	eeprom@50 {
														
 
															-		compatible = "samsung,s524ad0xd1";
														
 
															+		compatible = "samsung,s524ad0xd1", "atmel,24c128";
														
 
															 		reg = <0x50>;
														
 
															 	};
														
@@ -289,7 +289,7 @@
 
															 	samsung,i2c-max-bus-freq = <20000>;
														
 
															 	eeprom@51 {
														
 
															-		compatible = "samsung,s524ad0xd1";
														
 
															+		compatible = "samsung,s524ad0xd1", "atmel,24c128";
														
 
															 		reg = <0x51>;
														
 
															 	};
														
--- a/arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts
+++ b/arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts
@@ -297,7 +297,11 @@
 
															 	phy-mode = "rmii";
														
 
															 	phy-reset-gpios = <&gpio1 18 GPIO_ACTIVE_LOW>;
														
 
															 	phy-handle = <&phy>;
														
 
															-	clocks = <&clks IMX6QDL_CLK_ENET>, <&clks IMX6QDL_CLK_ENET>, <&rmii_clk>;
														
 
															+	clocks = <&clks IMX6QDL_CLK_ENET>,
														
 
															+		 <&clks IMX6QDL_CLK_ENET>,
														
 
															+		 <&rmii_clk>,
														
 
															+		 <&clks IMX6QDL_CLK_ENET_REF>;
														
 
															+	clock-names = "ipg", "ahb", "ptp", "enet_out";
														
 
															 	status = "okay";
														
 
															 	mdio {
														
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -1,6 +1,6 @@
 
															 // SPDX-License-Identifier: GPL-2.0+ OR MIT
														
 
															 /*
														
 
															- * Copyright 2014-2020 Toradex
														
 
															+ * Copyright 2014-2022 Toradex
														
 
															  * Copyright 2012 Freescale Semiconductor, Inc.
														
 
															  * Copyright 2011 Linaro Ltd.
														
 
															  */
														
@@ -132,7 +132,7 @@
 
															 	clock-frequency = <100000>;
														
 
															 	pinctrl-names = "default", "gpio";
														
 
															 	pinctrl-0 = <&pinctrl_i2c2>;
														
 
															-	pinctrl-0 = <&pinctrl_i2c2_gpio>;
														
 
															+	pinctrl-1 = <&pinctrl_i2c2_gpio>;
														
 
															 	scl-gpios = <&gpio2 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
														
 
															 	sda-gpios = <&gpio3 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
														
 
															 	status = "okay";
														
@@ -488,7 +488,7 @@
 
															 		>;
														
 
															 	};
														
 
															-	pinctrl_i2c2_gpio: i2c2grp {
														
 
															+	pinctrl_i2c2_gpio: i2c2gpiogrp {
														
 
															 		fsl,pins = <
														
 
															 			MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x4001b8b1
														
 
															 			MX6QDL_PAD_EIM_D16__GPIO3_IO16 0x4001b8b1
														
--- a/arch/arm/boot/dts/imx6qdl-ts7970.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-ts7970.dtsi
@@ -226,7 +226,7 @@
 
															 		reg = <0x28>;
														
 
															 		#gpio-cells = <2>;
														
 
															 		gpio-controller;
														
 
															-		ngpio = <32>;
														
 
															+		ngpios = <62>;
														
 
															 	};
														
 
															 	sgtl5000: codec@a {
														
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -756,7 +756,7 @@
 
															 					regulator-name = "vddpu";
														
 
															 					regulator-min-microvolt = <725000>;
														
 
															 					regulator-max-microvolt = <1450000>;
														
 
															-					regulator-enable-ramp-delay = <150>;
														
 
															+					regulator-enable-ramp-delay = <380>;
														
 
															 					anatop-reg-offset = <0x140>;
														
 
															 					anatop-vol-bit-shift = <9>;
														
 
															 					anatop-vol-bit-width = <5>;
														
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -102,6 +102,7 @@
 
															 		compatible = "usb-nop-xceiv";
														
 
															 		clocks = <&clks IMX7D_USB_HSIC_ROOT_CLK>;
														
 
															 		clock-names = "main_clk";
														
 
															+		power-domains = <&pgc_hsic_phy>;
														
 
															 		#phy-cells = <0>;
														
 
															 	};
														
@@ -1104,7 +1105,6 @@
 
															 				compatible = "fsl,imx7d-usb", "fsl,imx27-usb";
														
 
															 				reg = <0x30b30000 0x200>;
														
 
															 				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
														
 
															-				power-domains = <&pgc_hsic_phy>;
														
 
															 				clocks = <&clks IMX7D_USB_CTRL_CLK>;
														
 
															 				fsl,usbphy = <&usbphynop3>;
														
 
															 				fsl,usbmisc = <&usbmisc3 0>;
														
--- a/arch/arm/boot/dts/ox820.dtsi
+++ b/arch/arm/boot/dts/ox820.dtsi
@@ -287,7 +287,7 @@
 
															 				clocks = <&armclk>;
														
 
															 			};
														
 
															-			gic: gic@1000 {
														
 
															+			gic: interrupt-controller@1000 {
														
 
															 				compatible = "arm,arm11mp-gic";
														
 
															 				interrupt-controller;
														
 
															 				#interrupt-cells = <3>;
														
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -564,7 +564,6 @@
 
															 			reset-gpios = <&mp05 5 GPIO_ACTIVE_LOW>;
														
 
															 			vdd3-supply = <&ldo7_reg>;
														
 
															 			vci-supply = <&ldo17_reg>;
														
 
															-			spi-cs-high;
														
 
															 			spi-max-frequency = <1200000>;
														
 
															 			pinctrl-names = "default";
														
@@ -637,7 +636,7 @@
 
															 };
														
 
															 &i2s0 {
														
 
															-	dmas = <&pdma0 9>, <&pdma0 10>, <&pdma0 11>;
														
 
															+	dmas = <&pdma0 10>, <&pdma0 9>, <&pdma0 11>;
														
 
															 	status = "okay";
														
 
															 };
														
@@ -896,7 +895,7 @@
 
															 		device-wakeup-gpios = <&gpg3 4 GPIO_ACTIVE_HIGH>;
														
 
															 		interrupt-parent = <&gph2>;
														
 
															 		interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
														
 
															-		interrupt-names = "host-wake";
														
 
															+		interrupt-names = "host-wakeup";
														
 
															 	};
														
 
															 };
														
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -240,8 +240,8 @@
 
															 			reg = <0xeee30000 0x1000>;
														
 
															 			interrupt-parent = <&vic2>;
														
 
															 			interrupts = <16>;
														
 
															-			dma-names = "rx", "tx", "tx-sec";
														
 
															-			dmas = <&pdma1 9>, <&pdma1 10>, <&pdma1 11>;
														
 
															+			dma-names = "tx", "rx", "tx-sec";
														
 
															+			dmas = <&pdma1 10>, <&pdma1 9>, <&pdma1 11>;
														
 
															 			clock-names = "iis",
														
 
															 				      "i2s_opclk0",
														
 
															 				      "i2s_opclk1";
														
@@ -260,8 +260,8 @@
 
															 			reg = <0xe2100000 0x1000>;
														
 
															 			interrupt-parent = <&vic2>;
														
 
															 			interrupts = <17>;
														
 
															-			dma-names = "rx", "tx";
														
 
															-			dmas = <&pdma1 12>, <&pdma1 13>;
														
 
															+			dma-names = "tx", "rx";
														
 
															+			dmas = <&pdma1 13>, <&pdma1 12>;
														
 
															 			clock-names = "iis", "i2s_opclk0";
														
 
															 			clocks = <&clocks CLK_I2S1>, <&clocks SCLK_AUDIO1>;
														
 
															 			pinctrl-names = "default";
														
@@ -275,8 +275,8 @@
 
															 			reg = <0xe2a00000 0x1000>;
														
 
															 			interrupt-parent = <&vic2>;
														
 
															 			interrupts = <18>;
														
 
															-			dma-names = "rx", "tx";
														
 
															-			dmas = <&pdma1 14>, <&pdma1 15>;
														
 
															+			dma-names = "tx", "rx";
														
 
															+			dmas = <&pdma1 15>, <&pdma1 14>;
														
 
															 			clock-names = "iis", "i2s_opclk0";
														
 
															 			clocks = <&clocks CLK_I2S2>, <&clocks SCLK_AUDIO2>;
														
 
															 			pinctrl-names = "default";
														
--- a/arch/arm/boot/dts/sama5d2.dtsi
+++ b/arch/arm/boot/dts/sama5d2.dtsi
@@ -1125,7 +1125,7 @@
 
															 				clocks = <&pmc PMC_TYPE_PERIPHERAL 55>, <&pmc PMC_TYPE_GCK 55>;
														
 
															 				clock-names = "pclk", "gclk";
														
 
															 				assigned-clocks = <&pmc PMC_TYPE_CORE PMC_I2S1_MUX>;
														
 
															-				assigned-parrents = <&pmc PMC_TYPE_GCK 55>;
														
 
															+				assigned-clock-parents = <&pmc PMC_TYPE_GCK 55>;
														
 
															 				status = "disabled";
														
 
															 			};
														
--- a/arch/arm/boot/dts/stm32mp151.dtsi
+++ b/arch/arm/boot/dts/stm32mp151.dtsi
@@ -543,7 +543,7 @@
 
															 			compatible = "st,stm32-cec";
														
 
															 			reg = <0x40016000 0x400>;
														
 
															 			interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
														
 
															-			clocks = <&rcc CEC_K>, <&clk_lse>;
														
 
															+			clocks = <&rcc CEC_K>, <&rcc CEC>;
														
 
															 			clock-names = "cec", "hdmi-cec";
														
 
															 			status = "disabled";
														
 
															 		};
														
--- a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi
+++ b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi
@@ -141,6 +141,7 @@
 
															 		compatible = "snps,dwmac-mdio";
														
 
															 		reset-gpios = <&gpioz 2 GPIO_ACTIVE_LOW>;
														
 
															 		reset-delay-us = <1000>;
														
 
															+		reset-post-delay-us = <1000>;
														
 
															 		phy0: ethernet-phy@7 {
														
 
															 			reg = <7>;
														
--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
@@ -169,7 +169,7 @@
 
															 	flash@0 {
														
 
															 		#address-cells = <1>;
														
 
															 		#size-cells = <1>;
														
 
															-		compatible = "mxicy,mx25l1606e", "winbond,w25q128";
														
 
															+		compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
														
 
															 		reg = <0>;
														
 
															 		spi-max-frequency = <40000000>;
														
 
															 	};
														
--- a/arch/arm/boot/dts/suniv-f1c100s.dtsi
+++ b/arch/arm/boot/dts/suniv-f1c100s.dtsi
@@ -104,8 +104,10 @@
 
															 		wdt: watchdog@1c20ca0 {
														
 
															 			compatible = "allwinner,suniv-f1c100s-wdt",
														
 
															-				     "allwinner,sun4i-a10-wdt";
														
 
															+				     "allwinner,sun6i-a31-wdt";
														
 
															 			reg = <0x01c20ca0 0x20>;
														
 
															+			interrupts = <16>;
														
 
															+			clocks = <&osc32k>;
														
 
															 		};
														
 
															 		uart0: serial@1c25000 {
														
--- a/arch/arm/crypto/Makefile
+++ b/arch/arm/crypto/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o
 
															 obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o
														
 
															 obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o
														
 
															 obj-$(CONFIG_CRYPTO_BLAKE2S_ARM) += blake2s-arm.o
														
 
															+obj-$(if $(CONFIG_CRYPTO_BLAKE2S_ARM),y) += libblake2s-arm.o
														
 
															 obj-$(CONFIG_CRYPTO_BLAKE2B_NEON) += blake2b-neon.o
														
 
															 obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o
														
 
															 obj-$(CONFIG_CRYPTO_POLY1305_ARM) += poly1305-arm.o
														
@@ -31,7 +32,8 @@ sha256-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha256_neon_glue.o
 
															 sha256-arm-y	:= sha256-core.o sha256_glue.o $(sha256-arm-neon-y)
														
 
															 sha512-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha512-neon-glue.o
														
 
															 sha512-arm-y	:= sha512-core.o sha512-glue.o $(sha512-arm-neon-y)
														
 
															-blake2s-arm-y   := blake2s-core.o blake2s-glue.o
														
 
															+blake2s-arm-y   := blake2s-shash.o
														
 
															+libblake2s-arm-y:= blake2s-core.o blake2s-glue.o
														
 
															 blake2b-neon-y  := blake2b-neon-core.o blake2b-neon-glue.o
														
 
															 sha1-arm-ce-y	:= sha1-ce-core.o sha1-ce-glue.o
														
 
															 sha2-arm-ce-y	:= sha2-ce-core.o sha2-ce-glue.o
														
--- a/arch/arm/crypto/blake2s-core.S
+++ b/arch/arm/crypto/blake2s-core.S
@@ -167,8 +167,8 @@
 
															 .endm
														
 
															 //
														
 
															-// void blake2s_compress_arch(struct blake2s_state *state,
														
 
															-//			      const u8 *block, size_t nblocks, u32 inc);
														
 
															+// void blake2s_compress(struct blake2s_state *state,
														
 
															+//			 const u8 *block, size_t nblocks, u32 inc);
														
 
															 //
														
 
															 // Only the first three fields of struct blake2s_state are used:
														
 
															 //	u32 h[8];	(inout)
														
@@ -176,7 +176,7 @@
 
															 //	u32 f[2];	(in)
														
 
															 //
														
 
															 	.align		5
														
 
															-ENTRY(blake2s_compress_arch)
														
 
															+ENTRY(blake2s_compress)
														
 
															 	push		{r0-r2,r4-r11,lr}	// keep this an even number
														
 
															 .Lnext_block:
														
@@ -303,4 +303,4 @@ ENTRY(blake2s_compress_arch)
 
															 	str		r3, [r12], #4
														
 
															 	bne		1b
														
 
															 	b		.Lcopy_block_done
														
 
															-ENDPROC(blake2s_compress_arch)
														
 
															+ENDPROC(blake2s_compress)
														
--- a/arch/arm/crypto/blake2s-glue.c
+++ b/arch/arm/crypto/blake2s-glue.c
@@ -1,78 +1,7 @@
 
															 // SPDX-License-Identifier: GPL-2.0-or-later
														
 
															-/*
														
 
															- * BLAKE2s digest algorithm, ARM scalar implementation
														
 
															- *
														
 
															- * Copyright 2020 Google LLC
														
 
															- */
														
 
															 #include <crypto/internal/blake2s.h>
														
 
															-#include <crypto/internal/hash.h>
														
 
															-
														
 
															 #include <linux/module.h>
														
 
															 /* defined in blake2s-core.S */
														
 
															-EXPORT_SYMBOL(blake2s_compress_arch);
														
 
															-
														
 
															-static int crypto_blake2s_update_arm(struct shash_desc *desc,
														
 
															-				     const u8 *in, unsigned int inlen)
														
 
															-{
														
 
															-	return crypto_blake2s_update(desc, in, inlen, blake2s_compress_arch);
														
 
															-}
														
 
															-
														
 
															-static int crypto_blake2s_final_arm(struct shash_desc *desc, u8 *out)
														
 
															-{
														
 
															-	return crypto_blake2s_final(desc, out, blake2s_compress_arch);
														
 
															-}
														
 
															-
														
 
															-#define BLAKE2S_ALG(name, driver_name, digest_size)			\
														
 
															-	{								\
														
 
															-		.base.cra_name		= name,				\
														
 
															-		.base.cra_driver_name	= driver_name,			\
														
 
															-		.base.cra_priority	= 200,				\
														
 
															-		.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,	\
														
 
															-		.base.cra_blocksize	= BLAKE2S_BLOCK_SIZE,		\
														
 
															-		.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx), \
														
 
															-		.base.cra_module	= THIS_MODULE,			\
														
 
															-		.digestsize		= digest_size,			\
														
 
															-		.setkey			= crypto_blake2s_setkey,	\
														
 
															-		.init			= crypto_blake2s_init,		\
														
 
															-		.update			= crypto_blake2s_update_arm,	\
														
 
															-		.final			= crypto_blake2s_final_arm,	\
														
 
															-		.descsize		= sizeof(struct blake2s_state),	\
														
 
															-	}
														
 
															-
														
 
															-static struct shash_alg blake2s_arm_algs[] = {
														
 
															-	BLAKE2S_ALG("blake2s-128", "blake2s-128-arm", BLAKE2S_128_HASH_SIZE),
														
 
															-	BLAKE2S_ALG("blake2s-160", "blake2s-160-arm", BLAKE2S_160_HASH_SIZE),
														
 
															-	BLAKE2S_ALG("blake2s-224", "blake2s-224-arm", BLAKE2S_224_HASH_SIZE),
														
 
															-	BLAKE2S_ALG("blake2s-256", "blake2s-256-arm", BLAKE2S_256_HASH_SIZE),
														
 
															-};
														
 
															-
														
 
															-static int __init blake2s_arm_mod_init(void)
														
 
															-{
														
 
															-	return IS_REACHABLE(CONFIG_CRYPTO_HASH) ?
														
 
															-		crypto_register_shashes(blake2s_arm_algs,
														
 
															-					ARRAY_SIZE(blake2s_arm_algs)) : 0;
														
 
															-}
														
 
															-
														
 
															-static void __exit blake2s_arm_mod_exit(void)
														
 
															-{
														
 
															-	if (IS_REACHABLE(CONFIG_CRYPTO_HASH))
														
 
															-		crypto_unregister_shashes(blake2s_arm_algs,
														
 
															-					  ARRAY_SIZE(blake2s_arm_algs));
														
 
															-}
														
 
															-
														
 
															-module_init(blake2s_arm_mod_init);
														
 
															-module_exit(blake2s_arm_mod_exit);
														
 
															-
														
 
															-MODULE_DESCRIPTION("BLAKE2s digest algorithm, ARM scalar implementation");
														
 
															-MODULE_LICENSE("GPL");
														
 
															-MODULE_AUTHOR("Eric Biggers <[email protected]>");
														
 
															-MODULE_ALIAS_CRYPTO("blake2s-128");
														
 
															-MODULE_ALIAS_CRYPTO("blake2s-128-arm");
														
 
															-MODULE_ALIAS_CRYPTO("blake2s-160");
														
 
															-MODULE_ALIAS_CRYPTO("blake2s-160-arm");
														
 
															-MODULE_ALIAS_CRYPTO("blake2s-224");
														
 
															-MODULE_ALIAS_CRYPTO("blake2s-224-arm");
														
 
															-MODULE_ALIAS_CRYPTO("blake2s-256");
														
 
															-MODULE_ALIAS_CRYPTO("blake2s-256-arm");
														
 
															+EXPORT_SYMBOL(blake2s_compress);
														
--- a/arch/arm/crypto/blake2s-shash.c
+++ b/arch/arm/crypto/blake2s-shash.c
@@ -0,0 +1,75 @@
 
															+// SPDX-License-Identifier: GPL-2.0-or-later
														
 
															+/*
														
 
															+ * BLAKE2s digest algorithm, ARM scalar implementation
														
 
															+ *
														
 
															+ * Copyright 2020 Google LLC
														
 
															+ */
														
 
															+
														
 
															+#include <crypto/internal/blake2s.h>
														
 
															+#include <crypto/internal/hash.h>
														
 
															+
														
 
															+#include <linux/module.h>
														
 
															+
														
 
															+static int crypto_blake2s_update_arm(struct shash_desc *desc,
														
 
															+				     const u8 *in, unsigned int inlen)
														
 
															+{
														
 
															+	return crypto_blake2s_update(desc, in, inlen, false);
														
 
															+}
														
 
															+
														
 
															+static int crypto_blake2s_final_arm(struct shash_desc *desc, u8 *out)
														
 
															+{
														
 
															+	return crypto_blake2s_final(desc, out, false);
														
 
															+}
														
 
															+
														
 
															+#define BLAKE2S_ALG(name, driver_name, digest_size)			\
														
 
															+	{								\
														
 
															+		.base.cra_name		= name,				\
														
 
															+		.base.cra_driver_name	= driver_name,			\
														
 
															+		.base.cra_priority	= 200,				\
														
 
															+		.base.cra_flags		= CRYPTO_ALG_OPTIONAL_KEY,	\
														
 
															+		.base.cra_blocksize	= BLAKE2S_BLOCK_SIZE,		\
														
 
															+		.base.cra_ctxsize	= sizeof(struct blake2s_tfm_ctx), \
														
 
															+		.base.cra_module	= THIS_MODULE,			\
														
 
															+		.digestsize		= digest_size,			\
														
 
															+		.setkey			= crypto_blake2s_setkey,	\
														
 
															+		.init			= crypto_blake2s_init,		\
														
 
															+		.update			= crypto_blake2s_update_arm,	\
														
 
															+		.final			= crypto_blake2s_final_arm,	\
														
 
															+		.descsize		= sizeof(struct blake2s_state),	\
														
 
															+	}
														
 
															+
														
 
															+static struct shash_alg blake2s_arm_algs[] = {
														
 
															+	BLAKE2S_ALG("blake2s-128", "blake2s-128-arm", BLAKE2S_128_HASH_SIZE),
														
 
															+	BLAKE2S_ALG("blake2s-160", "blake2s-160-arm", BLAKE2S_160_HASH_SIZE),
														
 
															+	BLAKE2S_ALG("blake2s-224", "blake2s-224-arm", BLAKE2S_224_HASH_SIZE),
														
 
															+	BLAKE2S_ALG("blake2s-256", "blake2s-256-arm", BLAKE2S_256_HASH_SIZE),
														
 
															+};
														
 
															+
														
 
															+static int __init blake2s_arm_mod_init(void)
														
 
															+{
														
 
															+	return IS_REACHABLE(CONFIG_CRYPTO_HASH) ?
														
 
															+		crypto_register_shashes(blake2s_arm_algs,
														
 
															+					ARRAY_SIZE(blake2s_arm_algs)) : 0;
														
 
															+}
														
 
															+
														
 
															+static void __exit blake2s_arm_mod_exit(void)
														
 
															+{
														
 
															+	if (IS_REACHABLE(CONFIG_CRYPTO_HASH))
														
 
															+		crypto_unregister_shashes(blake2s_arm_algs,
														
 
															+					  ARRAY_SIZE(blake2s_arm_algs));
														
 
															+}
														
 
															+
														
 
															+module_init(blake2s_arm_mod_init);
														
 
															+module_exit(blake2s_arm_mod_exit);
														
 
															+
														
 
															+MODULE_DESCRIPTION("BLAKE2s digest algorithm, ARM scalar implementation");
														
 
															+MODULE_LICENSE("GPL");
														
 
															+MODULE_AUTHOR("Eric Biggers <[email protected]>");
														
 
															+MODULE_ALIAS_CRYPTO("blake2s-128");
														
 
															+MODULE_ALIAS_CRYPTO("blake2s-128-arm");
														
 
															+MODULE_ALIAS_CRYPTO("blake2s-160");
														
 
															+MODULE_ALIAS_CRYPTO("blake2s-160-arm");
														
 
															+MODULE_ALIAS_CRYPTO("blake2s-224");
														
 
															+MODULE_ALIAS_CRYPTO("blake2s-224-arm");
														
 
															+MODULE_ALIAS_CRYPTO("blake2s-256");
														
 
															+MODULE_ALIAS_CRYPTO("blake2s-256-arm");
														
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -10,7 +10,7 @@
 
															 #else
														
 
															 #define MAX_DMA_ADDRESS	({ \
														
 
															 	extern phys_addr_t arm_dma_zone_size; \
														
 
															-	arm_dma_zone_size && arm_dma_zone_size < (0x10000000 - PAGE_OFFSET) ? \
														
 
															+	arm_dma_zone_size && arm_dma_zone_size < (0x100000000ULL - PAGE_OFFSET) ? \
														
 
															 		(PAGE_OFFSET + arm_dma_zone_size) : 0xffffffffUL; })
														
 
															 #endif
														
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -27,6 +27,7 @@ enum {
 
															 	MT_HIGH_VECTORS,
														
 
															 	MT_MEMORY_RWX,
														
 
															 	MT_MEMORY_RW,
														
 
															+	MT_MEMORY_RO,
														
 
															 	MT_ROM,
														
 
															 	MT_MEMORY_RWX_NONCACHED,
														
 
															 	MT_MEMORY_RW_DTCM,
														
--- a/arch/arm/include/asm/ptrace.h
+++ b/arch/arm/include/asm/ptrace.h
@@ -164,5 +164,31 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs)
 
															 		((current_stack_pointer | (THREAD_SIZE - 1)) - 7) - 1;	\
														
 
															 })
														
 
															+
														
 
															+/*
														
 
															+ * Update ITSTATE after normal execution of an IT block instruction.
														
 
															+ *
														
 
															+ * The 8 IT state bits are split into two parts in CPSR:
														
 
															+ *	ITSTATE<1:0> are in CPSR<26:25>
														
 
															+ *	ITSTATE<7:2> are in CPSR<15:10>
														
 
															+ */
														
 
															+static inline unsigned long it_advance(unsigned long cpsr)
														
 
															+{
														
 
															+	if ((cpsr & 0x06000400) == 0) {
														
 
															+		/* ITSTATE<2:0> == 0 means end of IT block, so clear IT state */
														
 
															+		cpsr &= ~PSR_IT_MASK;
														
 
															+	} else {
														
 
															+		/* We need to shift left ITSTATE<4:0> */
														
 
															+		const unsigned long mask = 0x06001c00;  /* Mask ITSTATE<4:0> */
														
 
															+		unsigned long it = cpsr & mask;
														
 
															+		it <<= 1;
														
 
															+		it |= it >> (27 - 10);  /* Carry ITSTATE<2> to correct place */
														
 
															+		it &= mask;
														
 
															+		cpsr &= ~mask;
														
 
															+		cpsr |= it;
														
 
															+	}
														
 
															+	return cpsr;
														
 
															+}
														
 
															+
														
 
															 #endif /* __ASSEMBLY__ */
														
 
															 #endif
														
--- a/arch/arm/include/asm/timex.h
+++ b/arch/arm/include/asm/timex.h
@@ -11,5 +11,6 @@
 
															 typedef unsigned long cycles_t;
														
 
															 #define get_cycles()	({ cycles_t c; read_current_timer(&c) ? 0 : c; })
														
 
															+#define random_get_entropy() (((unsigned long)get_cycles()) ?: random_get_entropy_fallback())
														
 
															 #endif
														
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -1043,7 +1043,7 @@ vector_bhb_loop8_\name:
 
															 	@ bhb workaround
														
 
															 	mov	r0, #8
														
 
															-3:	b	. + 4
														
 
															+3:	W(b)	. + 4
														
 
															 	subs	r0, r0, #1
														
 
															 	bne	3b
														
 
															 	dsb
														
--- a/arch/arm/kernel/stacktrace.c
+++ b/arch/arm/kernel/stacktrace.c
@@ -53,17 +53,17 @@ int notrace unwind_frame(struct stackframe *frame)
 
															 		return -EINVAL;
														
 
															 	frame->sp = frame->fp;
														
 
															-	frame->fp = *(unsigned long *)(fp);
														
 
															-	frame->pc = *(unsigned long *)(fp + 4);
														
 
															+	frame->fp = READ_ONCE_NOCHECK(*(unsigned long *)(fp));
														
 
															+	frame->pc = READ_ONCE_NOCHECK(*(unsigned long *)(fp + 4));
														
 
															 #else
														
 
															 	/* check current frame pointer is within bounds */
														
 
															 	if (fp < low + 12 || fp > high - 4)
														
 
															 		return -EINVAL;
														
 
															 	/* restore the registers from the stack frame */
														
 
															-	frame->fp = *(unsigned long *)(fp - 12);
														
 
															-	frame->sp = *(unsigned long *)(fp - 8);
														
 
															-	frame->pc = *(unsigned long *)(fp - 4);
														
 
															+	frame->fp = READ_ONCE_NOCHECK(*(unsigned long *)(fp - 12));
														
 
															+	frame->sp = READ_ONCE_NOCHECK(*(unsigned long *)(fp - 8));
														
 
															+	frame->pc = READ_ONCE_NOCHECK(*(unsigned long *)(fp - 4));
														
 
															 #endif
														
 
															 	return 0;
														
--- a/arch/arm/lib/xor-neon.c
+++ b/arch/arm/lib/xor-neon.c
@@ -26,8 +26,9 @@ MODULE_LICENSE("GPL");
 
															  * While older versions of GCC do not generate incorrect code, they fail to
														
 
															  * recognize the parallel nature of these functions, and emit plain ARM code,
														
 
															  * which is known to be slower than the optimized ARM code in asm-arm/xor.h.
														
 
															+ *
														
 
															+ * #warning This code requires at least version 4.6 of GCC
														
 
															  */
														
 
															-#warning This code requires at least version 4.6 of GCC
														
 
															 #endif
														
 
															 #pragma GCC diagnostic ignored "-Wunused-variable"
														
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -104,7 +104,7 @@ static const struct wakeup_source_info ws_info[] = {
 
															 static const struct of_device_id sama5d2_ws_ids[] = {
														
 
															 	{ .compatible = "atmel,sama5d2-gem",		.data = &ws_info[0] },
														
 
															-	{ .compatible = "atmel,at91rm9200-rtc",		.data = &ws_info[1] },
														
 
															+	{ .compatible = "atmel,sama5d2-rtc",		.data = &ws_info[1] },
														
 
															 	{ .compatible = "atmel,sama5d3-udc",		.data = &ws_info[2] },
														
 
															 	{ .compatible = "atmel,at91rm9200-ohci",	.data = &ws_info[2] },
														
 
															 	{ .compatible = "usb-ohci",			.data = &ws_info[2] },
														
@@ -115,12 +115,12 @@ static const struct of_device_id sama5d2_ws_ids[] = {
 
															 };
														
 
															 static const struct of_device_id sam9x60_ws_ids[] = {
														
 
															-	{ .compatible = "atmel,at91sam9x5-rtc",		.data = &ws_info[1] },
														
 
															+	{ .compatible = "microchip,sam9x60-rtc",	.data = &ws_info[1] },
														
 
															 	{ .compatible = "atmel,at91rm9200-ohci",	.data = &ws_info[2] },
														
 
															 	{ .compatible = "usb-ohci",			.data = &ws_info[2] },
														
 
															 	{ .compatible = "atmel,at91sam9g45-ehci",	.data = &ws_info[2] },
														
 
															 	{ .compatible = "usb-ehci",			.data = &ws_info[2] },
														
 
															-	{ .compatible = "atmel,at91sam9260-rtt",	.data = &ws_info[4] },
														
 
															+	{ .compatible = "microchip,sam9x60-rtt",	.data = &ws_info[4] },
														
 
															 	{ .compatible = "cdns,sam9x60-macb",		.data = &ws_info[5] },
														
 
															 	{ /* sentinel */ }
														
 
															 };
														
--- a/arch/arm/mach-axxia/platsmp.c
+++ b/arch/arm/mach-axxia/platsmp.c
@@ -39,6 +39,7 @@ static int axxia_boot_secondary(unsigned int cpu, struct task_struct *idle)
 
															 		return -ENOENT;
														
 
															 	syscon = of_iomap(syscon_np, 0);
														
 
															+	of_node_put(syscon_np);
														
 
															 	if (!syscon)
														
 
															 		return -ENOMEM;
														
--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
@@ -372,6 +372,7 @@ static void __init cns3xxx_init(void)
 
															 		/* De-Asscer SATA Reset */
														
 
															 		cns3xxx_pwr_soft_rst(CNS3XXX_PWR_SOFTWARE_RST(SATA));
														
 
															 	}
														
 
															+	of_node_put(dn);
														
 
															 	dn = of_find_compatible_node(NULL, NULL, "cavium,cns3420-sdhci");
														
 
															 	if (of_device_is_available(dn)) {
														
@@ -385,6 +386,7 @@ static void __init cns3xxx_init(void)
 
															 		cns3xxx_pwr_clk_en(CNS3XXX_PWR_CLK_EN(SDIO));
														
 
															 		cns3xxx_pwr_soft_rst(CNS3XXX_PWR_SOFTWARE_RST(SDIO));
														
 
															 	}
														
 
															+	of_node_put(dn);
														
 
															 	pm_power_off = cns3xxx_power_off;
														
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -149,6 +149,7 @@ static void exynos_map_pmu(void)
 
															 	np = of_find_matching_node(NULL, exynos_dt_pmu_match);
														
 
															 	if (np)
														
 
															 		pmu_base_addr = of_iomap(np, 0);
														
 
															+	of_node_put(np);
														
 
															 }
														
 
															 static void __init exynos_init_irq(void)
														
--- a/arch/arm/mach-hisi/platsmp.c
+++ b/arch/arm/mach-hisi/platsmp.c
@@ -67,14 +67,17 @@ static void __init hi3xxx_smp_prepare_cpus(unsigned int max_cpus)
 
															 		}
														
 
															 		ctrl_base = of_iomap(np, 0);
														
 
															 		if (!ctrl_base) {
														
 
															+			of_node_put(np);
														
 
															 			pr_err("failed to map address\n");
														
 
															 			return;
														
 
															 		}
														
 
															 		if (of_property_read_u32(np, "smp-offset", &offset) < 0) {
														
 
															+			of_node_put(np);
														
 
															 			pr_err("failed to find smp-offset property\n");
														
 
															 			return;
														
 
															 		}
														
 
															 		ctrl_base += offset;
														
 
															+		of_node_put(np);
														
 
															 	}
														
 
															 }
														
@@ -160,6 +163,7 @@ static int hip01_boot_secondary(unsigned int cpu, struct task_struct *idle)
 
															 	if (WARN_ON(!node))
														
 
															 		return -1;
														
 
															 	ctrl_base = of_iomap(node, 0);
														
 
															+	of_node_put(node);
														
 
															 	/* set the secondary core boot from DDR */
														
 
															 	remap_reg_value = readl_relaxed(ctrl_base + REG_SC_CTRL);
														
--- a/arch/arm/mach-mediatek/Kconfig
+++ b/arch/arm/mach-mediatek/Kconfig
@@ -30,6 +30,7 @@ config MACH_MT7623
 
															 config MACH_MT7629
														
 
															 	bool "MediaTek MT7629 SoCs support"
														
 
															 	default ARCH_MEDIATEK
														
 
															+	select HAVE_ARM_ARCH_TIMER
														
 
															 config MACH_MT8127
														
 
															 	bool "MediaTek MT8127 SoCs support"
														
--- a/arch/arm/mach-meson/platsmp.c
+++ b/arch/arm/mach-meson/platsmp.c
@@ -71,6 +71,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible,
 
															 	}
														
 
															 	sram_base = of_iomap(node, 0);
														
 
															+	of_node_put(node);
														
 
															 	if (!sram_base) {
														
 
															 		pr_err("Couldn't map SRAM registers\n");
														
 
															 		return;
														
@@ -91,6 +92,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible,
 
															 	}
														
 
															 	scu_base = of_iomap(node, 0);
														
 
															+	of_node_put(node);
														
 
															 	if (!scu_base) {
														
 
															 		pr_err("Couldn't map SCU registers\n");
														
 
															 		return;
														
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -41,7 +41,7 @@ static DEFINE_SPINLOCK(clockfw_lock);
 
															 unsigned long omap1_uart_recalc(struct clk *clk)
														
 
															 {
														
 
															 	unsigned int val = __raw_readl(clk->enable_reg);
														
 
															-	return val & clk->enable_bit ? 48000000 : 12000000;
														
 
															+	return val & 1 << clk->enable_bit ? 48000000 : 12000000;
														
 
															 }
														
 
															 unsigned long omap1_sossi_recalc(struct clk *clk)
														
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -354,13 +354,13 @@ static struct platform_device cm_x300_spi_gpio = {
 
															 static struct gpiod_lookup_table cm_x300_spi_gpiod_table = {
														
 
															 	.dev_id         = "spi_gpio",
														
 
															 	.table          = {
														
 
															-		GPIO_LOOKUP("gpio-pxa", GPIO_LCD_SCL,
														
 
															+		GPIO_LOOKUP("pca9555.1", GPIO_LCD_SCL - GPIO_LCD_BASE,
														
 
															 			    "sck", GPIO_ACTIVE_HIGH),
														
 
															-		GPIO_LOOKUP("gpio-pxa", GPIO_LCD_DIN,
														
 
															+		GPIO_LOOKUP("pca9555.1", GPIO_LCD_DIN - GPIO_LCD_BASE,
														
 
															 			    "mosi", GPIO_ACTIVE_HIGH),
														
 
															-		GPIO_LOOKUP("gpio-pxa", GPIO_LCD_DOUT,
														
 
															+		GPIO_LOOKUP("pca9555.1", GPIO_LCD_DOUT - GPIO_LCD_BASE,
														
 
															 			    "miso", GPIO_ACTIVE_HIGH),
														
 
															-		GPIO_LOOKUP("gpio-pxa", GPIO_LCD_CS,
														
 
															+		GPIO_LOOKUP("pca9555.1", GPIO_LCD_CS - GPIO_LCD_BASE,
														
 
															 			    "cs", GPIO_ACTIVE_HIGH),
														
 
															 		{ },
														
 
															 	},
														
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -681,7 +681,7 @@ static struct platform_device bq24022 = {
 
															 static struct gpiod_lookup_table bq24022_gpiod_table = {
														
 
															 	.dev_id = "gpio-regulator",
														
 
															 	.table = {
														
 
															-		GPIO_LOOKUP("gpio-pxa", EGPIO_MAGICIAN_BQ24022_ISET2,
														
 
															+		GPIO_LOOKUP("htc-egpio-0", EGPIO_MAGICIAN_BQ24022_ISET2 - MAGICIAN_EGPIO_BASE,
														
 
															 			    NULL, GPIO_ACTIVE_HIGH),
														
 
															 		GPIO_LOOKUP("gpio-pxa", GPIO30_MAGICIAN_BQ24022_nCHARGE_EN,
														
 
															 			    "enable", GPIO_ACTIVE_LOW),
														
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -296,9 +296,9 @@ static struct gpiod_lookup_table tosa_mci_gpio_table = {
 
															 	.table = {
														
 
															 		GPIO_LOOKUP("gpio-pxa", TOSA_GPIO_nSD_DETECT,
														
 
															 			    "cd", GPIO_ACTIVE_LOW),
														
 
															-		GPIO_LOOKUP("gpio-pxa", TOSA_GPIO_SD_WP,
														
 
															+		GPIO_LOOKUP("sharp-scoop.0", TOSA_GPIO_SD_WP - TOSA_SCOOP_GPIO_BASE,
														
 
															 			    "wp", GPIO_ACTIVE_LOW),
														
 
															-		GPIO_LOOKUP("gpio-pxa", TOSA_GPIO_PWR_ON,
														
 
															+		GPIO_LOOKUP("sharp-scoop.0", TOSA_GPIO_PWR_ON - TOSA_SCOOP_GPIO_BASE,
														
 
															 			    "power", GPIO_ACTIVE_HIGH),
														
 
															 		{ },
														
 
															 	},
														
--- a/arch/arm/mach-vexpress/dcscb.c
+++ b/arch/arm/mach-vexpress/dcscb.c
@@ -144,6 +144,7 @@ static int __init dcscb_init(void)
 
															 	if (!node)
														
 
															 		return -ENODEV;
														
 
															 	dcscb_base = of_iomap(node, 0);
														
 
															+	of_node_put(node);
														
 
															 	if (!dcscb_base)
														
 
															 		return -EADDRNOTAVAIL;
														
 
															 	cfg = readl_relaxed(dcscb_base + DCS_CFG_R);
														
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@ -935,6 +935,9 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
 
															 	if (type == TYPE_LDST)
														
 
															 		do_alignment_finish_ldst(addr, instr, regs, offset);
														
 
															+	if (thumb_mode(regs))
														
 
															+		regs->ARM_cpsr = it_advance(regs->ARM_cpsr);
														
 
															+
														
 
															 	return 0;
														
 
															  bad_or_fault:
														
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -296,6 +296,13 @@ static struct mem_type mem_types[] __ro_after_init = {
 
															 		.prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
														
 
															 		.domain    = DOMAIN_KERNEL,
														
 
															 	},
														
 
															+	[MT_MEMORY_RO] = {
														
 
															+		.prot_pte  = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
														
 
															+			     L_PTE_XN | L_PTE_RDONLY,
														
 
															+		.prot_l1   = PMD_TYPE_TABLE,
														
 
															+		.prot_sect = PMD_TYPE_SECT,
														
 
															+		.domain    = DOMAIN_KERNEL,
														
 
															+	},
														
 
															 	[MT_ROM] = {
														
 
															 		.prot_sect = PMD_TYPE_SECT,
														
 
															 		.domain    = DOMAIN_KERNEL,
														
@@ -490,6 +497,7 @@ static void __init build_mem_type_table(void)
 
															 			/* Also setup NX memory mapping */
														
 
															 			mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_XN;
														
 
															+			mem_types[MT_MEMORY_RO].prot_sect |= PMD_SECT_XN;
														
 
															 		}
														
 
															 		if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
														
 
															 			/*
														
@@ -569,6 +577,7 @@ static void __init build_mem_type_table(void)
 
															 		mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
														
 
															 		mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
														
 
															 		mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
														
 
															+		mem_types[MT_MEMORY_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
														
 
															 #endif
														
 
															 		/*
														
@@ -588,6 +597,8 @@ static void __init build_mem_type_table(void)
 
															 			mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
														
 
															 			mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
														
 
															 			mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
														
 
															+			mem_types[MT_MEMORY_RO].prot_sect |= PMD_SECT_S;
														
 
															+			mem_types[MT_MEMORY_RO].prot_pte |= L_PTE_SHARED;
														
 
															 			mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
														
 
															 			mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
														
 
															 			mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
														
@@ -648,6 +659,8 @@ static void __init build_mem_type_table(void)
 
															 	mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
														
 
															 	mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
														
 
															 	mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
														
 
															+	mem_types[MT_MEMORY_RO].prot_sect |= ecc_mask | cp->pmd;
														
 
															+	mem_types[MT_MEMORY_RO].prot_pte |= kern_pgprot;
														
 
															 	mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
														
 
															 	mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
														
 
															 	mem_types[MT_ROM].prot_sect |= cp->pmd;
														
@@ -1342,7 +1355,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
 
															 		map.pfn = __phys_to_pfn(__atags_pointer & SECTION_MASK);
														
 
															 		map.virtual = FDT_FIXED_BASE;
														
 
															 		map.length = FDT_FIXED_SIZE;
														
 
															-		map.type = MT_ROM;
														
 
															+		map.type = MT_MEMORY_RO;
														
 
															 		create_mapping(&map);
														
 
															 	}
														
--- a/arch/arm/mm/proc-v7-bugs.c
+++ b/arch/arm/mm/proc-v7-bugs.c
@@ -108,8 +108,7 @@ static unsigned int spectre_v2_install_workaround(unsigned int method)
 
															 #else
														
 
															 static unsigned int spectre_v2_install_workaround(unsigned int method)
														
 
															 {
														
 
															-	pr_info("CPU%u: Spectre V2: workarounds disabled by configuration\n",
														
 
															-		smp_processor_id());
														
 
															+	pr_info_once("Spectre V2: workarounds disabled by configuration\n");
														
 
															 	return SPECTRE_VULNERABLE;
														
 
															 }
														
@@ -209,10 +208,10 @@ static int spectre_bhb_install_workaround(int method)
 
															 			return SPECTRE_VULNERABLE;
														
 
															 		spectre_bhb_method = method;
														
 
															-	}
														
 
															-	pr_info("CPU%u: Spectre BHB: using %s workaround\n",
														
 
															-		smp_processor_id(), spectre_bhb_method_name(method));
														
 
															+		pr_info("CPU%u: Spectre BHB: enabling %s workaround for all CPUs\n",
														
 
															+			smp_processor_id(), spectre_bhb_method_name(method));
														
 
															+	}
														
 
															 	return SPECTRE_MITIGATED;
														
 
															 }
														
@@ -288,6 +287,7 @@ void cpu_v7_ca15_ibe(void)
 
															 {
														
 
															 	if (check_spectre_auxcr(this_cpu_ptr(&spectre_warned), BIT(0)))
														
 
															 		cpu_v7_spectre_v2_init();
														
 
															+	cpu_v7_spectre_bhb_init();
														
 
															 }
														
 
															 void cpu_v7_bugs_init(void)
														
--- a/arch/arm/probes/decode.h
+++ b/arch/arm/probes/decode.h
@@ -14,6 +14,7 @@
 
															 #include <linux/types.h>
														
 
															 #include <linux/stddef.h>
														
 
															 #include <asm/probes.h>
														
 
															+#include <asm/ptrace.h>
														
 
															 #include <asm/kprobes.h>
														
 
															 void __init arm_probes_decode_init(void);
														
@@ -35,31 +36,6 @@ void __init find_str_pc_offset(void);
 
															 #endif
														
 
															-/*
														
 
															- * Update ITSTATE after normal execution of an IT block instruction.
														
 
															- *
														
 
															- * The 8 IT state bits are split into two parts in CPSR:
														
 
															- *	ITSTATE<1:0> are in CPSR<26:25>
														
 
															- *	ITSTATE<7:2> are in CPSR<15:10>
														
 
															- */
														
 
															-static inline unsigned long it_advance(unsigned long cpsr)
														
 
															-	{
														
 
															-	if ((cpsr & 0x06000400) == 0) {
														
 
															-		/* ITSTATE<2:0> == 0 means end of IT block, so clear IT state */
														
 
															-		cpsr &= ~PSR_IT_MASK;
														
 
															-	} else {
														
 
															-		/* We need to shift left ITSTATE<4:0> */
														
 
															-		const unsigned long mask = 0x06001c00;  /* Mask ITSTATE<4:0> */
														
 
															-		unsigned long it = cpsr & mask;
														
 
															-		it <<= 1;
														
 
															-		it |= it >> (27 - 10);  /* Carry ITSTATE<2> to correct place */
														
 
															-		it &= mask;
														
 
															-		cpsr &= ~mask;
														
 
															-		cpsr |= it;
														
 
															-	}
														
 
															-	return cpsr;
														
 
															-}
														
 
															-
														
 
															 static inline void __kprobes bx_write_pc(long pcv, struct pt_regs *regs)
														
 
															 {
														
 
															 	long cpsr = regs->ARM_cpsr;
														
--- a/arch/arm/xen/p2m.c
+++ b/arch/arm/xen/p2m.c
@@ -62,11 +62,12 @@ out:
 
															 unsigned long __pfn_to_mfn(unsigned long pfn)
														
 
															 {
														
 
															-	struct rb_node *n = phys_to_mach.rb_node;
														
 
															+	struct rb_node *n;
														
 
															 	struct xen_p2m_entry *entry;
														
 
															 	unsigned long irqflags;
														
 
															 	read_lock_irqsave(&p2m_lock, irqflags);
														
 
															+	n = phys_to_mach.rb_node;
														
 
															 	while (n) {
														
 
															 		entry = rb_entry(n, struct xen_p2m_entry, rbnode_phys);
														
 
															 		if (entry->pfn <= pfn &&
														
@@ -153,10 +154,11 @@ bool __set_phys_to_machine_multi(unsigned long pfn,
 
															 	int rc;
														
 
															 	unsigned long irqflags;
														
 
															 	struct xen_p2m_entry *p2m_entry;
														
 
															-	struct rb_node *n = phys_to_mach.rb_node;
														
 
															+	struct rb_node *n;
														
 
															 	if (mfn == INVALID_P2M_ENTRY) {
														
 
															 		write_lock_irqsave(&p2m_lock, irqflags);
														
 
															+		n = phys_to_mach.rb_node;
														
 
															 		while (n) {
														
 
															 			p2m_entry = rb_entry(n, struct xen_p2m_entry, rbnode_phys);
														
 
															 			if (p2m_entry->pfn <= pfn &&
														
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -341,6 +341,7 @@ config ARCH_STRATIX10
 
															 config ARCH_SYNQUACER
														
 
															 	bool "Socionext SynQuacer SoC Family"
														
 
															+	select IRQ_FASTEOI_HIERARCHY_HANDLERS
														
 
															 config ARCH_TEGRA
														
 
															 	bool "NVIDIA Tegra SoC Family"
														
--- a/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi
@@ -167,6 +167,7 @@
 
															 	pinctrl-0 = <&pinctrl_uart3>;
														
 
															 	assigned-clocks = <&clk IMX8MM_CLK_UART3>;
														
 
															 	assigned-clock-parents = <&clk IMX8MM_SYS_PLL1_80M>;
														
 
															+	uart-has-rtscts;
														
 
															 	status = "okay";
														
 
															 };
														
@@ -237,6 +238,8 @@
 
															 		fsl,pins = <
														
 
															 			MX8MM_IOMUXC_ECSPI1_SCLK_UART3_DCE_RX	0x40
														
 
															 			MX8MM_IOMUXC_ECSPI1_MOSI_UART3_DCE_TX	0x40
														
 
															+			MX8MM_IOMUXC_ECSPI1_MISO_UART3_DCE_CTS_B	0x40
														
 
															+			MX8MM_IOMUXC_ECSPI1_SS0_UART3_DCE_RTS_B	0x40
														
 
															 		>;
														
 
															 	};
														
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
@@ -148,27 +148,27 @@
 
															 	pinctrl_gpio_led: gpioledgrp {
														
 
															 		fsl,pins = <
														
 
															-			MX8MP_IOMUXC_NAND_READY_B__GPIO3_IO16	0x19
														
 
															+			MX8MP_IOMUXC_NAND_READY_B__GPIO3_IO16	0x140
														
 
															 		>;
														
 
															 	};
														
 
															 	pinctrl_i2c3: i2c3grp {
														
 
															 		fsl,pins = <
														
 
															-			MX8MP_IOMUXC_I2C3_SCL__I2C3_SCL		0x400001c3
														
 
															-			MX8MP_IOMUXC_I2C3_SDA__I2C3_SDA		0x400001c3
														
 
															+			MX8MP_IOMUXC_I2C3_SCL__I2C3_SCL		0x400001c2
														
 
															+			MX8MP_IOMUXC_I2C3_SDA__I2C3_SDA		0x400001c2
														
 
															 		>;
														
 
															 	};
														
 
															 	pinctrl_reg_usdhc2_vmmc: regusdhc2vmmcgrp {
														
 
															 		fsl,pins = <
														
 
															-			MX8MP_IOMUXC_SD2_RESET_B__GPIO2_IO19	0x41
														
 
															+			MX8MP_IOMUXC_SD2_RESET_B__GPIO2_IO19	0x40
														
 
															 		>;
														
 
															 	};
														
 
															 	pinctrl_uart2: uart2grp {
														
 
															 		fsl,pins = <
														
 
															-			MX8MP_IOMUXC_UART2_RXD__UART2_DCE_RX	0x49
														
 
															-			MX8MP_IOMUXC_UART2_TXD__UART2_DCE_TX	0x49
														
 
															+			MX8MP_IOMUXC_UART2_RXD__UART2_DCE_RX	0x140
														
 
															+			MX8MP_IOMUXC_UART2_TXD__UART2_DCE_TX	0x140
														
 
															 		>;
														
 
															 	};
														
@@ -180,7 +180,7 @@
 
															 			MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1	0x1d0
														
 
															 			MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2	0x1d0
														
 
															 			MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3	0x1d0
														
 
															-			MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT	0xc1
														
 
															+			MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT	0xc0
														
 
															 		>;
														
 
															 	};
														
@@ -192,7 +192,7 @@
 
															 			MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1	0x1d4
														
 
															 			MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2	0x1d4
														
 
															 			MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3	0x1d4
														
 
															-			MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc1
														
 
															+			MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0
														
 
															 		>;
														
 
															 	};
														
@@ -204,7 +204,7 @@
 
															 			MX8MP_IOMUXC_SD2_DATA1__USDHC2_DATA1	0x1d6
														
 
															 			MX8MP_IOMUXC_SD2_DATA2__USDHC2_DATA2	0x1d6
														
 
															 			MX8MP_IOMUXC_SD2_DATA3__USDHC2_DATA3	0x1d6
														
 
															-			MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc1
														
 
															+			MX8MP_IOMUXC_GPIO1_IO04__USDHC2_VSELECT 0xc0
														
 
															 		>;
														
 
															 	};
														
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -13,7 +13,7 @@
 
															 	clocks {
														
 
															 		sleep_clk: sleep_clk {
														
 
															 			compatible = "fixed-clock";
														
 
															-			clock-frequency = <32000>;
														
 
															+			clock-frequency = <32768>;
														
 
															 			#clock-cells = <0>;
														
 
															 		};
														
--- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
@@ -64,7 +64,7 @@
 
															 		vdd_l17_29-supply = <&vreg_vph_pwr>;
														
 
															 		vdd_l20_21-supply = <&vreg_vph_pwr>;
														
 
															 		vdd_l25-supply = <&pm8994_s5>;
														
 
															-		vdd_lvs1_2 = <&pm8994_s4>;
														
 
															+		vdd_lvs1_2-supply = <&pm8994_s4>;
														
 
															 		pm8994_s1: s1 {
														
 
															 			regulator-min-microvolt = <800000>;
														
--- a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
+++ b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
@@ -151,7 +151,7 @@
 
															 		vdd_l17_29-supply = <&vreg_vph_pwr>;
														
 
															 		vdd_l20_21-supply = <&vreg_vph_pwr>;
														
 
															 		vdd_l25-supply = <&pm8994_s5>;
														
 
															-		vdd_lvs1_2 = <&pm8994_s4>;
														
 
															+		vdd_lvs1_2-supply = <&pm8994_s4>;
														
 
															 		pm8994_s1: s1 {
														
 
															 			/* unused */
														
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -92,7 +92,7 @@
 
															 		CPU6: cpu@102 {
														
 
															 			device_type = "cpu";
														
 
															 			compatible = "arm,cortex-a57";
														
 
															-			reg = <0x0 0x101>;
														
 
															+			reg = <0x0 0x102>;
														
 
															 			enable-method = "psci";
														
 
															 			next-level-cache = <&L2_1>;
														
 
															 		};
														
@@ -100,7 +100,7 @@
 
															 		CPU7: cpu@103 {
														
 
															 			device_type = "cpu";
														
 
															 			compatible = "arm,cortex-a57";
														
 
															-			reg = <0x0 0x101>;
														
 
															+			reg = <0x0 0x103>;
														
 
															 			enable-method = "psci";
														
 
															 			next-level-cache = <&L2_1>;
														
 
															 		};
														
@@ -316,7 +316,7 @@
 
															 			#dma-cells = <1>;
														
 
															 			qcom,ee = <0>;
														
 
															 			qcom,controlled-remotely;
														
 
															-			num-channels = <18>;
														
 
															+			num-channels = <24>;
														
 
															 			qcom,num-ees = <4>;
														
 
															 		};
														
@@ -412,7 +412,7 @@
 
															 			#dma-cells = <1>;
														
 
															 			qcom,ee = <0>;
														
 
															 			qcom,controlled-remotely;
														
 
															-			num-channels = <18>;
														
 
															+			num-channels = <24>;
														
 
															 			qcom,num-ees = <4>;
														
 
															 		};
														
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1471,6 +1471,7 @@
 
															 			reg = <0xf780 0x24>;
														
 
															 			clocks = <&sdhci>;
														
 
															 			clock-names = "emmcclk";
														
 
															+			drive-impedance-ohm = <50>;
														
 
															 			#phy-cells = <0>;
														
 
															 			status = "disabled";
														
 
															 		};
														
@@ -1481,7 +1482,6 @@
 
															 			clock-names = "refclk";
														
 
															 			#phy-cells = <1>;
														
 
															 			resets = <&cru SRST_PCIEPHY>;
														
 
															-			drive-impedance-ohm = <50>;
														
 
															 			reset-names = "phy";
														
 
															 			status = "disabled";
														
 
															 		};
														
--- a/arch/arm64/crypto/poly1305-glue.c
+++ b/arch/arm64/crypto/poly1305-glue.c
@@ -52,7 +52,7 @@ static void neon_poly1305_blocks(struct poly1305_desc_ctx *dctx, const u8 *src,
 
															 {
														
 
															 	if (unlikely(!dctx->sset)) {
														
 
															 		if (!dctx->rset) {
														
 
															-			poly1305_init_arch(dctx, src);
														
 
															+			poly1305_init_arm64(&dctx->h, src);
														
 
															 			src += POLY1305_BLOCK_SIZE;
														
 
															 			len -= POLY1305_BLOCK_SIZE;
														
 
															 			dctx->rset = 1;
														
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -210,6 +210,8 @@ static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = {
 
															 #ifdef CONFIG_ARM64_ERRATUM_1286807
														
 
															 	{
														
 
															 		ERRATA_MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 3, 0),
														
 
															+		/* Kryo4xx Gold (rcpe to rfpe) => (r0p0 to r3p0) */
														
 
															+		ERRATA_MIDR_RANGE(MIDR_QCOM_KRYO_4XX_GOLD, 0xc, 0xe, 0xf, 0xe),
														
 
															 	},
														
 
															 #endif
														
 
															 	{},
														
--- a/arch/arm64/kernel/debug-monitors.c
+++ b/arch/arm64/kernel/debug-monitors.c
@@ -283,13 +283,11 @@ void register_user_break_hook(struct break_hook *hook)
 
															 {
														
 
															 	register_debug_hook(&hook->node, &user_break_hook);
														
 
															 }
														
 
															-EXPORT_SYMBOL_GPL(register_user_break_hook);
														
 
															 void unregister_user_break_hook(struct break_hook *hook)
														
 
															 {
														
 
															 	unregister_debug_hook(&hook->node);
														
 
															 }
														
 
															-EXPORT_SYMBOL_GPL(unregister_user_break_hook);
														
 
															 void register_kernel_break_hook(struct break_hook *hook)
														
 
															 {
														
@@ -301,7 +299,6 @@ void unregister_kernel_break_hook(struct break_hook *hook)
 
															 {
														
 
															 	unregister_debug_hook(&hook->node);
														
 
															 }
														
 
															-EXPORT_SYMBOL_GPL(unregister_kernel_break_hook);
														
 
															 static int call_break_hook(struct pt_regs *regs, unsigned int esr)
														
 
															 {
														
--- a/arch/arm64/kernel/ftrace.c
+++ b/arch/arm64/kernel/ftrace.c
@@ -77,47 +77,76 @@ static struct plt_entry *get_ftrace_plt(struct module *mod, unsigned long addr)
 
															 }
														
 
															 /*
														
 
															- * Turn on the call to ftrace_caller() in instrumented function
														
 
															+ * Find the address the callsite must branch to in order to reach '*addr'.
														
 
															+ *
														
 
															+ * Due to the limited range of 'BL' instructions, modules may be placed too far
														
 
															+ * away to branch directly and must use a PLT.
														
 
															+ *
														
 
															+ * Returns true when '*addr' contains a reachable target address, or has been
														
 
															+ * modified to contain a PLT address. Returns false otherwise.
														
 
															  */
														
 
															-int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
														
 
															+static bool ftrace_find_callable_addr(struct dyn_ftrace *rec,
														
 
															+				      struct module *mod,
														
 
															+				      unsigned long *addr)
														
 
															 {
														
 
															 	unsigned long pc = rec->ip;
														
 
															-	u32 old, new;
														
 
															-	long offset = (long)pc - (long)addr;
														
 
															+	long offset = (long)*addr - (long)pc;
														
 
															+	struct plt_entry *plt;
														
 
															-	if (offset < -SZ_128M || offset >= SZ_128M) {
														
 
															-		struct module *mod;
														
 
															-		struct plt_entry *plt;
														
 
															+	/*
														
 
															+	 * When the target is within range of the 'BL' instruction, use 'addr'
														
 
															+	 * as-is and branch to that directly.
														
 
															+	 */
														
 
															+	if (offset >= -SZ_128M && offset < SZ_128M)
														
 
															+		return true;
														
 
															-		if (!IS_ENABLED(CONFIG_ARM64_MODULE_PLTS))
														
 
															-			return -EINVAL;
														
 
															+	/*
														
 
															+	 * When the target is outside of the range of a 'BL' instruction, we
														
 
															+	 * must use a PLT to reach it. We can only place PLTs for modules, and
														
 
															+	 * only when module PLT support is built-in.
														
 
															+	 */
														
 
															+	if (!IS_ENABLED(CONFIG_ARM64_MODULE_PLTS))
														
 
															+		return false;
														
 
															-		/*
														
 
															-		 * On kernels that support module PLTs, the offset between the
														
 
															-		 * branch instruction and its target may legally exceed the
														
 
															-		 * range of an ordinary relative 'bl' opcode. In this case, we
														
 
															-		 * need to branch via a trampoline in the module.
														
 
															-		 *
														
 
															-		 * NOTE: __module_text_address() must be called with preemption
														
 
															-		 * disabled, but we can rely on ftrace_lock to ensure that 'mod'
														
 
															-		 * retains its validity throughout the remainder of this code.
														
 
															-		 */
														
 
															+	/*
														
 
															+	 * 'mod' is only set at module load time, but if we end up
														
 
															+	 * dealing with an out-of-range condition, we can assume it
														
 
															+	 * is due to a module being loaded far away from the kernel.
														
 
															+	 *
														
 
															+	 * NOTE: __module_text_address() must be called with preemption
														
 
															+	 * disabled, but we can rely on ftrace_lock to ensure that 'mod'
														
 
															+	 * retains its validity throughout the remainder of this code.
														
 
															+	 */
														
 
															+	if (!mod) {
														
 
															 		preempt_disable();
														
 
															 		mod = __module_text_address(pc);
														
 
															 		preempt_enable();
														
 
															+	}
														
 
															-		if (WARN_ON(!mod))
														
 
															-			return -EINVAL;
														
 
															+	if (WARN_ON(!mod))
														
 
															+		return false;
														
 
															-		plt = get_ftrace_plt(mod, addr);
														
 
															-		if (!plt) {
														
 
															-			pr_err("ftrace: no module PLT for %ps\n", (void *)addr);
														
 
															-			return -EINVAL;
														
 
															-		}
														
 
															-
														
 
															-		addr = (unsigned long)plt;
														
 
															+	plt = get_ftrace_plt(mod, *addr);
														
 
															+	if (!plt) {
														
 
															+		pr_err("ftrace: no module PLT for %ps\n", (void *)*addr);
														
 
															+		return false;
														
 
															 	}
														
 
															+	*addr = (unsigned long)plt;
														
 
															+	return true;
														
 
															+}
														
 
															+
														
 
															+/*
														
 
															+ * Turn on the call to ftrace_caller() in instrumented function
														
 
															+ */
														
 
															+int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
														
 
															+{
														
 
															+	unsigned long pc = rec->ip;
														
 
															+	u32 old, new;
														
 
															+
														
 
															+	if (!ftrace_find_callable_addr(rec, NULL, &addr))
														
 
															+		return -EINVAL;
														
 
															+
														
 
															 	old = aarch64_insn_gen_nop();
														
 
															 	new = aarch64_insn_gen_branch_imm(pc, addr, AARCH64_INSN_BRANCH_LINK);
														
@@ -131,6 +160,11 @@ int ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_addr,
 
															 	unsigned long pc = rec->ip;
														
 
															 	u32 old, new;
														
 
															+	if (!ftrace_find_callable_addr(rec, NULL, &old_addr))
														
 
															+		return -EINVAL;
														
 
															+	if (!ftrace_find_callable_addr(rec, NULL, &addr))
														
 
															+		return -EINVAL;
														
 
															+
														
 
															 	old = aarch64_insn_gen_branch_imm(pc, old_addr,
														
 
															 					  AARCH64_INSN_BRANCH_LINK);
														
 
															 	new = aarch64_insn_gen_branch_imm(pc, addr, AARCH64_INSN_BRANCH_LINK);
														
@@ -180,54 +214,15 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec,
 
															 		    unsigned long addr)
														
 
															 {
														
 
															 	unsigned long pc = rec->ip;
														
 
															-	bool validate = true;
														
 
															 	u32 old = 0, new;
														
 
															-	long offset = (long)pc - (long)addr;
														
 
															-	if (offset < -SZ_128M || offset >= SZ_128M) {
														
 
															-		u32 replaced;
														
 
															-
														
 
															-		if (!IS_ENABLED(CONFIG_ARM64_MODULE_PLTS))
														
 
															-			return -EINVAL;
														
 
															-
														
 
															-		/*
														
 
															-		 * 'mod' is only set at module load time, but if we end up
														
 
															-		 * dealing with an out-of-range condition, we can assume it
														
 
															-		 * is due to a module being loaded far away from the kernel.
														
 
															-		 */
														
 
															-		if (!mod) {
														
 
															-			preempt_disable();
														
 
															-			mod = __module_text_address(pc);
														
 
															-			preempt_enable();
														
 
															-
														
 
															-			if (WARN_ON(!mod))
														
 
															-				return -EINVAL;
														
 
															-		}
														
 
															-
														
 
															-		/*
														
 
															-		 * The instruction we are about to patch may be a branch and
														
 
															-		 * link instruction that was redirected via a PLT entry. In
														
 
															-		 * this case, the normal validation will fail, but we can at
														
 
															-		 * least check that we are dealing with a branch and link
														
 
															-		 * instruction that points into the right module.
														
 
															-		 */
														
 
															-		if (aarch64_insn_read((void *)pc, &replaced))
														
 
															-			return -EFAULT;
														
 
															-
														
 
															-		if (!aarch64_insn_is_bl(replaced) ||
														
 
															-		    !within_module(pc + aarch64_get_branch_offset(replaced),
														
 
															-				   mod))
														
 
															-			return -EINVAL;
														
 
															-
														
 
															-		validate = false;
														
 
															-	} else {
														
 
															-		old = aarch64_insn_gen_branch_imm(pc, addr,
														
 
															-						  AARCH64_INSN_BRANCH_LINK);
														
 
															-	}
														
 
															+	if (!ftrace_find_callable_addr(rec, mod, &addr))
														
 
															+		return -EINVAL;
														
 
															+	old = aarch64_insn_gen_branch_imm(pc, addr, AARCH64_INSN_BRANCH_LINK);
														
 
															 	new = aarch64_insn_gen_nop();
														
 
															-	return ftrace_modify_code(pc, old, new, validate);
														
 
															+	return ftrace_modify_code(pc, old, new, true);
														
 
															 }
														
 
															 void arch_ftrace_update_code(int command)
														
--- a/arch/arm64/kernel/mte.c
+++ b/arch/arm64/kernel/mte.c
@@ -67,6 +67,9 @@ void mte_sync_tags(pte_t *ptep, pte_t pte)
 
															 		if (!test_and_set_bit(PG_mte_tagged, &page->flags))
														
 
															 			mte_sync_page_tags(page, ptep, check_swap);
														
 
															 	}
														
 
															+
														
 
															+	/* ensure the tags are visible before the PTE is set */
														
 
															+	smp_wmb();
														
 
															 }
														
 
															 int memcmp_pages(struct page *page1, struct page *page2)
														
--- a/arch/arm64/kernel/paravirt.c
+++ b/arch/arm64/kernel/paravirt.c
@@ -30,7 +30,7 @@ struct paravirt_patch_template pv_ops;
 
															 EXPORT_SYMBOL_GPL(pv_ops);
														
 
															 struct pv_time_stolen_time_region {
														
 
															-	struct pvclock_vcpu_stolen_time *kaddr;
														
 
															+	struct pvclock_vcpu_stolen_time __rcu *kaddr;
														
 
															 };
														
 
															 static DEFINE_PER_CPU(struct pv_time_stolen_time_region, stolen_time_region);
														
@@ -47,7 +47,9 @@ early_param("no-steal-acc", parse_no_stealacc);
 
															 /* return stolen time in ns by asking the hypervisor */
														
 
															 static u64 pv_steal_clock(int cpu)
														
 
															 {
														
 
															+	struct pvclock_vcpu_stolen_time *kaddr = NULL;
														
 
															 	struct pv_time_stolen_time_region *reg;
														
 
															+	u64 ret = 0;
														
 
															 	reg = per_cpu_ptr(&stolen_time_region, cpu);
														
@@ -56,28 +58,37 @@ static u64 pv_steal_clock(int cpu)
 
															 	 * online notification callback runs. Until the callback
														
 
															 	 * has run we just return zero.
														
 
															 	 */
														
 
															-	if (!reg->kaddr)
														
 
															+	rcu_read_lock();
														
 
															+	kaddr = rcu_dereference(reg->kaddr);
														
 
															+	if (!kaddr) {
														
 
															+		rcu_read_unlock();
														
 
															 		return 0;
														
 
															+	}
														
 
															-	return le64_to_cpu(READ_ONCE(reg->kaddr->stolen_time));
														
 
															+	ret = le64_to_cpu(READ_ONCE(kaddr->stolen_time));
														
 
															+	rcu_read_unlock();
														
 
															+	return ret;
														
 
															 }
														
 
															 static int stolen_time_cpu_down_prepare(unsigned int cpu)
														
 
															 {
														
 
															+	struct pvclock_vcpu_stolen_time *kaddr = NULL;
														
 
															 	struct pv_time_stolen_time_region *reg;
														
 
															 	reg = this_cpu_ptr(&stolen_time_region);
														
 
															 	if (!reg->kaddr)
														
 
															 		return 0;
														
 
															-	memunmap(reg->kaddr);
														
 
															-	memset(reg, 0, sizeof(*reg));
														
 
															+	kaddr = rcu_replace_pointer(reg->kaddr, NULL, true);
														
 
															+	synchronize_rcu();
														
 
															+	memunmap(kaddr);
														
 
															 	return 0;
														
 
															 }
														
 
															 static int stolen_time_cpu_online(unsigned int cpu)
														
 
															 {
														
 
															+	struct pvclock_vcpu_stolen_time *kaddr = NULL;
														
 
															 	struct pv_time_stolen_time_region *reg;
														
 
															 	struct arm_smccc_res res;
														
@@ -88,17 +99,19 @@ static int stolen_time_cpu_online(unsigned int cpu)
 
															 	if (res.a0 == SMCCC_RET_NOT_SUPPORTED)
														
 
															 		return -EINVAL;
														
 
															-	reg->kaddr = memremap(res.a0,
														
 
															+	kaddr = memremap(res.a0,
														
 
															 			      sizeof(struct pvclock_vcpu_stolen_time),
														
 
															 			      MEMREMAP_WB);
														
 
															+	rcu_assign_pointer(reg->kaddr, kaddr);
														
 
															+
														
 
															 	if (!reg->kaddr) {
														
 
															 		pr_warn("Failed to map stolen time data structure\n");
														
 
															 		return -ENOMEM;
														
 
															 	}
														
 
															-	if (le32_to_cpu(reg->kaddr->revision) != 0 ||
														
 
															-	    le32_to_cpu(reg->kaddr->attributes) != 0) {
														
 
															+	if (le32_to_cpu(kaddr->revision) != 0 ||
														
 
															+	    le32_to_cpu(kaddr->attributes) != 0) {
														
 
															 		pr_warn_once("Unexpected revision or attributes in stolen time data\n");
														
 
															 		return -ENXIO;
														
 
															 	}
														
--- a/arch/arm64/kernel/sys_compat.c
+++ b/arch/arm64/kernel/sys_compat.c
@@ -114,6 +114,6 @@ long compat_arm_syscall(struct pt_regs *regs, int scno)
 
															 	addr = instruction_pointer(regs) - (compat_thumb_mode(regs) ? 2 : 4);
														
 
															 	arm64_notify_die("Oops - bad compat syscall(2)", regs,
														
 
															-			 SIGILL, ILL_ILLTRP, addr, scno);
														
 
															+			 SIGILL, ILL_ILLTRP, addr, 0);
														
 
															 	return 0;
														
 
															 }
														
--- a/arch/arm64/kvm/vgic/vgic-mmio-v2.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
@@ -418,11 +418,11 @@ static const struct vgic_register_region vgic_v2_dist_registers[] = {
 
															 		VGIC_ACCESS_32bit),
														
 
															 	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_PENDING_SET,
														
 
															 		vgic_mmio_read_pending, vgic_mmio_write_spending,
														
 
															-		NULL, vgic_uaccess_write_spending, 1,
														
 
															+		vgic_uaccess_read_pending, vgic_uaccess_write_spending, 1,
														
 
															 		VGIC_ACCESS_32bit),
														
 
															 	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_PENDING_CLEAR,
														
 
															 		vgic_mmio_read_pending, vgic_mmio_write_cpending,
														
 
															-		NULL, vgic_uaccess_write_cpending, 1,
														
 
															+		vgic_uaccess_read_pending, vgic_uaccess_write_cpending, 1,
														
 
															 		VGIC_ACCESS_32bit),
														
 
															 	REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_ACTIVE_SET,
														
 
															 		vgic_mmio_read_active, vgic_mmio_write_sactive,
														
--- a/arch/arm64/kvm/vgic/vgic-mmio.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio.c
@@ -226,8 +226,9 @@ int vgic_uaccess_write_cenable(struct kvm_vcpu *vcpu,
 
															 	return 0;
														
 
															 }
														
 
															-unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,
														
 
															-				     gpa_t addr, unsigned int len)
														
 
															+static unsigned long __read_pending(struct kvm_vcpu *vcpu,
														
 
															+				    gpa_t addr, unsigned int len,
														
 
															+				    bool is_user)
														
 
															 {
														
 
															 	u32 intid = VGIC_ADDR_TO_INTID(addr, 1);
														
 
															 	u32 value = 0;
														
@@ -248,7 +249,7 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,
 
															 						    IRQCHIP_STATE_PENDING,
														
 
															 						    &val);
														
 
															 			WARN_RATELIMIT(err, "IRQ %d", irq->host_irq);
														
 
															-		} else if (vgic_irq_is_mapped_level(irq)) {
														
 
															+		} else if (!is_user && vgic_irq_is_mapped_level(irq)) {
														
 
															 			val = vgic_get_phys_line_level(irq);
														
 
															 		} else {
														
 
															 			val = irq_is_pending(irq);
														
@@ -263,6 +264,18 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,
 
															 	return value;
														
 
															 }
														
 
															+unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,
														
 
															+				     gpa_t addr, unsigned int len)
														
 
															+{
														
 
															+	return __read_pending(vcpu, addr, len, false);
														
 
															+}
														
 
															+
														
 
															+unsigned long vgic_uaccess_read_pending(struct kvm_vcpu *vcpu,
														
 
															+					gpa_t addr, unsigned int len)
														
 
															+{
														
 
															+	return __read_pending(vcpu, addr, len, true);
														
 
															+}
														
 
															+
														
 
															 static bool is_vgic_v2_sgi(struct kvm_vcpu *vcpu, struct vgic_irq *irq)
														
 
															 {
														
 
															 	return (vgic_irq_is_sgi(irq->intid) &&
														
--- a/arch/arm64/kvm/vgic/vgic-mmio.h
+++ b/arch/arm64/kvm/vgic/vgic-mmio.h
@@ -149,6 +149,9 @@ int vgic_uaccess_write_cenable(struct kvm_vcpu *vcpu,
 
															 unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu,
														
 
															 				     gpa_t addr, unsigned int len);
														
 
															+unsigned long vgic_uaccess_read_pending(struct kvm_vcpu *vcpu,
														
 
															+					gpa_t addr, unsigned int len);
														
 
															+
														
 
															 void vgic_mmio_write_spending(struct kvm_vcpu *vcpu,
														
 
															 			      gpa_t addr, unsigned int len,
														
 
															 			      unsigned long val);
														
--- a/arch/arm64/mm/cache.S
+++ b/arch/arm64/mm/cache.S
@@ -228,8 +228,6 @@ SYM_FUNC_END_PI(__dma_flush_area)
 
															  *	- dir	- DMA direction
														
 
															  */
														
 
															 SYM_FUNC_START_PI(__dma_map_area)
														
 
															-	cmp	w2, #DMA_FROM_DEVICE
														
 
															-	b.eq	__dma_inv_area
														
 
															 	b	__dma_clean_area
														
 
															 SYM_FUNC_END_PI(__dma_map_area)
														
--- a/arch/arm64/mm/copypage.c
+++ b/arch/arm64/mm/copypage.c
@@ -16,8 +16,8 @@
 
															 void copy_highpage(struct page *to, struct page *from)
														
 
															 {
														
 
															-	struct page *kto = page_address(to);
														
 
															-	struct page *kfrom = page_address(from);
														
 
															+	void *kto = page_address(to);
														
 
															+	void *kfrom = page_address(from);
														
 
															 	copy_page(kto, kfrom);
														
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -1112,6 +1112,7 @@ skip_init_ctx:
 
															 			bpf_jit_binary_free(header);
														
 
															 			prog->bpf_func = NULL;
														
 
															 			prog->jited = 0;
														
 
															+			prog->jited_len = 0;
														
 
															 			goto out_off;
														
 
															 		}
														
 
															 		bpf_jit_binary_lock_ro(header);
														
--- a/arch/csky/kernel/probes/kprobes.c
+++ b/arch/csky/kernel/probes/kprobes.c
@@ -28,7 +28,7 @@ static int __kprobes patch_text_cb(void *priv)
 
															 	struct csky_insn_patch *param = priv;
														
 
															 	unsigned int addr = (unsigned int)param->addr;
														
 
															-	if (atomic_inc_return(&param->cpu_count) == 1) {
														
 
															+	if (atomic_inc_return(&param->cpu_count) == num_online_cpus()) {
														
 
															 		*(u16 *) addr = cpu_to_le16(param->opcode);
														
 
															 		dcache_wb_range(addr, addr + 2);
														
 
															 		atomic_inc(&param->cpu_count);
														
--- a/arch/ia64/include/asm/timex.h
+++ b/arch/ia64/include/asm/timex.h
@@ -39,6 +39,7 @@ get_cycles (void)
 
															 	ret = ia64_getreg(_IA64_REG_AR_ITC);
														
 
															 	return ret;
														
 
															 }
														
 
															+#define get_cycles get_cycles
														
 
															 extern void ia64_cpu_local_tick (void);
														
 
															 extern unsigned long long ia64_native_sched_clock (void);
														
--- a/arch/m68k/Kconfig.bus
+++ b/arch/m68k/Kconfig.bus
@@ -63,7 +63,7 @@ source "drivers/zorro/Kconfig"
 
															 endif
														
 
															-if COLDFIRE
														
 
															+if !MMU
														
 
															 config ISA_DMA_API
														
 
															 	def_bool !M5272