[PATCH v2 0/3] Moxtet bus fixes

[PATCH v2 0/3] Moxtet bus fixes

[Sjoerd Simons]

It seems the moxtet bus support was broken since 21aad8ba615e ("arm64:
dts: armada-3720-turris-mox: Add missing interrupt for RTC") for two
reasons:
* The moxtet irq isn't marked as shared so the driver fails to load if
  the rtc driver gets set up first.
* The dts change didn't set the IRQ type, so in case the rtc driver got
  probed first irq setup ended up wrong (rising instead of falling edge).

On top of that the moxtet module isn't auto-loading due to a missing spi
table

Changes in v2:
- Add cover letter
- Add patch to set the irq type

Sjoerd Simons (3):
  bus: moxtet: Mark the irq as shared
  bus: moxtet: Add spi device table
  arm64: dts: armada-3720-turris-mox: set irq type for RTC

 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
 drivers/bus/moxtet.c                                   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

-- 
2.43.0

[PATCH v2 1/3] bus: moxtet: Mark the irq as shared

[Sjoerd Simons]

The Turris Mox shares the moxtet IRQ with various devices on the board,
so mark the IRQ as shared in the driver as well.

Without this loading the module will fail with:
  genirq: Flags mismatch irq 40. 00002002 (moxtet) vs. 00002080 (mcp7940x)

Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
Cc: stable@vger.kernel.org # v6.2+
---

(no changes since v1)

 drivers/bus/moxtet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c
index 5eb0fe73ddc4..48c18f95660a 100644
--- a/drivers/bus/moxtet.c
+++ b/drivers/bus/moxtet.c
@@ -755,7 +755,7 @@ static int moxtet_irq_setup(struct moxtet *moxtet)
 	moxtet->irq.masked = ~0;
 
 	ret = request_threaded_irq(moxtet->dev_irq, NULL, moxtet_irq_thread_fn,
-				   IRQF_ONESHOT, "moxtet", moxtet);
+				   IRQF_SHARED | IRQF_ONESHOT, "moxtet", moxtet);
 	if (ret < 0)
 		goto err_free;
 
-- 
2.43.0

Re: [PATCH v2 1/3] bus: moxtet: Mark the irq as shared

[Marek Behún]

On Tue, 28 Nov 2023 22:35:04 +0100
Sjoerd Simons <sjoerd@collabora.com> wrote:

> The Turris Mox shares the moxtet IRQ with various devices on the board,
> so mark the IRQ as shared in the driver as well.
> 
> Without this loading the module will fail with:
>   genirq: Flags mismatch irq 40. 00002002 (moxtet) vs. 00002080 (mcp7940x)
> 
> Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
> Cc: stable@vger.kernel.org # v6.2+
> ---
> 
> (no changes since v1)
> 
>  drivers/bus/moxtet.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c
> index 5eb0fe73ddc4..48c18f95660a 100644
> --- a/drivers/bus/moxtet.c
> +++ b/drivers/bus/moxtet.c
> @@ -755,7 +755,7 @@ static int moxtet_irq_setup(struct moxtet *moxtet)
>  	moxtet->irq.masked = ~0;
>  
>  	ret = request_threaded_irq(moxtet->dev_irq, NULL, moxtet_irq_thread_fn,
> -				   IRQF_ONESHOT, "moxtet", moxtet);
> +				   IRQF_SHARED | IRQF_ONESHOT, "moxtet", moxtet);
>  	if (ret < 0)
>  		goto err_free;
>  

Reviewed-by: Marek Behún <kabel@kernel.org>

[PATCH v2 2/3] bus: moxtet: Add spi device table

[Sjoerd Simons]

The moxtet module fails to auto-load on. Add a SPI id table to
allow it to do so.

Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
Cc: stable@vger.kernel.org

---

(no changes since v1)

 drivers/bus/moxtet.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c
index 48c18f95660a..e384fbc6c1d9 100644
--- a/drivers/bus/moxtet.c
+++ b/drivers/bus/moxtet.c
@@ -830,6 +830,12 @@ static void moxtet_remove(struct spi_device *spi)
 	mutex_destroy(&moxtet->lock);
 }
 
+static const struct spi_device_id moxtet_spi_ids[] = {
+	{ "moxtet" },
+	{ },
+};
+MODULE_DEVICE_TABLE(spi, moxtet_spi_ids);
+
 static const struct of_device_id moxtet_dt_ids[] = {
 	{ .compatible = "cznic,moxtet" },
 	{},
@@ -841,6 +847,7 @@ static struct spi_driver moxtet_spi_driver = {
 		.name		= "moxtet",
 		.of_match_table = moxtet_dt_ids,
 	},
+	.id_table	= moxtet_spi_ids,
 	.probe		= moxtet_probe,
 	.remove		= moxtet_remove,
 };
-- 
2.43.0

Re: [PATCH v2 2/3] bus: moxtet: Add spi device table

[Marek Behún]

On Tue, 28 Nov 2023 22:35:05 +0100
Sjoerd Simons <sjoerd@collabora.com> wrote:

