[isar-cip-core] Add support Plat'Home OpenBlocks IoT VX2

Commit Message

Nobuhiro Iwamatsu Aug. 23, 2023, 2:17 a.m. UTC

From: Nobuhiro Iwamatsu <[e-mail]>

This adds configuration files to support Plat'Home OpenBlocks IoT VX2.

CC: Masato Minda <[e-mail]>
Signed-off-by: Nobuhiro Iwamatsu <[e-mail]>
---
 Kconfig                              |  4 ++++
 conf/machine/openblocks-iot-vx2.conf | 15 +++++++++++++++
 kas/board/openblocks-iot-vx2.yml     | 15 +++++++++++++++
 wic/openblocks-iot-vx2.wks           | 15 +++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 conf/machine/openblocks-iot-vx2.conf
 create mode 100644 kas/board/openblocks-iot-vx2.yml
 create mode 100644 wic/openblocks-iot-vx2.wks

Comments

Jan Kiszka Aug. 28, 2023, 6:43 a.m. UTC | #1

On 23.08.23 04:17, Nobuhiro Iwamatsu wrote:
> From: Nobuhiro Iwamatsu <[e-mail]>
> 
> This adds configuration files to support Plat'Home OpenBlocks IoT VX2.
> 
> CC: Masato Minda <[e-mail]>
> Signed-off-by: Nobuhiro Iwamatsu <[e-mail]>
> ---
>  Kconfig                              |  4 ++++
>  conf/machine/openblocks-iot-vx2.conf | 15 +++++++++++++++
>  kas/board/openblocks-iot-vx2.yml     | 15 +++++++++++++++
>  wic/openblocks-iot-vx2.wks           | 15 +++++++++++++++
>  4 files changed, 49 insertions(+)
>  create mode 100644 conf/machine/openblocks-iot-vx2.conf
>  create mode 100644 kas/board/openblocks-iot-vx2.yml
>  create mode 100644 wic/openblocks-iot-vx2.wks
> 
> diff --git a/Kconfig b/Kconfig
> index ec49631..778acf6 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -67,6 +67,9 @@ config TARGET_QEMU_RISCV64
>  	bool "QEMU RISC-V 64-bit (riscv64)"
>  	select ARCH_RISCV64
>  
> +config TARGET_OBS_IOT_VX2
> +	bool "Plat'Home OpenBlocks IoT VX2"
> +	select ARCH_AMD64
>  endchoice
>  
>  config KAS_INCLUDE_BOARD
> @@ -79,6 +82,7 @@ config KAS_INCLUDE_BOARD
>  	default "kas/board/bbb.yml" if TARGET_BBB
>  	default "kas/board/iwg20m.yml" if TARGET_IWG20D
>  	default "kas/board/qemu-riscv64.yml" if TARGET_QEMU_RISCV64
> +	default "kas/board/openblocks-iot-vx2.yml" if TARGET_OBS_IOT_VX2
>  
>  comment "Kernel options"
>  
> diff --git a/conf/machine/openblocks-iot-vx2.conf b/conf/machine/openblocks-iot-vx2.conf
> new file mode 100644
> index 0000000..a9bf65d
> --- /dev/null
> +++ b/conf/machine/openblocks-iot-vx2.conf
> @@ -0,0 +1,15 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2019
> +# Copyright (c) TOSHIBA CORPORATION, 2023
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +DISTRO_ARCH = "amd64"
> +
> +IMAGE_FSTYPES ?= "wic"
> +IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
> +USE_CIP_KERNEL_CONFIG = "1"
> +KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/plathome_obsvx2_defconfig"
> diff --git a/kas/board/openblocks-iot-vx2.yml b/kas/board/openblocks-iot-vx2.yml
> new file mode 100644
> index 0000000..6951e2e
> --- /dev/null
> +++ b/kas/board/openblocks-iot-vx2.yml
> @@ -0,0 +1,15 @@
> +#
> +# CIP Core, generic profile
> +#
> +# TOSHIBA CORPORATION, 2023
> +#
> +# Authors:
> +#  Nobuhiro Iwamatsu <[e-mail]>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> +  version: 12
> +
> +machine: openblocks-iot-vx2
> diff --git a/wic/openblocks-iot-vx2.wks b/wic/openblocks-iot-vx2.wks
> new file mode 100644
> index 0000000..3050684
> --- /dev/null
> +++ b/wic/openblocks-iot-vx2.wks
> @@ -0,0 +1,15 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2019
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +# Based wic/simatic-ipc227e.wks
> +#
> +
> +part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --label efi --part-type EF00 --align 1024
> +
> +part / --source rootfs --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid
> +
> +bootloader --ptable gpt --timeout 2 --append "console=ttyS0,115200"

