Commit 3189e9d3 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-5.0-sf5' into staging 



RISC-V Patches for the 5.0 Soft Freeze, Part 5

This tag contains the last of the patches I'd like to target for the 5.0 soft
freeze.  At this point we're mostly collecting fixes, but there are a few new
features.  The changes include:

* An OpenSBI update, including the various bits necessary to put CI together
  and an image for the 32-bit sifive_u board.
* A fix that disallows TSR when outside of machine mode.
* A fix for VS-mode interrupt forwarding.

# gpg: Signature made Tue 17 Mar 2020 03:59:58 GMT
# gpg:                using RSA key 2B3C3747446843B24A943A7A2E1319F35FBB1889
# gpg:                issuer "palmer@dabbelt.com"
# gpg: Good signature from "Palmer Dabbelt <palmer@dabbelt.com>" [unknown]
# gpg:                 aka "Palmer Dabbelt <palmer@sifive.com>" [unknown]
# gpg:                 aka "Palmer Dabbelt <palmerdabbelt@google.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 00CE 76D1 8349 60DF CE88  6DF8 EF4C A150 2CCB AB41
#      Subkey fingerprint: 2B3C 3747 4468 43B2 4A94  3A7A 2E13 19F3 5FBB 1889

* remotes/palmer/tags/riscv-for-master-5.0-sf5:
  target/riscv: Fix VS mode interrupts forwarding.
  gitlab-ci.yml: Add jobs to build OpenSBI firmware binaries
  riscv: sifive_u: Update BIOS_FILENAME for 32-bit
  roms: opensbi: Add 32-bit firmware image for sifive_u machine
  roms: opensbi: Upgrade from v0.5 to v0.6
  target/riscv: Correctly implement TSR trap

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a98135f7 c5969a3a

.gitlab-ci-opensbi.yml

0 → 100644
+63 −0
Original line number Diff line number Diff line 
docker-opensbi:

 stage: build

 rules: # Only run this job when the Dockerfile is modified

 - changes:

   - .gitlab-ci-opensbi.yml

   - .gitlab-ci.d/opensbi/Dockerfile

   when: always

 image: docker:19.03.1

 services:

 - docker:19.03.1-dind

 variables:

  GIT_DEPTH: 3

  IMAGE_TAG: $CI_REGISTRY_IMAGE:opensbi-cross-build

  # We don't use TLS

  DOCKER_HOST: tcp://docker:2375

  DOCKER_TLS_CERTDIR: ""

 before_script:

 - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY

 script:

 - docker pull $IMAGE_TAG || true

 - docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA

                                        --tag $IMAGE_TAG .gitlab-ci.d/opensbi

 - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA

 - docker push $IMAGE_TAG



build-opensbi:

 rules: # Only run this job when ...

 - changes: # ... roms/opensbi/ is modified (submodule updated)

   - roms/opensbi/*

   when: always

 - if: '$CI_COMMIT_REF_NAME =~ /^opensbi/' # or the branch/tag starts with 'opensbi'

   when: always

 - if: '$CI_COMMIT_MESSAGE =~ /opensbi/i' # or last commit description contains 'OpenSBI'

   when: always

 artifacts:

   paths: # 'artifacts.zip' will contains the following files:

   - pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin

   - pc-bios/opensbi-riscv32-virt-fw_jump.bin

   - pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin

   - pc-bios/opensbi-riscv64-virt-fw_jump.bin

   - opensbi32-virt-stdout.log

   - opensbi32-virt-stderr.log

   - opensbi64-virt-stdout.log

   - opensbi64-virt-stderr.log

   - opensbi32-sifive_u-stdout.log

   - opensbi32-sifive_u-stderr.log

   - opensbi64-sifive_u-stdout.log

   - opensbi64-sifive_u-stderr.log

 image: $CI_REGISTRY_IMAGE:opensbi-cross-build

 variables:

   GIT_DEPTH: 3

 script: # Clone the required submodules and build OpenSBI

 - git submodule update --init roms/opensbi

 - export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1))

 - echo "=== Using ${JOBS} simultaneous jobs ==="

 - make -j${JOBS} -C roms/opensbi clean

 - make -j${JOBS} -C roms opensbi32-virt 2>&1 1>opensbi32-virt-stdout.log | tee -a opensbi32-virt-stderr.log >&2

 - make -j${JOBS} -C roms/opensbi clean

 - make -j${JOBS} -C roms opensbi64-virt 2>&1 1>opensbi64-virt-stdout.log | tee -a opensbi64-virt-stderr.log >&2

 - make -j${JOBS} -C roms/opensbi clean

 - make -j${JOBS} -C roms opensbi32-sifive_u 2>&1 1>opensbi32-sifive_u-stdout.log | tee -a opensbi32-sifive_u-stderr.log >&2

 - make -j${JOBS} -C roms/opensbi clean

 - make -j${JOBS} -C roms opensbi64-sifive_u 2>&1 1>opensbi64-sifive_u-stdout.log | tee -a opensbi64-sifive_u-stderr.log >&2

.gitlab-ci.d/opensbi/Dockerfile

0 → 100644
+33 −0
Original line number Diff line number Diff line 
#

# Docker image to cross-compile OpenSBI firmware binaries

#

FROM ubuntu:18.04



MAINTAINER Bin Meng <bmeng.cn@gmail.com>



# Install packages required to build OpenSBI

RUN apt update \

    && \

    \

    DEBIAN_FRONTEND=noninteractive \

    apt install --assume-yes --no-install-recommends \

        build-essential \

        ca-certificates \

        git \

        make \

        wget \

    && \

    \

    rm -rf /var/lib/apt/lists/*



# Manually install the kernel.org "Crosstool" based toolchains for gcc-8.3

RUN wget -O - \

    https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/8.3.0/x86_64-gcc-8.3.0-nolibc-riscv32-linux.tar.xz \

    | tar -C /opt -xJ

RUN wget -O - \

    https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/8.3.0/x86_64-gcc-8.3.0-nolibc-riscv64-linux.tar.xz \

    | tar -C /opt -xJ



# Export the toolchains to the system path

ENV PATH="/opt/gcc-8.3.0-nolibc/riscv32-linux/bin:${PATH}"

ENV PATH="/opt/gcc-8.3.0-nolibc/riscv64-linux/bin:${PATH}"

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line 
include:

  - local: '/.gitlab-ci-edk2.yml'

  - local: '/.gitlab-ci-opensbi.yml'



before_script:

 - apt-get update -qq

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ u-boot.e500 u-boot-sam460-20100605.bin \ 
qemu_vga.ndrv \

edk2-licenses.txt \

hppa-firmware.img \

opensbi-riscv32-virt-fw_jump.bin \

opensbi-riscv32-sifive_u-fw_jump.bin opensbi-riscv32-virt-fw_jump.bin \

opensbi-riscv64-sifive_u-fw_jump.bin opensbi-riscv64-virt-fw_jump.bin

hw/riscv/sifive_u.c

+5 −1
Original line number Diff line number Diff line
@@ -56,7 +56,11 @@ 


#include <libfdt.h>



#if defined(TARGET_RISCV32)

# define BIOS_FILENAME "opensbi-riscv32-sifive_u-fw_jump.bin"

#else

# define BIOS_FILENAME "opensbi-riscv64-sifive_u-fw_jump.bin"

#endif



static const struct MemmapEntry {

    hwaddr base;