* Re: [isar-cip-core][PATCH 4/4] enable cip-core-image-kernelci
From: Jan Kiszka @ 2022-01-07 11:18 UTC (permalink / raw)
To: Alice Ferrazzi; +Cc: cip-dev
In-Reply-To: <CANgtXuNUWt4ez6O5pgeJid3avitUq=fiOnVQk_+opA+Q-aTf+A@mail.gmail.com>
On 07.01.22 11:23, Alice Ferrazzi wrote:
> On Fri, Jan 7, 2022 at 7:07 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>>
>> On 07.01.22 11:02, Alice Ferrazzi wrote:
>>> On Thu, Jan 6, 2022 at 11:12 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>>>>
>>>> On 06.01.22 12:16, Alice Ferrazzi wrote:
>>>>> enable CIP core image KernelCI to be built with gitlab pipeline
>>>>> and uploaded to the KernelCI storage using KernelCI API.
>>>>> enable cip-core-image-kernelci to be built for amd64, arm and arm64.
>>>>>
>>>>> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
>>>>> ---
>>>>> .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
>>>>> 1 file changed, 39 insertions(+), 1 deletion(-)
>>>>>
>>>>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>>>>> index e7db8c1..784343b 100644
>>>>> --- a/.gitlab-ci.yml
>>>>> +++ b/.gitlab-ci.yml
>>>>> @@ -9,6 +9,7 @@ variables:
>>>>> targz: disable
>>>>> dtb: none
>>>>> deploy: enable
>>>>> + deploy_kernelci: disable
>>>>>
>>>>> stages:
>>>>> - build
>>>>> @@ -37,7 +38,8 @@ default:
>>>>> - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
>>>>> - echo "Building ${base_yaml}"
>>>>> - kas build ${base_yaml}
>>>>> - - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
>>>>> + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi;
>>>>> + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi
>>>>
>>>> Does gitlab-ci forces us to add that closing ; to the last-but-one
>>>> command? If so, better add it to the new from the beginning.
>>>>
>>>
>>> I'm just following the syntax that is already there.
>>> The gitlab-ci.yml file syntax preceding my commit is also doing same
>>> thing of adding that closing ; to the last-but-one command.
>>> You can check it here
>>> https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40
>>>
>>
>> Then, if the closing semicolon is needed, add it to the new line as well
>> to avoid having to touch that when adding the next one.
>
> sorry I'm not understanding what you want me to do.
> The closing semicolon is needed to the last-but-one command.
> Adding it to the last command break the script.
>
Are you really sure about the closing semicolon?
https://gitlab.com/jan-kiszka/ci-test/-/jobs/1951623081
https://gitlab.com/jan-kiszka/ci-test/-/blob/semicolon/.gitlab-ci.yml
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply
* Re: [isar-cip-core][PATCH 4/4] enable cip-core-image-kernelci
From: Alice Ferrazzi @ 2022-01-07 10:23 UTC (permalink / raw)
To: Jan Kiszka; +Cc: cip-dev
In-Reply-To: <65c523ba-cfaa-877c-e36c-1f0a6eec4602@siemens.com>
On Fri, Jan 7, 2022 at 7:07 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>
> On 07.01.22 11:02, Alice Ferrazzi wrote:
> > On Thu, Jan 6, 2022 at 11:12 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
> >>
> >> On 06.01.22 12:16, Alice Ferrazzi wrote:
> >>> enable CIP core image KernelCI to be built with gitlab pipeline
> >>> and uploaded to the KernelCI storage using KernelCI API.
> >>> enable cip-core-image-kernelci to be built for amd64, arm and arm64.
> >>>
> >>> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> >>> ---
> >>> .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
> >>> 1 file changed, 39 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> >>> index e7db8c1..784343b 100644
> >>> --- a/.gitlab-ci.yml
> >>> +++ b/.gitlab-ci.yml
> >>> @@ -9,6 +9,7 @@ variables:
> >>> targz: disable
> >>> dtb: none
> >>> deploy: enable
> >>> + deploy_kernelci: disable
> >>>
> >>> stages:
> >>> - build
> >>> @@ -37,7 +38,8 @@ default:
> >>> - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
> >>> - echo "Building ${base_yaml}"
> >>> - kas build ${base_yaml}
> >>> - - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
> >>> + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi;
> >>> + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi
> >>
> >> Does gitlab-ci forces us to add that closing ; to the last-but-one
> >> command? If so, better add it to the new from the beginning.
> >>
> >
> > I'm just following the syntax that is already there.
> > The gitlab-ci.yml file syntax preceding my commit is also doing same
> > thing of adding that closing ; to the last-but-one command.
> > You can check it here
> > https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40
> >
>
> Then, if the closing semicolon is needed, add it to the new line as well
> to avoid having to touch that when adding the next one.
sorry I'm not understanding what you want me to do.
The closing semicolon is needed to the last-but-one command.
Adding it to the last command break the script.
--
Thanks,
Alicef
======================================
Cybertrust Japan Co.,Ltd.
Alice Ferrazzi
alice.ferrazzi@miraclelinux.com
======================================
^ permalink raw reply
* Re: [isar-cip-core][PATCH 0/4] Add cip-core-image-kernelci building and uploading system
From: Jan Kiszka @ 2022-01-07 10:22 UTC (permalink / raw)
To: Alice Ferrazzi, cip-dev
In-Reply-To: <CANgtXuPc0_27ZCR7au1e-C3y+-7De-nZQ2ddmjKAinT7Cm09_A@mail.gmail.com>
On 07.01.22 11:19, Alice Ferrazzi wrote:
> On Fri, Jan 7, 2022 at 7:11 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>>
>> On 07.01.22 10:57, Alice Ferrazzi wrote:
>>> On Thu, Jan 6, 2022 at 11:18 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>>>>
>>>> On 06.01.22 12:16, Alice Ferrazzi wrote:
>>>>> This patch series add a new image with settings for
>>>>> KernelCI.
>>>>>
>>>>> This new image is called cip-core-image-kernelci and is
>>>>> based on isar-cip-core general image with some changes
>>>>> needed for make it work with KernelCI and taken from
>>>>> KernelCI image base settings.
>>>>> The cip-core-image-kernelci images are built by GitlabCI
>>>>> and uploaded to KernelCI production fileserver.
>>>>> https://storage.kernelci.org/images/rootfs/cip/
>>>>>
>>>>> These patches are already integrated in the
>>>>> isar-cip-core:alicef/kernelci_master_refactor repository branch
>>>>> and are generating the images that are currently
>>>>> used by KernelCI.
>>>>>
>>>>> cip-core-image-kernelci as been tested and are
>>>>> already used in KernelCI production with good results.
>>>>> https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/
>>>>>
>>>>
>>>> Thanks a lot for enabling this!
>>>>
>>>> One meta-question: How does this image relate to what happens to a
>>>> standard image when adding kas/opt/test.yml? Does
>>>> kas/opt/kernelci.yml:kas/opt/test.yml make sense? Or should the former
>>>> actually include the latter?
>>>
>>> Currently it doesn't make too much sense to add such testing packages.
>>> CIP kernel image testing is done using ad-hoc images with a KernelCI
>>> built version of the
>>> testing packages for having a common base and better compare results
>>> with other kernels.
>>> cip-core-image-kernelci is currently tested as booting image with
>>> dmesg checks for each kernel (but still using specific KernelCI
>>> configurations and scripts).
>>> We are currently trying to implement the iec-security test as user
>>> space test that will use cip-core-image-kernelci,
>>> I sent a pull request for implementing the user space test
>>> iec-security but is still in progress.
>>> Because KernelCI testings and test environments differs from CIP
>>> gitlab pipeline test environment,
>>> we have to use a different file and merging both would currently make
>>> such different environments unstable.
>>>
>>> I hope that this answer your question.
>>
>> Ok, we just need to keep an eye on target configs and options that deal
>> with "testing" so that things are consistent and intuitive.
>>
>>>
>>>> These things you may ask yourself when try to add the image also to our
>>>> Kconfig menu ("kas-container menu"). That would be nice to have for a v3
>>>> as well, but more important is sorting out the option relationships.
>>>
>>> cip-core-image-kernelci are build using gitlab pipeline and there is
>>> currently no benefit to have such
>>> images manual build.
>>>
>>
>> So, the case that a test fails on kernel CI and someone want to
>> reproduce the image that triggered this does not exist? One would rather
>> build a regular image for the target then?
>>
>
> Why not just using the pre made image from
> https://storage.kernelci.org/images/rootfs/cip/
> for reproducing errors ?
Fine, as long as you do not need to adjust things in it afterwards.
Granted, such cases will be less common.
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply
* Re: [isar-cip-core][PATCH 0/4] Add cip-core-image-kernelci building and uploading system
From: Alice Ferrazzi @ 2022-01-07 10:20 UTC (permalink / raw)
To: Jan Kiszka; +Cc: cip-dev
In-Reply-To: <b0bd23e7-2ad9-69c7-41a7-bed2b3db7009@siemens.com>
On Fri, Jan 7, 2022 at 7:11 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>
> On 07.01.22 10:57, Alice Ferrazzi wrote:
> > On Thu, Jan 6, 2022 at 11:18 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
> >>
> >> On 06.01.22 12:16, Alice Ferrazzi wrote:
> >>> This patch series add a new image with settings for
> >>> KernelCI.
> >>>
> >>> This new image is called cip-core-image-kernelci and is
> >>> based on isar-cip-core general image with some changes
> >>> needed for make it work with KernelCI and taken from
> >>> KernelCI image base settings.
> >>> The cip-core-image-kernelci images are built by GitlabCI
> >>> and uploaded to KernelCI production fileserver.
> >>> https://storage.kernelci.org/images/rootfs/cip/
> >>>
> >>> These patches are already integrated in the
> >>> isar-cip-core:alicef/kernelci_master_refactor repository branch
> >>> and are generating the images that are currently
> >>> used by KernelCI.
> >>>
> >>> cip-core-image-kernelci as been tested and are
> >>> already used in KernelCI production with good results.
> >>> https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/
> >>>
> >>
> >> Thanks a lot for enabling this!
> >>
> >> One meta-question: How does this image relate to what happens to a
> >> standard image when adding kas/opt/test.yml? Does
> >> kas/opt/kernelci.yml:kas/opt/test.yml make sense? Or should the former
> >> actually include the latter?
> >
> > Currently it doesn't make too much sense to add such testing packages.
> > CIP kernel image testing is done using ad-hoc images with a KernelCI
> > built version of the
> > testing packages for having a common base and better compare results
> > with other kernels.
> > cip-core-image-kernelci is currently tested as booting image with
> > dmesg checks for each kernel (but still using specific KernelCI
> > configurations and scripts).
> > We are currently trying to implement the iec-security test as user
> > space test that will use cip-core-image-kernelci,
> > I sent a pull request for implementing the user space test
> > iec-security but is still in progress.
> > Because KernelCI testings and test environments differs from CIP
> > gitlab pipeline test environment,
> > we have to use a different file and merging both would currently make
> > such different environments unstable.
> >
> > I hope that this answer your question.
>
> Ok, we just need to keep an eye on target configs and options that deal
> with "testing" so that things are consistent and intuitive.
>
> >
> >> These things you may ask yourself when try to add the image also to our
> >> Kconfig menu ("kas-container menu"). That would be nice to have for a v3
> >> as well, but more important is sorting out the option relationships.
> >
> > cip-core-image-kernelci are build using gitlab pipeline and there is
> > currently no benefit to have such
> > images manual build.
> >
>
> So, the case that a test fails on kernel CI and someone want to
> reproduce the image that triggered this does not exist? One would rather
> build a regular image for the target then?
>
Why not just using the pre made image from
https://storage.kernelci.org/images/rootfs/cip/
for reproducing errors ?
Thanks,
Alicef
--
======================================
Cybertrust Japan Co.,Ltd.
Alice Ferrazzi
alice.ferrazzi@miraclelinux.com
======================================
^ permalink raw reply
* Re: [isar-cip-core][PATCH 1/4] Add cip-core-image-kernelci
From: Alice Ferrazzi @ 2022-01-07 10:16 UTC (permalink / raw)
To: Jan Kiszka; +Cc: cip-dev
In-Reply-To: <e4a55c2b-64dd-6281-c9d9-bf568a6fb732@siemens.com>
On Thu, Jan 6, 2022 at 11:01 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>
> On 06.01.22 12:16, Alice Ferrazzi wrote:
> > This image is currently used by KernelCI production for testing purpose.
> > The purpose of this image is that KernelCI need to be able to autologin
> > without password and to detect the login shell using special characters.
> > Currently added are the default settings used by KernelCI images.
> >
> > Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> > ---
> > kas/opt/kernelci.yml | 16 +++++++++
> > .../images/cip-core-image-kernelci.bb | 16 +++++++++
> > .../files/99-silent-printk.conf | 1 +
> > .../kernelci-customizations/files/ethernet | 23 +++++++++++++
> > .../kernelci-customizations/files/postinst | 34 +++++++++++++++++++
> > .../kernelci-customizations.bb | 34 +++++++++++++++++++
> > 6 files changed, 124 insertions(+)
> > create mode 100644 kas/opt/kernelci.yml
> > create mode 100644 recipes-core/images/cip-core-image-kernelci.bb
> > create mode 100644 recipes-core/kernelci-customizations/files/99-silent-printk.conf
> > create mode 100644 recipes-core/kernelci-customizations/files/ethernet
> > create mode 100644 recipes-core/kernelci-customizations/files/postinst
> > create mode 100644 recipes-core/kernelci-customizations/kernelci-customizations.bb
> >
> > diff --git a/kas/opt/kernelci.yml b/kas/opt/kernelci.yml
> > new file mode 100644
> > index 0000000..9c67864
> > --- /dev/null
> > +++ b/kas/opt/kernelci.yml
> > @@ -0,0 +1,16 @@
> > +#
> > +# CIP Core, generic profile
> > +#
> > +# Copyright (c) Toshiba Corporation, 2020
> > +# Copyright (c) Cybertrust Japan Co., Ltd., 2021
> > +#
> > +# Authors:
> > +# Venkata Pyla <venkata.pyla@toshiba-tsip.com>
> > +# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> > +#
> > +# SPDX-License-Identifier: MIT
> > +#
> > +header:
> > + version: 10
> > +
> > +target: cip-core-image-kernelci
> > diff --git a/recipes-core/images/cip-core-image-kernelci.bb b/recipes-core/images/cip-core-image-kernelci.bb
> > new file mode 100644
> > index 0000000..479c14c
> > --- /dev/null
> > +++ b/recipes-core/images/cip-core-image-kernelci.bb
> > @@ -0,0 +1,16 @@
> > +#
> > +# A reference image for KernelCI
> > +#
> > +# Copyright (c) Cybertrust Japan Co., Ltd., 2021
> > +#
> > +# Authors:
> > +# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> > +#
> > +# SPDX-License-Identifier: MIT
> > +#
> > +
> > +inherit image
> > +
> > +DESCRIPTION = "CIP Core image for KernelCI"
> > +
> > +IMAGE_INSTALL += "kernelci-customizations"
> > diff --git a/recipes-core/kernelci-customizations/files/99-silent-printk.conf b/recipes-core/kernelci-customizations/files/99-silent-printk.conf
> > new file mode 100644
> > index 0000000..ad24d3a
> > --- /dev/null
> > +++ b/recipes-core/kernelci-customizations/files/99-silent-printk.conf
> > @@ -0,0 +1 @@
> > +kernel.printk = 3 4 1 3
> > diff --git a/recipes-core/kernelci-customizations/files/ethernet b/recipes-core/kernelci-customizations/files/ethernet
> > new file mode 100644
> > index 0000000..fa47d1a
> > --- /dev/null
> > +++ b/recipes-core/kernelci-customizations/files/ethernet
> > @@ -0,0 +1,23 @@
> > +#
> > +# CIP Core, generic profile
> > +#
> > +# Copyright (c) Siemens AG, 2019
> > +#
> > +# Authors:
> > +# Jan Kiszka <jan.kiszka@siemens.com>
> > +#
> > +# SPDX-License-Identifier: MIT
> > +#
> > +
> > +allow-hotplug eth0
> > +allow-hotplug enp0s2
> > +allow-hotplug enp2s0
> > +
> > +# used on BBB
> > +iface eth0 inet dhcp
> > +
> > +# used on qemu-amd64
> > +iface enp0s2 inet dhcp
> > +
> > +# used on simatic-ipc227e
> > +iface enp2s0 inet dhcp
> > diff --git a/recipes-core/kernelci-customizations/files/postinst b/recipes-core/kernelci-customizations/files/postinst
> > new file mode 100644
> > index 0000000..7ae30e8
> > --- /dev/null
> > +++ b/recipes-core/kernelci-customizations/files/postinst
> > @@ -0,0 +1,34 @@
> > +#!/bin/sh
> > +#
> > +# CIP Core, generic profile
> > +#
> > +# Copyright (c) Siemens AG, 2019
> > +# Copyright (c) Cybertrust Japan Co., Ltd., 2021
> > +#
> > +# Authors:
> > +# Jan Kiszka <jan.kiszka@siemens.com>
> > +# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> > +#
> > +# SPDX-License-Identifier: MIT
> > +#
> > +
> > +echo "CIP Core Demo & Test Image" > /etc/issue
> > +
> > +# permit root login without password
> > +echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
> > +echo "PermitEmptyPasswords yes" >> /etc/ssh/sshd_config
> > +passwd root -d
> > +
> > +# serial getty service for autologin
> > +mkdir -p /etc/systemd/system/serial-getty@.service.d/
> > +echo "[Service]" > /etc/systemd/system/serial-getty@.service.d/override.conf
> > +echo "ExecStart=" >> /etc/systemd/system/serial-getty@.service.d/override.conf
> > +echo "ExecStart=-/sbin/agetty --autologin root --keep-baud 115200,38400,9600 %I $TERM" >> /etc/systemd/system/serial-getty@.service.d/override.conf
> > +
> > +# set the profile for KernelCI
> > +echo "PS1='\$(pwd) # '" > /root/.profile
> > +echo "cd /" >> /root/.profile
> > +
> > +HOSTNAME=demo
> > +echo "$HOSTNAME" > /etc/hostname
> > +echo "127.0.0.1 $HOSTNAME" >> /etc/hosts
> > diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb
> > new file mode 100644
> > index 0000000..dca0891
> > --- /dev/null
> > +++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb
> > @@ -0,0 +1,34 @@
> > +#
> > +# CIP Core, generic profile
> > +#
> > +# Copyright (c) Siemens AG, 2019
> > +# Copyright (c) Cybertrust Japan Co., Ltd., 2021
> > +#
> > +# Authors:
> > +# Jan Kiszka <jan.kiszka@siemens.com>
> > +# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> > +#
> > +# SPDX-License-Identifier: MIT
> > +#
> > +
> > +inherit dpkg-raw
> > +
> > +DESCRIPTION = "CIP Core image demo & customizations"
> > +
> > +SRC_URI = " \
> > + file://postinst \
> > + file://ethernet \
> > + file://99-silent-printk.conf"
> > +
> > +DEPENDS += "sshd-regen-keys"
> > +
> > +DEBIAN_DEPENDS = " \
> > + ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys"
> > +
> > +do_install() {
> > + install -v -d ${D}/etc/network/interfaces.d
> > + install -v -m 644 ${WORKDIR}/ethernet ${D}/etc/network/interfaces.d/
> > +
> > + install -v -d ${D}/etc/sysctl.d
> > + install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/
> > +}
>
> This is duplicating the default customization package, IIUC, for the
> purpose of adding further things. And you already miss some things due
> to this (WIRELESS_FIRMWARE_PACKAGE, INSTALL_WIRELESS_TOOLS).
>
> How about installing both and carrying in kernelci-customization only
> the delta? Or at least reuse artifacts from customizations package, e.g.
> via symlinks?
KernelCI enviroment and gitlab-ci eviroment are mostly different.
Changes on the symlink could possibly broke the KernelCI testing
image or the gitlab-ci image.
KernelCI working workflow is to have different files and porting changes
manually so that we can be sure it doesn't create problems and revert
on necessity.
Thanks,
Alicef
--
======================================
Cybertrust Japan Co.,Ltd.
Alice Ferrazzi
alice.ferrazzi@miraclelinux.com
======================================
^ permalink raw reply
* Re: [isar-cip-core][PATCH 0/4] Add cip-core-image-kernelci building and uploading system
From: Jan Kiszka @ 2022-01-07 10:10 UTC (permalink / raw)
To: Alice Ferrazzi; +Cc: cip-dev
In-Reply-To: <CANgtXuNVEsC3pa2Tzz6a7i65uJap+Ga7yGSobC9UZZbwYds5cw@mail.gmail.com>
On 07.01.22 10:57, Alice Ferrazzi wrote:
> On Thu, Jan 6, 2022 at 11:18 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>>
>> On 06.01.22 12:16, Alice Ferrazzi wrote:
>>> This patch series add a new image with settings for
>>> KernelCI.
>>>
>>> This new image is called cip-core-image-kernelci and is
>>> based on isar-cip-core general image with some changes
>>> needed for make it work with KernelCI and taken from
>>> KernelCI image base settings.
>>> The cip-core-image-kernelci images are built by GitlabCI
>>> and uploaded to KernelCI production fileserver.
>>> https://storage.kernelci.org/images/rootfs/cip/
>>>
>>> These patches are already integrated in the
>>> isar-cip-core:alicef/kernelci_master_refactor repository branch
>>> and are generating the images that are currently
>>> used by KernelCI.
>>>
>>> cip-core-image-kernelci as been tested and are
>>> already used in KernelCI production with good results.
>>> https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/
>>>
>>
>> Thanks a lot for enabling this!
>>
>> One meta-question: How does this image relate to what happens to a
>> standard image when adding kas/opt/test.yml? Does
>> kas/opt/kernelci.yml:kas/opt/test.yml make sense? Or should the former
>> actually include the latter?
>
> Currently it doesn't make too much sense to add such testing packages.
> CIP kernel image testing is done using ad-hoc images with a KernelCI
> built version of the
> testing packages for having a common base and better compare results
> with other kernels.
> cip-core-image-kernelci is currently tested as booting image with
> dmesg checks for each kernel (but still using specific KernelCI
> configurations and scripts).
> We are currently trying to implement the iec-security test as user
> space test that will use cip-core-image-kernelci,
> I sent a pull request for implementing the user space test
> iec-security but is still in progress.
> Because KernelCI testings and test environments differs from CIP
> gitlab pipeline test environment,
> we have to use a different file and merging both would currently make
> such different environments unstable.
>
> I hope that this answer your question.
Ok, we just need to keep an eye on target configs and options that deal
with "testing" so that things are consistent and intuitive.
>
>> These things you may ask yourself when try to add the image also to our
>> Kconfig menu ("kas-container menu"). That would be nice to have for a v3
>> as well, but more important is sorting out the option relationships.
>
> cip-core-image-kernelci are build using gitlab pipeline and there is
> currently no benefit to have such
> images manual build.
>
So, the case that a test fails on kernel CI and someone want to
reproduce the image that triggered this does not exist? One would rather
build a regular image for the target then?
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply
* Re: [isar-cip-core][PATCH 4/4] enable cip-core-image-kernelci
From: Jan Kiszka @ 2022-01-07 10:07 UTC (permalink / raw)
To: Alice Ferrazzi; +Cc: cip-dev
In-Reply-To: <CANgtXuMOv+rJYyEMC0CgZsap0YETmAt30S5ia5x6+W+ppKKRoQ@mail.gmail.com>
On 07.01.22 11:02, Alice Ferrazzi wrote:
> On Thu, Jan 6, 2022 at 11:12 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>>
>> On 06.01.22 12:16, Alice Ferrazzi wrote:
>>> enable CIP core image KernelCI to be built with gitlab pipeline
>>> and uploaded to the KernelCI storage using KernelCI API.
>>> enable cip-core-image-kernelci to be built for amd64, arm and arm64.
>>>
>>> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
>>> ---
>>> .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
>>> 1 file changed, 39 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>>> index e7db8c1..784343b 100644
>>> --- a/.gitlab-ci.yml
>>> +++ b/.gitlab-ci.yml
>>> @@ -9,6 +9,7 @@ variables:
>>> targz: disable
>>> dtb: none
>>> deploy: enable
>>> + deploy_kernelci: disable
>>>
>>> stages:
>>> - build
>>> @@ -37,7 +38,8 @@ default:
>>> - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
>>> - echo "Building ${base_yaml}"
>>> - kas build ${base_yaml}
>>> - - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
>>> + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi;
>>> + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi
>>
>> Does gitlab-ci forces us to add that closing ; to the last-but-one
>> command? If so, better add it to the new from the beginning.
>>
>
> I'm just following the syntax that is already there.
> The gitlab-ci.yml file syntax preceding my commit is also doing same
> thing of adding that closing ; to the last-but-one command.
> You can check it here
> https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40
>
Then, if the closing semicolon is needed, add it to the new line as well
to avoid having to touch that when adding the next one.
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply
* Re: [isar-cip-core][PATCH 4/4] enable cip-core-image-kernelci
From: Alice Ferrazzi @ 2022-01-07 10:02 UTC (permalink / raw)
To: Jan Kiszka; +Cc: cip-dev
In-Reply-To: <c8e9fcb9-eded-90fb-98cc-f766a7a9fbf3@siemens.com>
On Thu, Jan 6, 2022 at 11:12 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>
> On 06.01.22 12:16, Alice Ferrazzi wrote:
> > enable CIP core image KernelCI to be built with gitlab pipeline
> > and uploaded to the KernelCI storage using KernelCI API.
> > enable cip-core-image-kernelci to be built for amd64, arm and arm64.
> >
> > Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> > ---
> > .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
> > 1 file changed, 39 insertions(+), 1 deletion(-)
> >
> > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> > index e7db8c1..784343b 100644
> > --- a/.gitlab-ci.yml
> > +++ b/.gitlab-ci.yml
> > @@ -9,6 +9,7 @@ variables:
> > targz: disable
> > dtb: none
> > deploy: enable
> > + deploy_kernelci: disable
> >
> > stages:
> > - build
> > @@ -37,7 +38,8 @@ default:
> > - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
> > - echo "Building ${base_yaml}"
> > - kas build ${base_yaml}
> > - - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
> > + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi;
> > + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi
>
> Does gitlab-ci forces us to add that closing ; to the last-but-one
> command? If so, better add it to the new from the beginning.
>
I'm just following the syntax that is already there.
The gitlab-ci.yml file syntax preceding my commit is also doing same
thing of adding that closing ; to the last-but-one command.
You can check it here
https://gitlab.com/cip-project/cip-core/isar-cip-core/-/blob/master/.gitlab-ci.yml#L40
Thanks,
Alice
--
======================================
Cybertrust Japan Co.,Ltd.
Alice Ferrazzi
alice.ferrazzi@miraclelinux.com
======================================
^ permalink raw reply
* Re: [isar-cip-core][PATCH 0/4] Add cip-core-image-kernelci building and uploading system
From: Alice Ferrazzi @ 2022-01-07 9:57 UTC (permalink / raw)
To: Jan Kiszka; +Cc: cip-dev
In-Reply-To: <5f7b82d7-cda1-192c-9a09-e229fb1c3339@siemens.com>
On Thu, Jan 6, 2022 at 11:18 PM Jan Kiszka <jan.kiszka@siemens.com> wrote:
>
> On 06.01.22 12:16, Alice Ferrazzi wrote:
> > This patch series add a new image with settings for
> > KernelCI.
> >
> > This new image is called cip-core-image-kernelci and is
> > based on isar-cip-core general image with some changes
> > needed for make it work with KernelCI and taken from
> > KernelCI image base settings.
> > The cip-core-image-kernelci images are built by GitlabCI
> > and uploaded to KernelCI production fileserver.
> > https://storage.kernelci.org/images/rootfs/cip/
> >
> > These patches are already integrated in the
> > isar-cip-core:alicef/kernelci_master_refactor repository branch
> > and are generating the images that are currently
> > used by KernelCI.
> >
> > cip-core-image-kernelci as been tested and are
> > already used in KernelCI production with good results.
> > https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/
> >
>
> Thanks a lot for enabling this!
>
> One meta-question: How does this image relate to what happens to a
> standard image when adding kas/opt/test.yml? Does
> kas/opt/kernelci.yml:kas/opt/test.yml make sense? Or should the former
> actually include the latter?
Currently it doesn't make too much sense to add such testing packages.
CIP kernel image testing is done using ad-hoc images with a KernelCI
built version of the
testing packages for having a common base and better compare results
with other kernels.
cip-core-image-kernelci is currently tested as booting image with
dmesg checks for each kernel (but still using specific KernelCI
configurations and scripts).
We are currently trying to implement the iec-security test as user
space test that will use cip-core-image-kernelci,
I sent a pull request for implementing the user space test
iec-security but is still in progress.
Because KernelCI testings and test environments differs from CIP
gitlab pipeline test environment,
we have to use a different file and merging both would currently make
such different environments unstable.
I hope that this answer your question.
> These things you may ask yourself when try to add the image also to our
> Kconfig menu ("kas-container menu"). That would be nice to have for a v3
> as well, but more important is sorting out the option relationships.
cip-core-image-kernelci are build using gitlab pipeline and there is
currently no benefit to have such
images manual build.
Thanks,
Alice
--
======================================
Cybertrust Japan Co.,Ltd.
Alice Ferrazzi
alice.ferrazzi@miraclelinux.com
======================================
^ permalink raw reply
* Re: [cip-dev] [PATCH 5.10.y-cip 00/31] Add sound/adc support for RZ/G2L
From: Pavel Machek @ 2022-01-06 23:54 UTC (permalink / raw)
To: Prabhakar Mahadev Lad
Cc: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu, Pavel Machek,
Biju Das
In-Reply-To: <OSZPR01MB701986387CEBA39F8BC4DAD5AA4C9@OSZPR01MB7019.jpnprd01.prod.outlook.com>
[-- Attachment #1: Type: text/plain, Size: 722 bytes --]
Hi!
> > Hi All,
> >
> > This patch series adds Sound and ADC support for Renesas RZ/G2L SoC and enables RIIC/SOUND/CANFD/ADC
> > on Renesas SMARC EVK.
> >
> > I have also included the missing driver patch for riic and kernel configs.
> >
> > All the patches have been cherry picked from v5.16-rc7.
> >
> Do you want me to separate out audio related patches and just send the ADC for now until the audio patch comments are resolved/fixed?
>
Yes, I was thinking about that, too. That would be easy way forward.
Thank you and best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
^ permalink raw reply
* Re: [isar-cip-core][PATCH 0/4] Add cip-core-image-kernelci building and uploading system
From: Jan Kiszka @ 2022-01-06 14:18 UTC (permalink / raw)
To: Alice Ferrazzi, cip-dev
In-Reply-To: <20220106111614.218823-1-alice.ferrazzi@miraclelinux.com>
On 06.01.22 12:16, Alice Ferrazzi wrote:
> This patch series add a new image with settings for
> KernelCI.
>
> This new image is called cip-core-image-kernelci and is
> based on isar-cip-core general image with some changes
> needed for make it work with KernelCI and taken from
> KernelCI image base settings.
> The cip-core-image-kernelci images are built by GitlabCI
> and uploaded to KernelCI production fileserver.
> https://storage.kernelci.org/images/rootfs/cip/
>
> These patches are already integrated in the
> isar-cip-core:alicef/kernelci_master_refactor repository branch
> and are generating the images that are currently
> used by KernelCI.
>
> cip-core-image-kernelci as been tested and are
> already used in KernelCI production with good results.
> https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/
>
Thanks a lot for enabling this!
One meta-question: How does this image relate to what happens to a
standard image when adding kas/opt/test.yml? Does
kas/opt/kernelci.yml:kas/opt/test.yml make sense? Or should the former
actually include the latter?
These things you may ask yourself when try to add the image also to our
Kconfig menu ("kas-container menu"). That would be nice to have for a v3
as well, but more important is sorting out the option relationships.
Thanks,
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply
* Re: [isar-cip-core][PATCH 4/4] enable cip-core-image-kernelci
From: Jan Kiszka @ 2022-01-06 14:12 UTC (permalink / raw)
To: Alice Ferrazzi, cip-dev
In-Reply-To: <20220106111614.218823-5-alice.ferrazzi@miraclelinux.com>
On 06.01.22 12:16, Alice Ferrazzi wrote:
> enable CIP core image KernelCI to be built with gitlab pipeline
> and uploaded to the KernelCI storage using KernelCI API.
> enable cip-core-image-kernelci to be built for amd64, arm and arm64.
>
> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> ---
> .gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 39 insertions(+), 1 deletion(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index e7db8c1..784343b 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -9,6 +9,7 @@ variables:
> targz: disable
> dtb: none
> deploy: enable
> + deploy_kernelci: disable
>
> stages:
> - build
> @@ -37,7 +38,8 @@ default:
> - if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
> - echo "Building ${base_yaml}"
> - kas build ${base_yaml}
> - - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
> + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi;
> + - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi
Does gitlab-ci forces us to add that closing ; to the last-but-one
command? If so, better add it to the new from the beginning.
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply
* Re: [isar-cip-core][PATCH 1/4] Add cip-core-image-kernelci
From: Jan Kiszka @ 2022-01-06 14:01 UTC (permalink / raw)
To: Alice Ferrazzi, cip-dev
In-Reply-To: <20220106111614.218823-2-alice.ferrazzi@miraclelinux.com>
On 06.01.22 12:16, Alice Ferrazzi wrote:
> This image is currently used by KernelCI production for testing purpose.
> The purpose of this image is that KernelCI need to be able to autologin
> without password and to detect the login shell using special characters.
> Currently added are the default settings used by KernelCI images.
>
> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> ---
> kas/opt/kernelci.yml | 16 +++++++++
> .../images/cip-core-image-kernelci.bb | 16 +++++++++
> .../files/99-silent-printk.conf | 1 +
> .../kernelci-customizations/files/ethernet | 23 +++++++++++++
> .../kernelci-customizations/files/postinst | 34 +++++++++++++++++++
> .../kernelci-customizations.bb | 34 +++++++++++++++++++
> 6 files changed, 124 insertions(+)
> create mode 100644 kas/opt/kernelci.yml
> create mode 100644 recipes-core/images/cip-core-image-kernelci.bb
> create mode 100644 recipes-core/kernelci-customizations/files/99-silent-printk.conf
> create mode 100644 recipes-core/kernelci-customizations/files/ethernet
> create mode 100644 recipes-core/kernelci-customizations/files/postinst
> create mode 100644 recipes-core/kernelci-customizations/kernelci-customizations.bb
>
> diff --git a/kas/opt/kernelci.yml b/kas/opt/kernelci.yml
> new file mode 100644
> index 0000000..9c67864
> --- /dev/null
> +++ b/kas/opt/kernelci.yml
> @@ -0,0 +1,16 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Toshiba Corporation, 2020
> +# Copyright (c) Cybertrust Japan Co., Ltd., 2021
> +#
> +# Authors:
> +# Venkata Pyla <venkata.pyla@toshiba-tsip.com>
> +# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +header:
> + version: 10
> +
> +target: cip-core-image-kernelci
> diff --git a/recipes-core/images/cip-core-image-kernelci.bb b/recipes-core/images/cip-core-image-kernelci.bb
> new file mode 100644
> index 0000000..479c14c
> --- /dev/null
> +++ b/recipes-core/images/cip-core-image-kernelci.bb
> @@ -0,0 +1,16 @@
> +#
> +# A reference image for KernelCI
> +#
> +# Copyright (c) Cybertrust Japan Co., Ltd., 2021
> +#
> +# Authors:
> +# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +inherit image
> +
> +DESCRIPTION = "CIP Core image for KernelCI"
> +
> +IMAGE_INSTALL += "kernelci-customizations"
> diff --git a/recipes-core/kernelci-customizations/files/99-silent-printk.conf b/recipes-core/kernelci-customizations/files/99-silent-printk.conf
> new file mode 100644
> index 0000000..ad24d3a
> --- /dev/null
> +++ b/recipes-core/kernelci-customizations/files/99-silent-printk.conf
> @@ -0,0 +1 @@
> +kernel.printk = 3 4 1 3
> diff --git a/recipes-core/kernelci-customizations/files/ethernet b/recipes-core/kernelci-customizations/files/ethernet
> new file mode 100644
> index 0000000..fa47d1a
> --- /dev/null
> +++ b/recipes-core/kernelci-customizations/files/ethernet
> @@ -0,0 +1,23 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2019
> +#
> +# Authors:
> +# Jan Kiszka <jan.kiszka@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +allow-hotplug eth0
> +allow-hotplug enp0s2
> +allow-hotplug enp2s0
> +
> +# used on BBB
> +iface eth0 inet dhcp
> +
> +# used on qemu-amd64
> +iface enp0s2 inet dhcp
> +
> +# used on simatic-ipc227e
> +iface enp2s0 inet dhcp
> diff --git a/recipes-core/kernelci-customizations/files/postinst b/recipes-core/kernelci-customizations/files/postinst
> new file mode 100644
> index 0000000..7ae30e8
> --- /dev/null
> +++ b/recipes-core/kernelci-customizations/files/postinst
> @@ -0,0 +1,34 @@
> +#!/bin/sh
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2019
> +# Copyright (c) Cybertrust Japan Co., Ltd., 2021
> +#
> +# Authors:
> +# Jan Kiszka <jan.kiszka@siemens.com>
> +# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +echo "CIP Core Demo & Test Image" > /etc/issue
> +
> +# permit root login without password
> +echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
> +echo "PermitEmptyPasswords yes" >> /etc/ssh/sshd_config
> +passwd root -d
> +
> +# serial getty service for autologin
> +mkdir -p /etc/systemd/system/serial-getty@.service.d/
> +echo "[Service]" > /etc/systemd/system/serial-getty@.service.d/override.conf
> +echo "ExecStart=" >> /etc/systemd/system/serial-getty@.service.d/override.conf
> +echo "ExecStart=-/sbin/agetty --autologin root --keep-baud 115200,38400,9600 %I $TERM" >> /etc/systemd/system/serial-getty@.service.d/override.conf
> +
> +# set the profile for KernelCI
> +echo "PS1='\$(pwd) # '" > /root/.profile
> +echo "cd /" >> /root/.profile
> +
> +HOSTNAME=demo
> +echo "$HOSTNAME" > /etc/hostname
> +echo "127.0.0.1 $HOSTNAME" >> /etc/hosts
> diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb
> new file mode 100644
> index 0000000..dca0891
> --- /dev/null
> +++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb
> @@ -0,0 +1,34 @@
> +#
> +# CIP Core, generic profile
> +#
> +# Copyright (c) Siemens AG, 2019
> +# Copyright (c) Cybertrust Japan Co., Ltd., 2021
> +#
> +# Authors:
> +# Jan Kiszka <jan.kiszka@siemens.com>
> +# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +inherit dpkg-raw
> +
> +DESCRIPTION = "CIP Core image demo & customizations"
> +
> +SRC_URI = " \
> + file://postinst \
> + file://ethernet \
> + file://99-silent-printk.conf"
> +
> +DEPENDS += "sshd-regen-keys"
> +
> +DEBIAN_DEPENDS = " \
> + ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys"
> +
> +do_install() {
> + install -v -d ${D}/etc/network/interfaces.d
> + install -v -m 644 ${WORKDIR}/ethernet ${D}/etc/network/interfaces.d/
> +
> + install -v -d ${D}/etc/sysctl.d
> + install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/
> +}
This is duplicating the default customization package, IIUC, for the
purpose of adding further things. And you already miss some things due
to this (WIRELESS_FIRMWARE_PACKAGE, INSTALL_WIRELESS_TOOLS).
How about installing both and carrying in kernelci-customization only
the delta? Or at least reuse artifacts from customizations package, e.g.
via symlinks?
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply
* Re: [isar-cip-core][PATCH 0/4] Add cip-core-image-kernelci building and uploading system
From: Jan Kiszka @ 2022-01-06 13:43 UTC (permalink / raw)
To: Alice Ferrazzi, cip-dev
In-Reply-To: <20220106111614.218823-1-alice.ferrazzi@miraclelinux.com>
On 06.01.22 12:16, Alice Ferrazzi wrote:
> This patch series add a new image with settings for
> KernelCI.
>
> This new image is called cip-core-image-kernelci and is
> based on isar-cip-core general image with some changes
> needed for make it work with KernelCI and taken from
> KernelCI image base settings.
> The cip-core-image-kernelci images are built by GitlabCI
> and uploaded to KernelCI production fileserver.
> https://storage.kernelci.org/images/rootfs/cip/
>
> These patches are already integrated in the
> isar-cip-core:alicef/kernelci_master_refactor repository branch
> and are generating the images that are currently
> used by KernelCI.
>
> cip-core-image-kernelci as been tested and are
> already used in KernelCI production with good results.
> https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/
>
> Alice Ferrazzi (4):
> Add cip-core-image-kernelci
> Add dmesg filter needed for lava test result
> Add script deploy-kernelci.py for upload the cip-core-image-kernelci
> enable cip-core-image-kernelci
>
> .gitlab-ci.yml | 40 +++++++++++++-
> kas/opt/kernelci.yml | 16 ++++++
> .../images/cip-core-image-kernelci.bb | 16 ++++++
> .../files/99-silent-printk.conf | 1 +
> .../kernelci-customizations/files/dmesg.sh | 23 ++++++++
> .../kernelci-customizations/files/ethernet | 23 ++++++++
> .../kernelci-customizations/files/postinst | 34 ++++++++++++
> .../kernelci-customizations.bb | 35 ++++++++++++
> scripts/deploy-kernelci.py | 55 +++++++++++++++++++
> 9 files changed, 242 insertions(+), 1 deletion(-)
> create mode 100644 kas/opt/kernelci.yml
> create mode 100644 recipes-core/images/cip-core-image-kernelci.bb
> create mode 100644 recipes-core/kernelci-customizations/files/99-silent-printk.conf
> create mode 100644 recipes-core/kernelci-customizations/files/dmesg.sh
> create mode 100644 recipes-core/kernelci-customizations/files/ethernet
> create mode 100644 recipes-core/kernelci-customizations/files/postinst
> create mode 100644 recipes-core/kernelci-customizations/kernelci-customizations.bb
> create mode 100755 scripts/deploy-kernelci.py
>
This is v2 of https://lists.cip-project.org/g/cip-dev/message/7264,
right? Please flag that in the future.
What is the delta?
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply
* [isar-cip-core][PATCH 4/4] enable cip-core-image-kernelci
From: Alice Ferrazzi @ 2022-01-06 11:16 UTC (permalink / raw)
To: cip-dev; +Cc: Alice Ferrazzi
In-Reply-To: <20220106111614.218823-1-alice.ferrazzi@miraclelinux.com>
enable CIP core image KernelCI to be built with gitlab pipeline
and uploaded to the KernelCI storage using KernelCI API.
enable cip-core-image-kernelci to be built for amd64, arm and arm64.
Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
---
.gitlab-ci.yml | 40 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7db8c1..784343b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ variables:
targz: disable
dtb: none
deploy: enable
+ deploy_kernelci: disable
stages:
- build
@@ -37,7 +38,8 @@ default:
- if [ "${release}" = "bullseye" ]; then base_yaml="${base_yaml}:kas/opt/bullseye.yml"; fi;
- echo "Building ${base_yaml}"
- kas build ${base_yaml}
- - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
+ - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi;
+ - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi
# base image
build:simatic-ipc227e-base:
@@ -77,6 +79,18 @@ build:qemu-amd64-base:
wic_targz: disable
targz: enable
+build:qemu-amd64-base-kernelci:
+ extends:
+ - .build_base
+ variables:
+ target: qemu-amd64
+ extension: kernelci
+ use_rt: disable
+ wic_targz: disable
+ targz: enable
+ deploy: disable
+ deploy_kernelci: enable
+
build:qemu-arm64-base:
extends:
- .build_base
@@ -87,6 +101,18 @@ build:qemu-arm64-base:
wic_targz: disable
targz: enable
+build:qemu-arm64-base-kernelci:
+ extends:
+ - .build_base
+ variables:
+ target: qemu-arm64
+ extension: kernelci
+ use_rt: disable
+ wic_targz: disable
+ targz: enable
+ deploy: disable
+ deploy_kernelci: enable
+
build:qemu-arm-base:
extends:
- .build_base
@@ -97,6 +123,18 @@ build:qemu-arm-base:
wic_targz: disable
targz: enable
+build:qemu-arm-base-kernelci:
+ extends:
+ - .build_base
+ variables:
+ target: qemu-arm
+ extension: kernelci
+ use_rt: disable
+ wic_targz: disable
+ targz: enable
+ deploy: disable
+ deploy_kernelci: enable
+
# test
build:simatic-ipc227e-test:
extends:
--
2.33.1
^ permalink raw reply related
* [isar-cip-core][PATCH 3/4] Add script deploy-kernelci.py for upload the cip-core-image-kernelci
From: Alice Ferrazzi @ 2022-01-06 11:16 UTC (permalink / raw)
To: cip-dev; +Cc: Alice Ferrazzi
In-Reply-To: <20220106111614.218823-1-alice.ferrazzi@miraclelinux.com>
The cip-core-image-kernelci need to be uploaded to the KernelCI
production storage for been used by KernelCI.
This script use the KernelCI API for uploading the
cip-core-image-kernelci to the production storage.
The images are uploaded in the following link:
https://storage.kernelci.org/images/rootfs/cip/
Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
---
scripts/deploy-kernelci.py | 55 ++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100755 scripts/deploy-kernelci.py
diff --git a/scripts/deploy-kernelci.py b/scripts/deploy-kernelci.py
new file mode 100755
index 0000000..5a8adca
--- /dev/null
+++ b/scripts/deploy-kernelci.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import subprocess
+import requests
+import os
+import sys
+import time
+from urllib.parse import urljoin
+
+cdate=time.strftime("%Y%m%d")
+api="https://api.kernelci.org/upload"
+token=os.getenv("KERNELCI_TOKEN")
+
+release=sys.argv[1]
+target=sys.argv[2]
+extension=sys.argv[3]
+
+rootfs_filename="cip-core-image-kernelci-cip-core-"+release+"-"+target+".tar.gz"
+initrd_filename="cip-core-image-kernelci-cip-core-"+release+"-"+target+"-initrd.img"
+initrd_gz_filename="cip-core-image-kernelci-cip-core-"+release+"-"+target+"-initrd.img.gz"
+
+input_dir="build/tmp/deploy/images/"+target
+upload_path="/images/rootfs/cip/"+cdate+"/"+target+"/"
+upload_path_latest="/images/rootfs/cip/latest/"+target+"/"
+rootfs=input_dir+"/"+rootfs_filename
+initrd=input_dir+"/"+initrd_filename
+
+def upload_file(api, token, path, input_file, input_filename):
+ headers = {
+ 'Authorization': token,
+ }
+ data = {
+ 'path': path,
+ }
+ files = {
+ 'file': (input_filename, open(input_file, 'rb').read()),
+ }
+ url = urljoin(api, 'upload')
+ resp = requests.post(url, headers=headers, data=data, files=files)
+ resp.raise_for_status()
+
+if os.path.exists(rootfs) and os.path.exists(initrd):
+ print("uploading rootfs to KernelCI")
+ upload_file(api, token, upload_path, rootfs, rootfs_filename)
+ print("uploading initrd to KernelCI")
+ upload_file(api, token, upload_path, initrd, initrd_gz_filename)
+ print("uploaded to: https://storage.kernelci.org"+upload_path)
+
+ # Upload latest
+ print("uploading rootfs to KernelCI CIP latest")
+ upload_file(api, token, upload_path_latest, rootfs, rootfs_filename)
+ print("uploading initrd to KernelCI CIP latest")
+ upload_file(api, token, upload_path_latest, initrd, initrd_gz_filename)
+ print("uploaded to: https://storage.kernelci.org"+upload_path_latest)
--
2.33.1
^ permalink raw reply related
* [isar-cip-core][PATCH 2/4] Add dmesg filter needed for lava test result
From: Alice Ferrazzi @ 2022-01-06 11:16 UTC (permalink / raw)
To: cip-dev; +Cc: Alice Ferrazzi
In-Reply-To: <20220106111614.218823-1-alice.ferrazzi@miraclelinux.com>
KernelCI is using a dmesg filter script for checking dmesg
logs result with lava.
Adding the script to the cip-core-image-kernelci.
Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
---
.../kernelci-customizations/files/dmesg.sh | 23 +++++++++++++++++++
.../kernelci-customizations.bb | 1 +
2 files changed, 24 insertions(+)
create mode 100644 recipes-core/kernelci-customizations/files/dmesg.sh
diff --git a/recipes-core/kernelci-customizations/files/dmesg.sh b/recipes-core/kernelci-customizations/files/dmesg.sh
new file mode 100644
index 0000000..3b096e1
--- /dev/null
+++ b/recipes-core/kernelci-customizations/files/dmesg.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+if [ "$KERNELCI_LAVA" = "y" ]; then
+ alias test-result='lava-test-case'
+else
+ alias test-result='echo'
+fi
+
+for level in crit alert emerg; do
+ dmesg --level=$level --notime -x -k > dmesg.$level
+ test -s dmesg.$level && res=fail || res=pass
+ count=$(cat dmesg.$level | wc -l)
+ cat dmesg.$level
+ test-result \
+ $level \
+ --result $res \
+ --measurement $count \
+ --units lines
+done
+
+exit 0
diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb
index dca0891..c3f677c 100644
--- a/recipes-core/kernelci-customizations/kernelci-customizations.bb
+++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb
@@ -18,6 +18,7 @@ DESCRIPTION = "CIP Core image demo & customizations"
SRC_URI = " \
file://postinst \
file://ethernet \
+ file://dmesg.sh \
file://99-silent-printk.conf"
DEPENDS += "sshd-regen-keys"
--
2.33.1
^ permalink raw reply related
* [isar-cip-core][PATCH 1/4] Add cip-core-image-kernelci
From: Alice Ferrazzi @ 2022-01-06 11:16 UTC (permalink / raw)
To: cip-dev; +Cc: Alice Ferrazzi
In-Reply-To: <20220106111614.218823-1-alice.ferrazzi@miraclelinux.com>
This image is currently used by KernelCI production for testing purpose.
The purpose of this image is that KernelCI need to be able to autologin
without password and to detect the login shell using special characters.
Currently added are the default settings used by KernelCI images.
Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
---
kas/opt/kernelci.yml | 16 +++++++++
.../images/cip-core-image-kernelci.bb | 16 +++++++++
.../files/99-silent-printk.conf | 1 +
.../kernelci-customizations/files/ethernet | 23 +++++++++++++
.../kernelci-customizations/files/postinst | 34 +++++++++++++++++++
.../kernelci-customizations.bb | 34 +++++++++++++++++++
6 files changed, 124 insertions(+)
create mode 100644 kas/opt/kernelci.yml
create mode 100644 recipes-core/images/cip-core-image-kernelci.bb
create mode 100644 recipes-core/kernelci-customizations/files/99-silent-printk.conf
create mode 100644 recipes-core/kernelci-customizations/files/ethernet
create mode 100644 recipes-core/kernelci-customizations/files/postinst
create mode 100644 recipes-core/kernelci-customizations/kernelci-customizations.bb
diff --git a/kas/opt/kernelci.yml b/kas/opt/kernelci.yml
new file mode 100644
index 0000000..9c67864
--- /dev/null
+++ b/kas/opt/kernelci.yml
@@ -0,0 +1,16 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Toshiba Corporation, 2020
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+# Venkata Pyla <venkata.pyla@toshiba-tsip.com>
+# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
+#
+# SPDX-License-Identifier: MIT
+#
+header:
+ version: 10
+
+target: cip-core-image-kernelci
diff --git a/recipes-core/images/cip-core-image-kernelci.bb b/recipes-core/images/cip-core-image-kernelci.bb
new file mode 100644
index 0000000..479c14c
--- /dev/null
+++ b/recipes-core/images/cip-core-image-kernelci.bb
@@ -0,0 +1,16 @@
+#
+# A reference image for KernelCI
+#
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+inherit image
+
+DESCRIPTION = "CIP Core image for KernelCI"
+
+IMAGE_INSTALL += "kernelci-customizations"
diff --git a/recipes-core/kernelci-customizations/files/99-silent-printk.conf b/recipes-core/kernelci-customizations/files/99-silent-printk.conf
new file mode 100644
index 0000000..ad24d3a
--- /dev/null
+++ b/recipes-core/kernelci-customizations/files/99-silent-printk.conf
@@ -0,0 +1 @@
+kernel.printk = 3 4 1 3
diff --git a/recipes-core/kernelci-customizations/files/ethernet b/recipes-core/kernelci-customizations/files/ethernet
new file mode 100644
index 0000000..fa47d1a
--- /dev/null
+++ b/recipes-core/kernelci-customizations/files/ethernet
@@ -0,0 +1,23 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+#
+# Authors:
+# Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+allow-hotplug eth0
+allow-hotplug enp0s2
+allow-hotplug enp2s0
+
+# used on BBB
+iface eth0 inet dhcp
+
+# used on qemu-amd64
+iface enp0s2 inet dhcp
+
+# used on simatic-ipc227e
+iface enp2s0 inet dhcp
diff --git a/recipes-core/kernelci-customizations/files/postinst b/recipes-core/kernelci-customizations/files/postinst
new file mode 100644
index 0000000..7ae30e8
--- /dev/null
+++ b/recipes-core/kernelci-customizations/files/postinst
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+# Jan Kiszka <jan.kiszka@siemens.com>
+# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+echo "CIP Core Demo & Test Image" > /etc/issue
+
+# permit root login without password
+echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
+echo "PermitEmptyPasswords yes" >> /etc/ssh/sshd_config
+passwd root -d
+
+# serial getty service for autologin
+mkdir -p /etc/systemd/system/serial-getty@.service.d/
+echo "[Service]" > /etc/systemd/system/serial-getty@.service.d/override.conf
+echo "ExecStart=" >> /etc/systemd/system/serial-getty@.service.d/override.conf
+echo "ExecStart=-/sbin/agetty --autologin root --keep-baud 115200,38400,9600 %I $TERM" >> /etc/systemd/system/serial-getty@.service.d/override.conf
+
+# set the profile for KernelCI
+echo "PS1='\$(pwd) # '" > /root/.profile
+echo "cd /" >> /root/.profile
+
+HOSTNAME=demo
+echo "$HOSTNAME" > /etc/hostname
+echo "127.0.0.1 $HOSTNAME" >> /etc/hosts
diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb
new file mode 100644
index 0000000..dca0891
--- /dev/null
+++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb
@@ -0,0 +1,34 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+# Jan Kiszka <jan.kiszka@siemens.com>
+# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+inherit dpkg-raw
+
+DESCRIPTION = "CIP Core image demo & customizations"
+
+SRC_URI = " \
+ file://postinst \
+ file://ethernet \
+ file://99-silent-printk.conf"
+
+DEPENDS += "sshd-regen-keys"
+
+DEBIAN_DEPENDS = " \
+ ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys"
+
+do_install() {
+ install -v -d ${D}/etc/network/interfaces.d
+ install -v -m 644 ${WORKDIR}/ethernet ${D}/etc/network/interfaces.d/
+
+ install -v -d ${D}/etc/sysctl.d
+ install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/
+}
--
2.33.1
^ permalink raw reply related
* [isar-cip-core][PATCH 0/4] Add cip-core-image-kernelci building and uploading system
From: Alice Ferrazzi @ 2022-01-06 11:16 UTC (permalink / raw)
To: cip-dev; +Cc: Alice Ferrazzi
This patch series add a new image with settings for
KernelCI.
This new image is called cip-core-image-kernelci and is
based on isar-cip-core general image with some changes
needed for make it work with KernelCI and taken from
KernelCI image base settings.
The cip-core-image-kernelci images are built by GitlabCI
and uploaded to KernelCI production fileserver.
https://storage.kernelci.org/images/rootfs/cip/
These patches are already integrated in the
isar-cip-core:alicef/kernelci_master_refactor repository branch
and are generating the images that are currently
used by KernelCI.
cip-core-image-kernelci as been tested and are
already used in KernelCI production with good results.
https://linux.kernelci.org/test/job/stable-rc/branch/queue%2F5.14/kernel/v5.14.17-9-g9f7eecaa70b3/plan/baseline-cip-nfs/
Alice Ferrazzi (4):
Add cip-core-image-kernelci
Add dmesg filter needed for lava test result
Add script deploy-kernelci.py for upload the cip-core-image-kernelci
enable cip-core-image-kernelci
.gitlab-ci.yml | 40 +++++++++++++-
kas/opt/kernelci.yml | 16 ++++++
.../images/cip-core-image-kernelci.bb | 16 ++++++
.../files/99-silent-printk.conf | 1 +
.../kernelci-customizations/files/dmesg.sh | 23 ++++++++
.../kernelci-customizations/files/ethernet | 23 ++++++++
.../kernelci-customizations/files/postinst | 34 ++++++++++++
.../kernelci-customizations.bb | 35 ++++++++++++
scripts/deploy-kernelci.py | 55 +++++++++++++++++++
9 files changed, 242 insertions(+), 1 deletion(-)
create mode 100644 kas/opt/kernelci.yml
create mode 100644 recipes-core/images/cip-core-image-kernelci.bb
create mode 100644 recipes-core/kernelci-customizations/files/99-silent-printk.conf
create mode 100644 recipes-core/kernelci-customizations/files/dmesg.sh
create mode 100644 recipes-core/kernelci-customizations/files/ethernet
create mode 100644 recipes-core/kernelci-customizations/files/postinst
create mode 100644 recipes-core/kernelci-customizations/kernelci-customizations.bb
create mode 100755 scripts/deploy-kernelci.py
--
2.33.1
^ permalink raw reply
* Re: [cip-dev] [PATCH 5.10.y-cip 00/31] Add sound/adc support for RZ/G2L
From: Biju Das @ 2022-01-06 11:01 UTC (permalink / raw)
To: Prabhakar Mahadev Lad, cip-dev@lists.cip-project.org,
Nobuhiro Iwamatsu, Pavel Machek
In-Reply-To: <OSZPR01MB701986387CEBA39F8BC4DAD5AA4C9@OSZPR01MB7019.jpnprd01.prod.outlook.com>
Hi Pavel,
> Subject: RE: [cip-dev] [PATCH 5.10.y-cip 00/31] Add sound/adc support for
> RZ/G2L
>
> Hi Pavel,
>
> > -----Original Message-----
> > From: cip-dev@lists.cip-project.org <cip-dev@lists.cip-project.org> On
> > Behalf Of Lad Prabhakar via lists.cip-project.org
> > Sent: 29 December 2021 10:15
> > To: cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu
> > <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek <pavel@denx.de>
> > Cc: Biju Das <biju.das.jz@bp.renesas.com>
> > Subject: [cip-dev] [PATCH 5.10.y-cip 00/31] Add sound/adc support for
> > RZ/G2L
> >
> > Hi All,
> >
> > This patch series adds Sound and ADC support for Renesas RZ/G2L SoC
> > and enables RIIC/SOUND/CANFD/ADC on Renesas SMARC EVK.
> >
> > I have also included the missing driver patch for riic and kernel
> configs.
> >
> > All the patches have been cherry picked from v5.16-rc7.
> >
> Do you want me to separate out audio related patches and just send the ADC
> for now until the audio patch comments are resolved/fixed?
Just to add, I have tested audio playback/capture continuously for 3 days without anu issues.
The race is between atomic context and quit function. Currently it is not triggering any issues.
If you can point out a valid case where it can trigger issue, I am happy to check that.
Regards,
Biju
>
> Cheers,
> Prabhakar
>
> > I have created a MR [0] for cip-kernel-config to support build testing
> > and can be merged once this patch series is accepted.
> >
> > [0]
> > https://jpn01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitl
> > ab.com%2Fcip-project%2Fcip-
> > kernel%2Fcip-kernel-config%2F-%2Fmerge_requests%2F55&data=04%7C01%
> > 7Cprabhakar.mahadev-
> > lad.rj%40bp.renesas.com%7C448a426ec06a400fd7ee08d9cab42a09%7C53d82571d
> > a1947e49cb4625a166a4a2a%7C0%7C0%
> > 7C637763697420828810%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQI
> > joiV2luMzIiLCJBTiI6Ik1haWwiLCJXV
> > CI6Mn0%3D%7C3000&sdata=T6OVaoV3tgK9UsAYD7ZeT%2FwjVctGGJM3Hja2V%2BB
> > d5mU%3D&reserved=0
> >
> > Cheers,
> > Prabhakar
> >
> > Biju Das (21):
> > ASoC: dt-bindings: Document RZ/G2L bindings
> > ASoC: dt-bindings: sound: renesas,rz-ssi: Document DMA support
> > ASoC: sh: Add RZ/G2L SSIF-2 driver
> > ASoC: dt-bindings: renesas,rz-ssi: Update slave dma channel
> > configuration parameter
> > ASoC: sh: rz-ssi: Add SSI DMAC support
> > ASoC: sh: rz-ssi: Fix dereference of noderef expression warning
> > ASoC: sh: rz-ssi: Fix wrong operator used issue
> > ASoC: sh: rz-ssi: Improve error handling in rz_ssi_dma_request
> > function
> > clk: renesas: r9a07g044: Add SSIF-2 clock and reset entries
> > arm64: dts: renesas: r9a07g044: Add external audio clock nodes
> > arm64: dts: renesas: r9a07g044: Add SSI support
> > arm64: dts: renesas: r9a07g044: Add DMA support to SSI
> > arm64: dts: renesas: rzg2l-smarc: Enable I2C{0,1,3} support
> > arm64: dts: renesas: rzg2l-smarc: Add WM8978 sound codec
> > arm64: dts: renesas: rzg2l-smarc: Enable audio
> > arm64: dts: renesas: rzg2l-smarc: Add Mic routing
> > arm64: defconfig: Enable SOUND_SOC_RZ
> > arm64: defconfig: Enable SND_SOC_WM8978
> > clk: renesas: r9a07g044: Mark IA55_CLK and DMAC_ACLK critical
> > i2c: riic: Add RZ/G2L support
> > arm64: defconfig: Enable RIIC
> >
> > Colin Ian King (1):
> > iio: adc: rzg2l_adc: Fix -EBUSY timeout error return
> >
> > Lad Prabhakar (8):
> > dt-bindings: iio: adc: Add binding documentation for Renesas RZ/G2L
> > A/D converter
> > iio: adc: Add driver for Renesas RZ/G2L A/D converter
> > clk: renesas: r9a07g044: Add clock and reset entries for ADC
> > arm64: dts: renesas: r9a07g044: Add ADC node
> > arm64: dts: renesas: rzg2l-smarc-som: Move extal and memory nodes to
> > SOM DTSI
> > arm64: dts: renesas: rzg2l-smarc-som: Enable ADC on SMARC platform
> > arm64: dts: renesas: rzg2l-smarc: Enable CANFD
> > arm64: defconfig: Enable RZG2L_ADC
> >
> > Yang Yingliang (1):
> > iio: adc: rzg2l_adc: add missing clk_disable_unprepare() in
> > rzg2l_adc_pm_runtime_resume()
> >
> > .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 134 ++
> > .../bindings/sound/renesas,rz-ssi.yaml | 118 ++
> > MAINTAINERS | 8 +
> > arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 140 +++
> > .../boot/dts/renesas/r9a07g044l2-smarc.dts | 7 +-
> > .../boot/dts/renesas/rzg2l-smarc-som.dtsi | 35 +
> > arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 162 ++-
> > arch/arm64/configs/defconfig | 4 +
> > drivers/clk/renesas/r9a07g044-cpg.c | 28 +
> > drivers/i2c/busses/i2c-riic.c | 23 +-
> > drivers/iio/adc/Kconfig | 10 +
> > drivers/iio/adc/Makefile | 1 +
> > drivers/iio/adc/rzg2l_adc.c | 591 +++++++++
> > sound/soc/sh/Kconfig | 6 +
> > sound/soc/sh/Makefile | 4 +
> > sound/soc/sh/rz-ssi.c | 1074 +++++++++++++++++
> > 16 files changed, 2334 insertions(+), 11 deletions(-) create mode
> > 100644
> > Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml
> > create mode 100644
> > Documentation/devicetree/bindings/sound/renesas,rz-ssi.yaml
> > create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi
> > create mode 100644 drivers/iio/adc/rzg2l_adc.c create mode 100644
> > sound/soc/sh/rz-ssi.c
> >
> > --
> > 2.17.1
^ permalink raw reply
* RE: [cip-dev] [PATCH 5.10.y-cip 00/31] Add sound/adc support for RZ/G2L
From: Prabhakar Mahadev Lad @ 2022-01-06 10:53 UTC (permalink / raw)
To: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu, Pavel Machek; +Cc: Biju Das
In-Reply-To: <16C5324B2EFDDB95.12001@lists.cip-project.org>
Hi Pavel,
> -----Original Message-----
> From: cip-dev@lists.cip-project.org <cip-dev@lists.cip-project.org> On Behalf Of Lad Prabhakar via
> lists.cip-project.org
> Sent: 29 December 2021 10:15
> To: cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek
> <pavel@denx.de>
> Cc: Biju Das <biju.das.jz@bp.renesas.com>
> Subject: [cip-dev] [PATCH 5.10.y-cip 00/31] Add sound/adc support for RZ/G2L
>
> Hi All,
>
> This patch series adds Sound and ADC support for Renesas RZ/G2L SoC and enables RIIC/SOUND/CANFD/ADC
> on Renesas SMARC EVK.
>
> I have also included the missing driver patch for riic and kernel configs.
>
> All the patches have been cherry picked from v5.16-rc7.
>
Do you want me to separate out audio related patches and just send the ADC for now until the audio patch comments are resolved/fixed?
Cheers,
Prabhakar
> I have created a MR [0] for cip-kernel-config to support build testing and can be merged once this
> patch series is accepted.
>
> [0] https://jpn01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab.com%2Fcip-project%2Fcip-
> kernel%2Fcip-kernel-config%2F-%2Fmerge_requests%2F55&data=04%7C01%7Cprabhakar.mahadev-
> lad.rj%40bp.renesas.com%7C448a426ec06a400fd7ee08d9cab42a09%7C53d82571da1947e49cb4625a166a4a2a%7C0%7C0%
> 7C637763697420828810%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXV
> CI6Mn0%3D%7C3000&sdata=T6OVaoV3tgK9UsAYD7ZeT%2FwjVctGGJM3Hja2V%2BBd5mU%3D&reserved=0
>
> Cheers,
> Prabhakar
>
> Biju Das (21):
> ASoC: dt-bindings: Document RZ/G2L bindings
> ASoC: dt-bindings: sound: renesas,rz-ssi: Document DMA support
> ASoC: sh: Add RZ/G2L SSIF-2 driver
> ASoC: dt-bindings: renesas,rz-ssi: Update slave dma channel
> configuration parameter
> ASoC: sh: rz-ssi: Add SSI DMAC support
> ASoC: sh: rz-ssi: Fix dereference of noderef expression warning
> ASoC: sh: rz-ssi: Fix wrong operator used issue
> ASoC: sh: rz-ssi: Improve error handling in rz_ssi_dma_request
> function
> clk: renesas: r9a07g044: Add SSIF-2 clock and reset entries
> arm64: dts: renesas: r9a07g044: Add external audio clock nodes
> arm64: dts: renesas: r9a07g044: Add SSI support
> arm64: dts: renesas: r9a07g044: Add DMA support to SSI
> arm64: dts: renesas: rzg2l-smarc: Enable I2C{0,1,3} support
> arm64: dts: renesas: rzg2l-smarc: Add WM8978 sound codec
> arm64: dts: renesas: rzg2l-smarc: Enable audio
> arm64: dts: renesas: rzg2l-smarc: Add Mic routing
> arm64: defconfig: Enable SOUND_SOC_RZ
> arm64: defconfig: Enable SND_SOC_WM8978
> clk: renesas: r9a07g044: Mark IA55_CLK and DMAC_ACLK critical
> i2c: riic: Add RZ/G2L support
> arm64: defconfig: Enable RIIC
>
> Colin Ian King (1):
> iio: adc: rzg2l_adc: Fix -EBUSY timeout error return
>
> Lad Prabhakar (8):
> dt-bindings: iio: adc: Add binding documentation for Renesas RZ/G2L
> A/D converter
> iio: adc: Add driver for Renesas RZ/G2L A/D converter
> clk: renesas: r9a07g044: Add clock and reset entries for ADC
> arm64: dts: renesas: r9a07g044: Add ADC node
> arm64: dts: renesas: rzg2l-smarc-som: Move extal and memory nodes to
> SOM DTSI
> arm64: dts: renesas: rzg2l-smarc-som: Enable ADC on SMARC platform
> arm64: dts: renesas: rzg2l-smarc: Enable CANFD
> arm64: defconfig: Enable RZG2L_ADC
>
> Yang Yingliang (1):
> iio: adc: rzg2l_adc: add missing clk_disable_unprepare() in
> rzg2l_adc_pm_runtime_resume()
>
> .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 134 ++
> .../bindings/sound/renesas,rz-ssi.yaml | 118 ++
> MAINTAINERS | 8 +
> arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 140 +++
> .../boot/dts/renesas/r9a07g044l2-smarc.dts | 7 +-
> .../boot/dts/renesas/rzg2l-smarc-som.dtsi | 35 +
> arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 162 ++-
> arch/arm64/configs/defconfig | 4 +
> drivers/clk/renesas/r9a07g044-cpg.c | 28 +
> drivers/i2c/busses/i2c-riic.c | 23 +-
> drivers/iio/adc/Kconfig | 10 +
> drivers/iio/adc/Makefile | 1 +
> drivers/iio/adc/rzg2l_adc.c | 591 +++++++++
> sound/soc/sh/Kconfig | 6 +
> sound/soc/sh/Makefile | 4 +
> sound/soc/sh/rz-ssi.c | 1074 +++++++++++++++++
> 16 files changed, 2334 insertions(+), 11 deletions(-) create mode 100644
> Documentation/devicetree/bindings/iio/adc/renesas,rzg2l-adc.yaml
> create mode 100644 Documentation/devicetree/bindings/sound/renesas,rz-ssi.yaml
> create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi
> create mode 100644 drivers/iio/adc/rzg2l_adc.c create mode 100644 sound/soc/sh/rz-ssi.c
>
> --
> 2.17.1
^ permalink raw reply
* [cip-dev] CIP IRC weekly meeting today on libera.chat External
From: Jan Kiszka @ 2022-01-06 8:07 UTC (permalink / raw)
To: cip-dev
Hi all,
Kindly be reminded to attend the weekly meeting through IRC to discuss
technical topics with CIP kernel today. Our channel is the following:
irc:irc.libera.chat:6667/cip
The IRC meeting is scheduled to UTC (GMT) 13:00:
https://www.timeanddate.com/worldclock/meetingdetails.html?year=2022&month=1&day=6&hour=13&min=0&sec=0&p1=224&p2=179&p3=136&p4=37&p5=241&p6=248
USWest USEast UK DE TW JP
06:00 09:00 13:00 14:00 21:00 22:00
Last meeting minutes:
https://irclogs.baserock.org/meetings/cip/2021/12/cip.2021-12-23-13.00.log.html
* Action items
1. Review / integrate kernelci patches into isar-cip-core - jan
2. Propose tweet on KernelCI-CIP collaboration progress - alicef
3. Clarify with KernelCI whether CIP maintainers can get accounts - alicef
* Kernel maintenance updates
* Kernel testing
* AOB
Jan
^ permalink raw reply
* New CVE entries this week.
From: Masami Ichikawa @ 2022-01-05 23:31 UTC (permalink / raw)
To: cip-dev
Hi !
It's this week's CVE report.
This week reported 1 new CVE.
* New CVEs
CVE-2021-4197: cgroup: Use open-time creds and namespace for migration
perm checks
CVSS v3 score is not provided
A local attacker could escalate privileges for the containers or other
processes that uses cgroups
Patch series is available
(https://lore.kernel.org/lkml/20211209214707.805617-1-tj@kernel.org/T/)
but it hasn't been merged into the mainline yet.
Fixed status
Not fixed yet.
* Updated CVEs
CVE-2021-44733: tee: handle lookup of shm with reference count 0
This CVE was introduced by commit 967c9cc ("tee: generic TEE
subsystem") at 4.12-rc1. so 4.4 isn't affected this issue.
Fixed status
mainline: [dfd0743f1d9ea76931510ed150334d571fbab49d]
stable/4.14: [3d556a28bbfe34a80b014db49908b0f1bcb1ae80]
stable/4.19: [b4a661b4212b8fac8853ec3b68e4a909dccc88a1]
stable/5.10: [c05d8f66ec3470e5212c4d08c46d6cb5738d600d]
stable/5.15: [492eb7afe858d60408b2da09adc78540c4d16543]
stable/5.4: [940e68e57ab69248fabba5889e615305789db8a7]
CVE-2021-45100: ksmbd: disable SMB2_GLOBAL_CAP_ENCRYPTION for SMB 3.1.1
This CVE was introduced by commit e2f3448 ("cifsd: add server-side
procedures for SMB3") which was merged at 5.15-rc1. so before 5.15
kernels are not affected.
Fixed status
mainline: [83912d6d55be10d65b5268d1871168b9ebe1ec4b]
stable/5.15: [a2c144d17623984fdafa4634ecf4ab64580d29bb]
CVE-2021-45469: f2fs: fix to do sanity check on last xattr entry in
__f2fs_setxattr()
The mainline hasn't been fixed yet.
Fixed status
stable/4.14: [88dedecc24763c2e0bc1e8eeb35f9f2cd785a7e5]
stable/4.19: [f9dfa44be0fb5e8426183a70f69a246cf5827f49]
stable/5.10: [fffb6581a23add416239dfcf7e7f3980c6b913da]
stable/5.15: [a8a9d753edd7f71e6a2edaa580d8182530b68791]
stable/5.4: [b0406b5ef4e2c4fb21d9e7d5c36a0453b4279e9b]
Currently tracking CVEs
CVE-2021-31615: Unencrypted Bluetooth Low Energy baseband links in
Bluetooth Core Specifications 4.0 through 5.2
There is no fix information.
CVE-2020-26555: BR/EDR pin code pairing broken
No fix information
CVE-2020-26556: kernel: malleable commitment Bluetooth Mesh Provisioning
No fix information.
CVE-2020-26557: kernel: predictable Authvalue in Bluetooth Mesh
Provisioning Leads to MITM
No fix information.
CVE-2020-26559: kernel: Authvalue leak in Bluetooth Mesh Provisioning
No fix information.
CVE-2020-26560: kernel: impersonation attack in Bluetooth Mesh Provisioning
No fix information.
Regards,
--
Masami Ichikawa
Cybertrust Japan Co., Ltd.
Email :masami.ichikawa@cybertrust.co.jp
:masami.ichikawa@miraclelinux.com
^ permalink raw reply
* Re: [PATCH 5.10.y-cip 20/22] dmaengine: sh: make array ds_lut static
From: Biju Das @ 2022-01-04 10:39 UTC (permalink / raw)
To: Pavel Machek, Prabhakar Mahadev Lad
Cc: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu
In-Reply-To: <20211222100453.GD15186@amd>
Hi Pavel,
> Subject: Re: [PATCH 5.10.y-cip 20/22] dmaengine: sh: make array ds_lut
> static
>
> Hi!
>
> > commit 4c0eee50658746b0333d35a75d3db6e0aac08ef9 upstream.
> >
> > Don't populate the read-only array ds_lut on the stack but instead it
> > static. Also makes the object code smaller by 163 bytes:
> >
> > Before:
> > text data bss dec hex filename
> > 23508 4796 0 28304 6e90 ./drivers/dma/sh/rz-dmac.o
> >
> > After:
> > text data bss dec hex filename
> > 23281 4860 0 28141 6ded ./drivers/dma/sh/rz-dmac.o
>
> Heh.
>
> > @@ -574,7 +574,7 @@ static void rz_dmac_issue_pending(struct dma_chan
> > *chan) static u8 rz_dmac_ds_to_val_mapping(enum dma_slave_buswidth
> > ds) {
> > u8 i;
> > - const enum dma_slave_buswidth ds_lut[] = {
> > + static const enum dma_slave_buswidth ds_lut[] = {
> > DMA_SLAVE_BUSWIDTH_1_BYTE,
> > DMA_SLAVE_BUSWIDTH_2_BYTES,
> > DMA_SLAVE_BUSWIDTH_4_BYTES,
>
> Array could be avoided altogether; you could check for power of two and
> then count bits. That would give even shorter code, but I'm not sure about
> readability.
>
> I'd also not mind using usual convention here: return int, >= 0 success, <
> 0 errno.
Readability is ok with current implementation and moreover it is faster.
Otherwise, you need to check whether it is power of 2, then do count bits to make sure it is bounded between
DMA_SLAVE_BUSWIDTH_1_BYTE and DMA_SLAVE_BUSWIDTH_128_BYTES and then return the index.
Regards,
Biju
^ permalink raw reply
* Re: [PATCH 5.10.y-cip 04/31] ASoC: dt-bindings: renesas,rz-ssi: Update slave dma channel configuration parameter
From: Biju Das @ 2022-01-04 10:25 UTC (permalink / raw)
To: Pavel Machek, Prabhakar Mahadev Lad
Cc: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu
In-Reply-To: <20211230105507.GA9799@amd>
Hi Pavel,
> Subject: Re: [PATCH 5.10.y-cip 04/31] ASoC: dt-bindings: renesas,rz-ssi:
> Update slave dma channel configuration parameter
>
> Hi!
>
> > From: Biju Das <biju.das.jz@bp.renesas.com>
> >
> > commit bed0b1c1e88a27b76c74584128cadebc6fa58622 upstream.
> >
> > The DMAC on RZ/G2L has specific slave channel configuration parameters
> > for SSI.
> > This patch updates the dmas description and example node to include
> > the encoded slave channel configuration.
>
> > +++ b/Documentation/devicetree/bindings/sound/renesas,rz-ssi.yaml
> > @@ -48,6 +48,24 @@ properties:
> > dmas:
> > minItems: 1
> > maxItems: 2
> > + description:
> > + The first cell represents a phandle to dmac
> > + The second cell specifies the encoded MID/RID values of the SSI
> port
> > + connected to the DMA client and the slave channel configuration
> > + parameters.
> > + bits[0:9] - Specifies MID/RID value of a SSI channel as below
> > + MID/RID value of SSI rx0 = 0x256
> > + MID/RID value of SSI tx0 = 0x255
> > + MID/RID value of SSI rx1 = 0x25a
> > + MID/RID value of SSI tx1 = 0x259
> > + MID/RID value of SSI rt2 = 0x25f
> > + MID/RID value of SSI rx3 = 0x262
> > + MID/RID value of SSI tx3 = 0x261
> > + bit[10] - HIEN = 1, Detects a request in response to the
> rising edge
> > + of the signal
> > + bit[11] - LVL = 0, Detects based on the edge
> > + bits[12:14] - AM = 2, Bus cycle mode
> > + bit[15] - TM = 0, Single transfer mode
>
> I wish there was better solution to this. Device tree sources are quite
> human-readable, this really is not.
Can you please suggest the better solution?
Cheers,
Biju
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox