]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'asm-generic-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2022 17:07:23 +0000 (10:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Aug 2022 17:07:23 +0000 (10:07 -0700)
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.

20 files changed:
1  2 
Documentation/translations/zh_CN/core-api/index.rst
arch/Kconfig
arch/arm64/Kconfig
arch/arm64/include/asm/io.h
arch/arm64/kvm/hyp/nvhe/Makefile
arch/microblaze/Kconfig
arch/mips/Kconfig
arch/parisc/Kconfig
arch/parisc/kernel/irq.c
arch/powerpc/Kconfig
arch/sh/kernel/irq.c
arch/x86/Kconfig
arch/xtensa/Kconfig
drivers/hwtracing/coresight/coresight-etm4x-core.c
drivers/hwtracing/coresight/coresight-etm4x.h
drivers/tty/serial/qcom_geni_serial.c
include/asm-generic/io.h
lib/Kconfig
lib/Makefile
tools/include/uapi/asm-generic/fcntl.h

diff --cc arch/Kconfig
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index fb5900e2c29a5e5b2f1a96c925ce22017036b4a5,9a81b867c3bc7a999c1bd372ee7a0f9097164acc..cca4c0ac39ccab58102faa11e3ca0e8840d5b28c
@@@ -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
Simple merge
Simple merge
Simple merge
diff --cc lib/Kconfig
index eaaad4d85bf24b1a96389bf24f40181e19f5e8d1,80aeceee88edfaa87a2c68a7ea9c09b9689e18c7..55c27e1ec9cbff85ab14a21b48bb35906cdbc7e4
@@@ -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
diff --cc lib/Makefile
Simple merge