mbox series

[isar-cip-core,v2,0/4] SWUpdate abort on installing indentical image

Message ID 20221209145827.1309521-1-Quirin.Gylstorff@siemens.com (mailing list archive)
Headers show
Series SWUpdate abort on installing indentical image | expand

Message

Quirin Gylstorff Dec. 9, 2022, 2:58 p.m. UTC
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Use a pre/post function of the SWUpdate handler round robin to check if the given uuid
is already in the current root file system and abort if the uuid matches.

This fixes https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/43

Changes in V2:
 - remove RFC
 - Use upstream version instead of patch
 - add comment for variable expension

Quirin Gylstorff (4):
  core/images/swupdate.inc: Move image_uuid to swupdate.inc
  swupdate-handler-roundrobin: Increase revision for configfilecheck
  image_uuid: read target_image_uuid
  recipe-core/images: Integrate configfilecheck into sw-description

 classes/image_uuid.bbclass                    | 19 +++++++++++++++++++
 kas/opt/ebg-swu.yml                           |  2 +-
 recipes-core/images/files/sw-description.tmpl |  1 +
 recipes-core/images/image-uuid.inc            | 12 ------------
 recipes-core/images/swupdate.inc              |  6 +++++-
 .../swupdate-handler-roundrobin_0.1.bb        |  2 +-
 6 files changed, 27 insertions(+), 15 deletions(-)
 delete mode 100644 recipes-core/images/image-uuid.inc

Comments

Jan Kiszka Dec. 13, 2022, 1:01 p.m. UTC | #1
On 09.12.22 15:58, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Use a pre/post function of the SWUpdate handler round robin to check if the given uuid
> is already in the current root file system and abort if the uuid matches.
> 
> This fixes https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/43
> 
> Changes in V2:
>  - remove RFC
>  - Use upstream version instead of patch
>  - add comment for variable expension
> 
> Quirin Gylstorff (4):
>   core/images/swupdate.inc: Move image_uuid to swupdate.inc
>   swupdate-handler-roundrobin: Increase revision for configfilecheck
>   image_uuid: read target_image_uuid
>   recipe-core/images: Integrate configfilecheck into sw-description
> 
>  classes/image_uuid.bbclass                    | 19 +++++++++++++++++++
>  kas/opt/ebg-swu.yml                           |  2 +-
>  recipes-core/images/files/sw-description.tmpl |  1 +
>  recipes-core/images/image-uuid.inc            | 12 ------------
>  recipes-core/images/swupdate.inc              |  6 +++++-
>  .../swupdate-handler-roundrobin_0.1.bb        |  2 +-
>  6 files changed, 27 insertions(+), 15 deletions(-)
>  delete mode 100644 recipes-core/images/image-uuid.inc
> 

Thanks, applied.

Jan
Biju Das Dec. 13, 2022, 3:18 p.m. UTC | #2
Hi Pavel and Nobuhiro-San,

We are missing this patch from 5.10 stable[1] in 5.10.y-cip[2]. Can you please add it?

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.158&id=eb69c07eca22ffd8621d9de9378e4b3ce7965190

[2] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/log/drivers/net/can/rcar?h=linux-5.10.y-cip

Cheers,
Biju
Biju Das Dec. 13, 2022, 3:34 p.m. UTC | #3
Anyway, I will post this patch to CIP ML today.

> -----Original Message-----
> From: Biju Das
> Sent: 13 December 2022 15:19
> To: cip-dev@lists.cip-project.org; Pavel Machek <pavel@denx.de>; Nobuhiro
> Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> Subject: Regarding commit eb69c07eca22ffd8621d9de9378e4b3ce7965190
> 
> Hi Pavel and Nobuhiro-San,
> 
> We are missing this patch from 5.10 stable[1] in 5.10.y-cip[2]. Can you
> please add it?
> 
> [1]
> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h
> =v5.10.158&id=eb69c07eca22ffd8621d9de9378e4b3ce7965190
> 
> [2] https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-
> cip.git/log/drivers/net/can/rcar?h=linux-5.10.y-cip
> 
> Cheers,
> Biju
Pavel Machek Dec. 13, 2022, 3:51 p.m. UTC | #4
Hi!

> Anyway, I will post this patch to CIP ML today.

Let me investigate. We _do_ have that patch in 5.10.y-cip and that
patch does not "simply apply".

commit eb69c07eca22ffd8621d9de9378e4b3ce7965190

    can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on global FIFO receive


Best regards,
								Pavel
Pavel Machek Dec. 13, 2022, 4:06 p.m. UTC | #5
Hi!

> Anyway, I will post this patch to CIP ML today.

The code was moved around with

commit 59a641368b460e4d1e8dc58a922915591303bd54
Author: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Date:   Wed Dec 22 13:49:45 2021 +0000

    can: rcar_canfd: Add support for RZ/G2L family
    
    commit 76e9353a80e9e9ff65b362a6dd8545d84427ec30 upstream.

Sometimes later, I see your commit:

commit 702de2c21eed04c67cefaaedc248ef16e5f6b293
Author: Biju Das <biju.das.jz@bp.renesas.com>
Date:   Tue Oct 25 16:56:55 2022 +0100

    can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on global
 FIFO receive

...and yes, it looks like we may want that one.

Best regards,
								Pavel
Biju Das Dec. 13, 2022, 4:08 p.m. UTC | #6
Hi Pavel,

No worries, I am doing some testing with couple of CAN patches along with IRQ storm patch. I will post soon.

Cheers,
Biju

> -----Original Message-----
> From: Pavel Machek <pavel@denx.de>
> Sent: 13 December 2022 16:06
> To: Biju Das <biju.das.jz@bp.renesas.com>
> Cc: cip-dev@lists.cip-project.org; Pavel Machek <pavel@denx.de>; Nobuhiro
> Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
> Subject: Re: Regarding commit eb69c07eca22ffd8621d9de9378e4b3ce7965190
> 
> Hi!
> 
> > Anyway, I will post this patch to CIP ML today.
> 
> The code was moved around with
> 
> commit 59a641368b460e4d1e8dc58a922915591303bd54
> Author: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> Date:   Wed Dec 22 13:49:45 2021 +0000
> 
>     can: rcar_canfd: Add support for RZ/G2L family
> 
>     commit 76e9353a80e9e9ff65b362a6dd8545d84427ec30 upstream.
> 
> Sometimes later, I see your commit:
> 
> commit 702de2c21eed04c67cefaaedc248ef16e5f6b293
> Author: Biju Das <biju.das.jz@bp.renesas.com>
> Date:   Tue Oct 25 16:56:55 2022 +0100
> 
>     can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on
> global  FIFO receive
> 
> ...and yes, it looks like we may want that one.
> 
> Best regards,
> 								Pavel
> 
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany