Commit Graph

1122314 Commits

Author SHA1 Message Date
Arnd Bergmann
ffc79c2097 Merge tag 'aspeed-6.1-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/defconfig
ASPEED defconfig updates for 6.1

 - A long awaited sync to make the config closer to that used by OpenBMC
   machines

 - Enable PECI to provide defconfig coverage for the subsystem

* tag 'aspeed-6.1-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  ARM: config: aspeed_g5: Enable PECI
  ARM: configs: aspeed_g4: Remove appended DTB and ATAG
  ARM: configs: aspeed: Refresh defconfigs
  ARM: config: aspeed: Enable namespaces
  ARM: configs: aspeed_g4: Enable IPV6 options
  ARM: configs: aspeed_g4: Enable OCC and NBD drivers
  ARM: configs: aspeed_g5: Enable MCTP stack
  ARM: configs: aspeed_g5: Add PL2303 USB serial driver
  ARM: configs: aspeed_g5: Add TPM TIS I2C driver
  ARM: configs: aspeed_g5: Add mp5023 driver
  ARM: configs: aspeed: Add support for USB flash drives

Link: https://lore.kernel.org/r/CACPK8XeLzL3hT8fwVw9fV7Ccduz_PNhZn_67z2yXefCEha6jJg@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-28 22:34:21 +02:00
Joel Stanley
e0d4684278 ARM: config: aspeed_g5: Enable PECI
Intel systems use PECI, so provide build coverage for the driver stack.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-09-28 12:34:02 +09:30
Joel Stanley
8a908a1c5d ARM: configs: aspeed_g4: Remove appended DTB and ATAG
These machines boot using FIT and have done so since support was merged,
so neither option is used.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-09-28 12:33:58 +09:30
Joel Stanley
0cdc6ea53a ARM: configs: aspeed: Refresh defconfigs
Remove the unused CONFIG_BLK_DEV_BSG option.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-09-28 12:33:55 +09:30
Joel Stanley
1a9a571e5e ARM: config: aspeed: Enable namespaces
Used by OpenBMC due to systemd.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-09-28 12:33:55 +09:30
Joel Stanley
34f3b56d00 ARM: configs: aspeed_g4: Enable IPV6 options
Match the aspeed_g5 defconfig and what is used in OpenBMC.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-09-28 12:33:52 +09:30
Joel Stanley
92a207c907 ARM: configs: aspeed_g4: Enable OCC and NBD drivers
These are used by OpenBMC machines such as palmetto.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-09-28 12:33:45 +09:30
Joel Stanley
54789080a5 ARM: configs: aspeed_g5: Enable MCTP stack
Enable the MCTP core along with the serial and i2c drivers.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-09-28 12:33:45 +09:30
Joel Stanley
4cb069db3f ARM: configs: aspeed_g5: Add PL2303 USB serial driver
Used by P10 machines.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-09-28 12:33:45 +09:30
Joel Stanley
bb51f68c57 ARM: configs: aspeed_g5: Add TPM TIS I2C driver
It is used by the rainier and other p10bmc machines.

Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-09-28 12:33:45 +09:30
Joel Stanley
617baaacc5 ARM: configs: aspeed_g5: Add mp5023 driver
Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-09-28 12:33:45 +09:30
Adriana Kobylak
27c49cafd0 ARM: configs: aspeed: Add support for USB flash drives
Add support to detect USB flash drives and create the /dev/sd* devices.
Also add support for vfat to support USB drives formatted as FAT32.
This support will be used to enable firmware updates via USB flash
drives where the firmware image is stored in the USB drive and it's
plugged into the BMC USB port.

Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Tested-by: Adriana Kobylak <anoo@us.ibm.com>
Link: https://lore.kernel.org/r/20211112202931.2379145-1-anoo@linux.ibm.com
Signed-off-by: Joel Stanley <joel@jms.id.au>
2022-09-28 12:33:45 +09:30
Arnd Bergmann
15116bf667 Merge tag 'qcom-defconfig-for-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/defconfig
Qualcomm ARM defconfig updates for 6.1

This enables command-db, ocmem, rpmh and rpmhpd drivers in the
multi_v7_defconfig, used on SDX55, SDX65 and MSM8974. For qcom_defconfig
rmtfs-mem, rpmpd, socinfo and qcom-stats are enables as they are used
across MSM8974, MSM8226, MSM8916 and APQ8084.

Lastly the MAINTAINERS entry is updated to include the qcom_defconfig.

