| Message ID | YpOyb40/g5gIYigF@matsya (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b00ed48bb0a7c295facf9036135a573a5cdbe7de |
| Headers | show |
| Series | [GIT,PULL] : dmaengine updates for v5.19-rc1 | expand |
On Sun, May 29, 2022 at 10:50 AM Vinod Koul <vkoul@kernel.org> wrote: > > Please pull to receive the dmaengine updates for this cycle. Nothing > special, this includes a couple of new device support and new driver > support and bunch of driver updates. Vinod, _please_ report it when it turns out that there are semantic merge issues in linux-next. The whole point of linux-next is to report and find problems, but that also means that if the issues found in linux-next are then completely ignored, the _point_ of being in linux-next goes away. In particular, there was a semantic drivers/dma/idxd/device.c that git was perfectly happy to merge one way, but that needed manual intervention to get the locking right. See https://lore.kernel.org/all/a6df0b8a-dc42-51e4-4b7b-62d1d11c7800@intel.com/ and this is exactly the kind of thing that should be mentioned in the pull request, because no, I do not track every single merge issue in linux-next. I only catch them when something makes me go "Hmm", and in this case it was a different conflict near-by that just happened to make me look closer (the same one that Stephen had noted). Stephen makes this clear in his notifications: "This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging" and yes, the original merge was indeed trivial and wouldn't have needed any further mention had it _stayed_ that way. But it didn't actually stay that way, as pointed out by Dave Jiang in that thread. The fact that I caught it this time doesn't mean that I will catch things like this in general. I'm pretty good at merging, but there really is a reason linux-next exists. Linus
The pull request you sent on Sun, 29 May 2022 23:20:39 +0530:
> git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git tags/dmaengine-5.19-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b00ed48bb0a7c295facf9036135a573a5cdbe7de
Thank you!
On 29-05-22, 11:49, Linus Torvalds wrote: > On Sun, May 29, 2022 at 10:50 AM Vinod Koul <vkoul@kernel.org> wrote: > > > > Please pull to receive the dmaengine updates for this cycle. Nothing > > special, this includes a couple of new device support and new driver > > support and bunch of driver updates. > > Vinod, _please_ report it when it turns out that there are semantic > merge issues in linux-next. > > The whole point of linux-next is to report and find problems, but that > also means that if the issues found in linux-next are then completely > ignored, the _point_ of being in linux-next goes away. > > In particular, there was a semantic drivers/dma/idxd/device.c that git > was perfectly happy to merge one way, but that needed manual > intervention to get the locking right. See > > https://lore.kernel.org/all/a6df0b8a-dc42-51e4-4b7b-62d1d11c7800@intel.com/ > > and this is exactly the kind of thing that should be mentioned in the > pull request, because no, I do not track every single merge issue in > linux-next. > > I only catch them when something makes me go "Hmm", and in this case > it was a different conflict near-by that just happened to make me look > closer (the same one that Stephen had noted). > > Stephen makes this clear in his notifications: > > "This is now fixed as far as linux-next is concerned, but any non > trivial conflicts should be mentioned to your upstream maintainer when > your tree is submitted for merging" > > and yes, the original merge was indeed trivial and wouldn't have > needed any further mention had it _stayed_ that way. > > But it didn't actually stay that way, as pointed out by Dave Jiang in > that thread. > > The fact that I caught it this time doesn't mean that I will catch > things like this in general. I'm pretty good at merging, but there > really is a reason linux-next exists. Hi Linus, Sorry about missing it, am not sure why I didn't add it here, usually I do add. Apologies again for missing this and will ensure it won't be missed again. Yes merge had conflicts and linux-next had an updated and correct resolution which should have been mentioned by me as was done in the past. Will take steps to ensure I dont miss them. Thanks
Hello Linus, Please pull to receive the dmaengine updates for this cycle. Nothing special, this includes a couple of new device support and new driver support and bunch of driver updates. The following changes since commit 3123109284176b1532874591f7c81f3837bbdc17: Linux 5.18-rc1 (2022-04-03 14:08:21 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git tags/dmaengine-5.19-rc1 for you to fetch changes up to d1a28597808268b87f156138aad3104aa255e62b: dmaengine: idxd: make idxd_wq_enable() return 0 if wq is already enabled (2022-05-19 23:43:41 +0530) ---------------------------------------------------------------- dmaengine updates for v5.19-rc1 New support: - Tegra gpcdma Driver support - Qualcomm SM8350, Sm8450 and SC7280 Device support - Renesas RZN1 dma and platform support Updates: - stm32 device pause/resume support and updates - DMA memset ops Documentation and usage clarification - Deprecate '#dma-channels' & '#dma-requests' bindings - Driver updates for stm32, ptdma idsx etc ---------------------------------------------------------------- Aidan MacDonald (1): dmaengine: jz4780: set DMA maximum segment size Akhil R (5): dt-bindings: dmaengine: Add doc for tegra gpcdma dmaengine: tegra: Add tegra gpcdma driver dmaengine: tegra: Use platform_get_irq() to get IRQ resource dmaengine: tegra: Fix uninitialized variable usage dmaengine: tegra: Remove unused switch case Amelie Delaunay (9): dmaengine: stm32-mdma: check the channel availability (secure or not) dmaengine: stm32-mdma: remove GISR1 register dmaengine: stm32-mdma: fix chan initialization in stm32_mdma_irq_handler() dmaengine: stm32-mdma: use dev_dbg on non-busy channel spurious it dmaengine: stm32-dmamux: avoid reset of dmamux if used by coprocessor dmaengine: stm32-dma: introduce stm32_dma_sg_inc to manage chan->next_sg dmaengine: stm32-dma: pass DMA_SxSCR value to stm32_dma_handle_chan_done() dmaengine: stm32-dma: rename pm ops before dma pause/resume introduction dmaengine: stm32-dma: add device_pause/device_resume support Ben Walker (4): dmaengine: Document dmaengine_prep_dma_memset dmaengine: at_hdmac: In atc_prep_dma_memset, treat value as a single byte dmaengine: at_xdmac: In at_xdmac_prep_dma_memset, treat value as a single byte dmaengine: hidma: In hidma_prep_dma_memset treat value as a single byte Bjorn Andersson (1): dmaengine: qcom: gpi: Add SM8350 support Christophe JAILLET (2): dmaengine: Remove a useless mutex dmaengine: idxd: Fix the error handling path in idxd_cdev_register() Christophe Leroy (1): dmaengine: bestcomm: Prepare cleanup of powerpc's asm/prom.h Dave Jiang (16): dmaengine: idxd: don't load pasid config until needed dmaengine: idxd: remove trailing white space on input str for wq name dmaengine: idxd: update IAA definitions for user header dmaengine: idxd: set DMA_INTERRUPT cap bit dmaengine: idxd: set max_xfer and max_batch for RO device dmaengine: add verification of DMA_INTERRUPT capability for dmatest dmaengine: idxd: move wq irq enabling to after device enable dmaengine: idxd: refactor wq driver enable/disable operations dmaengine: idxd: Separate user and kernel pasid enabling dmaengine: idxd: fix lockdep warning on device driver removal dmaengine: idxd: free irq before wq type is reset dmaengine: idxd: remove redudant idxd_wq_disable_cleanup() call dmaengine: idxd: make idxd_register/unregister_dma_channel() static dmaengine: idxd: skip irq free when wq type is not kernel dmaengine: idxd: add missing callback function to support DMA_INTERRUPT dmaengine: idxd: make idxd_wq_enable() return 0 if wq is already enabled Geert Uytterhoeven (1): dt-bindings: renesas,rcar-dmac: R-Car V3U is R-Car Gen4 Haowen Bai (2): dmaengine: pl08x: drop the useless function dmaengine: mediatek: mtk-hsdma: use NULL instead of using plain integer as pointer Ilya Novikov (1): dmaengine: PTDMA: support polled mode Jayesh Choudhary (1): dmaengine: ti: k3-psil-am62: Update PSIL thread for saul. Jiapeng Chong (1): dmaengine: tegra: Remove unused including <linux/version.h> Krzysztof Kozlowski (7): dt-bindings: dmaengine: sprd: deprecate '#dma-channels' dmaengine: sprd: deprecate '#dma-channels' dt-bindings: dmaengine: mmp: deprecate '#dma-channels' and '#dma-requests' dmaengine: pxa: deprecate '#dma-channels' and '#dma-requests' dmaengine: mmp: deprecate '#dma-channels' dmaengine: ti: deprecate '#dma-channels' dt-bindings: dma: pl330: Add power-domains Lad Prabhakar (4): dmaengine: sh: Kconfig: Make RZ_DMAC depend on ARCH_RZG2L dmaengine: nbpfaxi: Use platform_get_irq_optional() to get the interrupt dmaengine: mediatek: mtk-hsdma: Use platform_get_irq() to get the interrupt dmaengine: mediatek-cqdma: Use platform_get_irq() to get the interrupt Minghao Chi (1): dmaengine: idxd: Remove unnecessary synchronize_irq() before free_irq() Miquel Raynal (7): dt-bindings: dmaengine: Introduce RZN1 dmamux bindings dt-bindings: clock: r9a06g032-sysctrl: Reference the DMAMUX subnode dt-bindings: dmaengine: Introduce RZN1 DMA compatible clk: renesas: r9a06g032: Export function to set dmamux dmaengine: dw: dmamux: Introduce RZN1 DMA router support clk: renesas: r9a06g032: Probe possible children dmaengine: dw: Add RZN1 compatible Olivier Dautricourt (2): MAINTAINERS: update my email address dt-bindings: altr,msgdma: update my email address Paul Kocialkowski (1): dmaengine: Clarify cyclic transfer residue documentation Radhey Shyam Pandey (3): dt-bindings: dmaengine: xilinx_dma: Add MCMDA channel ID index description dmaengine: zynqmp_dma: In struct zynqmp_dma_chan fix desc_size data type dmaengine: zynqmp_dma: use pm_runtime_resume_and_get() instead of pm_runtime_get_sync() Samuel Holland (4): dt-bindings: dma: sun50i-a64: Add compatible for D1 dmaengine: sun6i: Do not use virt_to_phys dmaengine: sun6i: Add support for 34-bit physical addresses dmaengine: sun6i: Add support for the D1 variant Shravya Kumbham (1): dmaengine: zynqmp_dma: check dma_async_device_register return value Vinod Koul (6): dmaengine: qcom: gpi: set chain and link flag for duplex dt-bindings: dmaengine: qcom: gpi: add compatible for sm8350/sm8350 dmaengine: qcom: gpi: Add support for ee_offset dt-bindings: dmaengine: qcom: gpi: add compatible for sc7280 dmaengine: ptdma: statify pt_tx_status dmaengine: qcom: gpi: Add support for sc7280 YueHaibing (1): dmaengine: tegra: Fix build error without IOMMU_API Yunbo Yu (2): dmaengine: plx_dma: Move spin_lock_bh() to spin_lock() dmaengine: mv_xor_v2 : Move spin_lock_bh() to spin_lock() Zong Li (2): dt-bindings: dma-engine: sifive,fu540: Add dma-channels property and modify compatible dmaengine: sf-pdma: Get number of channel by device tree jianchunfu (1): dmaengine: ep93xx: Remove redundant word in comment .../bindings/clock/renesas,r9a06g032-sysctrl.yaml | 11 + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 9 +- .../devicetree/bindings/dma/altr,msgdma.yaml | 2 +- .../devicetree/bindings/dma/arm,pl330.yaml | 3 + Documentation/devicetree/bindings/dma/mmp-dma.txt | 10 +- .../bindings/dma/nvidia,tegra186-gpc-dma.yaml | 110 ++ .../devicetree/bindings/dma/qcom,gpi.yaml | 3 + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 10 +- .../bindings/dma/renesas,rzn1-dmamux.yaml | 51 + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 19 +- .../bindings/dma/snps,dma-spear1340.yaml | 8 +- Documentation/devicetree/bindings/dma/sprd-dma.txt | 7 +- .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 6 +- Documentation/driver-api/dmaengine/provider.rst | 8 +- MAINTAINERS | 3 +- drivers/clk/renesas/r9a06g032-clocks.c | 40 +- drivers/dma/Kconfig | 14 +- drivers/dma/Makefile | 1 + drivers/dma/amba-pl08x.c | 11 - drivers/dma/at_hdmac.c | 10 +- drivers/dma/at_xdmac.c | 9 +- drivers/dma/bestcomm/bestcomm.c | 2 + drivers/dma/dma-jz4780.c | 9 + drivers/dma/dmaengine.c | 7 - drivers/dma/dmatest.c | 13 +- drivers/dma/dw/Kconfig | 9 + drivers/dma/dw/Makefile | 2 + drivers/dma/dw/platform.c | 1 + drivers/dma/dw/rzn1-dmamux.c | 155 ++ drivers/dma/ep93xx_dma.c | 2 +- drivers/dma/idxd/cdev.c | 18 +- drivers/dma/idxd/device.c | 152 +- drivers/dma/idxd/dma.c | 65 +- drivers/dma/idxd/idxd.h | 20 +- drivers/dma/idxd/init.c | 30 +- drivers/dma/idxd/registers.h | 1 + drivers/dma/idxd/sysfs.c | 12 +- drivers/dma/mediatek/mtk-cqdma.c | 12 +- drivers/dma/mediatek/mtk-hsdma.c | 13 +- drivers/dma/mmp_pdma.c | 14 +- drivers/dma/mv_xor_v2.c | 4 +- drivers/dma/nbpfaxi.c | 14 +- drivers/dma/plx_dma.c | 4 +- drivers/dma/ptdma/ptdma-dev.c | 36 +- drivers/dma/ptdma/ptdma-dmaengine.c | 16 +- drivers/dma/ptdma/ptdma.h | 13 + drivers/dma/pxa_dma.c | 13 +- drivers/dma/qcom/gpi.c | 21 +- drivers/dma/qcom/hidma.c | 13 +- drivers/dma/sf-pdma/sf-pdma.c | 24 +- drivers/dma/sf-pdma/sf-pdma.h | 8 +- drivers/dma/sh/Kconfig | 2 +- drivers/dma/sprd-dma.c | 6 +- drivers/dma/stm32-dma.c | 311 +++- drivers/dma/stm32-dmamux.c | 2 +- drivers/dma/stm32-mdma.c | 53 +- drivers/dma/sun6i-dma.c | 92 +- drivers/dma/tegra186-gpc-dma.c | 1498 ++++++++++++++++++++ drivers/dma/ti/cppi41.c | 6 +- drivers/dma/ti/k3-psil-am62.c | 8 +- drivers/dma/xilinx/zynqmp_dma.c | 17 +- include/linux/dmaengine.h | 9 +- include/linux/soc/renesas/r9a06g032-sysctrl.h | 11 + include/uapi/linux/idxd.h | 31 +- 64 files changed, 2744 insertions(+), 350 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/nvidia,tegra186-gpc-dma.yaml create mode 100644 Documentation/devicetree/bindings/dma/renesas,rzn1-dmamux.yaml create mode 100644 drivers/dma/dw/rzn1-dmamux.c create mode 100644 drivers/dma/tegra186-gpc-dma.c create mode 100644 include/linux/soc/renesas/r9a06g032-sysctrl.h