Date   

[PATCH linux-4.19.y-cip-rt 3/3] gitlab-ci: Remove test timeout

Chris Paterson
 

Setting a relevant test timeout is hard as we've no idea how many other
test jobs are running.

We have another two timeouts already:
1) The CI job timeut setting in the GitLab runner
2) The LAVA test job timeout

Signed-off-by: Chris Paterson <chris.paterson2@...>
---
.gitlab-ci.yml | 2 --
1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ebd29b94c3a..08b3913d295e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,6 @@ test:arm_renesas_shmobile_defconfig:
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
variables:
GIT_STRATEGY: none
- TEST_TIMEOUT: 60
script:
- /opt/submit_tests.sh
artifacts:
@@ -142,7 +141,6 @@ test:arm64_renesas_defconfig:
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
variables:
GIT_STRATEGY: none
- TEST_TIMEOUT: 60
script:
- /opt/submit_tests.sh
artifacts:
--
2.17.1


[PATCH linux-4.19.y-cip-rt 2/3] gitlab-ci: Remove unofficial build configurations

Chris Paterson
 

The Arm64 defconfig creates a huge image and an even larger modules
archive.

Both the build and test takes a long time, and CIP don't officially
support this configuration.

Also remove shmobile_defconfig as we're essentially building/testing the
same already.

Signed-off-by: Chris Paterson <chris.paterson2@...>
---
.gitlab-ci.yml | 67 --------------------------------------------------
1 file changed, 67 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b5a225c96f90..7ebd29b94c3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -249,70 +249,3 @@ build:rt_x86_siemens_i386-rt.config:
when: always
paths:
- output
-
-########################
-# Extra configurations #
-########################
-build:arm_shmobile_defconfig:
- stage: build
- image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
- variables:
- BUILD_ARCH: arm
- CONFIG: shmobile_defconfig
- CONFIG_LOC: intree
- DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm
- DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-ca.dtb
- script:
- - /opt/build_kernel.sh
- artifacts:
- name: "$CI_JOB_NAME"
- when: always
- paths:
- - output
-
-test:arm_shmobile_defconfig:
- stage: test
- needs: ["build:arm_shmobile_defconfig"]
- image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
- variables:
- GIT_STRATEGY: none
- TEST_TIMEOUT: 60
- script:
- - /opt/submit_tests.sh
- artifacts:
- name: "$CI_JOB_NAME"
- when: always
- paths:
- - output
-
-build:arm64_defconfig:
- stage: build
- image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
- variables:
- BUILD_ARCH: arm64
- CONFIG: defconfig
- CONFIG_LOC: intree
- DEVICES: r8a774c0-ek874 r8a774a1-hihope-rzg2m-ex
- DTBS: r8a774c0-ek874.dtb r8a774a1-hihope-rzg2m-ex.dtb
- script:
- - /opt/build_kernel.sh
- artifacts:
- name: "$CI_JOB_NAME"
- when: always
- paths:
- - output
-
-test:arm64_defconfig:
- stage: test
- needs: ["build:arm64_defconfig"]
- image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
- variables:
- GIT_STRATEGY: none
- TEST_TIMEOUT: 60
- script:
- - /opt/submit_tests.sh
- artifacts:
- name: "$CI_JOB_NAME"
- when: always
- paths:
- - output
--
2.17.1


[PATCH linux-4.19.y-cip-rt 1/3] gitlab-ci: Split tests into separate jobs

Chris Paterson
 

This will allow tests to run as soon as the corresponding build job is
complete.

This will help spread the load on the test infrastructure and save time.

Signed-off-by: Chris Paterson <chris.paterson2@...>
---
.gitlab-ci.yml | 92 ++++++++++++++++++++++++++++++++++++++------------
1 file changed, 71 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52f084fe37b5..b5a225c96f90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,10 @@ variables:
DOCKER_DRIVER: overlay2
DOCKER_IMAGE_TAG: v2

-# Building
-arm_hitachi_cyclonev_defconfig:
+###############################
+# Standard CIP configurations #
+###############################
+build:arm_hitachi_cyclonev_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -21,7 +23,7 @@ arm_hitachi_cyclonev_defconfig:
paths:
- output