> The moxtet module fails to auto-load on. Add a SPI id table to
> allow it to do so.
> 
> Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
> Cc: stable@vger.kernel.org
> 
> ---
> 
> (no changes since v1)
> 
>  drivers/bus/moxtet.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/bus/moxtet.c b/drivers/bus/moxtet.c
> index 48c18f95660a..e384fbc6c1d9 100644
> --- a/drivers/bus/moxtet.c
> +++ b/drivers/bus/moxtet.c
> @@ -830,6 +830,12 @@ static void moxtet_remove(struct spi_device *spi)
>  	mutex_destroy(&moxtet->lock);
>  }
>  
> +static const struct spi_device_id moxtet_spi_ids[] = {
> +	{ "moxtet" },
> +	{ },
> +};
> +MODULE_DEVICE_TABLE(spi, moxtet_spi_ids);
> +
>  static const struct of_device_id moxtet_dt_ids[] = {
>  	{ .compatible = "cznic,moxtet" },
>  	{},
> @@ -841,6 +847,7 @@ static struct spi_driver moxtet_spi_driver = {
>  		.name		= "moxtet",
>  		.of_match_table = moxtet_dt_ids,
>  	},
> +	.id_table	= moxtet_spi_ids,
>  	.probe		= moxtet_probe,
>  	.remove		= moxtet_remove,
>  };

Reviewed-by: Marek Behún <kabel@kernel.org>

[PATCH v2 3/3] arm64: dts: armada-3720-turris-mox: set irq type for RTC

[Sjoerd Simons]

The rtc on the mox shares its interrupt line with the moxtet bus. Set
the interrupt type to be consistent between both devices. This ensures
correct setup of the interrupt line regardless of probing order.

Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
Cc: stable@vger.kernel.org # v6.2+
Fixes: 21aad8ba615e ("arm64: dts: armada-3720-turris-mox: Add missing interrupt for RTC")

---

(no changes since v1)

 arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
index 9eab2bb22134..805ef2d79b40 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
@@ -130,7 +130,7 @@ rtc@6f {
 		compatible = "microchip,mcp7940x";
 		reg = <0x6f>;
 		interrupt-parent = <&gpiosb>;
-		interrupts = <5 0>; /* GPIO2_5 */
+		interrupts = <5 IRQ_TYPE_EDGE_FALLING>; /* GPIO2_5 */
 	};
 };
 
-- 
2.43.0

Re: [PATCH v2 3/3] arm64: dts: armada-3720-turris-mox: set irq type for RTC

[Marek Behún]

On Tue, 28 Nov 2023 22:35:06 +0100
Sjoerd Simons <sjoerd@collabora.com> wrote:

> The rtc on the mox shares its interrupt line with the moxtet bus. Set
> the interrupt type to be consistent between both devices. This ensures
> correct setup of the interrupt line regardless of probing order.
> 
> Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
> Cc: stable@vger.kernel.org # v6.2+
> Fixes: 21aad8ba615e ("arm64: dts: armada-3720-turris-mox: Add missing interrupt for RTC")
> 
> ---
> 
> (no changes since v1)
> 
>  arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> index 9eab2bb22134..805ef2d79b40 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
> @@ -130,7 +130,7 @@ rtc@6f {
>  		compatible = "microchip,mcp7940x";
>  		reg = <0x6f>;
>  		interrupt-parent = <&gpiosb>;
> -		interrupts = <5 0>; /* GPIO2_5 */
> +		interrupts = <5 IRQ_TYPE_EDGE_FALLING>; /* GPIO2_5 */
>  	};
>  };
>  

Reviewed-by: Marek Behún <kabel@kernel.org>

Re: [PATCH v2 0/3] Moxtet bus fixes

[Gregory CLEMENT]

Hello Marek and Sjoerd,