* tag 'qcom-defconfig-for-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: qcom: include defconfig in MAINTAINERS
  ARM: multi_v7_defconfig: enable more Qualcomm drivers
  ARM: qcom_defconfig: enable more Qualcomm drivers

Link: https://lore.kernel.org/r/20220921153734.1314952-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-23 17:59:27 +02:00
Arnd Bergmann
d1d48fd18a Merge tag 'qcom-arm64-defconfig-for-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/defconfig
Qualcomm ARM64 defconfig updates for 6.1

This enables core providers needed to boot SC8180X, sound drivers for
SC7180 and SC7280, the Qualcomm EDP PHY, last-level cache controller
driver, on-chip memory driver and the SPM driver.

* tag 'qcom-arm64-defconfig-for-6.1' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: defconfig: Enabled SC8180x configs
  arm64: defconfig: enable newer Qualcomm SoC sound drivers
  arm64: defconfig: enable more Qualcomm drivers

Link: https://lore.kernel.org/r/20220921150314.1312358-1-andersson@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-23 17:58:09 +02:00
Mark Brown
075ed7b9e4 arm64: configs: Enable all PMUs provided by Arm
The selection of PMUs enabled in the defconfig is currently a bit random
and does not include a number of those provided by Arm and present in a
fairly wide range of SoCs. Improve coverage and defconfig utility by
enabling all the Arm provided PMUs by default.

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: James Clark <james.clark@arm.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20220919162753.3079869-1-broonie@kernel.org'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-23 17:57:43 +02:00
Arnd Bergmann
e1381b13ee Merge tag 'sunxi-config-for-6.1-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/defconfig
Enable devfreq cooling device driver in arm64 defconfig

* tag 'sunxi-config-for-6.1-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: defconfig: Enable devfreq cooling device

Link: https://lore.kernel.org/r/YyePcA5YHOZjdOf7@kista.localdomain
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-23 17:56:08 +02:00
Arnd Bergmann
7b04ab8376 Merge tag 'tegra-for-6.1-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/defconfig
arm64: tegra: Default configuration changes for v6.1-rc1

Enables the new MGBE driver, as well as the existing SPI and QSPI
drivers on 64-bit ARM. The GPC DMA driver is now also built into the
kernel by default to avoid needless probe deferrals that would slow
down the boot process significantly.

* tag 'tegra-for-6.1-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: defconfig: Make TEGRA186_GPC_DMA built-in
  arm64: tegra: Enable Tegra SPI & QSPI in deconfig
  arm64: defconfig: Enable Tegra MGBE driver

Link: https://lore.kernel.org/r/20220916101957.1635854-6-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-23 17:55:11 +02:00
Vinod Koul
25c7d38579 arm64: defconfig: Enabled SC8180x configs
Enable sc8180x global clock controller, tlmm, interconnect and edp phy
drivers which are required for sc8180x like Lenovo Flex 5G laptop to
boot.

Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220916124214.3881948-1-vkoul@kernel.org
2022-09-16 14:12:11 -05:00
Arnd Bergmann
79774742bd Merge tag 'arm-soc/for-6.1/defconfig-arm64' of https://github.com/Broadcom/stblinux into arm/defconfig
This pull request contains Broadcom ARM64 defconfig changes for 6.1,
please pull the following:

- William completes the removal of ARCH_BCM4908 by removing that Kconfig
entry from the defconfig since it is being deleted after having been
transitional through 6.0

* tag 'arm-soc/for-6.1/defconfig-arm64' of https://github.com/Broadcom/stblinux:
  arm64: defconfig: remove BCM4908

Link: https://lore.kernel.org/r/20220915023044.2350782-1-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-15 21:57:57 +02:00
Akhil R
747c39f0eb arm64: defconfig: Make TEGRA186_GPC_DMA built-in
Make TEGRA186_GPC_DMA driver as built-in since the clients using the
DMA (like I2C_TEGRA etc) are built-in. This would avoid the potential
long delay probe deferral can cause.

Signed-off-by: Akhil R <akhilrajeev@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2022-09-15 15:51:47 +02:00
Krishna Yarlagadda
0ddf10a319 arm64: tegra: Enable Tegra SPI & QSPI in deconfig
Jetson AGX board has flash device on QSPI controller and SPI instance
on 40-pin expander.

Enable Tegra SPI & QSPI drivers in defconfig as modules.

