On Mon, Aug 24, 2020 at 03:30:20PM -0400, Jim Quinlan wrote: > The new field 'dma_range_map' in struct device is used to facilitate the > use of single or multiple offsets between mapping regions of cpu addrs and > dma addrs. It subsumes the role of "dev->dma_pfn_offset" which was only > capable of holding a single uniform offset and had no region bounds > checking. > > The function of_dma_get_range() has been modified so that it takes a single > argument -- the device node -- and returns a map, NULL, or an error code. > The map is an array that holds the information regarding the DMA regions. > Each range entry contains the address offset, the cpu_start address, the > dma_start address, and the size of the region. > > of_dma_configure() is the typical manner to set range offsets but there are > a number of ad hoc assignments to "dev->dma_pfn_offset" in the kernel > driver code. These cases now invoke the function > dma_attach_offset_range(dev, cpu_addr, dma_addr, size). > > Signed-off-by: Jim Quinlan <james.quinlan@xxxxxxxxxxxx> > --- > arch/arm/include/asm/dma-mapping.h | 10 +-- > arch/arm/mach-keystone/keystone.c | 17 +++-- > arch/sh/drivers/pci/pcie-sh7786.c | 9 +-- > arch/x86/pci/sta2x11-fixup.c | 7 +- > drivers/acpi/arm64/iort.c | 5 +- > drivers/base/core.c | 2 + > drivers/gpu/drm/sun4i/sun4i_backend.c | 5 +- > drivers/iommu/io-pgtable-arm.c | 2 +- > .../platform/sunxi/sun4i-csi/sun4i_csi.c | 5 +- > .../platform/sunxi/sun6i-csi/sun6i_csi.c | 4 +- > drivers/of/address.c | 72 +++++++++---------- > drivers/of/device.c | 43 ++++++----- > drivers/of/of_private.h | 10 +-- > drivers/of/unittest.c | 34 ++++++--- > drivers/remoteproc/remoteproc_core.c | 8 ++- > .../staging/media/sunxi/cedrus/cedrus_hw.c | 7 +- > drivers/usb/core/message.c | 9 ++- > drivers/usb/core/usb.c | 7 +- > include/linux/device.h | 4 +- > include/linux/dma-direct.h | 8 +-- > include/linux/dma-mapping.h | 36 ++++++++++ > kernel/dma/coherent.c | 10 +-- > kernel/dma/mapping.c | 66 +++++++++++++++++ > 23 files changed, 265 insertions(+), 115 deletions(-) Apologies if this has already been reported or is known but this commit is now in next-20200902 and it causes my Raspberry Pi 4 to no longer make it to userspace, instead spewing mmc errors: That commit causes my Raspberry Pi 4 to no longer make it to userspace, instead spewing mmc errors: [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd083] [ 0.000000] Linux version 5.9.0-rc3-00004-geef520b232c6-dirty (nathan@ubuntu-n2-xlarge-x86) (ClangBuiltLinux clang version 12.0.0 (https://github.com/llvm/llvm-project.git b21ddded8f04fee925bbf9e6458347104b5b99eb), LLD 12.0.0 (https://github.com/llvm/llvm-project.git b21ddded8f04fee925bbf9e6458347104b5b99eb)) #1 SMP PREEMPT Wed Sep 2 13:48:49 MST 2020 [ 0.000000] Machine model: Raspberry Pi 4 Model B Rev 1.2 ... [ 1.459752] raspberrypi-firmware soc:firmware: Attached to firmware from 2020-08-24T18:50:56 [ 1.500007] dwc2 fe980000.usb: supply vusb_d not found, using dummy regulator [ 1.507454] dwc2 fe980000.usb: supply vusb_a not found, using dummy regulator [ 1.615547] dwc2 fe980000.usb: EPs: 8, dedicated fifos, 4080 entries in SPRAM [ 1.627537] sdhci-iproc fe300000.sdhci: allocated mmc-pwrseq [ 1.665497] mmc0: SDHCI controller on fe300000.sdhci [fe300000.sdhci] using PIO [ 1.690601] mmc0: queuing unknown CIS tuple 0x80 (2 bytes) [ 1.697892] mmc0: queuing unknown CIS tuple 0x80 (3 bytes) [ 1.705173] mmc0: queuing unknown CIS tuple 0x80 (3 bytes) [ 1.713788] mmc0: queuing unknown CIS tuple 0x80 (7 bytes) [ 1.721228] mmc0: queuing unknown CIS tuple 0x80 (3 bytes) [ 1.732062] mmc1: SDHCI controller on fe340000.emmc2 [fe340000.emmc2] using ADMA [ 1.741828] ALSA device list: [ 1.744885] No soundcards found. [ 1.748540] Waiting for root device PARTUUID=45a8dd8a-02... [ 1.788865] random: fast init done [ 1.793489] mmc1: unrecognised SCR structure version 4 [ 1.798814] mmc1: error -22 whilst initialising SD card [ 1.813969] mmc0: new high speed SDIO card at address 0001 [ 1.883178] mmc1: unrecognised SCR structure version 2 [ 1.888423] mmc1: error -22 whilst initialising SD card [ 1.964069] mmc1: unrecognised SCR structure version 4 [ 1.969314] mmc1: error -22 whilst initialising SD card [ 2.061225] mmc1: unrecognised SCR structure version 4 [ 2.066470] mmc1: error -22 whilst initialising SD card [ 3.160476] mmc1: unrecognised SCR structure version 4 [ 3.165718] mmc1: error -22 whilst initialising SD card This is what it looks like before that commit: [ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd083] [ 0.000000] Linux version 5.9.0-rc3-00003-g2281f797f552-dirty (nathan@ubuntu-n2-xlarge-x86) (ClangBuiltLinux clang version 12.0.0 (https://github.com/llvm/llvm-project.git b21ddded8f04fee925bbf9e6458347104b5b99eb), LLD 12.0.0 (https://github.com/llvm/llvm-project.git b21ddded8f04fee925bbf9e6458347104b5b99eb)) #1 SMP PREEMPT Wed Sep 2 14:10:30 MST 2020 [ 0.000000] Machine model: Raspberry Pi 4 Model B Rev 1.2 ... [ 1.459871] raspberrypi-firmware soc:firmware: Attached to firmware from 2020-08-24T18:50:56 [ 1.500017] dwc2 fe980000.usb: supply vusb_d not found, using dummy regulator [ 1.507461] dwc2 fe980000.usb: supply vusb_a not found, using dummy regulator [ 1.615565] dwc2 fe980000.usb: EPs: 8, dedicated fifos, 4080 entries in SPRAM [ 1.627571] sdhci-iproc fe300000.sdhci: allocated mmc-pwrseq [ 1.665549] mmc0: SDHCI controller on fe300000.sdhci [fe300000.sdhci] using PIO [ 1.690225] mmc0: queuing unknown CIS tuple 0x80 (2 bytes) [ 1.697516] mmc0: queuing unknown CIS tuple 0x80 (3 bytes) [ 1.704800] mmc0: queuing unknown CIS tuple 0x80 (3 bytes) [ 1.713412] mmc0: queuing unknown CIS tuple 0x80 (7 bytes) [ 1.720853] mmc0: queuing unknown CIS tuple 0x80 (3 bytes) [ 1.731686] mmc1: SDHCI controller on fe340000.emmc2 [fe340000.emmc2] using ADMA [ 1.741484] ALSA device list: [ 1.744517] No soundcards found. [ 1.748194] Waiting for root device PARTUUID=45a8dd8a-02... [ 1.788643] random: fast init done [ 1.805009] mmc0: new high speed SDIO card at address 0001 [ 1.852305] mmc1: new ultra high speed DDR50 SDXC card at address aaaa [ 1.859647] mmcblk1: mmc1:aaaa SK64G 59.5 GiB [ 1.866190] mmcblk1: p1 p2 [ 1.892559] EXT4-fs (mmcblk1p2): mounted filesystem with ordered data mode. Opts: (null) Bisect log in case it is relevant: # bad: [4442749a203151a319a5bb8d0b983b84253a6931] Add linux-next specific files for 20200902 # good: [b765a32a2e9170702467747e290614be072c4f76] Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi git bisect start '4442749a203151a319a5bb8d0b983b84253a6931' 'b765a32a2e9170702467747e290614be072c4f76' # bad: [501c4123d9ecf8e38425fa2dae591d87f18a33f9] Merge remote-tracking branch 'wireless-drivers-next/master' into master git bisect bad 501c4123d9ecf8e38425fa2dae591d87f18a33f9 # bad: [3722ace45f7d9a37631b6f5b9c591ea1e118a077] Merge remote-tracking branch 'pstore/for-next/pstore' into master git bisect bad 3722ace45f7d9a37631b6f5b9c591ea1e118a077 # bad: [bcd6576526884cbe2f0798f9196eb2fd96fadb2b] Merge remote-tracking branch 'imx-mxs/for-next' into master git bisect bad bcd6576526884cbe2f0798f9196eb2fd96fadb2b # good: [f51293edaaf354f6de8836390cd4bd0407380c8d] Merge remote-tracking branch 'staging.current/staging-linus' into master git bisect good f51293edaaf354f6de8836390cd4bd0407380c8d # bad: [2b7f5289d46652f343f51e1853326876114f8647] Merge remote-tracking branch 'arm-soc/for-next' into master git bisect bad 2b7f5289d46652f343f51e1853326876114f8647 # good: [137aded9aad7803fa48e9a9538b359012715e171] Merge remote-tracking branch 'pidfd-fixes/fixes' into master git bisect good 137aded9aad7803fa48e9a9538b359012715e171 # good: [f5cb1ada6f986019d24037d9329c99445fcdd50a] Merge remote-tracking branch 'kbuild/for-next' into master git bisect good f5cb1ada6f986019d24037d9329c99445fcdd50a # good: [2694ca73fa41491762825ae7bba9b14ab0762415] ARM: Document merges git bisect good 2694ca73fa41491762825ae7bba9b14ab0762415 # bad: [192ec9acc561411c6ec5d35b3ad225d40c8c39bd] Merge remote-tracking branch 'dma-mapping/for-next' into master git bisect bad 192ec9acc561411c6ec5d35b3ad225d40c8c39bd # bad: [eef520b232c60e74eb8b33a5a7863ad8f2b4a5c7] dma-mapping: introduce DMA range map, supplanting dma_pfn_offset git bisect bad eef520b232c60e74eb8b33a5a7863ad8f2b4a5c7 # good: [c6303ab9b91e7ca20a49ff494338309259ed7c65] arm64: mm: reserve per-numa CMA to localize coherent dma buffers git bisect good c6303ab9b91e7ca20a49ff494338309259ed7c65 # good: [2281f797f5524abb8fff66bf8540b4f4687332a2] mm: cma: use CMA_MAX_NAME to define the length of cma name array git bisect good 2281f797f5524abb8fff66bf8540b4f4687332a2 # first bad commit: [eef520b232c60e74eb8b33a5a7863ad8f2b4a5c7] dma-mapping: introduce DMA range map, supplanting dma_pfn_offset I am happy to provide further information for debugging if necessary. Cheers, Nathan _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