I wonder if we should (and could) consolidate the x86 configs. Or does
this target come with any specialties?

Jan

Nobuhiro Iwamatsu Aug. 28, 2023, 8:26 a.m. UTC | #2

Hi Jan,

> -----Original Message-----
> From: Jan Kiszka <[e-mail]>
> Sent: Monday, August 28, 2023 3:44 PM
> To: iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□ＤＩＴ○ＯＳＴ)
> <[e-mail]>
> Cc: [e-mail]; Nobuhiro Iwamatsu
> <[e-mail]>; Masato Minda <[e-mail]>
> Subject: Re: [isar-cip-core][PATCH] Add support Plat'Home OpenBlocks IoT
> VX2
> 
> > diff --git a/wic/openblocks-iot-vx2.wks b/wic/openblocks-iot-vx2.wks
> > new file mode 100644 index 0000000..3050684
> > --- /dev/null
> > +++ b/wic/openblocks-iot-vx2.wks
> > @@ -0,0 +1,15 @@
> > +#
> > +# CIP Core, generic profile
> > +#
> > +# Copyright (c) Siemens AG, 2019
> > +#
> > +# SPDX-License-Identifier: MIT
> > +#
> > +# Based wic/simatic-ipc227e.wks
> > +#
> > +
> > +part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi"
> > +--label efi --part-type EF00 --align 1024
> > +
> > +part / --source rootfs --fstype ext4 --mkfs-extraopts "-T default"
> > +--label platform --align 1024 --use-uuid
> > +
> > +bootloader --ptable gpt --timeout 2 --append "console=ttyS0,115200"
> 
> I wonder if we should (and could) consolidate the x86 configs. Or does this
> target come with any specialties?

I think it can be integrated if the serial port and baud rate are the same.
(There may be other settings as well.)
And the partition scheme is a reference, so I think the same settings are fine.
This time ipc227e and vx2 happened to have the same settings, so they ended up in the same config file.

Best regards,
  Nobuhiro

Nobuhiro Iwamatsu Sept. 12, 2023, 1:11 p.m. UTC | #3

> -----Original Message-----
> From: iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□ＤＩＴ○ＯＳＴ)
> Sent: Monday, August 28, 2023 5:27 PM
> To: Jan Kiszka <[e-mail]>
> Cc: [e-mail]; Nobuhiro Iwamatsu
> <[e-mail]>; Masato Minda <[e-mail]>
> Subject: RE: [isar-cip-core][PATCH] Add support Plat'Home OpenBlocks IoT
> VX2
> 
> Hi Jan,
> 
> > -----Original Message-----
> > From: Jan Kiszka <[e-mail]>
> > Sent: Monday, August 28, 2023 3:44 PM
> > To: iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□ＤＩＴ○ＯＳＴ)
> > <[e-mail]>
> > Cc: [e-mail]; Nobuhiro Iwamatsu
> > <[e-mail]>; Masato Minda <[e-mail]>
> > Subject: Re: [isar-cip-core][PATCH] Add support Plat'Home OpenBlocks
> > IoT
> > VX2
> >
> > > diff --git a/wic/openblocks-iot-vx2.wks b/wic/openblocks-iot-vx2.wks
> > > new file mode 100644 index 0000000..3050684
> > > --- /dev/null
> > > +++ b/wic/openblocks-iot-vx2.wks
> > > @@ -0,0 +1,15 @@
> > > +#
> > > +# CIP Core, generic profile
> > > +#
> > > +# Copyright (c) Siemens AG, 2019
> > > +#
> > > +# SPDX-License-Identifier: MIT
> > > +#
> > > +# Based wic/simatic-ipc227e.wks
> > > +#
> > > +
> > > +part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi"
> > > +--label efi --part-type EF00 --align 1024
> > > +
> > > +part / --source rootfs --fstype ext4 --mkfs-extraopts "-T default"
> > > +--label platform --align 1024 --use-uuid
> > > +
> > > +bootloader --ptable gpt --timeout 2 --append "console=ttyS0,115200"
> >
> > I wonder if we should (and could) consolidate the x86 configs. Or does
> > this target come with any specialties?
> 
> I think it can be integrated if the serial port and baud rate are the same.
> (There may be other settings as well.)
> And the partition scheme is a reference, so I think the same settings are fine.
> This time ipc227e and vx2 happened to have the same settings, so they ended
> up in the same config file.
> 

Ping？

Jan Kiszka Sept. 14, 2023, 5:44 a.m. UTC | #4

