]> Git Repo - J-linux.git/commitdiff
Merge tag 'mmc-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
authorLinus Torvalds <[email protected]>
Wed, 13 Mar 2024 17:59:28 +0000 (10:59 -0700)
committerLinus Torvalds <[email protected]>
Wed, 13 Mar 2024 17:59:28 +0000 (10:59 -0700)
Pull MMC updates from Ulf Hansson:
 "MMC core:
   - Drop the use of BLK_BOUNCE_HIGH
   - Fix partition switch for GP3
   - Remove usage of the deprecated ida_simple API

  MMC host:
   - cqhci: Update bouncing email-addresses in MAINTAINERS
   - davinci_mmc: Use sg_miter for PIO
   - dw_mmc-hi3798cv200: Convert the DT bindings to YAML
   - dw_mmc-hi3798mv200: Add driver for the new dw_mmc variant
   - fsl-imx-esdhc: A couple of corrections/updates to the DT bindings
   - meson-mx-sdhc: Drop use of the ->card_hw_reset() callback
   - moxart-mmc: Use sg_miter for PIO
   - moxart-mmc: Fix accounting for DMA transfers
   - mvsdio: Use sg_miter for PIO
   - mxcmmc: Use sg_miter for PIO
   - omap: Use sg_miter for PIO
   - renesas,sdhi: Add support for R-Car V4M variant
   - sdhci-esdhc-mcf: Use sg_miter for swapping
   - sdhci-of-dwcmshc: Add support for Sophgo CV1800B and SG2002 variants
   - sh_mmcif: Use sg_miter for PIO
   - tmio: Avoid concurrent runs of mmc_request_done()"

* tag 'mmc-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (44 commits)
  mmc: core: make mmc_host_class constant
  mmc: core: Fix switch on gp3 partition
  mmc: tmio: comment the ERR_PTR usage in this driver
  mmc: mmc_spi: Don't mention DMA direction
  mmc: dw_mmc: Remove unused of_gpio.h
  mmc: dw_mmc: add support for hi3798mv200
  dt-bindings: mmc: hisilicon,hi3798cv200-dw-mshc: add Hi3798MV200 binding
  dt-bindings: mmc: dw-mshc-hi3798cv200: convert to YAML
  mmc: dw_mmc-hi3798cv200: remove MODULE_ALIAS()
  mmc: core: Use a struct device* as in-param to mmc_of_parse_clk_phase()
  mmc: wmt-sdmmc: remove an incorrect release_mem_region() call in the .remove function
  mmc: tmio: avoid concurrent runs of mmc_request_done()
  dt-bindings: mmc: fsl-imx-mmc: Document the required clocks
  mmc: sh_mmcif: Advance sg_miter before reading blocks
  mmc: sh_mmcif: sg_miter must not be atomic
  mmc: sdhci-esdhc-mcf: Flag the sg_miter as atomic
  dt-bindings: mmc: fsl-imx-esdhc: add default and 100mhz state
  mmc: core: constify the struct device_type usage
  mmc: sdhci-of-dwcmshc: Add support for Sophgo CV1800B and SG2002
  dt-bindings: mmc: sdhci-of-dwcmhsc: Add Sophgo CV1800B and SG2002 support
  ...

1  2 
MAINTAINERS
drivers/mmc/core/queue.c

diff --combined MAINTAINERS
index 8ea2cbfc52ea075e0eee2461303bbbcac21805de,137582fa10121eb66a81a98855a903c6b74b95fe..6fbb0db8373d928b727e2aefc7d0db68019379c0
@@@ -24,7 -24,7 +24,7 @@@ Descriptions of section entries and pre
           filing info, a direct bug tracker link, or a mailto: URI.
        C: URI for *chat* protocol, server and channel where developers
           usually hang out, for example irc://server/channel.
 -      P: Subsystem Profile document for more details submitting
 +      P: *Subsystem Profile* document for more details submitting
           patches to the given subsystem. This is either an in-tree file,
           or a URI. See Documentation/maintainer/maintainer-entry-profile.rst
           for details.
