LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v1] MIPS: Malta: fix alignment of the devicetree buffer
@ 2021-09-02  7:19 Oleksij Rempel
  2021-09-02  9:03 ` Thomas Bogendoerfer
  0 siblings, 1 reply; 6+ messages in thread
From: Oleksij Rempel @ 2021-09-02  7:19 UTC (permalink / raw)
  To: Thomas Bogendoerfer, Rob Herring
  Cc: Oleksij Rempel, Pengutronix Kernel Team, linux-kernel,
	linux-mips, Ralf Baechle, Paul Burton

Starting with following patch MIPS Malta is not able to boot:
| commit 79edff12060fe7772af08607eff50c0e2486c5ba
| Author: Rob Herring <robh@kernel.org>
| scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9

The reason is the alignment test added to the fdt_ro_probe_(). To fix
this issue, we need to make sure that fdt_buf is aligned.

Since the dtc patch was designed to uncover potential issue, I handle
initial MIPS Malta patch as initial bug.

Fixes: e81a8c7dabac ("MIPS: Malta: Setup RAM regions via DT")
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 arch/mips/mti-malta/malta-dtshim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/mti-malta/malta-dtshim.c b/arch/mips/mti-malta/malta-dtshim.c
index 0ddf03df6268..f451268f6c38 100644
--- a/arch/mips/mti-malta/malta-dtshim.c
+++ b/arch/mips/mti-malta/malta-dtshim.c
@@ -22,7 +22,7 @@
 #define  ROCIT_CONFIG_GEN1_MEMMAP_SHIFT	8
 #define  ROCIT_CONFIG_GEN1_MEMMAP_MASK	(0xf << 8)
 
-static unsigned char fdt_buf[16 << 10] __initdata;
+static unsigned char fdt_buf[16 << 10] __initdata __aligned(8);
 
 /* determined physical memory size, not overridden by command line args	 */
 extern unsigned long physical_memsize;
-- 
2.30.2


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v1] MIPS: Malta: fix alignment of the devicetree buffer
  2021-09-02  7:19 [PATCH v1] MIPS: Malta: fix alignment of the devicetree buffer Oleksij Rempel
@ 2021-09-02  9:03 ` Thomas Bogendoerfer
  2021-09-02 10:14   ` Marc Kleine-Budde
  0 siblings, 1 reply; 6+ messages in thread
From: Thomas Bogendoerfer @ 2021-09-02  9:03 UTC (permalink / raw)
  To: Oleksij Rempel
  Cc: Rob Herring, Pengutronix Kernel Team, linux-kernel, linux-mips,
	Ralf Baechle, Paul Burton

On Thu, Sep 02, 2021 at 09:19:51AM +0200, Oleksij Rempel wrote:
> Starting with following patch MIPS Malta is not able to boot:
> | commit 79edff12060fe7772af08607eff50c0e2486c5ba
> | Author: Rob Herring <robh@kernel.org>
> | scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9
> 
> The reason is the alignment test added to the fdt_ro_probe_(). To fix
> this issue, we need to make sure that fdt_buf is aligned.
> 
> Since the dtc patch was designed to uncover potential issue, I handle
> initial MIPS Malta patch as initial bug.
> 
> Fixes: e81a8c7dabac ("MIPS: Malta: Setup RAM regions via DT")
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
>  arch/mips/mti-malta/malta-dtshim.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v1] MIPS: Malta: fix alignment of the devicetree buffer
  2021-09-02  9:03 ` Thomas Bogendoerfer
@ 2021-09-02 10:14   ` Marc Kleine-Budde
  2021-10-10  9:58     ` Maciej W. Rozycki
  0 siblings, 1 reply; 6+ messages in thread
From: Marc Kleine-Budde @ 2021-09-02 10:14 UTC (permalink / raw)
  To: Thomas Bogendoerfer
  Cc: Oleksij Rempel, Rob Herring, Paul Burton, linux-kernel,
	Ralf Baechle, linux-mips, Pengutronix Kernel Team

[-- Attachment #1: Type: text/plain, Size: 1443 bytes --]

On 02.09.2021 11:03:24, Thomas Bogendoerfer wrote:
> On Thu, Sep 02, 2021 at 09:19:51AM +0200, Oleksij Rempel wrote:
> > Starting with following patch MIPS Malta is not able to boot:
> > | commit 79edff12060fe7772af08607eff50c0e2486c5ba
> > | Author: Rob Herring <robh@kernel.org>
> > | scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9

If the above patch broke malts, IMHO the fixes tag should be:

Fixes: 79edff12060f ("scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9")

> > The reason is the alignment test added to the fdt_ro_probe_(). To fix
> > this issue, we need to make sure that fdt_buf is aligned.
> > 
> > Since the dtc patch was designed to uncover potential issue, I handle
> > initial MIPS Malta patch as initial bug.
> > 
> > Fixes: e81a8c7dabac ("MIPS: Malta: Setup RAM regions via DT")
> > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> > ---
> >  arch/mips/mti-malta/malta-dtshim.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> applied to mips-next.

Please add stable on Cc, as Malta is broken since v5.12
(79edff12060f == v5.12-rc1~104^2~10^2~3).

regards,
Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v1] MIPS: Malta: fix alignment of the devicetree buffer
  2021-09-02 10:14   ` Marc Kleine-Budde
@ 2021-10-10  9:58     ` Maciej W. Rozycki
  2021-10-11  7:15       ` Oleksij Rempel
  0 siblings, 1 reply; 6+ messages in thread
From: Maciej W. Rozycki @ 2021-10-10  9:58 UTC (permalink / raw)
  To: Marc Kleine-Budde
  Cc: Thomas Bogendoerfer, Oleksij Rempel, Rob Herring, Paul Burton,
	linux-kernel, Ralf Baechle, linux-mips, Pengutronix Kernel Team

On Thu, 2 Sep 2021, Marc Kleine-Budde wrote:

> > > Starting with following patch MIPS Malta is not able to boot:
> > > | commit 79edff12060fe7772af08607eff50c0e2486c5ba
> > > | Author: Rob Herring <robh@kernel.org>
> > > | scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9
> 
> If the above patch broke malts, IMHO the fixes tag should be:
> 
> Fixes: 79edff12060f ("scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9")

 It's not clear either from this patch description or from the commit 
referred what the actual *purpose* of the alignment check is and therefore 
I think it's hard to say which of the two commits needs to be indicated as 
the offender.  Without further data I tend to agree it's 79edff12060f that 
ought to be referred, being the immediate cause of the regression, as 
things obviously worked before, for 5+ years.

> > > The reason is the alignment test added to the fdt_ro_probe_(). To fix
> > > this issue, we need to make sure that fdt_buf is aligned.
> > > 
> > > Since the dtc patch was designed to uncover potential issue, I handle
> > > initial MIPS Malta patch as initial bug.
> > > 
> > > Fixes: e81a8c7dabac ("MIPS: Malta: Setup RAM regions via DT")
> > > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> > > ---
> > >  arch/mips/mti-malta/malta-dtshim.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > applied to mips-next.
> 
> Please add stable on Cc, as Malta is broken since v5.12
> (79edff12060f == v5.12-rc1~104^2~10^2~3).

 That for sure.

  Maciej

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v1] MIPS: Malta: fix alignment of the devicetree buffer
  2021-10-10  9:58     ` Maciej W. Rozycki
@ 2021-10-11  7:15       ` Oleksij Rempel
  2021-10-11  8:09         ` Maciej W. Rozycki
  0 siblings, 1 reply; 6+ messages in thread
From: Oleksij Rempel @ 2021-10-11  7:15 UTC (permalink / raw)
  To: Maciej W. Rozycki
  Cc: Marc Kleine-Budde, Thomas Bogendoerfer, Rob Herring, Paul Burton,
	linux-kernel, Ralf Baechle, linux-mips, Pengutronix Kernel Team

On Sun, Oct 10, 2021 at 11:58:24AM +0200, Maciej W. Rozycki wrote:
> On Thu, 2 Sep 2021, Marc Kleine-Budde wrote:
> 
> > > > Starting with following patch MIPS Malta is not able to boot:
> > > > | commit 79edff12060fe7772af08607eff50c0e2486c5ba
> > > > | Author: Rob Herring <robh@kernel.org>
> > > > | scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9
> > 
> > If the above patch broke malts, IMHO the fixes tag should be:
> > 
> > Fixes: 79edff12060f ("scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9")
> 
>  It's not clear either from this patch description or from the commit 
> referred what the actual *purpose* of the alignment check is and therefore 
> I think it's hard to say which of the two commits needs to be indicated as 
> the offender.  Without further data I tend to agree it's 79edff12060f that 
> ought to be referred, being the immediate cause of the regression, as 
> things obviously worked before, for 5+ years.

This patch was already taken. Do I need to do any thing?

Regards,
Oleksij
-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v1] MIPS: Malta: fix alignment of the devicetree buffer
  2021-10-11  7:15       ` Oleksij Rempel
@ 2021-10-11  8:09         ` Maciej W. Rozycki
  0 siblings, 0 replies; 6+ messages in thread
From: Maciej W. Rozycki @ 2021-10-11  8:09 UTC (permalink / raw)
  To: Oleksij Rempel
  Cc: Marc Kleine-Budde, Thomas Bogendoerfer, Rob Herring, Paul Burton,
	linux-kernel, Ralf Baechle, linux-mips, Pengutronix Kernel Team

On Mon, 11 Oct 2021, Oleksij Rempel wrote:

> >  It's not clear either from this patch description or from the commit 
> > referred what the actual *purpose* of the alignment check is and therefore 
> > I think it's hard to say which of the two commits needs to be indicated as 
> > the offender.  Without further data I tend to agree it's 79edff12060f that 
> > ought to be referred, being the immediate cause of the regression, as 
> > things obviously worked before, for 5+ years.
> 
> This patch was already taken. Do I need to do any thing?

 No, unless Thomas chimes in, especially since you've posted v2 already (I 
hope he's sorted the stable part).  Overall we need better change 
descriptions though.

  Maciej

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-10-11  8:09 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-02  7:19 [PATCH v1] MIPS: Malta: fix alignment of the devicetree buffer Oleksij Rempel
2021-09-02  9:03 ` Thomas Bogendoerfer
2021-09-02 10:14   ` Marc Kleine-Budde
2021-10-10  9:58     ` Maciej W. Rozycki
2021-10-11  7:15       ` Oleksij Rempel
2021-10-11  8:09         ` Maciej W. Rozycki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).