-arm_hitachi_omap_defconfig:
+build:arm_hitachi_omap_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -37,7 +39,7 @@ arm_hitachi_omap_defconfig:
paths:
- output

-arm_moxa_mxc_defconfig:
+build:arm_moxa_mxc_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -53,7 +55,7 @@ arm_moxa_mxc_defconfig:
paths:
- output

-arm_renesas_shmobile_defconfig:
+build:arm_renesas_shmobile_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -70,7 +72,22 @@ arm_renesas_shmobile_defconfig:
paths:
- output

-arm_siemens_imx6.config:
+test:arm_renesas_shmobile_defconfig:
+ stage: test
+ needs: ["build:arm_renesas_shmobile_defconfig"]
+ image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
+ variables:
+ GIT_STRATEGY: none
+ TEST_TIMEOUT: 60
+ script:
+ - /opt/submit_tests.sh
+ artifacts:
+ name: "$CI_JOB_NAME"
+ when: always
+ paths:
+ - output
+
+build:arm_siemens_imx6.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -86,7 +103,7 @@ arm_siemens_imx6.config:
paths:
- output

-arm64_moxa_eds_defconfig:
+build:arm64_moxa_eds_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -102,7 +119,7 @@ arm64_moxa_eds_defconfig:
paths:
- output

-arm64_renesas_defconfig:
+build:arm64_renesas_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -119,7 +136,22 @@ arm64_renesas_defconfig:
paths:
- output

-x86_plathome_obsvx2.config:
+test:arm64_renesas_defconfig:
+ stage: test
+ needs: ["build:arm64_renesas_defconfig"]
+ image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
+ variables:
+ GIT_STRATEGY: none
+ TEST_TIMEOUT: 60
+ script:
+ - /opt/submit_tests.sh
+ artifacts:
+ name: "$CI_JOB_NAME"
+ when: always
+ paths:
+ - output
+
+build:x86_plathome_obsvx2.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -135,7 +167,7 @@ x86_plathome_obsvx2.config:
paths:
- output

-x86_siemens_iot2000.config:
+build:x86_siemens_iot2000.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -151,7 +183,7 @@ x86_siemens_iot2000.config:
paths:
- output

-x86_siemens_server_defconfig:
+build:x86_siemens_server_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -167,7 +199,7 @@ x86_siemens_server_defconfig:
paths:
- output

-x86_toshiba_atom_baytrail_cip.config:
+build:x86_toshiba_atom_baytrail_cip.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -183,8 +215,10 @@ x86_toshiba_atom_baytrail_cip.config:
paths:
- output

-# RT build configurations
-rt_arm_socfpga_defconfig:
+#########################
+# RT CIP configurations #
+#########################
+build:rt_arm_socfpga_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -200,7 +234,7 @@ rt_arm_socfpga_defconfig:
paths:
- output

-rt_x86_siemens_i386-rt.config:
+build:rt_x86_siemens_i386-rt.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -216,8 +250,10 @@ rt_x86_siemens_i386-rt.config:
paths:
- output

-# Extra build configurations
-arm_shmobile_defconfig:
+########################
+# Extra configurations #
+########################
+build:arm_shmobile_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -234,7 +270,22 @@ arm_shmobile_defconfig:
paths:
- output

-arm64_defconfig:
+test:arm_shmobile_defconfig:
+ stage: test
+ needs: ["build:arm_shmobile_defconfig"]
+ image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
+ variables:
+ GIT_STRATEGY: none
+ TEST_TIMEOUT: 60
+ script:
+ - /opt/submit_tests.sh
+ artifacts:
+ name: "$CI_JOB_NAME"
+ when: always
+ paths:
+ - output
+
+build:arm64_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -251,11 +302,10 @@ arm64_defconfig:
paths:
- output

-# Testing
-run_tests:
+test:arm64_defconfig:
stage: test
+ needs: ["build:arm64_defconfig"]
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
- when: always
variables:
GIT_STRATEGY: none
TEST_TIMEOUT: 60
--
2.17.1


