drop pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch

From almost all queues, breaks the build :(

diff --git a/queue-4.14/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch b/queue-4.14/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
deleted file mode 100644 (file)
index 27dae3e..0000000
--- a/queue-4.14/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 020162d6f49f2963062229814a56a89c86cbeaa8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
-Date: Wed, 7 Jul 2021 18:27:50 +0200
-Subject: pwm: mxs: Don't modify HW state in .probe() after the PWM chip was registered
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-commit 020162d6f49f2963062229814a56a89c86cbeaa8 upstream.
-
-This fixes a race condition: After pwmchip_add() is called there might
-already be a consumer and then modifying the hardware behind the
-consumer's back is bad. So reset before calling pwmchip_add().
-
-Note that reseting the hardware isn't the right thing to do if the PWM
-is already running as it might e.g. disable (or even enable) a backlight
-that is supposed to be on (or off).
-
-Fixes: 4dce82c1e840 ("pwm: add pwm-mxs support")
-Cc: Sascha Hauer <s.hauer@pengutronix.de>
-Cc: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/pwm/pwm-mxs.c |   13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
---- a/drivers/pwm/pwm-mxs.c
-+++ b/drivers/pwm/pwm-mxs.c
-@@ -158,6 +158,11 @@ static int mxs_pwm_probe(struct platform
-               return ret;
-       }
- 
-+      /* FIXME: Only do this if the PWM isn't already running */
-+      ret = stmp_reset_block(mxs->base);
-+      if (ret)
-+              return dev_err_probe(&pdev->dev, ret, "failed to reset PWM\n");
-+
-       ret = pwmchip_add(&mxs->chip);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to add pwm chip %d\n", ret);
-@@ -166,15 +171,7 @@ static int mxs_pwm_probe(struct platform
- 
-       platform_set_drvdata(pdev, mxs);
- 
--      ret = stmp_reset_block(mxs->base);
--      if (ret)
--              goto pwm_remove;
--
-       return 0;
--
--pwm_remove:
--      pwmchip_remove(&mxs->chip);
--      return ret;
- }
- 
- static int mxs_pwm_remove(struct platform_device *pdev)

diff --git a/queue-4.14/series b/queue-4.14/series
index 9923b7551b6229710bde9dd71469f8f3d538c906..e71c150c9f6e5c9fcf6bb408a2d05fb6bd766456 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -10,7 +10,6 @@ thermal-drivers-exynos-fix-an-error-code-in-exynos_tmu_probe.patch
 prctl-allow-to-setup-brk-for-et_dyn-executables.patch
 profiling-fix-shift-out-of-bounds-bugs.patch
 pwm-lpc32xx-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
-pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
 kconfig.debug-drop-selecting-non-existing-hardlockup.patch
 parisc-move-pci_dev_is_behind_card_dino-to-where-it-.patch
 dmaengine-ioat-depends-on-uml.patch

diff --git a/queue-4.19/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch b/queue-4.19/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
deleted file mode 100644 (file)
index b30cf90..0000000
--- a/queue-4.19/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 020162d6f49f2963062229814a56a89c86cbeaa8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
-Date: Wed, 7 Jul 2021 18:27:50 +0200
-Subject: pwm: mxs: Don't modify HW state in .probe() after the PWM chip was registered
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-commit 020162d6f49f2963062229814a56a89c86cbeaa8 upstream.
-
-This fixes a race condition: After pwmchip_add() is called there might
-already be a consumer and then modifying the hardware behind the
-consumer's back is bad. So reset before calling pwmchip_add().
-
-Note that reseting the hardware isn't the right thing to do if the PWM
-is already running as it might e.g. disable (or even enable) a backlight
-that is supposed to be on (or off).
-
-Fixes: 4dce82c1e840 ("pwm: add pwm-mxs support")
-Cc: Sascha Hauer <s.hauer@pengutronix.de>
-Cc: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/pwm/pwm-mxs.c |   13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
---- a/drivers/pwm/pwm-mxs.c
-+++ b/drivers/pwm/pwm-mxs.c
-@@ -152,6 +152,11 @@ static int mxs_pwm_probe(struct platform
-               return ret;
-       }
- 
-+      /* FIXME: Only do this if the PWM isn't already running */
-+      ret = stmp_reset_block(mxs->base);
-+      if (ret)
-+              return dev_err_probe(&pdev->dev, ret, "failed to reset PWM\n");
-+
-       ret = pwmchip_add(&mxs->chip);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to add pwm chip %d\n", ret);
-@@ -160,15 +165,7 @@ static int mxs_pwm_probe(struct platform
- 
-       platform_set_drvdata(pdev, mxs);
- 
--      ret = stmp_reset_block(mxs->base);
--      if (ret)
--              goto pwm_remove;
--
-       return 0;
--
--pwm_remove:
--      pwmchip_remove(&mxs->chip);
--      return ret;
- }
- 
- static int mxs_pwm_remove(struct platform_device *pdev)

diff --git a/queue-4.19/series b/queue-4.19/series
index 91e6a6ef84604718aa749f78f117ff20bc97f47c..2c02a9326d434bbe16ffdcc4f901758e91308265 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -13,7 +13,6 @@ prctl-allow-to-setup-brk-for-et_dyn-executables.patch
 nilfs2-use-refcount_dec_and_lock-to-fix-potential-uaf.patch
 profiling-fix-shift-out-of-bounds-bugs.patch
 pwm-lpc32xx-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
-pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
 kconfig.debug-drop-selecting-non-existing-hardlockup.patch
 drivers-base-cacheinfo-get-rid-of-define_smp_call_ca.patch
 parisc-move-pci_dev_is_behind_card_dino-to-where-it-.patch

diff --git a/queue-4.4/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch b/queue-4.4/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
deleted file mode 100644 (file)
index 27dae3e..0000000
--- a/queue-4.4/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 020162d6f49f2963062229814a56a89c86cbeaa8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
-Date: Wed, 7 Jul 2021 18:27:50 +0200
-Subject: pwm: mxs: Don't modify HW state in .probe() after the PWM chip was registered
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-commit 020162d6f49f2963062229814a56a89c86cbeaa8 upstream.
-
-This fixes a race condition: After pwmchip_add() is called there might
-already be a consumer and then modifying the hardware behind the
-consumer's back is bad. So reset before calling pwmchip_add().
-
-Note that reseting the hardware isn't the right thing to do if the PWM
-is already running as it might e.g. disable (or even enable) a backlight
-that is supposed to be on (or off).
-
-Fixes: 4dce82c1e840 ("pwm: add pwm-mxs support")
-Cc: Sascha Hauer <s.hauer@pengutronix.de>
-Cc: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/pwm/pwm-mxs.c |   13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
---- a/drivers/pwm/pwm-mxs.c
-+++ b/drivers/pwm/pwm-mxs.c
-@@ -158,6 +158,11 @@ static int mxs_pwm_probe(struct platform
-               return ret;
-       }
- 
-+      /* FIXME: Only do this if the PWM isn't already running */
-+      ret = stmp_reset_block(mxs->base);
-+      if (ret)
-+              return dev_err_probe(&pdev->dev, ret, "failed to reset PWM\n");
-+
-       ret = pwmchip_add(&mxs->chip);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to add pwm chip %d\n", ret);
-@@ -166,15 +171,7 @@ static int mxs_pwm_probe(struct platform
- 
-       platform_set_drvdata(pdev, mxs);
- 
--      ret = stmp_reset_block(mxs->base);
--      if (ret)
--              goto pwm_remove;
--
-       return 0;
--
--pwm_remove:
--      pwmchip_remove(&mxs->chip);
--      return ret;
- }
- 
- static int mxs_pwm_remove(struct platform_device *pdev)

diff --git a/queue-4.4/series b/queue-4.4/series
index fe3f3d71bf296d8f3e75a55d9d3b22e783ef6466..5fbd79b41c54f0b72db604c7482f06921ecf1057 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -6,7 +6,6 @@ thermal-drivers-exynos-fix-an-error-code-in-exynos_tmu_probe.patch
 9p-trans_virtio-remove-sysfs-file-on-probe-failure.patch
 prctl-allow-to-setup-brk-for-et_dyn-executables.patch
 profiling-fix-shift-out-of-bounds-bugs.patch
-pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
 dmaengine-acpi-dma-check-for-64-bit-mmio-address.patch
 dmaengine-acpi-avoid-comparison-gsi-with-linux-virq.patch
 parisc-move-pci_dev_is_behind_card_dino-to-where-it-.patch

diff --git a/queue-4.9/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch b/queue-4.9/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
deleted file mode 100644 (file)
index 27dae3e..0000000
--- a/queue-4.9/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 020162d6f49f2963062229814a56a89c86cbeaa8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
-Date: Wed, 7 Jul 2021 18:27:50 +0200
-Subject: pwm: mxs: Don't modify HW state in .probe() after the PWM chip was registered
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-commit 020162d6f49f2963062229814a56a89c86cbeaa8 upstream.
-
-This fixes a race condition: After pwmchip_add() is called there might
-already be a consumer and then modifying the hardware behind the
-consumer's back is bad. So reset before calling pwmchip_add().
-
-Note that reseting the hardware isn't the right thing to do if the PWM
-is already running as it might e.g. disable (or even enable) a backlight
-that is supposed to be on (or off).
-
-Fixes: 4dce82c1e840 ("pwm: add pwm-mxs support")
-Cc: Sascha Hauer <s.hauer@pengutronix.de>
-Cc: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/pwm/pwm-mxs.c |   13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
---- a/drivers/pwm/pwm-mxs.c
-+++ b/drivers/pwm/pwm-mxs.c
-@@ -158,6 +158,11 @@ static int mxs_pwm_probe(struct platform
-               return ret;
-       }
- 
-+      /* FIXME: Only do this if the PWM isn't already running */
-+      ret = stmp_reset_block(mxs->base);
-+      if (ret)
-+              return dev_err_probe(&pdev->dev, ret, "failed to reset PWM\n");
-+
-       ret = pwmchip_add(&mxs->chip);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to add pwm chip %d\n", ret);
-@@ -166,15 +171,7 @@ static int mxs_pwm_probe(struct platform
- 
-       platform_set_drvdata(pdev, mxs);
- 
--      ret = stmp_reset_block(mxs->base);
--      if (ret)
--              goto pwm_remove;
--
-       return 0;
--
--pwm_remove:
--      pwmchip_remove(&mxs->chip);
--      return ret;
- }
- 
- static int mxs_pwm_remove(struct platform_device *pdev)

diff --git a/queue-4.9/series b/queue-4.9/series
index c6d64c42cdc4d17054fe9b235b5819fd09b11a3c..a945220412e521b6561eb8cc3ab1063c2dc581e8 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -10,7 +10,6 @@ thermal-drivers-exynos-fix-an-error-code-in-exynos_tmu_probe.patch
 prctl-allow-to-setup-brk-for-et_dyn-executables.patch
 profiling-fix-shift-out-of-bounds-bugs.patch
 pwm-lpc32xx-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
-pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
 parisc-move-pci_dev_is_behind_card_dino-to-where-it-.patch
 dmaengine-ioat-depends-on-uml.patch
 dmaengine-xilinx_dma-set-dma-mask-for-coherent-apis.patch

diff --git a/queue-5.4/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch b/queue-5.4/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
deleted file mode 100644 (file)
index 036cceb..0000000
--- a/queue-5.4/pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 020162d6f49f2963062229814a56a89c86cbeaa8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
-Date: Wed, 7 Jul 2021 18:27:50 +0200
-Subject: pwm: mxs: Don't modify HW state in .probe() after the PWM chip was registered
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-
-commit 020162d6f49f2963062229814a56a89c86cbeaa8 upstream.
-
-This fixes a race condition: After pwmchip_add() is called there might
-already be a consumer and then modifying the hardware behind the
-consumer's back is bad. So reset before calling pwmchip_add().
-
-Note that reseting the hardware isn't the right thing to do if the PWM
-is already running as it might e.g. disable (or even enable) a backlight
-that is supposed to be on (or off).
-
-Fixes: 4dce82c1e840 ("pwm: add pwm-mxs support")
-Cc: Sascha Hauer <s.hauer@pengutronix.de>
-Cc: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/pwm/pwm-mxs.c |   13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
---- a/drivers/pwm/pwm-mxs.c
-+++ b/drivers/pwm/pwm-mxs.c
-@@ -150,6 +150,11 @@ static int mxs_pwm_probe(struct platform
-               return ret;
-       }
- 
-+      /* FIXME: Only do this if the PWM isn't already running */
-+      ret = stmp_reset_block(mxs->base);
-+      if (ret)
-+              return dev_err_probe(&pdev->dev, ret, "failed to reset PWM\n");
-+
-       ret = pwmchip_add(&mxs->chip);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "failed to add pwm chip %d\n", ret);
-@@ -158,15 +163,7 @@ static int mxs_pwm_probe(struct platform
- 
-       platform_set_drvdata(pdev, mxs);
- 
--      ret = stmp_reset_block(mxs->base);
--      if (ret)
--              goto pwm_remove;
--
-       return 0;
--
--pwm_remove:
--      pwmchip_remove(&mxs->chip);
--      return ret;
- }
- 
- static int mxs_pwm_remove(struct platform_device *pdev)

diff --git a/queue-5.4/series b/queue-5.4/series
index 090398d34bb903bbdae4e2df9fc2732053890eea..ed92128b965741f2a94b72b0cddc7e5093029ea7 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -23,7 +23,6 @@ prctl-allow-to-setup-brk-for-et_dyn-executables.patch
 nilfs2-use-refcount_dec_and_lock-to-fix-potential-uaf.patch
 profiling-fix-shift-out-of-bounds-bugs.patch
 pwm-lpc32xx-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
-pwm-mxs-don-t-modify-hw-state-in-.probe-after-the-pwm-chip-was-registered.patch
 phy-avoid-unnecessary-link-up-delay-in-polling-mode.patch
 net-stmmac-reset-tx-desc-base-address-before-restarting-tx.patch
 kconfig.debug-drop-selecting-non-existing-hardlockup.patch