On 12.09.23 18:41, [e-mail] wrote:
>> -----Original Message-----
>> From: iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□ＤＩＴ○ＯＳＴ)
>> Sent: Monday, August 28, 2023 5:27 PM
>> To: Jan Kiszka <[e-mail]>
>> Cc: [e-mail]; Nobuhiro Iwamatsu
>> <[e-mail]>; Masato Minda <[e-mail]>
>> Subject: RE: [isar-cip-core][PATCH] Add support Plat'Home OpenBlocks IoT
>> VX2
>>
>> Hi Jan,
>>
>>> -----Original Message-----
>>> From: Jan Kiszka <[e-mail]>
>>> Sent: Monday, August 28, 2023 3:44 PM
>>> To: iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□ＤＩＴ○ＯＳＴ)
>>> <[e-mail]>
>>> Cc: [e-mail]; Nobuhiro Iwamatsu
>>> <[e-mail]>; Masato Minda <[e-mail]>
>>> Subject: Re: [isar-cip-core][PATCH] Add support Plat'Home OpenBlocks
>>> IoT
>>> VX2
>>>
>>>> diff --git a/wic/openblocks-iot-vx2.wks b/wic/openblocks-iot-vx2.wks
>>>> new file mode 100644 index 0000000..3050684
>>>> --- /dev/null
>>>> +++ b/wic/openblocks-iot-vx2.wks
>>>> @@ -0,0 +1,15 @@
>>>> +#
>>>> +# CIP Core, generic profile
>>>> +#
>>>> +# Copyright (c) Siemens AG, 2019
>>>> +#
>>>> +# SPDX-License-Identifier: MIT
>>>> +#
>>>> +# Based wic/simatic-ipc227e.wks
>>>> +#
>>>> +
>>>> +part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi"
>>>> +--label efi --part-type EF00 --align 1024
>>>> +
>>>> +part / --source rootfs --fstype ext4 --mkfs-extraopts "-T default"
>>>> +--label platform --align 1024 --use-uuid
>>>> +
>>>> +bootloader --ptable gpt --timeout 2 --append "console=ttyS0,115200"
>>>
>>> I wonder if we should (and could) consolidate the x86 configs. Or does
>>> this target come with any specialties?
>>
>> I think it can be integrated if the serial port and baud rate are the same.
>> (There may be other settings as well.)
>> And the partition scheme is a reference, so I think the same settings are fine.
>> This time ipc227e and vx2 happened to have the same settings, so they ended
>> up in the same config file.
>>
> 
> Ping？
> 

Sounded to me like you wanted to send v2, given that you confirmed we
can consolidate things. Or did I misunderstand this?

Jan

Kazuhiro Hayashi Sept. 26, 2023, 1:12 p.m. UTC | #5

Hello Jan,

[...]
> >>>> diff --git a/wic/openblocks-iot-vx2.wks b/wic/openblocks-iot-vx2.wks
> >>>> new file mode 100644 index 0000000..3050684
> >>>> --- /dev/null
> >>>> +++ b/wic/openblocks-iot-vx2.wks
> >>>> @@ -0,0 +1,15 @@
> >>>> +#
> >>>> +# CIP Core, generic profile
> >>>> +#
> >>>> +# Copyright (c) Siemens AG, 2019
> >>>> +#
> >>>> +# SPDX-License-Identifier: MIT
> >>>> +#
> >>>> +# Based wic/simatic-ipc227e.wks
> >>>> +#
> >>>> +
> >>>> +part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi"
> >>>> +--label efi --part-type EF00 --align 1024
> >>>> +
> >>>> +part / --source rootfs --fstype ext4 --mkfs-extraopts "-T default"
> >>>> +--label platform --align 1024 --use-uuid
> >>>> +
> >>>> +bootloader --ptable gpt --timeout 2 --append "console=ttyS0,115200"
> >>>
> >>> I wonder if we should (and could) consolidate the x86 configs. Or does
> >>> this target come with any specialties?
> >>
> >> I think it can be integrated if the serial port and baud rate are the same.
> >> (There may be other settings as well.)
> >> And the partition scheme is a reference, so I think the same settings are fine.
> >> This time ipc227e and vx2 happened to have the same settings, so they ended
> >> up in the same config file.
> >>
> >
> > Ping？
> >
> 
> Sounded to me like you wanted to send v2, given that you confirmed we
> can consolidate things. Or did I misunderstand this?

Sorry for interrupting you.
Do you expect consolidating .wks only? or other configs/yamls as well?
i.e. Introduce a common machine definition like "x86-generic" and
use it for both IPC227E & OpenBlocks IoT VX2

Kazu

> 
> Jan
> 
> --
> Siemens AG, Technology
> Linux Expert Center

Nobuhiro Iwamatsu Oct. 1, 2023, 11:47 p.m. UTC | #6

Hi Jan,