[PATCH linux-4.19.y-cip 3/3] gitlab-ci: Remove test timeout

Chris Paterson
 

Setting a relevant test timeout is hard as we've no idea how many other
test jobs are running.

We have another two timeouts already:
1) The CI job timeut setting in the GitLab runner
2) The LAVA test job timeout

Signed-off-by: Chris Paterson <chris.paterson2@...>
---
.gitlab-ci.yml | 2 --
1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d297f3deaced..3e6d493bbc89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,6 @@ test:arm_renesas_shmobile_defconfig:
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
variables:
GIT_STRATEGY: none
- TEST_TIMEOUT: 60
script:
- /opt/submit_tests.sh
artifacts:
@@ -142,7 +141,6 @@ test:arm64_renesas_defconfig:
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
variables:
GIT_STRATEGY: none
- TEST_TIMEOUT: 60
script:
- /opt/submit_tests.sh
artifacts:
--
2.17.1


[PATCH linux-4.19.y-cip 2/3] gitlab-ci: Remove unofficial build configurations

Chris Paterson
 

The Arm64 defconfig creates a huge image and an even larger modules
archive.

Both the build and test takes a long time, and CIP don't officially
support this configuration.

Also remove shmobile_defconfig as we're essentially building/testing the
same already.

Signed-off-by: Chris Paterson <chris.paterson2@...>
---
.gitlab-ci.yml | 67 --------------------------------------------------
1 file changed, 67 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b72f0325435a..d297f3deaced 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -214,70 +214,3 @@ build:x86_toshiba_atom_baytrail_cip.config:
when: always
paths:
- output
-
-########################
-# Extra configurations #
-########################
-build:arm_shmobile_defconfig:
- stage: build
- image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
- variables:
- BUILD_ARCH: arm
- CONFIG: shmobile_defconfig
- CONFIG_LOC: intree
- DEVICES: r8a7743-iwg20d-q7 r8a7745-iwg22d-sodimm
- DTBS: r8a7743-iwg20d-q7-dbcm-ca.dtb r8a7745-iwg22d-sodimm-dbhd-ca.dtb
- script:
- - /opt/build_kernel.sh
- artifacts:
- name: "$CI_JOB_NAME"
- when: always
- paths:
- - output
-
-test:arm_shmobile_defconfig:
- stage: test
- needs: ["build:arm_shmobile_defconfig"]
- image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
- variables:
- GIT_STRATEGY: none
- TEST_TIMEOUT: 60
- script:
- - /opt/submit_tests.sh
- artifacts:
- name: "$CI_JOB_NAME"
- when: always
- paths:
- - output
-
-build:arm64_defconfig:
- stage: build
- image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
- variables:
- BUILD_ARCH: arm64
- CONFIG: defconfig
- CONFIG_LOC: intree
- DEVICES: r8a774c0-ek874 r8a774a1-hihope-rzg2m-ex
- DTBS: r8a774c0-ek874.dtb r8a774a1-hihope-rzg2m-ex.dtb
- script:
- - /opt/build_kernel.sh
- artifacts:
- name: "$CI_JOB_NAME"
- when: always
- paths:
- - output
-
-test:arm64_defconfig:
- stage: test
- needs: ["build:arm64_defconfig"]
- image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
- variables:
- GIT_STRATEGY: none
- TEST_TIMEOUT: 60
- script:
- - /opt/submit_tests.sh
- artifacts:
- name: "$CI_JOB_NAME"
- when: always
- paths:
- - output
--
2.17.1


[PATCH linux-4.19.y-cip 1/3] gitlab-ci: Split tests into separate jobs

Chris Paterson
 

This will allow tests to run as soon as the corresponding build job is
complete.

This will help spread the load on the test infrastructure and save time.

Signed-off-by: Chris Paterson <chris.paterson2@...>
---
.gitlab-ci.yml | 84 +++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 66 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba8b75abaee7..b72f0325435a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,10 @@ variables:
DOCKER_DRIVER: overlay2
DOCKER_IMAGE_TAG: v2

-# Building
-arm_hitachi_cyclonev_defconfig:
+###############################
+# Standard CIP configurations #
+###############################
+build:arm_hitachi_cyclonev_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -21,7 +23,7 @@ arm_hitachi_cyclonev_defconfig:
paths:
- output

-arm_hitachi_omap_defconfig:
+build:arm_hitachi_omap_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -37,7 +39,7 @@ arm_hitachi_omap_defconfig:
paths:
- output

-arm_moxa_mxc_defconfig:
+build:arm_moxa_mxc_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -53,7 +55,7 @@ arm_moxa_mxc_defconfig:
paths:
- output

-arm_renesas_shmobile_defconfig:
+build:arm_renesas_shmobile_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -70,7 +72,22 @@ arm_renesas_shmobile_defconfig:
paths:
- output

-arm_siemens_imx6.config:
+test:arm_renesas_shmobile_defconfig:
+ stage: test
+ needs: ["build:arm_renesas_shmobile_defconfig"]
+ image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
+ variables:
+ GIT_STRATEGY: none
+ TEST_TIMEOUT: 60
+ script:
+ - /opt/submit_tests.sh
+ artifacts:
+ name: "$CI_JOB_NAME"
+ when: always
+ paths:
+ - output
+
+build:arm_siemens_imx6.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -86,7 +103,7 @@ arm_siemens_imx6.config:
paths:
- output

-arm64_moxa_eds_defconfig:
+build:arm64_moxa_eds_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -102,7 +119,7 @@ arm64_moxa_eds_defconfig:
paths:
- output

-arm64_renesas_defconfig:
+build:arm64_renesas_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -119,7 +136,22 @@ arm64_renesas_defconfig:
paths:
- output

-x86_plathome_obsvx2.config:
+test:arm64_renesas_defconfig:
+ stage: test
+ needs: ["build:arm64_renesas_defconfig"]
+ image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
+ variables:
+ GIT_STRATEGY: none
+ TEST_TIMEOUT: 60
+ script:
+ - /opt/submit_tests.sh
+ artifacts:
+ name: "$CI_JOB_NAME"
+ when: always
+ paths:
+ - output
+
+build:x86_plathome_obsvx2.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -135,7 +167,7 @@ x86_plathome_obsvx2.config:
paths:
- output

-x86_siemens_iot2000.config:
+build:x86_siemens_iot2000.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -151,7 +183,7 @@ x86_siemens_iot2000.config:
paths:
- output

-x86_siemens_server_defconfig:
+build:x86_siemens_server_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -167,7 +199,7 @@ x86_siemens_server_defconfig:
paths:
- output

-x86_toshiba_atom_baytrail_cip.config:
+build:x86_toshiba_atom_baytrail_cip.config:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -183,8 +215,10 @@ x86_toshiba_atom_baytrail_cip.config:
paths:
- output

-# Extra build configurations
-arm_shmobile_defconfig:
+########################
+# Extra configurations #
+########################
+build:arm_shmobile_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -201,7 +235,22 @@ arm_shmobile_defconfig:
paths:
- output

-arm64_defconfig:
+test:arm_shmobile_defconfig:
+ stage: test
+ needs: ["build:arm_shmobile_defconfig"]
+ image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
+ variables:
+ GIT_STRATEGY: none
+ TEST_TIMEOUT: 60
+ script:
+ - /opt/submit_tests.sh
+ artifacts:
+ name: "$CI_JOB_NAME"
+ when: always
+ paths:
+ - output
+
+build:arm64_defconfig:
stage: build
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:build-$DOCKER_IMAGE_TAG
variables:
@@ -218,11 +267,10 @@ arm64_defconfig:
paths:
- output

-# Testing
-run_tests:
+test:arm64_defconfig:
stage: test
+ needs: ["build:arm64_defconfig"]
image: registry.gitlab.com/cip-project/cip-testing/linux-cip-ci:test-$DOCKER_IMAGE_TAG
- when: always
variables:
GIT_STRATEGY: none
TEST_TIMEOUT: 60
--
2.17.1