Signed-off-by: Krishna Yarlagadda <kyarlagadda@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2022-09-15 14:03:49 +02:00
Krzysztof Kozlowski
9385eb46e3 arm64: defconfig: enable newer Qualcomm SoC sound drivers
Enable sound support:
1. machine drivers for Qualcomm SC7180 and SC7280 SoCs,
2. Qualcomm ADSP Peripheral Image Loader used already on SC7280.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220909105136.421877-1-krzysztof.kozlowski@linaro.org
2022-09-14 21:21:21 -05:00
Linus Walleij
5a4ca019f6 ARM: config: ixp4xx: Disable legacy EEPROM driver
This disables the legacy EEPROM driver, we only need
the new AT24 driver.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20220911214042.1857352-1-linus.walleij@linaro.org'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-12 17:11:48 +02:00
Clément Péron
561044b5d6 arm64: defconfig: Enable devfreq cooling device
Devfreq cooling device framework is used in Panfrost
to throttle GPU in order to regulate its temperature.

Enable this driver for ARM64 SoC.

Signed-off-by: Clément Péron <peron.clem@gmail.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/r/20220906153034.153321-2-peron.clem@gmail.com
2022-09-08 22:09:50 +02:00
Michael Walle
0fd64e61d2 arm64: defconfig: enable ARCH_NXP
Commit 566e373fe0 ("arm64: Kconfig.platforms: Group NXP platforms
together") introduced a new symbol ARCH_NXP and made ARCH_LAYERSCAPE
(among others) depend on it, but didn't enable it in the defconfig.
Thus, now the defconfig doesn't include support for any NXP
architectures anymore. Fix it.

Fixes: 566e373fe0 ("arm64: Kconfig.platforms: Group NXP platforms together")
Signed-off-by: Michael Walle <michael@walle.cc>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-08 16:09:39 +02:00
Florian Fainelli
7e21f077b1 arm64: defconfig: enable ARCH_BCM
Commit 96796c914b ("arm64: Kconfig.platforms: Re-organized Broadcom
menu") introduced a new symbol ARCH_BCM and made all of the Broadcom
SoCs Kconfig depend on it, but did not enable it in the defconfig.
Thus, now the defconfig doesn't include support for any Broadcom
architectures anymore. Fix it.

Fixes: 96796c914b ("arm64: Kconfig.platforms: Re-organized Broadcom menu")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20220906033957.4377-1-f.fainelli@gmail.com'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-08 16:09:03 +02:00
Bhadram Varka
4cac4de4b0 arm64: defconfig: Enable Tegra MGBE driver
Enable the driver for the Multi-Gigabit Ethernet (MGBE) controller which
can be found on NVIDIA Tegra234 SoCs.

Signed-off-by: Bhadram Varka <vbhadram@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2022-09-07 18:25:31 +02:00
Arnaud Pouliquen
aa7f46b326 arm64: defconfig: Config that had RPMSG_CHAR now gets RPMSG_CTRL
In the commit 617d32938d ("rpmsg: Move the rpmsg control device
from rpmsg_char to rpmsg_ctrl"), we split the rpmsg_char driver in two.
By default give everyone who had the old driver enabled the rpmsg_ctrl
driver too.

Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-05 17:01:52 +02:00
Arnaud Pouliquen
26b6e7edcf arm: configs: Configs that had RPMSG_CHAR now get RPMSG_CTRL
In the commit 617d32938d ("rpmsg: Move the rpmsg control device
from rpmsg_char to rpmsg_ctrl"), we split the rpmsg_char driver in two.
By default give everyone who had the old driver enabled the rpmsg_ctrl
driver too.

Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-05 17:01:34 +02:00
Arnd Bergmann
853ca4bb74 Merge tag 'renesas-arm-defconfig-for-v6.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/defconfig
Renesas ARM defconfig updates for v6.1

  - Refresh shmobile_defconfig for v6.0-rc1,
  - Enable additional support for Renesas platforms in the arm64
    defconfig.

* tag 'renesas-arm-defconfig-for-v6.1-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  arm64: defconfig: Enable additional support for Renesas platforms
  ARM: shmobile: defconfig: Refresh for v6.0-rc1

Link: https://lore.kernel.org/r/cover.1662111126.git.geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-09-02 12:06:16 +02:00
Sudeep Holla
853ff6c321 arm64: defconfig: Drop ARM_CPUIDLE(generic idle driver) config
Since commit 788961462f ("ARM: psci: cpuidle: Enable PSCI CPUidle
driver") the generic ARM cpuidle driver probe no longer worked on
ARM64. It was however left enabled with the driver failing to probe
successfully. However the commit 51280acad8 ("cpuidle: cpuidle-arm:
remove arm64 support") removed the Kconfig option so that it is no
longer enabled for arm64 platforms.

Drop the disabled/unavailable ARM_CPUIDLE from the defconfig.

Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Link: https://lore.kernel.org/r/20220822121604.2213778-1-sudeep.holla@arm.com'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-08-29 11:01:56 +02:00
Stefan Hansson
5b8e894163 ARM: configs: replace CONFIG_NO_HZ=y with CONFIG_NO_HZ_IDLE=y
According to https://www.kernel.org/doc/html/latest/timers/no_hz.html,
CONFIG_NO_HZ=y should be replaced by CONFIG_NO_HZ_IDLE=y for newer
kernels, so let's reflect that in the 32-bit ARM defconfigs.

Signed-off-by: Stefan Hansson <newbie13xd@gmail.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> # Samsung
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/r/20220825162034.5901-1-newbie13xd@gmail.com'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-08-29 10:53:29 +02:00
Arnd Bergmann
839ddb93d5 Merge branch 'arm/defconfig-cleanup' into arm/defconfig
I have continued the cleanup of the multi_*_defconfig files, and
reordered the other files according to the 'make savedefconfig'
output as before.

Since a third of the defconfig files are for machines that
are now marked as unused, I skipped those files. There are still
a few things that get removed by 'make savedefconfig' as they
now get selected by some driver:

-CONFIG_SERIAL_BCM63XX=y
-CONFIG_SND_AUDIO_GRAPH_CARD=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_TEGRA20_APB_DMA=y

I think for those we should follow up with patches to remove the
'select' statements.

* arm/defconfig-cleanup:
  ARM: defconfig: fix CONFIG_SND_SOC_AC97_CODEC name
  ARM: defconfig: drop CONFIG_MICROCHIP_PIT64B
  ARM: defconfig: drop CONFIG_USB_FSL_USB2
  ARM: defconfig: drop CONFIG_SND_SOC_FSL_SAI
  ARM: defconfig: drop CONFIG_PTP_1588_CLOCK=y
  ARM: defconfig: drop CONFIG_DRM_RCAR_LVDS
  ARM: defconfig: drop CONFIG_SERIAL_OMAP references
  ARM: defconfig: drop CONFIG_NET_VENDOR_ASIX=y
  ARM: defconfig: clean up multi_v4t and multi_v5 configs
  ARM: defconfig: reorder defconfig files
2022-08-29 10:50:39 +02:00
Arnd Bergmann
8bd2b56b53 ARM: defconfig: fix CONFIG_SND_SOC_AC97_CODEC name
The CONFIG_SND_SOC_AC97 symbol was recently enabled but does not
actually exist. From the patch description, I assume that this
was meant to be CONFIG_SND_SOC_AC97_CODEC, which is used in
imx_v6_v7_defconfig.

Fixes: 2cc1cd26e9 ("ARM: configs: Enable ASoC AC'97 glue")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-08-29 10:45:56 +02:00
Arnd Bergmann
8a981ea176 ARM: defconfig: drop CONFIG_MICROCHIP_PIT64B
This is now default-enabled when CONFIG_SOC_SAMA7 is
used, so the defconfig entry can be dropped.

Fixes: f611af4c3b ("ARM: at91: Kconfig: implement PIT64B selection")
Acked-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-08-29 10:45:44 +02:00
Arnd Bergmann
1bc709eb31 ARM: defconfig: drop CONFIG_USB_FSL_USB2
USB_FSL_USB2 is no longer available for Arm platforms and
was replaced by the chipidea driver.

Fixes: a390bef7db ("usb: gadget: fsl_mxc_udc: Remove the driver")
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-08-29 10:45:34 +02:00
Arnd Bergmann
d1521bcef4 ARM: defconfig: drop CONFIG_SND_SOC_FSL_SAI
This is selected by CONFIG_SND_SOC_FSL_ASOC_CARD=m, so the
extra line is redundant.

Fixes: 212e3b6b87 ("ARM: configs: Enable more audio support for i.MX")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-08-29 10:45:34 +02:00
Arnd Bergmann
39916e7d40 ARM: defconfig: drop CONFIG_PTP_1588_CLOCK=y
PTP support is now enabled by default for configurations with
ethernet support, so drop the redundant entries in defconfig
files.

Fixes: e5f3155267 ("ethernet: fix PTP_1588_CLOCK dependencies")
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-08-29 10:45:24 +02:00
Arnd Bergmann
1441a15dd4 ARM: defconfig: drop CONFIG_DRM_RCAR_LVDS
This is now a hidden symbol, so just drop the defconfig line.

Fixes: 42d95d1b3a ("drm/rcar: stop using 'imply' for dependencies")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-08-29 10:45:23 +02:00
Arnd Bergmann
1c9cb2bbf7 ARM: defconfig: drop CONFIG_SERIAL_OMAP references
This driver is mutually exclusive with the new 8250_OMAP
driver, so 'make defconfig' turns it off already. Drop
the reference now.

Fixes: 077e1cde78 ("ARM: omap2plus_defconfig: Enable 8250_OMAP")
Fixes: f98d45145e ("ARM: multi_v7_defconfig: Enable 8250-omap serial driver and use it by default")
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-08-29 10:45:08 +02:00
Arnd Bergmann
7d40cecd0e ARM: defconfig: drop CONFIG_NET_VENDOR_ASIX=y
This option is 'default y' and has always been this way, the
line was added in error.

Fixes: dfe21dcaba ("ARM: defconfig: Enable ax88796c driver for Exynos boards")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-08-29 10:45:08 +02:00
Arnd Bergmann
d11277c35e ARM: defconfig: clean up multi_v4t and multi_v5 configs
Integrator now selects the regulators and versatile selects the
reset driver, so the correspondig options can be dropped from
the defconfig files.

Fixes: d2854bbe5f ("ARM: integrator: Add some Kconfig selections")
Fixes: 1c6e288da6 ("ARM: versatile: move restart to the device tree")
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-08-29 10:44:54 +02:00
Arnd Bergmann
e92ab51026 ARM: defconfig: reorder defconfig files
The debug-info and can subystem options have moved around in the
'savedefconfig' output, so fix these up to reduce the clutter
from the savedefconfig command.

Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2022-08-29 10:38:22 +02:00
Geert Uytterhoeven
eb970f3eb9 arm64: defconfig: Enable additional support for Renesas platforms
Increase build and test coverage by enabling support for more hardware
present on Renesas SoCs and boards:
  - Renesas RZ/V2M I2C,
  - Renesas Universal Flash Storage Controller on R-Car S4, as used on
    the Spider board.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/bd863fdd098be394d57b9dc15f8bb0f6b1f2d78a.1661162345.git.geert+renesas@glider.be
2022-08-29 09:08:36 +02:00
Geert Uytterhoeven
8b99550ba4 ARM: shmobile: defconfig: Refresh for v6.0-rc1
Refresh the defconfig for Renesas ARM systems:
  - Enable RZ/N1 A5PSW Ethernet switch support incl. dependencies
    (RZN1D-DB),
  - Move CONFIG_CAN_RCAR=y (moved in commit d7786af598 ("net:
    Kconfig: move the CAN device menu to the "Device Drivers"
    section")),
  - Enable RZ/N1 Gigabit Ethernet MAC support (RZN1D-DB),
  - Enable RZ/N1 Pin control support (RZN1D-DB),
  - Enable RZ/N1 DMA support incl. dependencies (RZN1D-DB).

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/428755447c1abbc8f1f08a63e83353d23ab22dd6.1661154821.git.geert+renesas@glider.be
2022-08-29 09:08:36 +02:00
Linus Torvalds
b90cb10531 Linux 6.0-rc3 2022-08-28 15:05:29 -07:00
Linus Torvalds
b467192ec7 Merge tag 'mm-hotfixes-stable-2022-08-28' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull more hotfixes from Andrew Morton:
 "Seventeen hotfixes.  Mostly memory management things.

  Ten patches are cc:stable, addressing pre-6.0 issues"

* tag 'mm-hotfixes-stable-2022-08-28' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  .mailmap: update Luca Ceresoli's e-mail address
  mm/mprotect: only reference swap pfn page if type match
  squashfs: don't call kmalloc in decompressors
  mm/damon/dbgfs: avoid duplicate context directory creation
  mailmap: update email address for Colin King
  asm-generic: sections: refactor memory_intersects
  bootmem: remove the vmemmap pages from kmemleak in put_page_bootmem
  ocfs2: fix freeing uninitialized resource on ocfs2_dlm_shutdown
  Revert "memcg: cleanup racy sum avoidance code"
  mm/zsmalloc: do not attempt to free IS_ERR handle
  binder_alloc: add missing mmap_lock calls when using the VMA
  mm: re-allow pinning of zero pfns (again)
  vmcoreinfo: add kallsyms_num_syms symbol
  mailmap: update Guilherme G. Piccoli's email addresses
  writeback: avoid use-after-free after removing device
  shmem: update folio if shmem_replace_page() updates the page
  mm/hugetlb: avoid corrupting page->mapping in hugetlb_mcopy_atomic_pte
2022-08-28 14:49:59 -07:00
Linus Torvalds
373eff576e Merge tag 'bitmap-6.0-rc3' of github.com:/norov/linux
Pull bitmap fixes from Yury Norov:
 "Fix the reported issues, and implements the suggested improvements,
  for the version of the cpumask tests [1] that was merged with commit
  c41e8866c2 ("lib/test: introduce cpumask KUnit test suite").

  These changes include fixes for the tests, and better alignment with
  the KUnit style guidelines"

* tag 'bitmap-6.0-rc3' of github.com:/norov/linux:
  lib/cpumask_kunit: add tests file to MAINTAINERS
  lib/cpumask_kunit: log mask contents
  lib/test_cpumask: follow KUnit style guidelines
  lib/test_cpumask: fix cpu_possible_mask last test
  lib/test_cpumask: drop cpu_possible_mask full test
2022-08-28 14:36:27 -07:00
Luca Ceresoli
0ebafe2ea8 .mailmap: update Luca Ceresoli's e-mail address
My Bootlin address is preferred from now on.

Link: https://lkml.kernel.org/r/20220826130515.3011951-1-luca.ceresoli@bootlin.com
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Atish Patra <atishp@atishpatra.org>
Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2022-08-28 14:02:46 -07:00
Peter Xu
3d2f78f08c mm/mprotect: only reference swap pfn page if type match
Yu Zhao reported a bug after the commit "mm/swap: Add swp_offset_pfn() to
fetch PFN from swap entry" added a check in swp_offset_pfn() for swap type [1]:

  kernel BUG at include/linux/swapops.h:117!
  CPU: 46 PID: 5245 Comm: EventManager_De Tainted: G S         O L 6.0.0-dbg-DEV #2
  RIP: 0010:pfn_swap_entry_to_page+0x72/0xf0
  Code: c6 48 8b 36 48 83 fe ff 74 53 48 01 d1 48 83 c1 08 48 8b 09 f6
  c1 01 75 7b 66 90 48 89 c1 48 8b 09 f6 c1 01 74 74 5d c3 eb 9e <0f> 0b
  48 ba ff ff ff ff 03 00 00 00 eb ae a9 ff 0f 00 00 75 13 48
  RSP: 0018:ffffa59e73fabb80 EFLAGS: 00010282
  RAX: 00000000ffffffe8 RBX: 0c00000000000000 RCX: ffffcd5440000000
  RDX: 1ffffffffff7a80a RSI: 0000000000000000 RDI: 0c0000000000042b
  RBP: ffffa59e73fabb80 R08: ffff9965ca6e8bb8 R09: 0000000000000000
  R10: ffffffffa5a2f62d R11: 0000030b372e9fff R12: ffff997b79db5738
  R13: 000000000000042b R14: 0c0000000000042b R15: 1ffffffffff7a80a
  FS:  00007f549d1bb700(0000) GS:ffff99d3cf680000(0000) knlGS:0000000000000000
  CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
  CR2: 0000440d035b3180 CR3: 0000002243176004 CR4: 00000000003706e0
  DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
  DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
  Call Trace:
   <TASK>
   change_pte_range+0x36e/0x880
   change_p4d_range+0x2e8/0x670
   change_protection_range+0x14e/0x2c0
   mprotect_fixup+0x1ee/0x330
   do_mprotect_pkey+0x34c/0x440
   __x64_sys_mprotect+0x1d/0x30

It triggers because pfn_swap_entry_to_page() could be called upon e.g. a
genuine swap entry.

Fix it by only calling it when it's a write migration entry where the page*
is used.

[1] https://lore.kernel.org/lkml/CAOUHufaVC2Za-p8m0aiHw6YkheDcrO-C3wRGixwDS32VTS+k1w@mail.gmail.com/

Link: https://lkml.kernel.org/r/20220823221138.45602-1-peterx@redhat.com
Fixes: 6c287605fd ("mm: remember exclusively mapped anonymous pages with PG_anon_exclusive")
Signed-off-by: Peter Xu <peterx@redhat.com>
Reported-by: Yu Zhao <yuzhao@google.com>
Tested-by: Yu Zhao <yuzhao@google.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2022-08-28 14:02:46 -07:00