Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1333636 > unrolled thread
| Started by | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| First post | 2016-02-14 23:40 +0100 |
| Last post | 2016-02-15 19:20 +0100 |
| Articles | 11 — 3 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-14 23:40 +0100
Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message Michael Welling <mwelling@ieee.org> - 2016-02-15 00:00 +0100
Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-15 01:30 +0100
Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message Michael Welling <mwelling@ieee.org> - 2016-02-15 04:10 +0100
Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-15 19:20 +0100
Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message Michael Welling <mwelling@ieee.org> - 2016-02-15 20:00 +0100
Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-15 20:40 +0100
Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message Michael Welling <mwelling@ieee.org> - 2016-02-15 21:10 +0100
Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message Mark Brown <broonie@kernel.org> - 2016-02-15 12:10 +0100
Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message Michael Welling <mwelling@ieee.org> - 2016-02-15 16:30 +0100
Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-02-15 19:20 +0100
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-02-14 23:40 +0100 |
| Subject | [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message |
| Message-ID | <r2duI-zw-73@gated-at.bofh.it> |
4.3-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neil Armstrong <narmstrong@baylibre.com>
commit 468a32082b04c7febccfcd55b06ecbc438fcddcc upstream.
Since the "Switch driver to use transfer_one" change, the cs_change
behavior has changed and a channel chip select can still be
asserted when changing channel from a previous last transfer in a
message having the cs_change attribute.
Since there is no sense having multiple chip select being asserted at the
same time, disable all the remaining forced chip selects in a the
prepare_message called right before a spi_transfer_one_message call.
It ignores the current channel configuration in order to keep the
possibility to leave the chip select asserted between messages.
It fixes this bug on a DM8168 SoC ES2.1 Soc and an OMAP4 ES2.1 SoC.
It was hanging all the other channels transfers when a CHCONF_FORCE
is present on the wrong channel.
Fixes: b28cb9414db9 ("spi: omap2-mcspi: Switch driver to use transfer_one")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/spi/spi-omap2-mcspi.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1217,6 +1217,33 @@ out:
return status;
}
+static int omap2_mcspi_prepare_message(struct spi_master *master,
+ struct spi_message *msg)
+{
+ struct omap2_mcspi *mcspi = spi_master_get_devdata(master);
+ struct omap2_mcspi_regs *ctx = &mcspi->ctx;
+ struct omap2_mcspi_cs *cs;
+
+ /* Only a single channel can have the FORCE bit enabled
+ * in its chconf0 register.
+ * Scan all channels and disable them except the current one.
+ * A FORCE can remain from a last transfer having cs_change enabled
+ */
+ list_for_each_entry(cs, &ctx->cs, node) {
+ if (msg->spi->controller_state == cs)
+ continue;
+
+ if ((cs->chconf0 & OMAP2_MCSPI_CHCONF_FORCE)) {
+ cs->chconf0 &= ~OMAP2_MCSPI_CHCONF_FORCE;
+ writel_relaxed(cs->chconf0,
+ cs->base + OMAP2_MCSPI_CHCONF0);
+ readl_relaxed(cs->base + OMAP2_MCSPI_CHCONF0);
+ }
+ }
+
+ return 0;
+}
+
static int omap2_mcspi_transfer_one(struct spi_master *master,
struct spi_device *spi, struct spi_transfer *t)
{
@@ -1344,6 +1371,7 @@ static int omap2_mcspi_probe(struct plat
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
master->setup = omap2_mcspi_setup;
master->auto_runtime_pm = true;
+ master->prepare_message = omap2_mcspi_prepare_message;
master->transfer_one = omap2_mcspi_transfer_one;
master->set_cs = omap2_mcspi_set_cs;
master->cleanup = omap2_mcspi_cleanup;
[toc] | [next] | [standalone]
| From | Michael Welling <mwelling@ieee.org> |
|---|---|
| Date | 2016-02-15 00:00 +0100 |
| Subject | Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message |
| Message-ID | <r2dO3-Ir-41@gated-at.bofh.it> |
| In reply to | #1333636 |
On Sun, Feb 14, 2016 at 02:20:48PM -0800, Greg Kroah-Hartman wrote:
> 4.3-stable review patch. If anyone has any objections, please let me know.
>
If not planned it should be considered that we include the latest two
commits to spi-omap2-mcpsi into stable as well.
spi: omap2-mcspi: Prevent duplicate gpio_request
spi: omap2-mcspi: Add calls for pinctrl state select
Let me know if I need to do anything to make this happen.
> ------------------
>
> From: Neil Armstrong <narmstrong@baylibre.com>
>
> commit 468a32082b04c7febccfcd55b06ecbc438fcddcc upstream.
>
> Since the "Switch driver to use transfer_one" change, the cs_change
> behavior has changed and a channel chip select can still be
> asserted when changing channel from a previous last transfer in a
> message having the cs_change attribute.
>
> Since there is no sense having multiple chip select being asserted at the
> same time, disable all the remaining forced chip selects in a the
> prepare_message called right before a spi_transfer_one_message call.
> It ignores the current channel configuration in order to keep the
> possibility to leave the chip select asserted between messages.
>
> It fixes this bug on a DM8168 SoC ES2.1 Soc and an OMAP4 ES2.1 SoC.
> It was hanging all the other channels transfers when a CHCONF_FORCE
> is present on the wrong channel.
>
> Fixes: b28cb9414db9 ("spi: omap2-mcspi: Switch driver to use transfer_one")
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> Reviewed-by: Michael Welling <mwelling@ieee.org>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
> drivers/spi/spi-omap2-mcspi.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)
>
> --- a/drivers/spi/spi-omap2-mcspi.c
> +++ b/drivers/spi/spi-omap2-mcspi.c
> @@ -1217,6 +1217,33 @@ out:
> return status;
> }
>
> +static int omap2_mcspi_prepare_message(struct spi_master *master,
> + struct spi_message *msg)
> +{
> + struct omap2_mcspi *mcspi = spi_master_get_devdata(master);
> + struct omap2_mcspi_regs *ctx = &mcspi->ctx;
> + struct omap2_mcspi_cs *cs;
> +
> + /* Only a single channel can have the FORCE bit enabled
> + * in its chconf0 register.
> + * Scan all channels and disable them except the current one.
> + * A FORCE can remain from a last transfer having cs_change enabled
> + */
> + list_for_each_entry(cs, &ctx->cs, node) {
> + if (msg->spi->controller_state == cs)
> + continue;
> +
> + if ((cs->chconf0 & OMAP2_MCSPI_CHCONF_FORCE)) {
> + cs->chconf0 &= ~OMAP2_MCSPI_CHCONF_FORCE;
> + writel_relaxed(cs->chconf0,
> + cs->base + OMAP2_MCSPI_CHCONF0);
> + readl_relaxed(cs->base + OMAP2_MCSPI_CHCONF0);
> + }
> + }
> +
> + return 0;
> +}
> +
> static int omap2_mcspi_transfer_one(struct spi_master *master,
> struct spi_device *spi, struct spi_transfer *t)
> {
> @@ -1344,6 +1371,7 @@ static int omap2_mcspi_probe(struct plat
> master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
> master->setup = omap2_mcspi_setup;
> master->auto_runtime_pm = true;
> + master->prepare_message = omap2_mcspi_prepare_message;
> master->transfer_one = omap2_mcspi_transfer_one;
> master->set_cs = omap2_mcspi_set_cs;
> master->cleanup = omap2_mcspi_cleanup;
>
>
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-02-15 01:30 +0100 |
| Subject | Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message |
| Message-ID | <r2fd8-1KG-15@gated-at.bofh.it> |
| In reply to | #1333691 |
On Sun, Feb 14, 2016 at 04:50:47PM -0600, Michael Welling wrote: > On Sun, Feb 14, 2016 at 02:20:48PM -0800, Greg Kroah-Hartman wrote: > > 4.3-stable review patch. If anyone has any objections, please let me know. > > > > If not planned it should be considered that we include the latest two > commits to spi-omap2-mcpsi into stable as well. > > spi: omap2-mcspi: Prevent duplicate gpio_request > spi: omap2-mcspi: Add calls for pinctrl state select > > Let me know if I need to do anything to make this happen. What are the git commit ids of them? What stable tree(s) do you want them applied to? thanks, greg k-h
[toc] | [prev] | [next] | [standalone]
| From | Michael Welling <mwelling@ieee.org> |
|---|---|
| Date | 2016-02-15 04:10 +0100 |
| Subject | Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message |
| Message-ID | <r2hHX-3rm-1@gated-at.bofh.it> |
| In reply to | #1333985 |
On Sun, Feb 14, 2016 at 03:17:36PM -0800, Greg Kroah-Hartman wrote:
> On Sun, Feb 14, 2016 at 04:50:47PM -0600, Michael Welling wrote:
> > On Sun, Feb 14, 2016 at 02:20:48PM -0800, Greg Kroah-Hartman wrote:
> > > 4.3-stable review patch. If anyone has any objections, please let me know.
> > >
> >
> > If not planned it should be considered that we include the latest two
> > commits to spi-omap2-mcpsi into stable as well.
> >
> > spi: omap2-mcspi: Prevent duplicate gpio_request
> > spi: omap2-mcspi: Add calls for pinctrl state select
> >
> > Let me know if I need to do anything to make this happen.
>
> What are the git commit ids of them?
commit 2f538c017e1a8620d19553931199c6d6a6d31bb2
Author: Michael Welling <mwelling@ieee.org>
Date: Mon Nov 30 09:02:39 2015 -0600
spi: omap2-mcspi: Prevent duplicate gpio_request
Occasionally the setup function will be called multiple times. Only request
the gpio the first time otherwise -EBUSY will occur on subsequent calls to
setup.
Reported-by: Joseph Bell <joe@iachieved.it>
Signed-off-by: Michael Welling <mwelling@ieee.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
commit beca365565d8f8912dce67567f54ad4c71734843
Author: Pascal Huerst <pascal.huerst@gmail.com>
Date: Thu Nov 19 16:18:28 2015 +0100
spi: omap2-mcspi: Add calls for pinctrl state select
This adds calls to pinctrl subsystem in order to switch pin states
on suspend/resume if you provide a "sleep" state in DT.
If no "sleep" state is provided in DT, these calls turn
to NOPs.
Signed-off-by: Pascal Huerst <pascal.huerst@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
> What stable tree(s) do you want
> them applied to?
v4.3, v4.4
>
> thanks,
>
> greg k-h
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-02-15 19:20 +0100 |
| Subject | Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message |
| Message-ID | <r2vUC-4Jg-15@gated-at.bofh.it> |
| In reply to | #1334113 |
On Sun, Feb 14, 2016 at 09:08:50PM -0600, Michael Welling wrote: > On Sun, Feb 14, 2016 at 03:17:36PM -0800, Greg Kroah-Hartman wrote: > > On Sun, Feb 14, 2016 at 04:50:47PM -0600, Michael Welling wrote: > > > On Sun, Feb 14, 2016 at 02:20:48PM -0800, Greg Kroah-Hartman wrote: > > > > 4.3-stable review patch. If anyone has any objections, please let me know. > > > > > > > > > > If not planned it should be considered that we include the latest two > > > commits to spi-omap2-mcpsi into stable as well. > > > > > > spi: omap2-mcspi: Prevent duplicate gpio_request > > > spi: omap2-mcspi: Add calls for pinctrl state select > > > > > > Let me know if I need to do anything to make this happen. > > > > What are the git commit ids of them? > > commit 2f538c017e1a8620d19553931199c6d6a6d31bb2 > Author: Michael Welling <mwelling@ieee.org> > Date: Mon Nov 30 09:02:39 2015 -0600 > > spi: omap2-mcspi: Prevent duplicate gpio_request > > Occasionally the setup function will be called multiple times. Only request > the gpio the first time otherwise -EBUSY will occur on subsequent calls to > setup. > > Reported-by: Joseph Bell <joe@iachieved.it> > > Signed-off-by: Michael Welling <mwelling@ieee.org> > Signed-off-by: Mark Brown <broonie@kernel.org> That seems reasonable but: > commit beca365565d8f8912dce67567f54ad4c71734843 > Author: Pascal Huerst <pascal.huerst@gmail.com> > Date: Thu Nov 19 16:18:28 2015 +0100 > > spi: omap2-mcspi: Add calls for pinctrl state select > > This adds calls to pinctrl subsystem in order to switch pin states > on suspend/resume if you provide a "sleep" state in DT. > > If no "sleep" state is provided in DT, these calls turn > to NOPs. > > Signed-off-by: Pascal Huerst <pascal.huerst@gmail.com> > Signed-off-by: Mark Brown <broonie@kernel.org> That looks like a new feature being added. > > What stable tree(s) do you want > > them applied to? > > v4.3, v4.4 4.3 is now end-of-life with this release, can you live with these just in 4.4-stable instead? thanks, greg k-h
[toc] | [prev] | [next] | [standalone]
| From | Michael Welling <mwelling@ieee.org> |
|---|---|
| Date | 2016-02-15 20:00 +0100 |
| Subject | Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message |
| Message-ID | <r2wxm-505-41@gated-at.bofh.it> |
| In reply to | #1334683 |
On Mon, Feb 15, 2016 at 10:15:08AM -0800, Greg Kroah-Hartman wrote: > On Sun, Feb 14, 2016 at 09:08:50PM -0600, Michael Welling wrote: > > On Sun, Feb 14, 2016 at 03:17:36PM -0800, Greg Kroah-Hartman wrote: > > > On Sun, Feb 14, 2016 at 04:50:47PM -0600, Michael Welling wrote: > > > > On Sun, Feb 14, 2016 at 02:20:48PM -0800, Greg Kroah-Hartman wrote: > > > > > 4.3-stable review patch. If anyone has any objections, please let me know. > > > > > > > > > > > > > If not planned it should be considered that we include the latest two > > > > commits to spi-omap2-mcpsi into stable as well. > > > > > > > > spi: omap2-mcspi: Prevent duplicate gpio_request > > > > spi: omap2-mcspi: Add calls for pinctrl state select > > > > > > > > Let me know if I need to do anything to make this happen. > > > > > > What are the git commit ids of them? > > > > commit 2f538c017e1a8620d19553931199c6d6a6d31bb2 > > Author: Michael Welling <mwelling@ieee.org> > > Date: Mon Nov 30 09:02:39 2015 -0600 > > > > spi: omap2-mcspi: Prevent duplicate gpio_request > > > > Occasionally the setup function will be called multiple times. Only request > > the gpio the first time otherwise -EBUSY will occur on subsequent calls to > > setup. > > > > Reported-by: Joseph Bell <joe@iachieved.it> > > > > Signed-off-by: Michael Welling <mwelling@ieee.org> > > Signed-off-by: Mark Brown <broonie@kernel.org> > > That seems reasonable but: > > > commit beca365565d8f8912dce67567f54ad4c71734843 > > Author: Pascal Huerst <pascal.huerst@gmail.com> > > Date: Thu Nov 19 16:18:28 2015 +0100 > > > > spi: omap2-mcspi: Add calls for pinctrl state select > > > > This adds calls to pinctrl subsystem in order to switch pin states > > on suspend/resume if you provide a "sleep" state in DT. > > > > If no "sleep" state is provided in DT, these calls turn > > to NOPs. > > > > Signed-off-by: Pascal Huerst <pascal.huerst@gmail.com> > > Signed-off-by: Mark Brown <broonie@kernel.org> > > That looks like a new feature being added. > > > > What stable tree(s) do you want > > > them applied to? > > > > v4.3, v4.4 > > 4.3 is now end-of-life with this release, can you live with these just > in 4.4-stable instead? v4.4 stable is good enough. Let me know what needs to be done if anything. > > thanks, > > greg k-h
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-02-15 20:40 +0100 |
| Subject | Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message |
| Message-ID | <r2xa2-5vB-25@gated-at.bofh.it> |
| In reply to | #1334736 |
On Mon, Feb 15, 2016 at 12:50:41PM -0600, Michael Welling wrote: > On Mon, Feb 15, 2016 at 10:15:08AM -0800, Greg Kroah-Hartman wrote: > > On Sun, Feb 14, 2016 at 09:08:50PM -0600, Michael Welling wrote: > > > On Sun, Feb 14, 2016 at 03:17:36PM -0800, Greg Kroah-Hartman wrote: > > > > On Sun, Feb 14, 2016 at 04:50:47PM -0600, Michael Welling wrote: > > > > > On Sun, Feb 14, 2016 at 02:20:48PM -0800, Greg Kroah-Hartman wrote: > > > > > > 4.3-stable review patch. If anyone has any objections, please let me know. > > > > > > > > > > > > > > > > If not planned it should be considered that we include the latest two > > > > > commits to spi-omap2-mcpsi into stable as well. > > > > > > > > > > spi: omap2-mcspi: Prevent duplicate gpio_request > > > > > spi: omap2-mcspi: Add calls for pinctrl state select > > > > > > > > > > Let me know if I need to do anything to make this happen. > > > > > > > > What are the git commit ids of them? > > > > > > commit 2f538c017e1a8620d19553931199c6d6a6d31bb2 > > > Author: Michael Welling <mwelling@ieee.org> > > > Date: Mon Nov 30 09:02:39 2015 -0600 > > > > > > spi: omap2-mcspi: Prevent duplicate gpio_request > > > > > > Occasionally the setup function will be called multiple times. Only request > > > the gpio the first time otherwise -EBUSY will occur on subsequent calls to > > > setup. > > > > > > Reported-by: Joseph Bell <joe@iachieved.it> > > > > > > Signed-off-by: Michael Welling <mwelling@ieee.org> > > > Signed-off-by: Mark Brown <broonie@kernel.org> > > > > That seems reasonable but: > > > > > commit beca365565d8f8912dce67567f54ad4c71734843 > > > Author: Pascal Huerst <pascal.huerst@gmail.com> > > > Date: Thu Nov 19 16:18:28 2015 +0100 > > > > > > spi: omap2-mcspi: Add calls for pinctrl state select > > > > > > This adds calls to pinctrl subsystem in order to switch pin states > > > on suspend/resume if you provide a "sleep" state in DT. > > > > > > If no "sleep" state is provided in DT, these calls turn > > > to NOPs. > > > > > > Signed-off-by: Pascal Huerst <pascal.huerst@gmail.com> > > > Signed-off-by: Mark Brown <broonie@kernel.org> > > > > That looks like a new feature being added. > > > > > > What stable tree(s) do you want > > > > them applied to? > > > > > > v4.3, v4.4 > > > > 4.3 is now end-of-life with this release, can you live with these just > > in 4.4-stable instead? > > v4.4 stable is good enough. > > Let me know what needs to be done if anything. That last patch does not seem like it follows the rules documented at Documentation/stable_kernel_rules.txt, so I can't take it.
[toc] | [prev] | [next] | [standalone]
| From | Michael Welling <mwelling@ieee.org> |
|---|---|
| Date | 2016-02-15 21:10 +0100 |
| Subject | Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message |
| Message-ID | <r2xD4-5Wh-15@gated-at.bofh.it> |
| In reply to | #1334761 |
On Mon, Feb 15, 2016 at 11:36:13AM -0800, Greg Kroah-Hartman wrote: > On Mon, Feb 15, 2016 at 12:50:41PM -0600, Michael Welling wrote: > > On Mon, Feb 15, 2016 at 10:15:08AM -0800, Greg Kroah-Hartman wrote: > > > On Sun, Feb 14, 2016 at 09:08:50PM -0600, Michael Welling wrote: > > > > On Sun, Feb 14, 2016 at 03:17:36PM -0800, Greg Kroah-Hartman wrote: > > > > > On Sun, Feb 14, 2016 at 04:50:47PM -0600, Michael Welling wrote: > > > > > > On Sun, Feb 14, 2016 at 02:20:48PM -0800, Greg Kroah-Hartman wrote: > > > > > > > 4.3-stable review patch. If anyone has any objections, please let me know. > > > > > > > > > > > > > > > > > > > If not planned it should be considered that we include the latest two > > > > > > commits to spi-omap2-mcpsi into stable as well. > > > > > > > > > > > > spi: omap2-mcspi: Prevent duplicate gpio_request > > > > > > spi: omap2-mcspi: Add calls for pinctrl state select > > > > > > > > > > > > Let me know if I need to do anything to make this happen. > > > > > > > > > > What are the git commit ids of them? > > > > > > > > commit 2f538c017e1a8620d19553931199c6d6a6d31bb2 > > > > Author: Michael Welling <mwelling@ieee.org> > > > > Date: Mon Nov 30 09:02:39 2015 -0600 > > > > > > > > spi: omap2-mcspi: Prevent duplicate gpio_request > > > > > > > > Occasionally the setup function will be called multiple times. Only request > > > > the gpio the first time otherwise -EBUSY will occur on subsequent calls to > > > > setup. > > > > > > > > Reported-by: Joseph Bell <joe@iachieved.it> > > > > > > > > Signed-off-by: Michael Welling <mwelling@ieee.org> > > > > Signed-off-by: Mark Brown <broonie@kernel.org> > > > > > > That seems reasonable but: > > > > > > > commit beca365565d8f8912dce67567f54ad4c71734843 > > > > Author: Pascal Huerst <pascal.huerst@gmail.com> > > > > Date: Thu Nov 19 16:18:28 2015 +0100 > > > > > > > > spi: omap2-mcspi: Add calls for pinctrl state select > > > > > > > > This adds calls to pinctrl subsystem in order to switch pin states > > > > on suspend/resume if you provide a "sleep" state in DT. > > > > > > > > If no "sleep" state is provided in DT, these calls turn > > > > to NOPs. > > > > > > > > Signed-off-by: Pascal Huerst <pascal.huerst@gmail.com> > > > > Signed-off-by: Mark Brown <broonie@kernel.org> > > > > > > That looks like a new feature being added. > > > > > > > > What stable tree(s) do you want > > > > > them applied to? > > > > > > > > v4.3, v4.4 > > > > > > 4.3 is now end-of-life with this release, can you live with these just > > > in 4.4-stable instead? > > > > v4.4 stable is good enough. > > > > Let me know what needs to be done if anything. > > That last patch does not seem like it follows the rules documented at > Documentation/stable_kernel_rules.txt, so I can't take it. > Okay sorry for the noise.
[toc] | [prev] | [next] | [standalone]
| From | Mark Brown <broonie@kernel.org> |
|---|---|
| Date | 2016-02-15 12:10 +0100 |
| Subject | Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message |
| Message-ID | <r2pcu-6M-21@gated-at.bofh.it> |
| In reply to | #1333691 |
[Multipart message — attachments visible in raw view] — view raw
On Sun, Feb 14, 2016 at 04:50:47PM -0600, Michael Welling wrote: > spi: omap2-mcspi: Add calls for pinctrl state select That doesn't sound like stable material, it's adding a new feature which might break existing systems if they have buggy configuration defined in DT which we suddenly start using.
[toc] | [prev] | [next] | [standalone]
| From | Michael Welling <mwelling@ieee.org> |
|---|---|
| Date | 2016-02-15 16:30 +0100 |
| Subject | Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message |
| Message-ID | <r2tg6-2PB-11@gated-at.bofh.it> |
| In reply to | #1334382 |
On Mon, Feb 15, 2016 at 11:03:51AM +0000, Mark Brown wrote: > On Sun, Feb 14, 2016 at 04:50:47PM -0600, Michael Welling wrote: > > > spi: omap2-mcspi: Add calls for pinctrl state select > > That doesn't sound like stable material, it's adding a new feature which > might break existing systems if they have buggy configuration defined in > DT which we suddenly start using. Okay. I was looking to get the GPIO registration fix in and figured that it would be easier to merge with both. Greg, How do you want to handle this? Try to patch and see if it applies with fuzz or have me provide a patch that applies to the stable?
[toc] | [prev] | [next] | [standalone]
| From | Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
|---|---|
| Date | 2016-02-15 19:20 +0100 |
| Subject | Re: [PATCH 4.3 041/200] spi: omap2-mcspi: disable other channels CHCONF_FORCE in prepare_message |
| Message-ID | <r2vUC-4Jg-23@gated-at.bofh.it> |
| In reply to | #1334515 |
On Mon, Feb 15, 2016 at 09:23:46AM -0600, Michael Welling wrote: > On Mon, Feb 15, 2016 at 11:03:51AM +0000, Mark Brown wrote: > > On Sun, Feb 14, 2016 at 04:50:47PM -0600, Michael Welling wrote: > > > > > spi: omap2-mcspi: Add calls for pinctrl state select > > > > That doesn't sound like stable material, it's adding a new feature which > > might break existing systems if they have buggy configuration defined in > > DT which we suddenly start using. > > Okay. > > I was looking to get the GPIO registration fix in and figured that > it would be easier to merge with both. > > Greg, How do you want to handle this? I always prefer to keep things identical to how they are in Linus's tree, so let's leave this as-is because I'm guessing this is working properly in 4.4 and 4.5-rc releases. thanks greg k-h
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web