@@@ -897,12 -897,6 +897,12 @@@ Q:       https://patchwork.kernel.org/project
  F:    drivers/infiniband/hw/efa/
  F:    include/uapi/rdma/efa-abi.h
  
 +AMD ADDRESS TRANSLATION LIBRARY (ATL)
 +M:    Yazen Ghannam <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/ras/amd/atl/*
 +
  AMD AXI W1 DRIVER
  M:    Kris Chaplin <[email protected]>
  R:    Thomas Delev <[email protected]>
@@@ -1401,7 -1395,6 +1401,7 @@@ F:      drivers/hwmon/max31760.
  
  ANALOGBITS PLL LIBRARIES
  M:    Paul Walmsley <[email protected]>
 +M:    Samuel Holland <[email protected]>
  S:    Supported
  F:    drivers/clk/analogbits/*
  F:    include/linux/clk/analogbits*
@@@ -2163,7 -2156,7 +2163,7 @@@ M:      Shawn Guo <[email protected]
  M:    Sascha Hauer <[email protected]>
  R:    Pengutronix Kernel Team <[email protected]>
  R:    Fabio Estevam <[email protected]>
 -R:    NXP Linux Team <[email protected]>
 +L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
@@@ -2549,14 -2542,13 +2549,14 @@@ F:   drivers/*/*/*wpcm
  F:    drivers/*/*wpcm*
  
  ARM/NXP S32G ARCHITECTURE
 -M:    Chester Lin <[email protected]>
 -R:    Andreas Färber <[email protected]>
 +R:    Chester Lin <[email protected]>
  R:    Matthias Brugger <[email protected]>
 -R:    NXP S32 Linux Team <[email protected]>
 +R:    Ghennadi Procopciuc <[email protected]>
 +L:    NXP S32 Linux Team <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm64/boot/dts/freescale/s32g*.dts*
 +F:    drivers/pinctrl/nxp/
  
  ARM/Orion SoC/Technologic Systems TS-78xx platform support
  M:    Alexander Clouter <[email protected]>
@@@ -3807,7 -3799,6 +3807,7 @@@ M:      Alexei Starovoitov <[email protected]
  M:    Daniel Borkmann <[email protected]>
  M:    Andrii Nakryiko <[email protected]>
  R:    Martin KaFai Lau <[email protected]>
 +R:    Eduard Zingerman <[email protected]>
  R:    Song Liu <[email protected]>
  R:    Yonghong Song <[email protected]>
  R:    John Fastabend <[email protected]>
@@@ -3868,7 -3859,6 +3868,7 @@@ F:      net/unix/unix_bpf.
  
  BPF [LIBRARY] (libbpf)
  M:    Andrii Nakryiko <[email protected]>
 +M:    Eduard Zingerman <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    tools/lib/bpf/
@@@ -3926,7 -3916,6 +3926,7 @@@ F:      security/bpf
  
  BPF [SELFTESTS] (Test Runners & Infrastructure)
  M:    Andrii Nakryiko <[email protected]>
 +M:    Eduard Zingerman <[email protected]>
  R:    Mykola Lysenko <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -4640,8 -4629,8 +4640,8 @@@ S:      Maintaine
  F:    net/sched/sch_cake.c
  
  CAN NETWORK DRIVERS
 -M:    Wolfgang Grandegger <[email protected]>
  M:    Marc Kleine-Budde <[email protected]>
 +M:    Vincent Mailhol <[email protected]>
  L:    [email protected]
  S:    Maintained
  W:    https://github.com/linux-can
@@@ -5389,7 -5378,7 +5389,7 @@@ CONTROL GROUP - MEMORY RESOURCE CONTROL
  M:    Johannes Weiner <[email protected]>
  M:    Michal Hocko <[email protected]>
  M:    Roman Gushchin <[email protected]>
 -M:    Shakeel Butt <shakeel[email protected]>
 +M:    Shakeel Butt <shakeel[email protected]>
  R:    Muchun Song <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -5621,11 -5610,6 +5621,11 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml
  F:    drivers/net/can/ctucanfd/
  
 +CVE ASSIGNMENT CONTACT
 +M:    CVE Assignment Team <[email protected]>
 +S:    Maintained
 +F:    Documentation/process/cve.rst
 +
  CW1200 WLAN driver
  S:    Orphan
  F:    drivers/net/wireless/st/cw1200/
@@@ -6134,14 -6118,6 +6134,14 @@@ F:    include/linux/device-mapper.
  F:    include/linux/dm-*.h
  F:    include/uapi/linux/dm-*.h
  
 +DEVICE-MAPPER VDO TARGET
 +M:    Matthew Sakai <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/admin-guide/device-mapper/vdo*.rst
 +F:    drivers/md/dm-vdo/
 +
  DEVLINK
  M:    Jiri Pirko <[email protected]>
  L:    [email protected]
@@@ -6396,7 -6372,6 +6396,7 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/admin-guide/quickly-build-trimmed-linux.rst
  F:    Documentation/admin-guide/reporting-issues.rst
 +F:    Documentation/admin-guide/verify-bugs-and-bisect-regressions.rst
  
  DOCUMENTATION SCRIPTS
  M:    Mauro Carvalho Chehab <[email protected]>
