diff --git a/.github/problem-matchers/compiler-non-source.json b/.github/problem-matchers/compiler-non-source.json new file mode 100644 index 0000000000000..5a21a7dcbb594 --- /dev/null +++ b/.github/problem-matchers/compiler-non-source.json @@ -0,0 +1,17 @@ +{ + "problemMatcher": [ + { + "__comment_owner": "match compiler warning/error lines not from source", + "owner": "compiler-non-source", + "pattern": [ + { + "__comment_regexp1": "clang: warning: argument unused during compilation: '-march=armv7-a' [-Wunused-command-line-argument]", + "__comment_regexp2": "ld.lld: warning: lld uses blx instruction, no object with architecture supporting feature detected", + "regexp": "^(?:[^:]+): (?:fatal\\s+)?(warning|error):\\s+(.*)$", + "severity": 1, + "message": 2 + } + ] + } + ] +} diff --git a/.github/problem-matchers/compiler-source.json b/.github/problem-matchers/compiler-source.json new file mode 100644 index 0000000000000..e719f671e8dc7 --- /dev/null +++ b/.github/problem-matchers/compiler-source.json @@ -0,0 +1,17 @@ +{ + "problemMatcher": [ + { + "owner": "gcc-problem-matcher", + "pattern": [ + { + "regexp": "^(?:/linux/)?(.*):(\\d+):(\\d+):\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$", + "file": 1, + "line": 2, + "column": 3, + "severity": 4, + "message": 5 + } + ] + } + ] +} diff --git a/.github/workflows/powerpc-allconfig.yml b/.github/workflows/powerpc-allconfig.yml new file mode 100644 index 0000000000000..7db42cf836a6f --- /dev/null +++ b/.github/workflows/powerpc-allconfig.yml @@ -0,0 +1,76 @@ +name: powerpc/allconfig + +# Controls when the action will run. +on: + # This allows the build to be triggered manually via the github UI. + workflow_dispatch: + + push: + # This triggers the build on a push to merge-test only + branches: + - 'merge-test' + +jobs: + kernel: + runs-on: ubuntu-latest + + continue-on-error: true + + strategy: + fail-fast: false + matrix: + include: + # ppc64le allmod and allyes + - subarch: ppc64le + defconfig: ppc64le_allmodconfig + image: ubuntu-21.10 + - subarch: ppc64le + defconfig: allmodconfig + image: ubuntu-21.10 + merge_config: /linux/arch/powerpc/configs/le.config + # ppc64 allmod and allyes + - subarch: ppc64 + defconfig: allmodconfig + image: ubuntu-21.10 + - subarch: ppc64 + defconfig: allyesconfig + image: ubuntu-21.10 + # ppc32 allmod + - subarch: ppc + defconfig: ppc32_allmodconfig + image: ubuntu-21.10 + # ppc64 book3e allmod + - subarch: ppc64 + defconfig: ppc64_book3e_allmodconfig + image: ubuntu-21.10 + + env: + ARCH: powerpc + TARGET: kernel + SUBARCH: ${{ matrix.subarch }} + IMAGE: ${{ matrix.image }} + DEFCONFIG: ${{ matrix.defconfig }} + MERGE_CONFIG: /linux/arch/powerpc/configs/disable-werror.config,${{ matrix.merge_config }} + + steps: + - uses: actions/checkout@v2 + + - name: Register problem matchers + run: | + echo "::add-matcher::.github/problem-matchers/compiler-source.json" + echo "::add-matcher::.github/problem-matchers/compiler-non-source.json" + + - name: build + run: ./arch/powerpc/tools/ci-build.sh + + - name: Archive artifacts + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.defconfig }}-${{ matrix.image }} + path: | + ~/output/vmlinux + ~/output/.config + ~/output/System.map + ~/output/modules.tar.bz2 + ~/output/arch/powerpc/boot/zImage + ~/output/arch/powerpc/boot/uImage diff --git a/.github/workflows/powerpc-extrawarn.yml b/.github/workflows/powerpc-extrawarn.yml new file mode 100644 index 0000000000000..6e10622a54353 --- /dev/null +++ b/.github/workflows/powerpc-extrawarn.yml @@ -0,0 +1,55 @@ +name: powerpc/extrawarn + +# Controls when the action will run. +on: + # Only when triggered manually via the github UI. + workflow_dispatch: + +jobs: + kernel: + runs-on: ubuntu-latest + + strategy: + matrix: + defconfig: [ppc64, corenet64_smp, pmac32, ppc40x, ppc44x, mpc885_ads, corenet32_smp] + image: [fedora-33, korg-4.9.4] + subarch: [ppc64] + include: + - subarch: ppc64le + defconfig: ppc64le + image: korg-5.5.0 + - subarch: ppc64le + defconfig: ppc64le + image: fedora-33 + + env: + ARCH: powerpc + TARGET: kernel + SUBARCH: ${{ matrix.subarch }} + IMAGE: ${{ matrix.image }} + DEFCONFIG: ${{ matrix.defconfig }} + MERGE_CONFIG: /linux/arch/powerpc/configs/disable-werror.config + KBUILD_EXTRA_WARN: 1 + + steps: + - uses: actions/checkout@v2 + + - name: Register problem matchers + run: | + echo "::add-matcher::.github/problem-matchers/compiler-source.json" + echo "::add-matcher::.github/problem-matchers/compiler-non-source.json" + + - name: build + run: ./arch/powerpc/tools/ci-build.sh + + - name: Archive artifacts + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.defconfig }}-${{ matrix.image }} + path: | + ~/output/vmlinux + ~/output/.config + ~/output/System.map + ~/output/modules.tar.bz2 + ~/output/arch/powerpc/boot/zImage + ~/output/arch/powerpc/boot/uImage diff --git a/.github/workflows/powerpc-kernel+qemu.yml b/.github/workflows/powerpc-kernel+qemu.yml new file mode 100644 index 0000000000000..f297df10c1afc --- /dev/null +++ b/.github/workflows/powerpc-kernel+qemu.yml @@ -0,0 +1,195 @@ +name: powerpc/kernel+qemu + +# Controls when the action will run. +on: + # This allows the build to be triggered manually via the github UI. + workflow_dispatch: + + push: + # This triggers the build on a push to any branch + branches: + - '**' + # As long as one of these paths matches + paths: + - '!tools/**' # ignore tools + - '!samples/**' # ignore samples + - '!Documentation/**' # ignore Documentation + - '!arch/**' # ignore arch changes + - 'arch/powerpc/**' # but not arch/powerpc + - 'arch/Kconfig' # or common bits in arch + - '**' # anything else triggers a build + +jobs: + kernel: + runs-on: ubuntu-latest + + strategy: + matrix: + defconfig: [ppc64_defconfig, ppc40x_defconfig, mpc885_ads_defconfig] + image: [fedora-34, korg-5.5.0] + include: + # ppc64le + - defconfig: ppc64le_defconfig + image: korg-5.5.0 + subarch: ppc64le + - defconfig: ppc64le_defconfig + image: fedora-34 + subarch: ppc64le + + # ppc64le_guest_defconfig + - subarch: ppc64le + defconfig: ppc64le_guest_defconfig + image: fedora-34 + - subarch: ppc64le + defconfig: ppc64le_guest_defconfig + image: korg-5.5.0 + + # ppc44x + - defconfig: ppc44x_defconfig + merge_config: /linux/arch/powerpc/configs/ppc44x-qemu.config + image: fedora-34 + - defconfig: ppc44x_defconfig + merge_config: /linux/arch/powerpc/configs/ppc44x-qemu.config + image: korg-5.5.0 + + # corenet64_smp + - defconfig: corenet64_smp_defconfig + merge_config: /linux/arch/powerpc/configs/ppc64e-qemu.config + image: fedora-34 + - defconfig: corenet64_smp_defconfig + merge_config: /linux/arch/powerpc/configs/ppc64e-qemu.config + image: korg-5.5.0 + + # g5 + - defconfig: g5_defconfig + merge_config: /linux/arch/powerpc/configs/g5-qemu.config + image: fedora-34 + - defconfig: g5_defconfig + merge_config: /linux/arch/powerpc/configs/g5-qemu.config + image: korg-5.5.0 + + # pmac32 + - defconfig: pmac32_defconfig + merge_config: /linux/arch/powerpc/configs/pmac32-qemu.config + image: fedora-34 + - defconfig: pmac32_defconfig + merge_config: /linux/arch/powerpc/configs/pmac32-qemu.config + image: korg-5.5.0 + + - defconfig: corenet32_smp_defconfig + image: fedora-34 + + env: + ARCH: powerpc + TARGET: kernel + SUBARCH: ${{ matrix.subarch }} + IMAGE: ${{ matrix.image }} + DEFCONFIG: ${{ matrix.defconfig }} + MERGE_CONFIG: ${{ matrix.merge_config }} + + steps: + - uses: actions/checkout@v2 + + - name: Register problem matchers + run: | + echo "::add-matcher::.github/problem-matchers/compiler-source.json" + echo "::add-matcher::.github/problem-matchers/compiler-non-source.json" + + - name: build + run: ./arch/powerpc/tools/ci-build.sh + + - name: Archive artifacts + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.defconfig }}-${{ matrix.image }} + path: | + ~/output/vmlinux + ~/output/.config + ~/output/System.map + ~/output/modules.tar.bz2 + ~/output/arch/powerpc/boot/zImage + ~/output/arch/powerpc/boot/uImage + ~/output/include/config/kernel.release + + boot: + runs-on: ubuntu-latest + needs: kernel + + strategy: + matrix: + include: + - defconfig: ppc64le_guest_defconfig + machine: pseries+p8+tcg + machine_2: pseries+p9+tcg + packages: qemu-system-ppc64 + rootfs: ppc64le-rootfs.cpio.gz + old-image: korg-5.5.0 + new-image: fedora-34 + + - defconfig: ppc44x_defconfig + machine: 44x + packages: qemu-system-ppc + rootfs: ppc-rootfs.cpio.gz + old-image: korg-5.5.0 + new-image: fedora-34 + + - defconfig: corenet64_smp_defconfig + machine: ppc64e + machine_2: ppc64e+compat + packages: qemu-system-ppc64 + rootfs: ppc64-novsx-rootfs.cpio.gz ppc-rootfs.cpio.gz + old-image: korg-5.5.0 + new-image: fedora-34 + + - defconfig: g5_defconfig + machine: g5 + packages: qemu-system-ppc64 openbios-ppc + rootfs: ppc64-rootfs.cpio.gz + old-image: korg-5.5.0 + new-image: fedora-34 + + - defconfig: pmac32_defconfig + machine: mac99 + packages: qemu-system-ppc openbios-ppc + rootfs: ppc-rootfs.cpio.gz + old-image: korg-5.5.0 + new-image: fedora-34 + + steps: + - uses: actions/checkout@v2 + with: + repository: linuxppc/ci-scripts + + - name: Download root disk + run: make -C root-disks ${{ matrix.rootfs }} + + - name: Set root disk path + run: echo "ROOT_DISK_PATH=$PWD/root-disks" >> $GITHUB_ENV + + - name: APT update + run: sudo apt update + + - name: Install dependencies + run: sudo apt install -y ${{ matrix.packages }} python3-pexpect python3-termcolor python3-yaml + + - uses: actions/download-artifact@v2 + with: + name: ${{ matrix.defconfig }}-${{ matrix.new-image }} + + - name: Run qemu-${{ matrix.machine }} with ${{ matrix.new-image }} build kernel + run: ./scripts/boot/qemu-${{ matrix.machine }} + + - name: Run qemu-${{ matrix.machine_2 }} with ${{ matrix.new-image }} build kernel + run: ./scripts/boot/qemu-${{ matrix.machine_2 }} + if: matrix.machine_2 != '' + + - uses: actions/download-artifact@v2 + with: + name: ${{ matrix.defconfig }}-${{ matrix.old-image }} + + - name: Run qemu-${{ matrix.machine }} with ${{ matrix.old-image }} build kernel + run: ./scripts/boot/qemu-${{ matrix.machine }} + + - name: Run qemu-${{ matrix.machine_2 }} with ${{ matrix.old-image }} build kernel + run: ./scripts/boot/qemu-${{ matrix.machine_2 }} + if: matrix.machine_2 != '' diff --git a/.github/workflows/powerpc-perf.yml b/.github/workflows/powerpc-perf.yml new file mode 100644 index 0000000000000..1d65c14812305 --- /dev/null +++ b/.github/workflows/powerpc-perf.yml @@ -0,0 +1,53 @@ +name: powerpc/perf + +# Controls when the action will run. +on: + # This allows the build to be triggered manually via the github UI. + workflow_dispatch: + + push: + # This triggers the build on a push to any branch + branches: + - '**' + # As long as one of these paths matches + paths: + # Only build if perf or other pieces it uses have been modified + - 'tools/perf/**' + - 'tools/arch/**' + - 'tools/build/**' + - 'tools/include/**' + - 'tools/lib/**' + - 'tools/scripts/**' + +jobs: + perf: + runs-on: ubuntu-latest + + strategy: + matrix: + image: [ubuntu-21.10, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04, ubuntu-16.04] + subarch: [ppc64, ppc64le] + + env: + ARCH: powerpc + TARGET: perf + SUBARCH: ${{ matrix.subarch }} + IMAGE: ${{ matrix.image }} + + steps: + - uses: actions/checkout@v2 + + - name: Register problem matchers + run: | + echo "::add-matcher::.github/problem-matchers/compiler-source.json" + echo "::add-matcher::.github/problem-matchers/compiler-non-source.json" + + - name: build + run: ./arch/powerpc/tools/ci-build.sh + + - name: Archive artifacts + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.subarch }}-${{ matrix.image }} + path: | + ~/output diff --git a/.github/workflows/powerpc-ppctests.yml b/.github/workflows/powerpc-ppctests.yml new file mode 100644 index 0000000000000..6638ffc85c602 --- /dev/null +++ b/.github/workflows/powerpc-ppctests.yml @@ -0,0 +1,51 @@ +name: powerpc/ppctests + +# Controls when the action will run. +on: + # This allows the build to be triggered manually via the github UI. + workflow_dispatch: + + push: + # This triggers the build on a push to any branch + branches: + - '**' + # As long as one of these paths matches + paths: + # Generic selftests changes might affect us so match all of selftests + - 'tools/testing/selftests/**' + # Some files in arch are symlinked by selftests + - 'arch/powerpc/**' + +jobs: + ppctests: + runs-on: ubuntu-latest + + strategy: + matrix: + image: [ubuntu-21.10, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04, ubuntu-16.04] + subarch: [ppc64, ppc64le] + + env: + ARCH: powerpc + TARGET: ppctests + INSTALL: 1 + SUBARCH: ${{ matrix.subarch }} + IMAGE: ${{ matrix.image }} + + steps: + - uses: actions/checkout@v2 + + - name: Register problem matchers + run: | + echo "::add-matcher::.github/problem-matchers/compiler-source.json" + echo "::add-matcher::.github/problem-matchers/compiler-non-source.json" + + - name: build + run: ./arch/powerpc/tools/ci-build.sh + + - name: Archive artifacts + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.subarch }}-${{ matrix.image }} + path: | + ~/output/install diff --git a/.github/workflows/powerpc-selftests.yml b/.github/workflows/powerpc-selftests.yml new file mode 100644 index 0000000000000..90e3febf40d04 --- /dev/null +++ b/.github/workflows/powerpc-selftests.yml @@ -0,0 +1,51 @@ +name: powerpc/selftests + +# Controls when the action will run. +on: + # This allows the build to be triggered manually via the github UI. + workflow_dispatch: + + push: + # This triggers the build on a push to any branch + branches: + - '**' + # As long as one of these paths matches + paths: + # Generic selftests changes might affect us so match all of selftests + - 'tools/testing/selftests/**' + # Some files in arch are symlinked by selftests + - 'arch/powerpc/**' + +jobs: + selftests: + runs-on: ubuntu-latest + + strategy: + matrix: + image: [ubuntu-21.10, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04, ubuntu-16.04] + subarch: [ppc64, ppc64le] + + env: + ARCH: powerpc + TARGET: selftests + INSTALL: 1 + SUBARCH: ${{ matrix.subarch }} + IMAGE: ${{ matrix.image }} + + steps: + - uses: actions/checkout@v2 + + - name: Register problem matchers + run: | + echo "::add-matcher::.github/problem-matchers/compiler-source.json" + echo "::add-matcher::.github/problem-matchers/compiler-non-source.json" + + - name: build + run: ./arch/powerpc/tools/ci-build.sh + + - name: Archive artifacts + uses: actions/upload-artifact@v2 + with: + name: ${{ matrix.subarch }}-${{ matrix.image }} + path: | + ~/output/install diff --git a/.github/workflows/powerpc-sparse.yml b/.github/workflows/powerpc-sparse.yml new file mode 100644 index 0000000000000..7ab9c2d30b02b --- /dev/null +++ b/.github/workflows/powerpc-sparse.yml @@ -0,0 +1,64 @@ +name: powerpc/sparse + +# Controls when the action will run. +on: + # This allows the build to be triggered manually via the github UI. + workflow_dispatch: + + push: + # This triggers the build on a push to any branch named ci/powerpc/ + branches: + - '**' + # As long as one of these paths matches + paths: + - '!tools/**' # ignore tools + - '!samples/**' # ignore samples + - '!Documentation/**' # ignore Documentation + - '!arch/**' # ignore arch changes + - 'arch/powerpc/**' # but not arch/powerpc + - 'arch/Kconfig' # or common bits in arch + - '**' # anything else triggers a build + +jobs: + sparse: + runs-on: ubuntu-latest + + strategy: + matrix: + defconfig: [ppc64, pmac32, mpc885_ads_defconfig] + image: [ubuntu-21.10] + subarch: [ppc64] + include: + - subarch: ppc64le + defconfig: ppc64le + image: ubuntu-21.10 + + env: + ARCH: powerpc + TARGET: kernel + SPARSE: 1 + SUBARCH: ${{ matrix.subarch }} + IMAGE: ${{ matrix.image }} + DEFCONFIG: ${{ matrix.defconfig }} + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Register problem matchers + run: | + echo "::add-matcher::.github/problem-matchers/compiler-source.json" + echo "::add-matcher::.github/problem-matchers/compiler-non-source.json" + + - name: Build + run: ./arch/powerpc/tools/ci-build.sh + + - name: powerpc sparse errors + run: grep /linux/arch/powerpc ~/output/sparse.log + + - name: Archive artifacts + uses: actions/upload-artifact@v2 + with: + name: sparse-${{ matrix.defconfig }}-${{ matrix.image }}.log + path: | + ~/output/sparse.log diff --git a/arch/powerpc/configs/disable-werror.config b/arch/powerpc/configs/disable-werror.config new file mode 100644 index 0000000000000..668b2a57f6e57 --- /dev/null +++ b/arch/powerpc/configs/disable-werror.config @@ -0,0 +1,2 @@ +CONFIG_PPC_DISABLE_WERROR=y +CONFIG_WERROR=n diff --git a/arch/powerpc/configs/g5-qemu.config b/arch/powerpc/configs/g5-qemu.config new file mode 100644 index 0000000000000..3ae1c8a8bc61f --- /dev/null +++ b/arch/powerpc/configs/g5-qemu.config @@ -0,0 +1,2 @@ +CONFIG_SERIAL_PMACZILOG=y +CONFIG_SERIAL_PMACZILOG_CONSOLE=y diff --git a/arch/powerpc/configs/pmac32-qemu.config b/arch/powerpc/configs/pmac32-qemu.config new file mode 100644 index 0000000000000..de4d633034a60 --- /dev/null +++ b/arch/powerpc/configs/pmac32-qemu.config @@ -0,0 +1,4 @@ +CONFIG_SERIAL_PMACZILOG=y +CONFIG_SERIAL_PMACZILOG_CONSOLE=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y diff --git a/arch/powerpc/configs/ppc44x-qemu.config b/arch/powerpc/configs/ppc44x-qemu.config new file mode 100644 index 0000000000000..5e9cf983acc7d --- /dev/null +++ b/arch/powerpc/configs/ppc44x-qemu.config @@ -0,0 +1,2 @@ +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y diff --git a/arch/powerpc/configs/ppc64e-qemu.config b/arch/powerpc/configs/ppc64e-qemu.config new file mode 100644 index 0000000000000..6f36f4d1f58a2 --- /dev/null +++ b/arch/powerpc/configs/ppc64e-qemu.config @@ -0,0 +1,3 @@ +CONFIG_E5500_CPU=y +CONFIG_PPC_QEMU_E500=y +CONFIG_POWER_RESET_GPIO=y diff --git a/arch/powerpc/tools/ci-build.sh b/arch/powerpc/tools/ci-build.sh new file mode 100755 index 0000000000000..420df6ec5a2f5 --- /dev/null +++ b/arch/powerpc/tools/ci-build.sh @@ -0,0 +1,84 @@ +#!/bin/bash + +if [[ -z "$TARGET" || -z "$IMAGE" ]]; then + echo "Error: required environment variables not set!" + exit 1 +fi + +cmd="docker run --rm " +cmd+="--network none " +cmd+="-w /linux " + +linux_dir=$(realpath $(dirname $0))/../../../ +cmd+="-v $linux_dir:/linux:ro " + +cmd+="-e ARCH " +cmd+="-e JFACTOR=$(nproc) " +cmd+="-e KBUILD_BUILD_TIMESTAMP=$(date +%Y-%m-%d) " +cmd+="-e CLANG " +cmd+="-e LLVM_IAS " +cmd+="-e SPARSE " + +if [[ -n "$MODULES" ]]; then + cmd+="-e MODULES=$MODULES " +fi + +if [[ -n "$DEFCONFIG" ]]; then + if [[ $DEFCONFIG != *config ]]; then + DEFCONFIG=${DEFCONFIG}_defconfig + fi + + cmd+="-e DEFCONFIG=${DEFCONFIG} " +fi + +if [[ -n "$MERGE_CONFIG" ]]; then + cmd+="-e MERGE_CONFIG=$MERGE_CONFIG " +fi + +if [[ "$SUBARCH" == "ppc64le" ]]; then + cross="powerpc64le-linux-gnu-" +else + cross="powerpc-linux-gnu-" +fi +cmd+="-e CROSS_COMPILE=$cross " + +mkdir -p $HOME/output +cmd+="-v $HOME/output:/output:rw " + +user=$(stat -c "%u:%g" $HOME/output) +cmd+="-u $user " + +if [[ -n "$CCACHE" ]]; then + cmd+="-v $HOME/.ccache:/ccache:rw " + cmd+="-e CCACHE_DIR=/ccache " + cmd+="-e CCACHE=1 " +fi + +if [[ -n "$TARGETS" ]]; then + cmd+="-e TARGETS=$TARGETS " +fi + +if [[ -n "$INSTALL" ]]; then + cmd+="-e INSTALL=$INSTALL " +fi + +if [[ "$TARGET" == "kernel" ]]; then + cmd+="-e QUIET=1 " +fi + +if [[ -n $KBUILD_EXTRA_WARN ]]; then + cmd+="-e KBUILD_EXTRA_WARN=$KBUILD_EXTRA_WARN " +fi + +cmd+="linuxppc/build:$IMAGE-$(uname -m) " +cmd+="/bin/container-build.sh $TARGET" + +(set -x; $cmd) + +rc=$? + +if [[ -n "$SPARSE" ]]; then + cat $HOME/output/sparse.log +fi + +exit $rc