From: Greg Kroah-Hartman Date: Tue, 25 Jan 2022 11:02:37 +0000 (+0100) Subject: drop uio-uio_dmem_genirq-catch-the-exception.patch from everywhere. X-Git-Tag: v4.4.300~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb7fa7a9f39fd2c2f92cd84e31dab453f0bab563;p=thirdparty%2Fkernel%2Fstable-queue.git drop uio-uio_dmem_genirq-catch-the-exception.patch from everywhere. --- diff --git a/queue-4.14/series b/queue-4.14/series index 5eb63111f07..d3cfe48d132 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -73,7 +73,6 @@ rdma-hns-validate-the-pkey-index.patch powerpc-prom_init-fix-improper-check-of-prom_getprop.patch alsa-oss-fix-compile-error-when-oss_debug-is-enabled.patch char-mwave-adjust-io-port-register-size.patch -uio-uio_dmem_genirq-catch-the-exception.patch scsi-ufs-fix-race-conditions-related-to-driver-data.patch rdma-core-let-ib_find_gid-continue-search-even-after.patch dmaengine-pxa-mmp-stop-referencing-config-slave_id.patch diff --git a/queue-4.14/uio-uio_dmem_genirq-catch-the-exception.patch b/queue-4.14/uio-uio_dmem_genirq-catch-the-exception.patch deleted file mode 100644 index 350fdecd8d5..00000000000 --- a/queue-4.14/uio-uio_dmem_genirq-catch-the-exception.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4bc32416d5846cd331ad44a817318ac88a8eca6d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 4 Dec 2021 08:03:26 +0800 -Subject: uio: uio_dmem_genirq: Catch the Exception - -From: Jiasheng Jiang - -[ Upstream commit eec91694f927d1026974444eb6a3adccd4f1cbc2 ] - -The return value of dma_set_coherent_mask() is not always 0. -To catch the exception in case that dma is not support the mask. - -Fixes: 0a0c3b5a24bd ("Add new uio device for dynamic memory allocation") -Signed-off-by: Jiasheng Jiang -Link: https://lore.kernel.org/r/20211204000326.1592687-1-jiasheng@iscas.ac.cn -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/uio/uio_dmem_genirq.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c -index a00b4aee6c799..a31b9d5260ca0 100644 ---- a/drivers/uio/uio_dmem_genirq.c -+++ b/drivers/uio/uio_dmem_genirq.c -@@ -194,7 +194,11 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) - goto bad0; - } - -- dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ if (ret) { -+ dev_err(&pdev->dev, "DMA enable failed\n"); -+ return ret; -+ } - - priv->uioinfo = uioinfo; - spin_lock_init(&priv->lock); --- -2.34.1 - diff --git a/queue-4.19/series b/queue-4.19/series index d29d5879966..37b3be13bbe 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -104,7 +104,6 @@ powerpc-prom_init-fix-improper-check-of-prom_getprop.patch asoc-uniphier-drop-selecting-non-existing-snd_soc_un.patch alsa-oss-fix-compile-error-when-oss_debug-is-enabled.patch char-mwave-adjust-io-port-register-size.patch -uio-uio_dmem_genirq-catch-the-exception.patch iommu-io-pgtable-arm-fix-table-descriptor-paddr-form.patch scsi-ufs-fix-race-conditions-related-to-driver-data.patch rdma-core-let-ib_find_gid-continue-search-even-after.patch diff --git a/queue-4.19/uio-uio_dmem_genirq-catch-the-exception.patch b/queue-4.19/uio-uio_dmem_genirq-catch-the-exception.patch deleted file mode 100644 index 5b70477b74f..00000000000 --- a/queue-4.19/uio-uio_dmem_genirq-catch-the-exception.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0e3187d6db6f18402ef4689ef4fc8689a620ba6f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 4 Dec 2021 08:03:26 +0800 -Subject: uio: uio_dmem_genirq: Catch the Exception - -From: Jiasheng Jiang - -[ Upstream commit eec91694f927d1026974444eb6a3adccd4f1cbc2 ] - -The return value of dma_set_coherent_mask() is not always 0. -To catch the exception in case that dma is not support the mask. - -Fixes: 0a0c3b5a24bd ("Add new uio device for dynamic memory allocation") -Signed-off-by: Jiasheng Jiang -Link: https://lore.kernel.org/r/20211204000326.1592687-1-jiasheng@iscas.ac.cn -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/uio/uio_dmem_genirq.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c -index a00b4aee6c799..a31b9d5260ca0 100644 ---- a/drivers/uio/uio_dmem_genirq.c -+++ b/drivers/uio/uio_dmem_genirq.c -@@ -194,7 +194,11 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) - goto bad0; - } - -- dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ if (ret) { -+ dev_err(&pdev->dev, "DMA enable failed\n"); -+ return ret; -+ } - - priv->uioinfo = uioinfo; - spin_lock_init(&priv->lock); --- -2.34.1 - diff --git a/queue-4.4/series b/queue-4.4/series index a0872bd45f2..bb0b232e2c8 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -46,7 +46,6 @@ alsa-hda-add-missing-rwsem-around-snd_ctl_remove-cal.patch powerpc-prom_init-fix-improper-check-of-prom_getprop.patch alsa-oss-fix-compile-error-when-oss_debug-is-enabled.patch char-mwave-adjust-io-port-register-size.patch -uio-uio_dmem_genirq-catch-the-exception.patch rdma-core-let-ib_find_gid-continue-search-even-after.patch dmaengine-pxa-mmp-stop-referencing-config-slave_id.patch asoc-samsung-idma-check-of-ioremap-return-value.patch diff --git a/queue-4.4/uio-uio_dmem_genirq-catch-the-exception.patch b/queue-4.4/uio-uio_dmem_genirq-catch-the-exception.patch deleted file mode 100644 index 036a3446169..00000000000 --- a/queue-4.4/uio-uio_dmem_genirq-catch-the-exception.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 15eb4378d3afe81b093f4ed5d3b7dda65934c2e2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 4 Dec 2021 08:03:26 +0800 -Subject: uio: uio_dmem_genirq: Catch the Exception - -From: Jiasheng Jiang - -[ Upstream commit eec91694f927d1026974444eb6a3adccd4f1cbc2 ] - -The return value of dma_set_coherent_mask() is not always 0. -To catch the exception in case that dma is not support the mask. - -Fixes: 0a0c3b5a24bd ("Add new uio device for dynamic memory allocation") -Signed-off-by: Jiasheng Jiang -Link: https://lore.kernel.org/r/20211204000326.1592687-1-jiasheng@iscas.ac.cn -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/uio/uio_dmem_genirq.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c -index a00b4aee6c799..a31b9d5260ca0 100644 ---- a/drivers/uio/uio_dmem_genirq.c -+++ b/drivers/uio/uio_dmem_genirq.c -@@ -194,7 +194,11 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) - goto bad0; - } - -- dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ if (ret) { -+ dev_err(&pdev->dev, "DMA enable failed\n"); -+ return ret; -+ } - - priv->uioinfo = uioinfo; - spin_lock_init(&priv->lock); --- -2.34.1 - diff --git a/queue-4.9/series b/queue-4.9/series index cd4fd938cc0..2253ed3d69e 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -61,7 +61,6 @@ rdma-hns-validate-the-pkey-index.patch powerpc-prom_init-fix-improper-check-of-prom_getprop.patch alsa-oss-fix-compile-error-when-oss_debug-is-enabled.patch char-mwave-adjust-io-port-register-size.patch -uio-uio_dmem_genirq-catch-the-exception.patch scsi-ufs-fix-race-conditions-related-to-driver-data.patch rdma-core-let-ib_find_gid-continue-search-even-after.patch dmaengine-pxa-mmp-stop-referencing-config-slave_id.patch diff --git a/queue-4.9/uio-uio_dmem_genirq-catch-the-exception.patch b/queue-4.9/uio-uio_dmem_genirq-catch-the-exception.patch deleted file mode 100644 index 3dfdd822410..00000000000 --- a/queue-4.9/uio-uio_dmem_genirq-catch-the-exception.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0b7a99a5f6229d4a7041bd05af66f90dc0730b4a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 4 Dec 2021 08:03:26 +0800 -Subject: uio: uio_dmem_genirq: Catch the Exception - -From: Jiasheng Jiang - -[ Upstream commit eec91694f927d1026974444eb6a3adccd4f1cbc2 ] - -The return value of dma_set_coherent_mask() is not always 0. -To catch the exception in case that dma is not support the mask. - -Fixes: 0a0c3b5a24bd ("Add new uio device for dynamic memory allocation") -Signed-off-by: Jiasheng Jiang -Link: https://lore.kernel.org/r/20211204000326.1592687-1-jiasheng@iscas.ac.cn -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/uio/uio_dmem_genirq.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c -index a00b4aee6c799..a31b9d5260ca0 100644 ---- a/drivers/uio/uio_dmem_genirq.c -+++ b/drivers/uio/uio_dmem_genirq.c -@@ -194,7 +194,11 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) - goto bad0; - } - -- dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ if (ret) { -+ dev_err(&pdev->dev, "DMA enable failed\n"); -+ return ret; -+ } - - priv->uioinfo = uioinfo; - spin_lock_init(&priv->lock); --- -2.34.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 0d56b913587..02aff53c264 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -259,7 +259,6 @@ alsa-usb-audio-drop-superfluous-0-in-presonus-studio.patch char-mwave-adjust-io-port-register-size.patch binder-fix-handling-of-error-during-copy.patch openrisc-add-clone3-abi-wrapper.patch -uio-uio_dmem_genirq-catch-the-exception.patch iommu-io-pgtable-arm-fix-table-descriptor-paddr-form.patch scsi-ufs-fix-race-conditions-related-to-driver-data.patch rdma-qedr-fix-reporting-max_-send-recv-_wr-attrs.patch diff --git a/queue-5.10/uio-uio_dmem_genirq-catch-the-exception.patch b/queue-5.10/uio-uio_dmem_genirq-catch-the-exception.patch deleted file mode 100644 index ea2d67f5675..00000000000 --- a/queue-5.10/uio-uio_dmem_genirq-catch-the-exception.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3c4953875e1494b16e79c3e8147494b4dee925ac Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 4 Dec 2021 08:03:26 +0800 -Subject: uio: uio_dmem_genirq: Catch the Exception - -From: Jiasheng Jiang - -[ Upstream commit eec91694f927d1026974444eb6a3adccd4f1cbc2 ] - -The return value of dma_set_coherent_mask() is not always 0. -To catch the exception in case that dma is not support the mask. - -Fixes: 0a0c3b5a24bd ("Add new uio device for dynamic memory allocation") -Signed-off-by: Jiasheng Jiang -Link: https://lore.kernel.org/r/20211204000326.1592687-1-jiasheng@iscas.ac.cn -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/uio/uio_dmem_genirq.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c -index ec7f66f4555a6..bf39a424ea77d 100644 ---- a/drivers/uio/uio_dmem_genirq.c -+++ b/drivers/uio/uio_dmem_genirq.c -@@ -183,7 +183,11 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) - goto bad0; - } - -- dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ if (ret) { -+ dev_err(&pdev->dev, "DMA enable failed\n"); -+ return ret; -+ } - - priv->uioinfo = uioinfo; - spin_lock_init(&priv->lock); --- -2.34.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 624bf7845dc..3c1e44a6b30 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -398,7 +398,6 @@ char-mwave-adjust-io-port-register-size.patch binder-fix-handling-of-error-during-copy.patch binder-avoid-potential-data-leakage-when-copying-txn.patch openrisc-add-clone3-abi-wrapper.patch -uio-uio_dmem_genirq-catch-the-exception.patch iommu-extend-mutex-lock-scope-in-iommu_probe_device.patch iommu-io-pgtable-arm-fix-table-descriptor-paddr-form.patch scsi-core-fix-scsi_device_max_queue_depth.patch diff --git a/queue-5.15/uio-uio_dmem_genirq-catch-the-exception.patch b/queue-5.15/uio-uio_dmem_genirq-catch-the-exception.patch deleted file mode 100644 index 035d8aa6086..00000000000 --- a/queue-5.15/uio-uio_dmem_genirq-catch-the-exception.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 62c41d364934200f6cde69e4f002ba59ced8db71 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 4 Dec 2021 08:03:26 +0800 -Subject: uio: uio_dmem_genirq: Catch the Exception - -From: Jiasheng Jiang - -[ Upstream commit eec91694f927d1026974444eb6a3adccd4f1cbc2 ] - -The return value of dma_set_coherent_mask() is not always 0. -To catch the exception in case that dma is not support the mask. - -Fixes: 0a0c3b5a24bd ("Add new uio device for dynamic memory allocation") -Signed-off-by: Jiasheng Jiang -Link: https://lore.kernel.org/r/20211204000326.1592687-1-jiasheng@iscas.ac.cn -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/uio/uio_dmem_genirq.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c -index 6b5cfa5b06733..1106f33764047 100644 ---- a/drivers/uio/uio_dmem_genirq.c -+++ b/drivers/uio/uio_dmem_genirq.c -@@ -188,7 +188,11 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) - return -ENOMEM; - } - -- dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ if (ret) { -+ dev_err(&pdev->dev, "DMA enable failed\n"); -+ return ret; -+ } - - priv->uioinfo = uioinfo; - spin_lock_init(&priv->lock); --- -2.34.1 - diff --git a/queue-5.16/series b/queue-5.16/series index 72657c77acf..98ca9ea2f38 100644 --- a/queue-5.16/series +++ b/queue-5.16/series @@ -471,7 +471,6 @@ char-mwave-adjust-io-port-register-size.patch binder-fix-handling-of-error-during-copy.patch binder-avoid-potential-data-leakage-when-copying-txn.patch openrisc-add-clone3-abi-wrapper.patch -uio-uio_dmem_genirq-catch-the-exception.patch iommu-extend-mutex-lock-scope-in-iommu_probe_device.patch iommu-io-pgtable-arm-fix-table-descriptor-paddr-form.patch asoc-sof-intel-fix-build-issue-related-to-codec_prob.patch diff --git a/queue-5.16/uio-uio_dmem_genirq-catch-the-exception.patch b/queue-5.16/uio-uio_dmem_genirq-catch-the-exception.patch deleted file mode 100644 index 68634c5fa3f..00000000000 --- a/queue-5.16/uio-uio_dmem_genirq-catch-the-exception.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a49d3cbe866c53f38d3e20489c9404a6dc72b3c5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 4 Dec 2021 08:03:26 +0800 -Subject: uio: uio_dmem_genirq: Catch the Exception - -From: Jiasheng Jiang - -[ Upstream commit eec91694f927d1026974444eb6a3adccd4f1cbc2 ] - -The return value of dma_set_coherent_mask() is not always 0. -To catch the exception in case that dma is not support the mask. - -Fixes: 0a0c3b5a24bd ("Add new uio device for dynamic memory allocation") -Signed-off-by: Jiasheng Jiang -Link: https://lore.kernel.org/r/20211204000326.1592687-1-jiasheng@iscas.ac.cn -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/uio/uio_dmem_genirq.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c -index 6b5cfa5b06733..1106f33764047 100644 ---- a/drivers/uio/uio_dmem_genirq.c -+++ b/drivers/uio/uio_dmem_genirq.c -@@ -188,7 +188,11 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) - return -ENOMEM; - } - -- dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ if (ret) { -+ dev_err(&pdev->dev, "DMA enable failed\n"); -+ return ret; -+ } - - priv->uioinfo = uioinfo; - spin_lock_init(&priv->lock); --- -2.34.1 - diff --git a/queue-5.4/series b/queue-5.4/series index c599b27fceb..0ddbf23c612 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -130,7 +130,6 @@ asoc-uniphier-drop-selecting-non-existing-snd_soc_un.patch alsa-oss-fix-compile-error-when-oss_debug-is-enabled.patch char-mwave-adjust-io-port-register-size.patch binder-fix-handling-of-error-during-copy.patch -uio-uio_dmem_genirq-catch-the-exception.patch iommu-io-pgtable-arm-fix-table-descriptor-paddr-form.patch scsi-ufs-fix-race-conditions-related-to-driver-data.patch pci-msi-fix-pci_irq_vector-pci_irq_get_affinity.patch diff --git a/queue-5.4/uio-uio_dmem_genirq-catch-the-exception.patch b/queue-5.4/uio-uio_dmem_genirq-catch-the-exception.patch deleted file mode 100644 index 026cf774f4f..00000000000 --- a/queue-5.4/uio-uio_dmem_genirq-catch-the-exception.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 43d13aead05569cec1414eb78b78d6c1a8fb83f0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 4 Dec 2021 08:03:26 +0800 -Subject: uio: uio_dmem_genirq: Catch the Exception - -From: Jiasheng Jiang - -[ Upstream commit eec91694f927d1026974444eb6a3adccd4f1cbc2 ] - -The return value of dma_set_coherent_mask() is not always 0. -To catch the exception in case that dma is not support the mask. - -Fixes: 0a0c3b5a24bd ("Add new uio device for dynamic memory allocation") -Signed-off-by: Jiasheng Jiang -Link: https://lore.kernel.org/r/20211204000326.1592687-1-jiasheng@iscas.ac.cn -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Sasha Levin ---- - drivers/uio/uio_dmem_genirq.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c -index 44858f70f5f52..bdba9dc06f63b 100644 ---- a/drivers/uio/uio_dmem_genirq.c -+++ b/drivers/uio/uio_dmem_genirq.c -@@ -192,7 +192,11 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) - goto bad0; - } - -- dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); -+ if (ret) { -+ dev_err(&pdev->dev, "DMA enable failed\n"); -+ return ret; -+ } - - priv->uioinfo = uioinfo; - spin_lock_init(&priv->lock); --- -2.34.1 -