From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Aug 2022 17:07:23 +0000 (-0700)
Subject: Merge tag 'asm-generic-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd... 
X-Git-Tag: v6.6.17~6878
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bd6e5854bf9bb5436d6b533e206561839e3b284;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'asm-generic-6.0' of git://git./linux/kernel/git/arnd/asm-generic

Pull asm-generic updates from Arnd Bergmann:
 "There are three independent sets of changes:

   - Sai Prakash Ranjan adds tracing support to the asm-generic version
     of the MMIO accessors, which is intended to help understand
     problems with device drivers and has been part of Qualcomm's vendor
     kernels for many years

   - A patch from Sebastian Siewior to rework the handling of IRQ stacks
     in softirqs across architectures, which is needed for enabling
     PREEMPT_RT

   - The last patch to remove the CONFIG_VIRT_TO_BUS option and some of
     the code behind that, after the last users of this old interface
     made it in through the netdev, scsi, media and staging trees"

* tag 'asm-generic-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  uapi: asm-generic: fcntl: Fix typo 'the the' in comment
  arch/*/: remove CONFIG_VIRT_TO_BUS
  soc: qcom: geni: Disable MMIO tracing for GENI SE
  serial: qcom_geni_serial: Disable MMIO tracing for geni serial
  asm-generic/io: Add logging support for MMIO accessors
  KVM: arm64: Add a flag to disable MMIO trace for nVHE KVM
  lib: Add register read/write tracing support
  drm/meson: Fix overflow implicit truncation warnings
  irqchip/tegra: Fix overflow implicit truncation warnings
  coresight: etm4x: Use asm-generic IO memory barriers
  arm64: io: Use asm-generic high level MMIO accessors
  arch/*: Disable softirq stacks on PREEMPT_RT.
---

3bd6e5854bf9bb5436d6b533e206561839e3b284
diff --cc arch/x86/Kconfig
index fb5900e,9a81b86..cca4c0a
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -278,9 -277,7 +278,8 @@@ config X8
  	select SYSCTL_EXCEPTION_TRACE
  	select THREAD_INFO_IN_TASK
  	select TRACE_IRQFLAGS_SUPPORT
 +	select TRACE_IRQFLAGS_NMI_SUPPORT
  	select USER_STACKTRACE_SUPPORT
- 	select VIRT_TO_BUS
  	select HAVE_ARCH_KCSAN			if X86_64
  	select X86_FEATURE_NAMES		if PROC_FS
  	select PROC_PID_ARCH_STATUS		if PROC_FS
diff --cc lib/Kconfig
index eaaad4d,80aecee..55c27e1
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@@ -118,11 -118,15 +118,18 @@@ config INDIRECT_IOMEM_FALLBAC
  	  mmio accesses when the IO memory address is not a registered
  	  emulated region.
  
+ config TRACE_MMIO_ACCESS
+ 	bool "Register read/write tracing"
+ 	depends on TRACING && ARCH_HAVE_TRACE_MMIO_ACCESS
+ 	help
+ 	  Create tracepoints for MMIO read/write operations. These trace events
+ 	  can be used for logging all MMIO read/write operations.
+ 
  source "lib/crypto/Kconfig"
  
 +config LIB_MEMNEQ
 +	bool
 +
  config CRC_CCITT
  	tristate "CRC-CCITT functions"
  	help