> >>> I wonder if we should (and could) consolidate the x86 configs. Or 
> >>> does this target come with any specialties?
> >>
> >> I think it can be integrated if the serial port and baud rate are the same.
> >> (There may be other settings as well.) And the partition scheme is 
> >> a reference, so I think the same settings are fine.
> >> This time ipc227e and vx2 happened to have the same settings, so 
> >> they ended up in the same config file.
> >>
> >
> > Ping？
> >
> 
> Sounded to me like you wanted to send v2, given that you confirmed we 
> can consolidate things. Or did I misunderstand this?

ipc227e と vx2 は統合可能です。しかしこれらは偶然一致しただけなので、設定は別にすることを提案します。 

ipc227e and vx2 can be integrated.
However, since these are just a coincidence, I suggest that we set them separately.

Best regards,
  Nobuhiro

Jan Kiszka Oct. 2, 2023, 10:23 a.m. UTC | #7

On 02.10.23 01:47, [e-mail] wrote:
> Hi Jan,
> 
>>>>> I wonder if we should (and could) consolidate the x86 configs. Or 
>>>>> does this target come with any specialties?
>>>>
>>>> I think it can be integrated if the serial port and baud rate are the same.
>>>> (There may be other settings as well.) And the partition scheme is 
>>>> a reference, so I think the same settings are fine.
>>>> This time ipc227e and vx2 happened to have the same settings, so 
>>>> they ended up in the same config file.
>>>>
>>>
>>> Ping？
>>>
>>
>> Sounded to me like you wanted to send v2, given that you confirmed we 
>> can consolidate things. Or did I misunderstand this?
> 
> ipc227e と vx2 は統合可能です。しかしこれらは偶然一致しただけなので、設定は別にすることを提案します。 
> 
> ipc227e and vx2 can be integrated.
> However, since these are just a coincidence, I suggest that we set them separately.
> 

I really prefer creating a generic x86-64 target, now that also the
M-COM device is being added. Will reduce our (build-)test matrix.

Jan

Nobuhiro Iwamatsu Oct. 2, 2023, 9:34 p.m. UTC | #8

Hi Jan,

> >
> > ipc227e and vx2 can be integrated.
> > However, since these are just a coincidence, I suggest that we set them
> separately.
> >
> 
> I really prefer creating a generic x86-64 target, now that also the M-COM device
> is being added. Will reduce our (build-)test matrix.
> 

I see.
I will create a patch with generic x86-64 target.

Best regards,
  Nobuhiro

Schilling, Benjamin March 22, 2024, 11:39 a.m. UTC | #9

Hi all,

I'm joining the discussion to start integrating the M-COM x86 support.
What's the status on the generic x86-64 target?

Best regards
Benjamin

Jan Kiszka March 26, 2024, 6:52 a.m. UTC | #10

On 22.03.24 12:39, Benjamin Schilling wrote:
> Hi all,
> 
> I'm joining the discussion to start integrating the M-COM x86 support.
> What's the status on the generic x86-64 target?
> 

Nobuhiro wrote recently he has a prototype. Maybe he can share to
finalize it together.

Jan

Nobuhiro Iwamatsu April 5, 2024, 7:39 a.m. UTC | #11

Hi all,

First of all I created generic kernel configuration for x86 CIP reference hardware and performed boot tests.
The configurations of each device in cip-kernel-config are merged using KERNEL/scripts/kconfig/merge_config.sh.
Also, booting is fine[2][3]. But there are a lot of differences in the configurations[0][1], so I think we need to decide
what to do with them.

About M-COM x86, but I haven't investigated it yet.

Best regards,
  Nobuhiro

Merged config:
    https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/config
Diff with ipc227e original config [0]:
    https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/siemens_ipc227e_config.v6.1.83-cip18.diff
Diff with OpenBlocks IoT VX2 original config[1]:
    https://gitlab.com/iwamatsu/cip-merge-config-work/-/blob/master/plathome_obsvx2_config.v6.1.83-cip18.diff
Kernel size:
    7760544 bytes

ipc227e boot log (merged)[2]
    https://lava.ciplatform.org/scheduler/job/1113259
    https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/ipc227e-merged.log
ipc227e boot log (NO merged)
    https://lava.ciplatform.org/scheduler/job/1113356
    https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/ipc227e-NO-merged.log
    kernel size: 7251072 bytes
ipc227e boot log (diff)
    https://gitlab.com/iwamatsu/cip-merge-config-work/-/blob/master/ipc227e.log.diff

OpenBlocks IoT VX2 boot log (merged)[3]
    https://lava.ciplatform.org/scheduler/job/1113301
    https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/obs-merged.log
OpenBlocks IoT VX2 boot log (NO merged)
    https://lava.ciplatform.org/scheduler/job/1113303
    https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/obs-no-merge.log
    kernel size: 9203296 bytes
OpenBlocks IoT VX2 boot log (diff)
    https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/obs.log.diff


