[GIT PULL] asm-generic: build fixes for v5.15

From: Arnd Bergmann <arnd@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-arch <linux-arch@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Bjorn Andersson <bjorn.andersson@linaro.org>,
	Adam Borowski <kilobyte@angband.pl>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Mark Brown <broonie@kernel.org>,
	Charles Keepax <ckeepax@opensource.cirrus.com>
Subject: [GIT PULL] asm-generic: build fixes for v5.15
Date: Fri, 8 Oct 2021 16:36:35 +0200	[thread overview]
Message-ID: <CAK8P3a0WCfiZ=WeezCCATSoxGmaDtL=pAWKzRu3wuLaT9qs6gA@mail.gmail.com> (raw)

The following changes since commit 6880fa6c56601bb8ed59df6c30fd390cc5f6dd8f:

  Linux 5.15-rc1 (2021-09-12 16:28:37 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git
tags/asm-generic-fixes-5.15

for you to fetch changes up to 2fbc349911e45d4ea5187b608c8d58db66496260:

  asm-generic/io.h: give stub iounmap() on !MMU same prototype as
elsewhere (2021-10-08 15:39:33 +0200)

----------------------------------------------------------------
asm-generic: build fixes for v5.15

There is one build fix for Arm platforms that ended up impacting most
architectures because of the way the drivers/firmware Kconfig file is
wired up:

The CONFIG_QCOM_SCM dependency have caused a number of randconfig
regressions over time, and some still remain in v5.15-rc4. The
fix we agreed on in the end is to make this symbol selected by any
driver using it, and then building it even for non-Arm platforms with
CONFIG_COMPILE_TEST.

To make this work on all architectures, the drivers/firmware/Kconfig
file needs to be included for all architectures to make the symbol
itself visible.

In a separate discussion, we found that a sound driver patch that is
pending for v5.16 needs the same change to include this Kconfig file,
so the easiest solution seems to have my Kconfig rework included in v5.15.

There is a small merge conflict against an earlier partial fix for the
QCOM_SCM dependency problems.

Finally, the branch also includes a small unrelated build fix for NOMMU
architectures.

Link: https://lore.kernel.org/all/20210928153508.101208f8@canb.auug.org.au/
Link: https://lore.kernel.org/all/20210928075216.4193128-1-arnd@kernel.org/
Link: https://lore.kernel.org/all/20211007151010.333516-1-arnd@kernel.org/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

----------------------------------------------------------------
Adam Borowski (1):
      asm-generic/io.h: give stub iounmap() on !MMU same prototype as elsewhere

Arnd Bergmann (2):
      firmware: include drivers/firmware/Kconfig unconditionally
      qcom_scm: hide Kconfig symbol

 arch/arm/Kconfig                           |  2 -
 arch/arm64/Kconfig                         |  2 -
 arch/ia64/Kconfig                          |  2 -
 arch/mips/Kconfig                          |  2 -
 arch/parisc/Kconfig                        |  2 -
 arch/riscv/Kconfig                         |  2 -
 arch/x86/Kconfig                           |  2 -
 drivers/Kconfig                            |  2 +
 drivers/firmware/Kconfig                   |  5 +--
 drivers/gpu/drm/msm/Kconfig                |  4 +-
 drivers/iommu/Kconfig                      |  3 +-
 drivers/iommu/arm/arm-smmu/Makefile        |  3 +-
 drivers/iommu/arm/arm-smmu/arm-smmu-impl.c |  3 +-
 drivers/media/platform/Kconfig             |  2 +-
 drivers/mmc/host/Kconfig                   |  2 +-
 drivers/net/ipa/Kconfig                    |  1 +
 drivers/net/wireless/ath/ath10k/Kconfig    |  2 +-
 drivers/pinctrl/qcom/Kconfig               |  3 +-
 include/asm-generic/io.h                   |  2 +-
 include/linux/arm-smccc.h                  | 10 +++++
 include/linux/qcom_scm.h                   | 71 ------------------------------
 21 files changed, 27 insertions(+), 100 deletions(-)