Re: [PATCH 4.19.y-cip 0/3] Add WLAN/BT support

Pavel Machek
 

On Thu 2019-10-10 07:45:12, Biju Das wrote:
This patch series add WLAN/BT support for HiHope RZ/G2M platform.

This patch series is based on linux-4.19.y-cip and all the patches
in this series are cherry-picked from linux rc tree.
Thanks, applied.

Best regards,
Pavel

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


[Git][cip-project/cip-kernel/cip-kernel-sec] Deleted branch bwh/update-issues

Agustin Benito Bethencourt
 

Ben Hutchings deleted branch bwh/update-issues at cip-project / cip-kernel / cip-kernel-sec


[Git][cip-project/cip-kernel/cip-kernel-sec][master] 6 commits: Import more data

Agustin Benito Bethencourt
 

SZ Lin (林上智) pushed to branch master at cip-project / cip-kernel / cip-kernel-sec

Commits:

  • 7d6b6d04
    by Ben Hutchings at 2019-10-06T20:00:49Z
    Import more data
    
    
    
    Signed-off-by: Ben Hutchings <ben.hutchings@...>
    
    
  • 7acf4945
    by Ben Hutchings at 2019-10-06T20:02:58Z
    Add second commit needed to fix CVE-2019-0136 on linux-4.9.y branch
    
    
    
    Signed-off-by: Ben Hutchings <ben.hutchings@...>
    
    
  • 5c05ad84
    by Ben Hutchings at 2019-10-06T20:44:07Z
    Correct introduced-by commit list for CVE-2019-15917
    
    
    
    I now think this issue goes back to the start of git history.
    
    
    
    Signed-off-by: Ben Hutchings <ben.hutchings@...>
    
    
  • 1833f581
    by Ben Hutchings at 2019-10-06T20:45:10Z
    Fill in commit lists for CVE-2019-1125
    
    
    
    This is finally fixed on all live branches, although the oldest
    
    branches don't include the documentation update.
    
    
    
    Also drop one commit from the list for linux-4.9.y that isn't really
    
    part of the fixes.
    
    
    
    Signed-off-by: Ben Hutchings <ben.hutchings@...>
    
    
  • 06c16c36
    by Ben Hutchings at 2019-10-06T20:46:57Z
    Fill in commit lists in various issues
    
    
    
    Signed-off-by: Ben Hutchings <ben.hutchings@...>
    
    
  • f2989df1
    by SZ Lin (林上智) at 2019-10-12T16:56:07Z
    Merge branch 'bwh/update-issues' into 'master'
    
    
    
    Update issues
    
    
    
    See merge request cip-project/cip-kernel/cip-kernel-sec!15

30 changed files:

The diff was not included because it is too large.


[ANNOUNCE] Release v4.19.78-cip12 and v4.4.196-cip38

Nobuhiro Iwamatsu
 

Hi,

CIP kernel team has released Linux kernel v4.19.78-cip12 and v4.4.196-cip38.

The linux-4.19.y-cip tree has been updated from base version from 4.19.75 to 4.19.78,
and updated VSP1 and DU, added support r8a774c0's CANFD.

The linux-4.4.y-cip tree has been updated from base version from 4.4.192 to 4.4.196.

You can get this release via the git tree at:

v4.19.78-cip12:

repository: https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git
branch: linux-4.19.y-cip
commit: 4b63cf5d2a9dcd2f8b4a1dcb77a4637669dfb934

v4.4.196-cip38:

repository: https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git
branch: linux-4.4.y-cip
commit: 83bce8ee46df26e7ad3129f6b824d47d9640a510

Best regards,
Nobuhiro


Re: [PATCH 4.19.y-cip 2/3] arm64: dts: renesas: hihope-common: Add BT support

Biju Das <biju.das@...>
 

Hi Pavel,

Thanks for feedback.

Subject: Re: [PATCH 4.19.y-cip 2/3] arm64: dts: renesas: hihope-common:
Add BT support

Hi!

commit d112c20925443b4a8876b101e5b7b13ef105057e upstream.