> -----Original Message-----
> From: Jan Kiszka <[e-mail]>
> Sent: Tuesday, March 26, 2024 3:52 PM
> To: Benjamin Schilling <[e-mail]>;
> [e-mail]; iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□Ｄ
> ＩＴ○ＯＳＴ) <[e-mail]>
> Subject: Re: [isar-cip-core][PATCH] Add support Plat'Home OpenBlocks IoT
> VX2
> 
> On 22.03.24 12:39, Benjamin Schilling wrote:
> > Hi all,
> >
> > I'm joining the discussion to start integrating the M-COM x86 support.
> > What's the status on the generic x86-64 target?
> >
> 
> Nobuhiro wrote recently he has a prototype. Maybe he can share to finalize it
> together.
> 
> Jan
> 
> --
> Siemens AG, Technology
> Linux Expert Center

Jan Kiszka April 11, 2024, 4:51 p.m. UTC | #12

Hi Nobuhiro,

thanks for picking this up!

On 05.04.24 09:39, [e-mail] wrote:
> Hi all,
> 
> First of all I created generic kernel configuration for x86 CIP reference hardware and performed boot tests.
> The configurations of each device in cip-kernel-config are merged using KERNEL/scripts/kconfig/merge_config.sh.

This script will likely prioritize the choice of later-provided configs
over those earlier listed. But we rather generally want that features
enabled in one config are also enabled in the merged ones (superset).
How could we achieve this? Probably most of the comments I would have on
the ipc227e diff would relate to this.

Jan

> Also, booting is fine[2][3]. But there are a lot of differences in the configurations[0][1], so I think we need to decide
> what to do with them.
> 
> About M-COM x86, but I haven't investigated it yet.
> 
> Best regards,
>   Nobuhiro
> 
> Merged config:
>     https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/config
> Diff with ipc227e original config [0]:
>     https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/siemens_ipc227e_config.v6.1.83-cip18.diff
> Diff with OpenBlocks IoT VX2 original config[1]:
>     https://gitlab.com/iwamatsu/cip-merge-config-work/-/blob/master/plathome_obsvx2_config.v6.1.83-cip18.diff
> Kernel size:
>     7760544 bytes
> 
> ipc227e boot log (merged)[2]
>     https://lava.ciplatform.org/scheduler/job/1113259
>     https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/ipc227e-merged.log
> ipc227e boot log (NO merged)
>     https://lava.ciplatform.org/scheduler/job/1113356
>     https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/ipc227e-NO-merged.log
>     kernel size: 7251072 bytes
> ipc227e boot log (diff)
>     https://gitlab.com/iwamatsu/cip-merge-config-work/-/blob/master/ipc227e.log.diff
> 
> OpenBlocks IoT VX2 boot log (merged)[3]
>     https://lava.ciplatform.org/scheduler/job/1113301
>     https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/obs-merged.log
> OpenBlocks IoT VX2 boot log (NO merged)
>     https://lava.ciplatform.org/scheduler/job/1113303
>     https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/obs-no-merge.log
>     kernel size: 9203296 bytes
> OpenBlocks IoT VX2 boot log (diff)
>     https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/obs.log.diff
> 
> 
>> -----Original Message-----
>> From: Jan Kiszka <[e-mail]>
>> Sent: Tuesday, March 26, 2024 3:52 PM
>> To: Benjamin Schilling <[e-mail]>;
>> [e-mail]; iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□Ｄ
>> ＩＴ○ＯＳＴ) <[e-mail]>
>> Subject: Re: [isar-cip-core][PATCH] Add support Plat'Home OpenBlocks IoT
>> VX2
>>
>> On 22.03.24 12:39, Benjamin Schilling wrote:
>>> Hi all,
>>>
>>> I'm joining the discussion to start integrating the M-COM x86 support.
>>> What's the status on the generic x86-64 target?
>>>
>>
>> Nobuhiro wrote recently he has a prototype. Maybe he can share to finalize it
>> together.
>>
>> Jan
>>
>> --
>> Siemens AG, Technology
>> Linux Expert Center

Nobuhiro Iwamatsu April 23, 2024, 1:18 p.m. UTC | #13

Hi Jan,

> This script will likely prioritize the choice of later-provided configs over those
> earlier listed. But we rather generally want that features enabled in one config
> are also enabled in the merged ones (superset).
> How could we achieve this? Probably most of the comments I would have on
> the ipc227e diff would relate to this.

I see. I think we need to check the configuration of each device to achieve that. 
First I create a list of configs.

Best regards,
  Nobuhiro

> -----Original Message-----
> From: Jan Kiszka <[e-mail]>
> Sent: Friday, April 12, 2024 1:51 AM
> To: iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□ＤＩＴ○ＯＳＴ)
> <[e-mail]>; [e-mail];
> [e-mail]
> Cc: [e-mail]; [e-mail]
> Subject: Re: Generic x86 kernel configration (RE: [isar-cip-core][PATCH] Add
> support Plat'Home OpenBlocks IoT VX2)
> 
> Hi Nobuhiro,
> 
> thanks for picking this up!
> 
> On 05.04.24 09:39, [e-mail] wrote:
> > Hi all,
> >
> > First of all I created generic kernel configuration for x86 CIP reference
> hardware and performed boot tests.
> > The configurations of each device in cip-kernel-config are merged using
> KERNEL/scripts/kconfig/merge_config.sh.
> 
> This script will likely prioritize the choice of later-provided configs over those
> earlier listed. But we rather generally want that features enabled in one config
> are also enabled in the merged ones (superset).
> How could we achieve this? Probably most of the comments I would have on
> the ipc227e diff would relate to this.
> 
> Jan
> 
> > Also, booting is fine[2][3]. But there are a lot of differences in the
> > configurations[0][1], so I think we need to decide what to do with them.
> >
> > About M-COM x86, but I haven't investigated it yet.
> >
> > Best regards,
> >   Nobuhiro
> >
> > Merged config:
> >
> > https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/config
> > Diff with ipc227e original config [0]:
> >
> >
> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/siemens
> > _ipc227e_config.v6.1.83-cip18.diff
> > Diff with OpenBlocks IoT VX2 original config[1]:
> >
> >
> https://gitlab.com/iwamatsu/cip-merge-config-work/-/blob/master/platho
> > me_obsvx2_config.v6.1.83-cip18.diff
> > Kernel size:
> >     7760544 bytes
> >
> > ipc227e boot log (merged)[2]
> >     https://lava.ciplatform.org/scheduler/job/1113259
> >
> >
> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/ipc227e
> > -merged.log
> > ipc227e boot log (NO merged)
> >     https://lava.ciplatform.org/scheduler/job/1113356
> >
> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/ipc227e-
> NO-merged.log
> >     kernel size: 7251072 bytes
> > ipc227e boot log (diff)
> >
> >
> https://gitlab.com/iwamatsu/cip-merge-config-work/-/blob/master/ipc227
> > e.log.diff
> >
> > OpenBlocks IoT VX2 boot log (merged)[3]
> >     https://lava.ciplatform.org/scheduler/job/1113301
> >
> >
> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/obs-mer
> > ged.log OpenBlocks IoT VX2 boot log (NO merged)
> >     https://lava.ciplatform.org/scheduler/job/1113303
> >
> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/obs-no-
> merge.log
> >     kernel size: 9203296 bytes
> > OpenBlocks IoT VX2 boot log (diff)
> >
> >
> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/obs.log
> > .diff
> >
> >
> >> -----Original Message-----
> >> From: Jan Kiszka <[e-mail]>
> >> Sent: Tuesday, March 26, 2024 3:52 PM
> >> To: Benjamin Schilling <[e-mail]>;
> >> [e-mail]; iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□
> Ｄ
> >> ＩＴ○ＯＳＴ) <[e-mail]>
> >> Subject: Re: [isar-cip-core][PATCH] Add support Plat'Home OpenBlocks
> >> IoT
> >> VX2
> >>
> >> On 22.03.24 12:39, Benjamin Schilling wrote:
> >>> Hi all,
> >>>
> >>> I'm joining the discussion to start integrating the M-COM x86 support.
> >>> What's the status on the generic x86-64 target?
> >>>
> >>
> >> Nobuhiro wrote recently he has a prototype. Maybe he can share to
> >> finalize it together.
> >>
> >> Jan
> >>
> >> --
> >> Siemens AG, Technology
> >> Linux Expert Center
> 
> --
> Siemens AG, Technology
> Linux Expert Center

Quirin Gylstorff April 26, 2024, 1:21 p.m. UTC | #14

On 4/23/24 3:18 PM, Nobuhiro Iwamatsu via lists.cip-project.org wrote:
> Hi Jan,
> 
>> This script will likely prioritize the choice of later-provided configs over those
>> earlier listed. But we rather generally want that features enabled in one config
>> are also enabled in the merged ones (superset).
>> How could we achieve this? Probably most of the comments I would have on
>> the ipc227e diff would relate to this.
> 
> I see. I think we need to check the configuration of each device to achieve that.
> First I create a list of configs.

I look into using [merge_config.py]  instead of [merge_config.sh].
This looks promising as it takes the Kconfig of the kernel into account.
It still requires an make savedefconfig afterwards. `merge_config.py` 
shows warnings like:

Merged configuration 
'./cip-kernel-config/5.10.y-cip/x86/siemens_ipc227e_defconfig'
Merged configuration 
'./cip-kernel-config/5.10.y-cip/x86/plathome_obsvx2_defconfig'
warning: The int symbol BASE_SMALL (defined at init/Kconfig:2043) is 
being evaluated in a logical context somewhere. It will always evaluate 
to n.
warning: The int symbol ARCH_MMAP_RND_BITS_DEFAULT (defined at 
arch/Kconfig:732) is being evaluated in a logical context somewhere. It 
will always evaluate to n.
warning: The int symbol ARCH_MMAP_RND_COMPAT_BITS_DEFAULT (defined at 
arch/Kconfig:766) is being evaluated in a logical context somewhere. It 
will always evaluate to n.
warning: NFSD_V2_ACL (defined at fs/nfsd/Kconfig:34) has direct 
dependencies NFSD && NETWORK_FILESYSTEMS with value m, but is currently 
being y-selected by the following symbols:
  - NFSD_V3_ACL (defined at fs/nfsd/Kconfig:47), with value y, direct 
dependencies NFSD_V3 && NETWORK_FILESYSTEMS (value: y), and select 
condition NFSD_V3 && NETWORK_FILESYSTEMS (value: y)
No change to configuration in 
'/home/gylstorff/02_repos/cip-kernel-config/5.10.y-cip/x86/ipc227e_obsvx2.merged'
warning: PREEMPT_VOLUNTARY (defined at kernel/Kconfig.preempt:20) was 
assigned the value 'y' but got the value 'n' -- check dependencies
warning: KVM (defined at arch/x86/kvm/Kconfig:21) was assigned the value 
'm' but got the value 'n' -- check dependencies
warning: KVM_INTEL (defined at arch/x86/kvm/Kconfig:77) was assigned the 
value 'm' but got the value 'n' -- check dependencies


[merge_config.py]: 
https://github.com/ulfalizer/Kconfiglib/blob/master/examples/merge_config.py
[merge_config.sh]: 
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/scripts/kconfig/merge_config.sh

Best regards

Quirin