@@@ -7602,6 -7577,7 +7602,6 @@@ R:      Robert Richter <[email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
 -F:    Documentation/admin-guide/ras.rst
  F:    Documentation/driver-api/edac.rst
  F:    drivers/edac/
  F:    include/linux/edac.h
@@@ -7809,8 -7785,8 +7809,8 @@@ F:      drivers/media/usb/em28xx
  
  EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER
  M:    Adrian Hunter <[email protected]>
- M:    Ritesh Harjani <[email protected]>
M:    Asutosh Das <[email protected]>
+ M:    Asutosh Das <[email protected]>
R:    Ritesh Harjani <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/mmc/host/cqhci*
@@@ -7908,13 -7884,6 +7908,13 @@@ S:    Maintaine
  F:    include/linux/errseq.h
  F:    lib/errseq.c
  
 +ESD CAN NETWORK DRIVERS
 +M:    Stefan Mätje <[email protected]>
 +R:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/can/esd/
 +
  ESD CAN/USB DRIVERS
  M:    Frank Jungclaus <[email protected]>
  R:    [email protected]
@@@ -8191,7 -8160,6 +8191,7 @@@ F:      include/uapi/scsi/fc
  FILE LOCKING (flock() and fcntl()/lockf())
  M:    Jeff Layton <[email protected]>
  M:    Chuck Lever <[email protected]>
 +R:    Alexander Aring <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    fs/fcntl.c
@@@ -8522,7 -8490,7 +8522,7 @@@ FREESCALE IMX / MXC FEC DRIVE
  M:    Wei Fang <[email protected]>
  R:    Shenwei Wang <[email protected]>
  R:    Clark Wang <[email protected]>
 -R:    NXP Linux Team <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/fsl,fec.yaml
@@@ -8557,7 -8525,7 +8557,7 @@@ F:      drivers/i2c/busses/i2c-imx.
  FREESCALE IMX LPI2C DRIVER
  M:    Dong Aisheng <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml
  F:    drivers/i2c/busses/i2c-imx-lpi2c.c
@@@ -8617,13 -8585,6 +8617,13 @@@ F:    Documentation/devicetree/bindings/so
  F:    drivers/soc/fsl/qe/qmc.c
  F:    include/soc/fsl/qe/qmc.h
  
 +FREESCALE QUICC ENGINE QMC HDLC DRIVER
 +M:    Herve Codina <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/wan/fsl_qmc_hdlc.c
 +
  FREESCALE QUICC ENGINE TSA DRIVER
  M:    Herve Codina <[email protected]>
  L:    [email protected]
@@@ -9015,10 -8976,9 +9015,10 @@@ F:    include/linux/string.
  F:    include/linux/string_choices.h
  F:    include/linux/string_helpers.h
  F:    lib/string.c
 +F:    lib/string_kunit.c
  F:    lib/string_helpers.c
 -F:    lib/test-string_helpers.c
 -F:    lib/test_string.c
 +F:    lib/string_helpers_kunit.c
 +F:    scripts/coccinelle/api/string_choices.cocci
  
  GENERIC UIO DRIVER FOR PCI DEVICES
  M:    "Michael S. Tsirkin" <[email protected]>
@@@ -9120,7 -9080,6 +9120,7 @@@ F:      Documentation/devicetree/bindings/cl
  F:    arch/arm64/boot/dts/exynos/google/
  F:    drivers/clk/samsung/clk-gs101.c
  F:    include/dt-bindings/clock/google,gs101.h
 +K:    [gG]oogle.?[tT]ensor
  
  GPD POCKET FAN DRIVER
  M:    Hans de Goede <[email protected]>
@@@ -10512,8 -10471,7 +10512,8 @@@ M:   Donald Robson <donald.robson@imgtec.
  M:    Matt Coster <[email protected]>
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/gpu/img,powervr.yaml
 +F:    Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml
 +F:    Documentation/devicetree/bindings/gpu/img,powervr-sgx.yaml
  F:    Documentation/gpu/imagination/
  F:    drivers/gpu/drm/imagination/
  F:    include/uapi/drm/pvr_drm.h
@@@ -10771,7 -10729,7 +10771,7 @@@ INTEL DRM I915 DRIVER (Meteor Lake, DG
  M:    Jani Nikula <[email protected]>
  M:    Joonas Lahtinen <[email protected]>
  M:    Rodrigo Vivi <[email protected]>
 -M:    Tvrtko Ursulin <t[email protected]>
 +M:    Tvrtko Ursulin <t[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://drm.pages.freedesktop.org/intel-docs/
  S:    Maintained
  F:    drivers/net/wwan/iosm/
  
 +INTEL(R) FLEXIBLE RETURN AND EVENT DELIVERY
 +M:    Xin Li <[email protected]>
 +M:    "H. Peter Anvin" <[email protected]>
 +S:    Supported
 +F:    Documentation/arch/x86/x86_64/fred.rst
 +F:    arch/x86/entry/entry_64_fred.S
 +F:    arch/x86/entry/entry_fred.c
 +F:    arch/x86/include/asm/fred.h
 +F:    arch/x86/kernel/fred.c
 +
  INTEL(R) TRACE HUB
  M:    Alexander Shishkin <[email protected]>
  S:    Supported
@@@ -11291,6 -11239,7 +11291,6 @@@ F:   drivers/iommu
  F:    include/linux/iommu.h
  F:    include/linux/iova.h
  F:    include/linux/of_iommu.h
 -F:    include/uapi/linux/iommu.h
  
  IOMMUFD
  M:    Jason Gunthorpe <[email protected]>
@@@ -12204,11 -12153,11 +12204,11 @@@ F:        Documentation/scsi/53c700.rs
  F:    drivers/scsi/53c700*
  
  LEAKING_ADDRESSES
 -M:    Tobin C. Harding <[email protected]>
  M:    Tycho Andersen <[email protected]>
 +R:    Kees Cook <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    scripts/leaking_addresses.pl
  
  LED SUBSYSTEM
@@@ -12562,6 -12511,7 +12562,6 @@@ F:   arch/powerpc/include/asm/livepatch.
  F:    include/linux/livepatch.h
  F:    kernel/livepatch/
  F:    kernel/module/livepatch.c
 -F:    lib/livepatch/
  F:    samples/livepatch/
  F:    tools/testing/selftests/livepatch/
  
  S:    Supported
  F:    drivers/net/ethernet/marvell/octeon_ep
  
 +MARVELL OCTEON ENDPOINT VF DRIVER
 +M:    Veerasenareddy Burru <[email protected]>
 +M:    Sathesh Edara <[email protected]>
 +M:    Shinas Rasheed <[email protected]>
 +M:    Satananda Burla <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/marvell/octeon_ep_vf
 +
  MARVELL OCTEONTX2 PHYSICAL FUNCTION DRIVER
  M:    Sunil Goutham <[email protected]>
  M:    Geetha sowjanya <[email protected]>
@@@ -14069,7 -14010,7 +14069,7 @@@ F:   include/uapi/rdma/mlx5-abi.
  
  MELLANOX MLX5 VDPA DRIVER
  M:    Dragos Tatulea <[email protected]>
 -L:    [email protected]-foundation.org
 +L:    [email protected].dev
  S:    Supported
  F:    drivers/vdpa/mlx5/
  
@@@ -14165,17 -14106,6 +14165,17 @@@ F: mm
  F:    tools/mm/
  F:    tools/testing/selftests/mm/
  
 +MEMORY MAPPING
 +M:    Andrew Morton <[email protected]>
 +R:    Liam R. Howlett <[email protected]>
 +R:    Vlastimil Babka <[email protected]>
 +R:    Lorenzo Stoakes <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +W:    http://www.linux-mm.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
 +F:    mm/mmap.c
 +
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    Miquel Raynal <[email protected]>
  M:    Richard Weinberger <[email protected]>
@@@ -14434,7 -14364,7 +14434,7 @@@ MICROCHIP MCP16502 PMIC DRIVE
  M:    Claudiu Beznea <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
 -F:    Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt
 +F:    Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml
  F:    drivers/regulator/mcp16502.c
  
  MICROCHIP MCP3564 ADC DRIVER
@@@ -15153,7 -15083,6 +15153,7 @@@ NETDEVSI
  M:    Jakub Kicinski <[email protected]>
  S:    Maintained
  F:    drivers/net/netdevsim/*
 +F:    tools/testing/selftests/drivers/net/netdevsim/*
  
  NETEM NETWORK EMULATOR
  M:    Stephen Hemminger <[email protected]>
@@@ -15308,8 -15237,6 +15308,8 @@@ F:   Documentation/networking
  F:    Documentation/networking/net_cachelines/
  F:    Documentation/process/maintainer-netdev.rst
  F:    Documentation/userspace-api/netlink/
 +F:    include/linux/framer/framer-provider.h
 +F:    include/linux/framer/framer.h
  F:    include/linux/in.h
  F:    include/linux/indirect_call_wrapper.h
  F:    include/linux/net.h
@@@ -15397,7 -15324,7 +15397,7 @@@ K:   \bmdo
  NETWORKING [MPTCP]
  M:    Matthieu Baerts <[email protected]>
  M:    Mat Martineau <[email protected]>
 -R:    Geliang Tang <geliang[email protected]>
 +R:    Geliang Tang <geliang@kernel.org>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -15644,6 -15571,16 +15644,6 @@@ W:  https://github.com/davejiang/linux/w
  T:    git https://github.com/davejiang/linux.git
  F:    drivers/ntb/hw/intel/
  
 -NTFS FILESYSTEM
 -M:    Anton Altaparmakov <[email protected]>
 -R:    Namjae Jeon <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -W:    http://www.tuxera.com/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
 -F:    Documentation/filesystems/ntfs.rst
 -F:    fs/ntfs/
 -
  NTFS3 FILESYSTEM
  M:    Konstantin Komarov <[email protected]>
  L:    [email protected]
@@@ -15772,7 -15709,7 +15772,7 @@@ F:   drivers/iio/gyro/fxas21002c_spi.
  NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER
  M:    Haibo Chen <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml
  F:    Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
@@@ -15809,7 -15746,7 +15809,7 @@@ F:   drivers/gpu/drm/imx/dcss
  NXP i.MX 8QXP ADC DRIVER
  M:    Cai Huoqing <[email protected]>
  M:    Haibo Chen <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml
@@@ -15817,7 -15754,7 +15817,7 @@@ F:   drivers/iio/adc/imx8qxp-adc.
  
  NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
  M:    Mirela Rabulea <[email protected]>
 -R:    NXP Linux Team <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/nxp,imx8-jpeg.yaml
@@@ -15827,7 -15764,7 +15827,7 @@@ NXP i.MX CLOCK DRIVER
  M:    Abel Vesa <[email protected]>
  R:    Peng Fan <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
  F:    Documentation/devicetree/bindings/clock/imx*
@@@ -16788,7 -16725,6 +16788,7 @@@ F:   drivers/pci/controller/dwc/*layersca
  PCI DRIVER FOR FU740
  M:    Paul Walmsley <[email protected]>
  M:    Greentime Hu <[email protected]>
 +M:    Samuel Holland <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/sifive,fu740-pcie.yaml
@@@ -16901,7 -16837,6 +16901,7 @@@ F:   drivers/pci/controller/dwc/*designwa
  
  PCI DRIVER FOR TI DRA7XX/J721E
  M:    Vignesh Raghavendra <[email protected]>
 +R:    Siddharth Vadapalli <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  M:    Jacky Bai <[email protected]>
  R:    Pengutronix Kernel Team <[email protected]>
  L:    [email protected]
 +L:    NXP S32 Linux Team <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/fsl,*
 +F:    Documentation/devicetree/bindings/pinctrl/nxp,s32*
  F:    drivers/pinctrl/freescale/
 +F:    drivers/pinctrl/nxp/
  
  PIN CONTROLLER - INTEL
  M:    Mika Westerberg <[email protected]>
@@@ -17387,6 -17319,14 +17387,6 @@@ S:  Supporte
  F:    drivers/gpio/gpio-sama5d2-piobu.c
  F:    drivers/pinctrl/pinctrl-at91*
  
 -PIN CONTROLLER - NXP S32
 -M:    Chester Lin <[email protected]>
 -R:    NXP S32 Linux Team <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/pinctrl/nxp,s32*
 -F:    drivers/pinctrl/nxp/
 -
  PIN CONTROLLER - QUALCOMM
  M:    Bjorn Andersson <[email protected]>
  L:    [email protected]
@@@ -17403,6 -17343,7 +17403,6 @@@ F:   Documentation/devicetree/bindings/pi
  F:    drivers/pinctrl/renesas/
  
  PIN CONTROLLER - SAMSUNG
 -M:    Tomasz Figa <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
  R:    Alim Akhtar <[email protected]>
@@@ -17552,7 -17493,6 +17552,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    fs/timerfd.c
  F:    include/linux/time_namespace.h
  F:    include/linux/timer*
 +F:    include/trace/events/timer*
  F:    kernel/time/*timer*
  F:    kernel/time/namespace.c
  
@@@ -17589,7 -17529,6 +17589,7 @@@ F:   Documentation/devicetree/bindings/po
  F:    drivers/power/supply/
  F:    include/linux/power/
  F:    include/linux/power_supply.h
 +F:    tools/testing/selftests/power_supply/
  
  POWERNV OPERATOR PANEL LCD DISPLAY DRIVER
  M:    Suraj Jitindar Singh <[email protected]>
@@@ -18037,34 -17976,33 +18037,34 @@@ F:        drivers/media/tuners/qt1010
  
  QUALCOMM ATH12K WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
 -M:    Jeff Johnson <[email protected]>
 +M:    Jeff Johnson <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath12k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath12k/
 +N:    ath12k
  
  QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
 -M:    Jeff Johnson <[email protected]>
 +M:    Jeff Johnson <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 -F:    Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml
  F:    drivers/net/wireless/ath/ath10k/
 +N:    ath10k
  
  QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
  M:    Kalle Valo <[email protected]>
 -M:    Jeff Johnson <[email protected]>
 +M:    Jeff Johnson <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath11k
  B:    https://wireless.wiki.kernel.org/en/users/Drivers/ath11k/bugreport
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 -F:    Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml
  F:    drivers/net/wireless/ath/ath11k/
 +N:    ath11k
  
  QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
  M:    Toke Høiland-Jørgensen <[email protected]>
@@@ -18075,13 -18013,6 +18075,13 @@@ T: git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml
  F:    drivers/net/wireless/ath/ath9k/
  
 +QUALCOMM ATHEROS QCA7K ETHERNET DRIVER
 +M:    Stefan Wahren <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/net/qca,qca7000.txt
 +F:    drivers/net/ethernet/qualcomm/qca*
 +
  QUALCOMM BAM-DMUX WWAN NETWORK DRIVER
  M:    Stephan Gerhold <[email protected]>
  L:    [email protected]
@@@ -18425,17 -18356,11 +18425,17 @@@ M:        Tony Luck <[email protected]
  M:    Borislav Petkov <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/admin-guide/ras.rst
 +F:    Documentation/admin-guide/RAS
  F:    drivers/ras/
  F:    include/linux/ras.h
  F:    include/ras/ras_event.h
  
 +RAS FRU MEMORY POISON MANAGER (FMPM)
 +M:    Yazen Ghannam <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/ras/amd/fmpm.c
 +
  RC-CORE / LIRC FRAMEWORK
  M:    Sean Young <[email protected]>
  L:    [email protected]
@@@ -18925,7 -18850,6 +18925,7 @@@ F:   Documentation/devicetree/bindings/ri
  F:    arch/riscv/boot/dts/
  X:    arch/riscv/boot/dts/allwinner/
  X:    arch/riscv/boot/dts/renesas/
 +X:    arch/riscv/boot/dts/sophgo/
  
  RISC-V PMU DRIVERS
  M:    Atish Patra <[email protected]>
@@@ -19174,7 -19098,6 +19174,7 @@@ F:   Documentation/rust
  F:    rust/
  F:    samples/rust/
  F:    scripts/*rust*
 +F:    tools/testing/selftests/rust/
  K:    \b(?i:rust)\b
  
  RXRPC SOCKETS (AF_RXRPC)
@@@ -19468,6 -19391,7 +19468,6 @@@ F:   drivers/media/platform/samsung/exyno
  SAMSUNG SOC CLOCK DRIVERS
  M:    Krzysztof Kozlowski <[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
 -M:    Tomasz Figa <[email protected]>
  M:    Chanwoo Choi <[email protected]>
  R:    Alim Akhtar <[email protected]>
  L:    [email protected]
@@@ -19709,7 -19633,7 +19709,7 @@@ F:   drivers/mmc/host/sdhci-of-at91.
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) NXP i.MX DRIVER
  M:    Haibo Chen <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/mmc/host/sdhci-esdhc-imx.c
@@@ -20044,15 -19968,36 +20044,15 @@@ S:        Maintaine
  F:    drivers/watchdog/simatic-ipc-wdt.c
  
  SIFIVE DRIVERS
 -M:    Palmer Dabbelt <[email protected]>
  M:    Paul Walmsley <[email protected]>
 +M:    Samuel Holland <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    drivers/dma/sf-pdma/
  N:    sifive
 +K:    fu[57]40
  K:    [^@]sifive
  
 -SIFIVE CACHE DRIVER
 -M:    Conor Dooley <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/cache/sifive,ccache0.yaml
 -F:    drivers/cache/sifive_ccache.c
 -
 -SIFIVE FU540 SYSTEM-ON-CHIP
 -M:    Paul Walmsley <[email protected]>
 -M:    Palmer Dabbelt <[email protected]>
 -L:    [email protected]
 -S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git
 -N:    fu540
 -K:    fu540
 -
 -SIFIVE PDMA DRIVER
 -M:    Green Wan <[email protected]>
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml
 -F:    drivers/dma/sf-pdma/
 -
 -
  SILEAD TOUCHSCREEN DRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
@@@ -20261,8 -20206,8 +20261,8 @@@ F:   Documentation/devicetree/bindings/ne
  F:    drivers/net/ethernet/socionext/sni_ave.c
  
  SOCIONEXT (SNI) NETSEC NETWORK DRIVER
 -M:    Jassi Brar <[email protected]>
  M:    Ilias Apalodimas <[email protected]>
 +M:    Masahisa Kojima <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/socionext,synquacer-netsec.yaml
@@@ -20503,13 -20448,12 +20503,13 @@@ F:        drivers/char/sonypi.
  F:    drivers/platform/x86/sony-laptop.c
  F:    include/linux/sony-laptop.h
  
 -SOPHGO DEVICETREES
 -M:    Chao Wei <[email protected]>
 +SOPHGO DEVICETREES and DRIVERS
  M:    Chen Wang <[email protected]>
 +M:    Inochi Amaoto <[email protected]>
 +T:    git https://github.com/sophgo/linux.git
  S:    Maintained
 -F:    arch/riscv/boot/dts/sophgo/
 -F:    Documentation/devicetree/bindings/riscv/sophgo.yaml
 +N:    sophgo
 +K:    sophgo
  
  SOUND
  M:    Jaroslav Kysela <[email protected]>
@@@ -21016,12 -20960,6 +21016,12 @@@ F: Documentation/devicetree/bindings/ph
  F:    drivers/phy/starfive/phy-jh7110-pcie.c
  F:    drivers/phy/starfive/phy-jh7110-usb.c
  
 +STARFIVE JH8100 EXTERNAL INTERRUPT CONTROLLER DRIVER
 +M:    Changhuang Liang <[email protected]>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/interrupt-controller/starfive,jh8100-intc.yaml
 +F:    drivers/irqchip/irq-starfive-jh8100-intc.c
 +
  STATIC BRANCH/CALL
  M:    Peter Zijlstra <[email protected]>
  M:    Josh Poimboeuf <[email protected]>
@@@ -21387,7 -21325,6 +21387,7 @@@ F:   drivers/clk/clk-sc[mp]i.
  F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scmi/
  F:    drivers/firmware/arm_scpi.c
 +F:    drivers/hwmon/scmi-hwmon.c
  F:    drivers/pmdomain/arm/
  F:    drivers/powercap/arm_scmi_powercap.c
  F:    drivers/regulator/scmi-regulator.c
@@@ -21582,7 -21519,7 +21582,7 @@@ F:   tools/testing/selftests/drivers/net/
  TECHNICAL ADVISORY BOARD PROCESS DOCS
  M:    "Theodore Ts'o" <[email protected]>
  M:    Greg Kroah-Hartman <[email protected]>
 -L:    [email protected]-foundation.org
 +L:    [email protected].dev
  S:    Maintained
  F:    Documentation/process/contribution-maturity-model.rst
  F:    Documentation/process/researcher-guidelines.rst
@@@ -22072,14 -22009,6 +22072,14 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/i2c/ds90*
  F:    include/media/i2c/ds90*
  
 +TI HDC302X HUMIDITY DRIVER
 +M:    Javier Carrasco <[email protected]>
 +M:    Li peiyu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/humidity/ti,hdc3020.yaml
 +F:    drivers/iio/humidity/hdc3020.c
 +
  TI ICSSG ETHERNET DRIVER (ICSSG)
  R:    MD Danish Anwar <[email protected]>
  R:    Roger Quadros <[email protected]>
@@@ -22546,23 -22475,6 +22546,23 @@@ F: Documentation/block/ublk.rs
  F:    drivers/block/ublk_drv.c
  F:    include/uapi/linux/ublk_cmd.h
  
 +UBSAN
 +M:    Kees Cook <[email protected]>
 +R:    Marco Elver <[email protected]>
 +R:    Andrey Konovalov <[email protected]>
 +R:    Andrey Ryabinin <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
 +F:    Documentation/dev-tools/ubsan.rst
 +F:    include/linux/ubsan.h
 +F:    lib/Kconfig.ubsan
 +F:    lib/test_ubsan.c
 +F:    lib/ubsan.c
 +F:    scripts/Makefile.ubsan
 +K:    \bARCH_HAS_UBSAN\b
 +
  UCLINUX (M68KNOMMU AND COLDFIRE)
  M:    Greg Ungerer <[email protected]>
  L:    [email protected]
@@@ -22952,8 -22864,9 +22952,8 @@@ S:   Maintaine
  F:    drivers/usb/typec/mux/pi3usb30532.c
  
  USB TYPEC PORT CONTROLLER DRIVERS
 -M:    Guenter Roeck <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/usb/typec/tcpm/
  
  USB UHCI DRIVER
@@@ -23165,7 -23078,7 +23165,7 @@@ F:   drivers/vfio/pci/mlx5
  VFIO VIRTIO PCI DRIVER
  M:    Yishai Hadas <[email protected]>
  L:    [email protected]
 -L:    [email protected]-foundation.org
 +L:    [email protected].dev
  S:    Maintained
  F:    drivers/vfio/pci/virtio
  
@@@ -24209,13 -24122,14 +24209,13 @@@ F:        drivers/net/ethernet/xilinx/xilinx_a
  
  XILINX CAN DRIVER
  M:    Appana Durga Kedareswara rao <[email protected]>
 -R:    Naga Sureshkumar Relli <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/can/xilinx,can.yaml
  F:    drivers/net/can/xilinx_can.c
  
  XILINX EVENT MANAGEMENT DRIVER
 -M:    Abhyuday Godhasara <abhyuday.godhasara@xilinx.com>
 +M:    Michal Simek <michal.simek@amd.com>
  S:    Maintained
  F:    drivers/soc/xilinx/xlnx_event_manager.c
  F:    include/linux/firmware/xlnx-event-manager.h
diff --combined drivers/mmc/core/queue.c
index 2ae60d208cdf1ee2243aa99a340bd5be06d8bbc3,316415588a77ce60b84fb26bb8ab63f11283d35e..241cdc2b2a2a3befddcf2e5a7ac3922879985cdf
@@@ -174,8 -174,8 +174,8 @@@ static struct scatterlist *mmc_alloc_sg
        return sg;
  }
  
 -static void mmc_queue_setup_discard(struct request_queue *q,
 -                                  struct mmc_card *card)
 +static void mmc_queue_setup_discard(struct mmc_card *card,
 +              struct queue_limits *lim)
  {
        unsigned max_discard;
  
        if (!max_discard)
                return;
  
 -      blk_queue_max_discard_sectors(q, max_discard);
 -      q->limits.discard_granularity = card->pref_erase << 9;
 -      /* granularity must not be greater than max. discard */
 -      if (card->pref_erase > max_discard)
 -              q->limits.discard_granularity = SECTOR_SIZE;
 +      lim->max_hw_discard_sectors = max_discard;
        if (mmc_can_secure_erase_trim(card))
 -              blk_queue_max_secure_erase_sectors(q, max_discard);
 +              lim->max_secure_erase_sectors = max_discard;
        if (mmc_can_trim(card) && card->erased_byte == 0)
 -              blk_queue_max_write_zeroes_sectors(q, max_discard);
 +              lim->max_write_zeroes_sectors = max_discard;
 +
 +      /* granularity must not be greater than max. discard */
 +      if (card->pref_erase > max_discard)
 +              lim->discard_granularity = SECTOR_SIZE;
 +      else
 +              lim->discard_granularity = card->pref_erase << 9;
  }
  
  static unsigned short mmc_get_max_segments(struct mmc_host *host)
@@@ -343,53 -341,38 +343,50 @@@ static const struct blk_mq_ops mmc_mq_o
        .timeout        = mmc_mq_timed_out,
  };
  
 -static void mmc_setup_queue(struct mmc_queue *mq, struct mmc_card *card)
 +static struct gendisk *mmc_alloc_disk(struct mmc_queue *mq,
 +              struct mmc_card *card)
  {
        struct mmc_host *host = card->host;
 -      unsigned block_size = 512;
 +      struct queue_limits lim = { };
 +      struct gendisk *disk;
  
 -      blk_queue_flag_set(QUEUE_FLAG_NONROT, mq->queue);
 -      blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, mq->queue);
        if (mmc_can_erase(card))
 -              mmc_queue_setup_discard(mq->queue, card);
 -
 -      blk_queue_max_hw_sectors(mq->queue,
 -              min(host->max_blk_count, host->max_req_size / 512));
 -      if (host->can_dma_map_merge)
 -              WARN(!blk_queue_can_use_dma_map_merging(mq->queue,
 -                                                      mmc_dev(host)),
 -                   "merging was advertised but not possible");
 -      blk_queue_max_segments(mq->queue, mmc_get_max_segments(host));
 -
 -      if (mmc_card_mmc(card) && card->ext_csd.data_sector_size) {
 -              block_size = card->ext_csd.data_sector_size;
 -              WARN_ON(block_size != 512 && block_size != 4096);
 -      }
 +              mmc_queue_setup_discard(card, &lim);
 +
-       if (!mmc_dev(host)->dma_mask || !*mmc_dev(host)->dma_mask)
-               lim.bounce = BLK_BOUNCE_HIGH;
 +      lim.max_hw_sectors = min(host->max_blk_count, host->max_req_size / 512);
 +
 +      if (mmc_card_mmc(card) && card->ext_csd.data_sector_size)
 +              lim.logical_block_size = card->ext_csd.data_sector_size;
 +      else
 +              lim.logical_block_size = 512;
 +
 +      WARN_ON_ONCE(lim.logical_block_size != 512 &&
 +                   lim.logical_block_size != 4096);
  
 -      blk_queue_logical_block_size(mq->queue, block_size);
        /*
 -       * After blk_queue_can_use_dma_map_merging() was called with succeed,
 -       * since it calls blk_queue_virt_boundary(), the mmc should not call
 -       * both blk_queue_max_segment_size().
 +       * Setting a virt_boundary implicity sets a max_segment_size, so try
 +       * to set the hardware one here.
         */
 -      if (!host->can_dma_map_merge)
 -              blk_queue_max_segment_size(mq->queue,
 -                      round_down(host->max_seg_size, block_size));
 +      if (host->can_dma_map_merge) {
 +              lim.virt_boundary_mask = dma_get_merge_boundary(mmc_dev(host));
 +              lim.max_segments = MMC_DMA_MAP_MERGE_SEGMENTS;
 +      } else {
 +              lim.max_segment_size =
 +                      round_down(host->max_seg_size, lim.logical_block_size);
 +              lim.max_segments = host->max_segs;
 +      }
 +
 +      disk = blk_mq_alloc_disk(&mq->tag_set, &lim, mq);
 +      if (IS_ERR(disk))
 +              return disk;
 +      mq->queue = disk->queue;
 +
 +      if (mmc_host_is_spi(host) && host->use_spi_crc)
 +              blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, mq->queue);
 +      blk_queue_rq_timeout(mq->queue, 60 * HZ);
 +
 +      blk_queue_flag_set(QUEUE_FLAG_NONROT, mq->queue);
 +      blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, mq->queue);
  
        dma_set_max_seg_size(mmc_dev(host), queue_max_segment_size(mq->queue));
  
        init_waitqueue_head(&mq->wait);
  
        mmc_crypto_setup_queue(mq->queue, host);
 +      return disk;
  }
  
  static inline bool mmc_merge_capable(struct mmc_host *host)
@@@ -463,9 -445,18 +460,9 @@@ struct gendisk *mmc_init_queue(struct m
                return ERR_PTR(ret);
                
  
 -      disk = blk_mq_alloc_disk(&mq->tag_set, mq);
 -      if (IS_ERR(disk)) {
 +      disk = mmc_alloc_disk(mq, card);
 +      if (IS_ERR(disk))
                blk_mq_free_tag_set(&mq->tag_set);
 -              return disk;
 -      }
 -      mq->queue = disk->queue;
 -
 -      if (mmc_host_is_spi(host) && host->use_spi_crc)
 -              blk_queue_flag_set(QUEUE_FLAG_STABLE_WRITES, mq->queue);
 -      blk_queue_rq_timeout(mq->queue, 60 * HZ);
 -
 -      mmc_setup_queue(mq, card);
        return disk;
  }
  
This page took 0.111942 seconds and 4 git commands to generate.