This patch enables BT support for the HiHope RZ/G2[MN] boards.
+++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
@@ -31,6 +32,13 @@
leds {
compatible = "gpio-leds";

+ bt_active_led {
+ label = "blue:bt";
It would be good to change this to "blue:bluetooth", for consistency with
include/dt-bindings/leds/common.h . It will change names in the sysfs.
Can you please me point to the right file? There is nothing related to "blue:bluetooth",
Mentioned in include/dt-bindings/leds/common.h

Cheers,
Biju


Re: [PATCH 4.19.y-cip 0/3] Add WLAN/BT support

Nobuhiro Iwamatsu
 

Hi all,

-----Original Message-----
From: Pavel Machek [mailto:pavel@...]
Sent: Thursday, October 10, 2019 4:43 PM
To: Biju Das <biju.das@...>
Cc: cip-dev@...; iwamatsu nobuhiro(岩松 信洋 ○SW
C□OST) <nobuhiro1.iwamatsu@...>; Pavel Machek
<pavel@...>; Chris Paterson <chris.paterson2@...>;
Fabrizio Castro <fabrizio.castro@...>
Subject: Re: [PATCH 4.19.y-cip 0/3] Add WLAN/BT support

Hi!

This patch series add WLAN/BT support for HiHope RZ/G2M platform.

This patch series is based on linux-4.19.y-cip and all the patches in
this series are cherry-picked from linux rc tree.

Biju Das (3):
arm64: dts: renesas: hihope-common: Add PCA9654 I/O expander
arm64: dts: renesas: hihope-common: Add BT support
arm64: dts: renesas: hihope-common: Add WLAN support
Thank you, series looks good. (Comment about label probably should be
resolved in the mainline, first).
Looks good to me too.

I can apply it unless Iwamatsu wants to do that?
Please apply.

Best regards,
Nobuhiro


Re: [PATCH 4.19.y-cip 2/3] arm64: dts: renesas: hihope-common: Add BT support

Biju Das <biju.das@...>
 

Hi Pavel,

Thanks for the feedback.

-----Original Message-----
From: Pavel Machek <pavel@...>
Sent: Thursday, October 10, 2019 8:38 AM
To: Biju Das <biju.das@...>
Cc: cip-dev@...; Nobuhiro Iwamatsu
<nobuhiro1.iwamatsu@...>; Pavel Machek <pavel@...>;
Chris Paterson <Chris.Paterson2@...>; Fabrizio Castro
<fabrizio.castro@...>
Subject: Re: [PATCH 4.19.y-cip 2/3] arm64: dts: renesas: hihope-common:
Add BT support

Hi!

commit d112c20925443b4a8876b101e5b7b13ef105057e upstream.

This patch enables BT support for the HiHope RZ/G2[MN] boards.
+++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
@@ -31,6 +32,13 @@
leds {
compatible = "gpio-leds";

+ bt_active_led {
+ label = "blue:bt";
As you mentioned, I agree we should fix this in mainline first and then backported to cip.

Cherrs,
Biju

It would be good to change this to "blue:bluetooth", for consistency with
include/dt-bindings/leds/common.h . It will change names in the sysfs.

Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


Re: [PATCH 4.19.y-cip 0/3] Add WLAN/BT support

Pavel Machek
 

Hi!

This patch series add WLAN/BT support for HiHope RZ/G2M platform.

This patch series is based on linux-4.19.y-cip and all the patches
in this series are cherry-picked from linux rc tree.

Biju Das (3):
arm64: dts: renesas: hihope-common: Add PCA9654 I/O expander
arm64: dts: renesas: hihope-common: Add BT support
arm64: dts: renesas: hihope-common: Add WLAN support
Thank you, series looks good. (Comment about label probably should be
resolved in the mainline, first).

I can apply it unless Iwamatsu wants to do that?

Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


Re: [PATCH 4.19.y-cip 2/3] arm64: dts: renesas: hihope-common: Add BT support

Pavel Machek
 

Hi!

commit d112c20925443b4a8876b101e5b7b13ef105057e upstream.

This patch enables BT support for the HiHope RZ/G2[MN] boards.
+++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
@@ -31,6 +32,13 @@
leds {
compatible = "gpio-leds";

+ bt_active_led {
+ label = "blue:bt";
It would be good to change this to "blue:bluetooth", for consistency
with include/dt-bindings/leds/common.h . It will change names in the
sysfs.

Best regards,
Pavel
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


[PATCH 4.19.y-cip 3/3] arm64: dts: renesas: hihope-common: Add WLAN support

Biju Das <biju.das@...>
 

commit 176f936a1e887a53d78f05248dc3c9bbd2c7f4c8 upstream.

This patch enables WLAN support for the HiHope RZ/G2[MN] boards.

Signed-off-by: Biju Das <biju.das@...>
Signed-off-by: Geert Uytterhoeven <geert+renesas@...>
---
arch/arm64/boot/dts/renesas/hihope-common.dtsi | 45 ++++++++++++++++++++++++++
1 file changed, 45 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/hihope-common.dtsi b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
index 76f7a9a..0daff2d 100644
--- a/arch/arm64/boot/dts/renesas/hihope-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
@@ -54,6 +54,13 @@
led3 {
gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
};
+
+ wlan_active_led {
+ label = "yellow:wlan";
+ gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "phy0tx";
+ default-state = "off";
+ };
};

reg_1p8v: regulator0 {
@@ -98,6 +105,17 @@
1800000 0>;
};

+ wlan_en_reg: regulator-wlan_en {
+ compatible = "regulator-fixed";
+ regulator-name = "wlan-en-regulator";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ startup-delay-us = <70000>;
+
+ gpio = <&gpio_expander 1 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
x302_clk: x302-clock {
compatible = "fixed-clock";
#clock-cells = <0>;
@@ -242,6 +260,12 @@
power-source = <1800>;
};

+ sdhi2_pins: sd2 {
+ groups = "sdhi2_data4", "sdhi2_ctrl";
+ function = "sdhi2";
+ power-source = <1800>;
+ };
+
sdhi3_pins: sd3 {
groups = "sdhi3_data8", "sdhi3_ctrl", "sdhi3_ds";
function = "sdhi3";
@@ -301,6 +325,27 @@
status = "okay";
};

+&sdhi2 {
+ status = "okay";
+ pinctrl-0 = <&sdhi2_pins>;
+ pinctrl-names = "default";
+
+ vmmc-supply = <&wlan_en_reg>;
+ bus-width = <4>;
+ non-removable;
+ cap-power-off-card;
+ keep-power-in-suspend;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+ wlcore: wlcore@2 {
+ compatible = "ti,wl1837";
+ reg = <2>;
+ interrupt-parent = <&gpio2>;
+ interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
+ };
+};
+
&sdhi3 {
pinctrl-0 = <&sdhi3_pins>;
pinctrl-1 = <&sdhi3_pins>;
--
2.7.4


[PATCH 4.19.y-cip 2/3] arm64: dts: renesas: hihope-common: Add BT support

Biju Das <biju.das@...>
 

commit d112c20925443b4a8876b101e5b7b13ef105057e upstream.

This patch enables BT support for the HiHope RZ/G2[MN] boards.

Signed-off-by: Biju Das <biju.das@...>
Signed-off-by: Geert Uytterhoeven <geert+renesas@...>
---
arch/arm64/boot/dts/renesas/hihope-common.dtsi | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/hihope-common.dtsi b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
index a13cb88..76f7a9a 100644
--- a/arch/arm64/boot/dts/renesas/hihope-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
@@ -10,6 +10,7 @@
/ {
aliases {
serial0 = &scif2;
+ serial1 = &hscif0;
};

chosen {
@@ -31,6 +32,13 @@
leds {
compatible = "gpio-leds";

+ bt_active_led {
+ label = "blue:bt";
+ gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "hci0-power";
+ default-state = "off";
+ };
+
led0 {
gpios = <&gpio6 11 GPIO_ACTIVE_HIGH>;
};
@@ -153,6 +161,19 @@
};
};

+&hscif0 {
+ pinctrl-0 = <&hscif0_pins>;
+ pinctrl-names = "default";
+
+ uart-has-rtscts;
+ status = "okay";
+
+ bluetooth {
+ compatible = "ti,wl1837-st";
+ enable-gpios = <&gpio_expander 2 GPIO_ACTIVE_HIGH>;
+ };
+};
+
&hsusb {
dr_mode = "otg";
status = "okay";
@@ -194,6 +215,11 @@
pinctrl-0 = <&scif_clk_pins>;
pinctrl-names = "default";

+ hscif0_pins: hscif0 {
+ groups = "hscif0_data", "hscif0_ctrl";
+ function = "hscif0";
+ };
+
scif2_pins: scif2 {
groups = "scif2_data_a";
function = "scif2";
--
2.7.4


[PATCH 4.19.y-cip 1/3] arm64: dts: renesas: hihope-common: Add PCA9654 I/O expander

Biju Das <biju.das@...>
 

commit cd3e43be14189542d8934faa94eff0392da32536 upstream.

Enable PCA9654 GPIO expander, so that we can configure its GPIOs later.

Signed-off-by: Biju Das <biju.das@...>
Signed-off-by: Geert Uytterhoeven <geert+renesas@...>
---
arch/arm64/boot/dts/renesas/hihope-common.dtsi | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/hihope-common.dtsi b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
index 23fd022..a13cb88 100644
--- a/arch/arm64/boot/dts/renesas/hihope-common.dtsi
+++ b/arch/arm64/boot/dts/renesas/hihope-common.dtsi
@@ -162,6 +162,13 @@
clock-frequency = <400000>;
status = "okay";

+ gpio_expander: gpio@20 {
+ compatible = "onnn,pca9654";
+ reg = <0x20>;
+ gpio-controller;
+ #gpio-cells = <2>;
+ };
+
versaclock5: clock-generator@6a {
compatible = "idt,5p49v5923";
reg = <0x6a>;
--
2.7.4


[PATCH 4.19.y-cip 0/3] Add WLAN/BT support

Biju Das <biju.das@...>
 

This patch series add WLAN/BT support for HiHope RZ/G2M platform.

This patch series is based on linux-4.19.y-cip and all the patches
in this series are cherry-picked from linux rc tree.

Biju Das (3):
arm64: dts: renesas: hihope-common: Add PCA9654 I/O expander
arm64: dts: renesas: hihope-common: Add BT support
arm64: dts: renesas: hihope-common: Add WLAN support

arch/arm64/boot/dts/renesas/hihope-common.dtsi | 78 ++++++++++++++++++++++++++
1 file changed, 78 insertions(+)

--
2.7.4


CIP IRC weekly meeting today

SZ Lin (林上智) <SZ.Lin@...>
 

Hi all,

 

Kindly be reminded to attend the weekly meeting through IRC to discuss technical topics with CIP kernel today.

 

*Please note that IRC meeting was rescheduled to UTC (GMT) 09:00 starting from the first week of Apr. according to TSC meeting*

https://www.timeanddate.com/worldclock/meetingdetails.html?year=2019&month=10&day=10&hour=9&min=0&sec=0&p1=241&p2=137&p3=179&p4=136&p5=37&p6=248

         

US-West US-East   UK     DE     TW     JP

02:00    05:00   10:00   11:00   17:00   18:00

 

Channel:

* irc:chat.freenode.net:6667/cip

 

Agenda:

 

* Action item

1. Provide the cases to cip-testing to build up the test environment - Iwamatsu-san

 

2. Test LTS (pre)releases directly patersonc

 

3. Review the proposal from Kudo-san - Kernel team

 

* Kernel maintenance updates

* Kernel testing

* CIP Core

* Software update

* AOB

 

The meeting will take 30 min, although it can be extended to an hour if it makes sense and those involved in the topics can stay. Otherwise, the topic will be taken offline or in the next meeting.

 

Best regards,

 

SZ Lin, Moxa.

6221 - 6240 of 9641