> It seems the moxtet bus support was broken since 21aad8ba615e ("arm64:
> dts: armada-3720-turris-mox: Add missing interrupt for RTC") for two
> reasons:
> * The moxtet irq isn't marked as shared so the driver fails to load if
>   the rtc driver gets set up first.
> * The dts change didn't set the IRQ type, so in case the rtc driver got
>   probed first irq setup ended up wrong (rising instead of falling edge).
>
> On top of that the moxtet module isn't auto-loading due to a missing spi
> table
>
> Changes in v2:
> - Add cover letter
> - Add patch to set the irq type
>
> Sjoerd Simons (3):
>   bus: moxtet: Mark the irq as shared
>   bus: moxtet: Add spi device table
>   arm64: dts: armada-3720-turris-mox: set irq type for RTC

I only received the previous patch in my inbox, I plan to apply it. But
what about the 2 other patches ? Marek will you do a pull request with
these 2 patches or do you expect that I take them also ?

Regards,

Gregory


>
>  arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 2 +-
>  drivers/bus/moxtet.c                                   | 9 ++++++++-
>  2 files changed, 9 insertions(+), 2 deletions(-)
>
> -- 
> 2.43.0
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

Re: [PATCH v2 0/3] Moxtet bus fixes

[Marek Behún]

On Fri, 08 Dec 2023 15:51:20 +0100
Gregory CLEMENT <gregory.clement@bootlin.com> wrote:

> Hello Marek and Sjoerd,
> 
> > It seems the moxtet bus support was broken since 21aad8ba615e ("arm64:
> > dts: armada-3720-turris-mox: Add missing interrupt for RTC") for two
> > reasons:
> > * The moxtet irq isn't marked as shared so the driver fails to load if
> >   the rtc driver gets set up first.
> > * The dts change didn't set the IRQ type, so in case the rtc driver got
> >   probed first irq setup ended up wrong (rising instead of falling edge).
> >
> > On top of that the moxtet module isn't auto-loading due to a missing spi
> > table
> >
> > Changes in v2:
> > - Add cover letter
> > - Add patch to set the irq type
> >
> > Sjoerd Simons (3):
> >   bus: moxtet: Mark the irq as shared
> >   bus: moxtet: Add spi device table
> >   arm64: dts: armada-3720-turris-mox: set irq type for RTC  
> 
> I only received the previous patch in my inbox, I plan to apply it. But
> what about the 2 other patches ? Marek will you do a pull request with
> these 2 patches or do you expect that I take them also ?
> 
> Regards,
> 
> Gregory

Gregory, as of yet I've never done a pull request. If you are willing
to take all 3 patches now, please do. In the future I would like to
start doing it for Turris stuff, if you are OK with it.

Marek

Re: [PATCH v2 0/3] Moxtet bus fixes

[Gregory CLEMENT]

Marek Behún <kabel@kernel.org> writes:

> On Fri, 08 Dec 2023 15:51:20 +0100
> Gregory CLEMENT <gregory.clement@bootlin.com> wrote:
>
>> Hello Marek and Sjoerd,
>> 
>> > It seems the moxtet bus support was broken since 21aad8ba615e ("arm64:
>> > dts: armada-3720-turris-mox: Add missing interrupt for RTC") for two
>> > reasons:
>> > * The moxtet irq isn't marked as shared so the driver fails to load if
>> >   the rtc driver gets set up first.
>> > * The dts change didn't set the IRQ type, so in case the rtc driver got
>> >   probed first irq setup ended up wrong (rising instead of falling edge).
>> >
>> > On top of that the moxtet module isn't auto-loading due to a missing spi
>> > table
>> >
>> > Changes in v2:
>> > - Add cover letter
>> > - Add patch to set the irq type
>> >
>> > Sjoerd Simons (3):
>> >   bus: moxtet: Mark the irq as shared
>> >   bus: moxtet: Add spi device table
>> >   arm64: dts: armada-3720-turris-mox: set irq type for RTC  
>> 
>> I only received the previous patch in my inbox, I plan to apply it. But
>> what about the 2 other patches ? Marek will you do a pull request with
>> these 2 patches or do you expect that I take them also ?
>> 
>> Regards,
>> 
>> Gregory
>
> Gregory, as of yet I've never done a pull request. If you are willing
> to take all 3 patches now, please do. In the future I would like to

OK I applied them on mvebu/driver.

> start doing it for Turris stuff, if you are OK with it.

No pb, just tell me when you are going to doing it.

Gregory

>
> Marek

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

Re: [PATCH v2 0/3] Moxtet bus fixes

[Sjoerd Simons]

Re: [PATCH v2 0/3] Moxtet bus fixes

[Sjoerd Simons]

On Fri, 2023-12-15 at 15:47 +0100, Gregory CLEMENT wrote:
> Marek Behún <kabel@kernel.org> writes:
> 
> > On Fri, 08 Dec 2023 15:51:20 +0100
> > Gregory CLEMENT <gregory.clement@bootlin.com> wrote:
> > 
> > Gregory, as of yet I've never done a pull request. If you are
> > willing
> > to take all 3 patches now, please do. In the future I would like to
> 
> OK I applied them on mvebu/driver.

Thanks both for moving this patches forward; Gregory looks like you
only applied two of the three patches (missing the dt patch), are you
expect that to flow through a different tree or ?


Regards,
-- 
Sjoerd Simons
Collabora Ltd.

Re: [PATCH v2 0/3] Moxtet bus fixes

[Gregory CLEMENT]

Sjoerd Simons <sjoerd@collabora.com> writes:

> On Fri, 2023-12-15 at 15:47 +0100, Gregory CLEMENT wrote:
>> Marek Behún <kabel@kernel.org> writes:
>> 
>> > On Fri, 08 Dec 2023 15:51:20 +0100
>> > Gregory CLEMENT <gregory.clement@bootlin.com> wrote:
>> > 
>> > Gregory, as of yet I've never done a pull request. If you are
>> > willing
>> > to take all 3 patches now, please do. In the future I would like to
>> 
>> OK I applied them on mvebu/driver.
>
> Thanks both for moving this patches forward; Gregory looks like you
> only applied two of the three patches (missing the dt patch), are you
> expect that to flow through a different tree or ?

The device tree patch is applied on mvebu/dt64, I've just pushed the
updated branch, but it was already in the for-next branch.

Gregory

>
>
> Regards,
> -- 
> Sjoerd Simons
> Collabora Ltd.

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com