> 
> Best regards,
>    Nobuhiro
> 
>> -----Original Message-----
>> From: Jan Kiszka <[e-mail]>
>> Sent: Friday, April 12, 2024 1:51 AM
>> To: iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□ＤＩＴ○ＯＳＴ)
>> <[e-mail]>; [e-mail];
>> [e-mail]
>> Cc: [e-mail]; [e-mail]
>> Subject: Re: Generic x86 kernel configration (RE: [isar-cip-core][PATCH] Add
>> support Plat'Home OpenBlocks IoT VX2)
>>
>> Hi Nobuhiro,
>>
>> thanks for picking this up!
>>
>> On 05.04.24 09:39, [e-mail] wrote:
>>> Hi all,
>>>
>>> First of all I created generic kernel configuration for x86 CIP reference
>> hardware and performed boot tests.
>>> The configurations of each device in cip-kernel-config are merged using
>> KERNEL/scripts/kconfig/merge_config.sh.
>>
>> This script will likely prioritize the choice of later-provided configs over those
>> earlier listed. But we rather generally want that features enabled in one config
>> are also enabled in the merged ones (superset).
>> How could we achieve this? Probably most of the comments I would have on
>> the ipc227e diff would relate to this.
>>
>> Jan
>>
>>> Also, booting is fine[2][3]. But there are a lot of differences in the
>>> configurations[0][1], so I think we need to decide what to do with them.
>>>
>>> About M-COM x86, but I haven't investigated it yet.
>>>
>>> Best regards,
>>>    Nobuhiro
>>>
>>> Merged config:
>>>
>>> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/config
>>> Diff with ipc227e original config [0]:
>>>
>>>
>> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/siemens
>>> _ipc227e_config.v6.1.83-cip18.diff
>>> Diff with OpenBlocks IoT VX2 original config[1]:
>>>
>>>
>> https://gitlab.com/iwamatsu/cip-merge-config-work/-/blob/master/platho
>>> me_obsvx2_config.v6.1.83-cip18.diff
>>> Kernel size:
>>>      7760544 bytes
>>>
>>> ipc227e boot log (merged)[2]
>>>      https://lava.ciplatform.org/scheduler/job/1113259
>>>
>>>
>> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/ipc227e
>>> -merged.log
>>> ipc227e boot log (NO merged)
>>>      https://lava.ciplatform.org/scheduler/job/1113356
>>>
>> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/ipc227e-
>> NO-merged.log
>>>      kernel size: 7251072 bytes
>>> ipc227e boot log (diff)
>>>
>>>
>> https://gitlab.com/iwamatsu/cip-merge-config-work/-/blob/master/ipc227
>>> e.log.diff
>>>
>>> OpenBlocks IoT VX2 boot log (merged)[3]
>>>      https://lava.ciplatform.org/scheduler/job/1113301
>>>
>>>
>> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/obs-mer
>>> ged.log OpenBlocks IoT VX2 boot log (NO merged)
>>>      https://lava.ciplatform.org/scheduler/job/1113303
>>>
>> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/obs-no-
>> merge.log
>>>      kernel size: 9203296 bytes
>>> OpenBlocks IoT VX2 boot log (diff)
>>>
>>>
>> https://gitlab.com/iwamatsu/cip-merge-config-work/-/raw/master/obs.log
>>> .diff
>>>
>>>
>>>> -----Original Message-----
>>>> From: Jan Kiszka <[e-mail]>
>>>> Sent: Tuesday, March 26, 2024 3:52 PM
>>>> To: Benjamin Schilling <[e-mail]>;
>>>> [e-mail]; iwamatsu nobuhiro(岩松 信洋 ○ＤＩＴＣ□
>> Ｄ
>>>> ＩＴ○ＯＳＴ) <[e-mail]>
>>>> Subject: Re: [isar-cip-core][PATCH] Add support Plat'Home OpenBlocks
>>>> IoT
>>>> VX2
>>>>
>>>> On 22.03.24 12:39, Benjamin Schilling wrote:
>>>>> Hi all,
>>>>>
>>>>> I'm joining the discussion to start integrating the M-COM x86 support.
>>>>> What's the status on the generic x86-64 target?
>>>>>
>>>>
>>>> Nobuhiro wrote recently he has a prototype. Maybe he can share to
>>>> finalize it together.
>>>>
>>>> Jan
>>>>
>>>> --
>>>> Siemens AG, Technology
>>>> Linux Expert Center
>>
>> --
>> Siemens AG, Technology
>> Linux Expert Center
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#15741): https://lists.cip-project.org/g/cip-dev/message/15741
>> Mute This Topic: https://lists.cip-project.org/mt/105344534/1753640
>> Group Owner: [e-mail]
>> Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129121/1753640/1405269326/xyzzy [[e-mail]]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>

Patch

diff --git a/Kconfig b/Kconfig
index ec49631..778acf6 100644
--- a/Kconfig
+++ b/Kconfig
@@ -67,6 +67,9 @@  config TARGET_QEMU_RISCV64
 	bool "QEMU RISC-V 64-bit (riscv64)"
 	select ARCH_RISCV64
 
+config TARGET_OBS_IOT_VX2
+	bool "Plat'Home OpenBlocks IoT VX2"
+	select ARCH_AMD64
 endchoice
 
 config KAS_INCLUDE_BOARD
@@ -79,6 +82,7 @@  config KAS_INCLUDE_BOARD
 	default "kas/board/bbb.yml" if TARGET_BBB
 	default "kas/board/iwg20m.yml" if TARGET_IWG20D
 	default "kas/board/qemu-riscv64.yml" if TARGET_QEMU_RISCV64
+	default "kas/board/openblocks-iot-vx2.yml" if TARGET_OBS_IOT_VX2
 
 comment "Kernel options"
 
diff --git a/conf/machine/openblocks-iot-vx2.conf b/conf/machine/openblocks-iot-vx2.conf
new file mode 100644
index 0000000..a9bf65d
--- /dev/null
+++ b/conf/machine/openblocks-iot-vx2.conf
@@ -0,0 +1,15 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+# Copyright (c) TOSHIBA CORPORATION, 2023
+#
+# SPDX-License-Identifier: MIT
+#
+
+DISTRO_ARCH = "amd64"
+
+IMAGE_FSTYPES ?= "wic"
+IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
+USE_CIP_KERNEL_CONFIG = "1"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/plathome_obsvx2_defconfig"
diff --git a/kas/board/openblocks-iot-vx2.yml b/kas/board/openblocks-iot-vx2.yml
new file mode 100644
index 0000000..6951e2e
--- /dev/null
+++ b/kas/board/openblocks-iot-vx2.yml
@@ -0,0 +1,15 @@ 
+#
+# CIP Core, generic profile
+#
+# TOSHIBA CORPORATION, 2023
+#
+# Authors:
+#  Nobuhiro Iwamatsu <[e-mail]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 12
+
+machine: openblocks-iot-vx2
diff --git a/wic/openblocks-iot-vx2.wks b/wic/openblocks-iot-vx2.wks
new file mode 100644
index 0000000..3050684
--- /dev/null
+++ b/wic/openblocks-iot-vx2.wks
@@ -0,0 +1,15 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+#
+# SPDX-License-Identifier: MIT
+#
+# Based wic/simatic-ipc227e.wks
+#
+
+part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --label efi --part-type EF00 --align 1024
+
+part / --source rootfs --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid
+
+bootloader --ptable gpt --timeout 2 --append "console=ttyS0,115200"