From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=Vdwnwu6G; spf=pass (domain: linaro.org, ip: 209.85.221.65, mailfrom: leif.lindholm@linaro.org) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by groups.io with SMTP; Thu, 26 Sep 2019 15:41:30 -0700 Received: by mail-wr1-f65.google.com with SMTP id v8so551968wrt.2 for ; Thu, 26 Sep 2019 15:41:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=cYZRnvRzLMXaXw3HhheiVyy6D+YRg/v9n/nI+0eOQSY=; b=Vdwnwu6GU8p8t9VEa6Va6pn1RTNWYLMU6wb3fYrbPgyPlFI0gyfh4QGZpZNylNBsUC K1F0jgKKtYU9jgJrGubjncNdHvCaZPzdDqdg+2kOnlJabx6XAFS3f1bl/xRUN5PyXqps q6usQg4K7XHBxDET9KU/H7r2NWUGTQUc/wWYz/n3I/js3DjChq0mxV+IvLtmQRYQnPIx i3HwKYoyI3kz5DIypS7dHYpxdr11njIZjW7+kOPH2KhzNitwZrf5R5AlvOFoS//rDxGu aiUPTcVr/5Fbr7H04PdbJxWCxcdgArKiNVqhGVwzyoGh2huyuA3DWSBYbcG9yYGoVzh1 dgNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=cYZRnvRzLMXaXw3HhheiVyy6D+YRg/v9n/nI+0eOQSY=; b=gDWnyeJfC60BxqDX57sJ3+5E0tqwtWU63GW+Lk3p6gKku0jS7TYQKj6/uSDKiRf6Gy SUryUcX0B05btpbXvX/zoAbWMJ34uMp5kd8iqvS3revp3xfyktE4k4Q+4GdzJ/AG2f24 lBuC+yS6/66gRcU1Z5NvjsNsSlR/L510K/kMO8lnPQ+FsxPLQmL6Cs/UGTAe/KgE7sWN fzn9wqvj5Bhu93LGqrT6B1pNy/c9lsrkrkaxITYRk6qz9lH3ewjkcfZYaJZqb4Suer6X hcHgcHHQlRdhDxvuuKRWivLG9s7Y56ITqu52OkK0kk3SsKkeoEQR4D8xCCmDdnKgEoSi K43Q== X-Gm-Message-State: APjAAAUP4xg4akAW+6dPDVrtrB/YmP+eYDHvWVjN783ebCp0jO4g8cqY cOPxC+9fS9tv6GKJRK3PRUkosSZsumdXZA== X-Google-Smtp-Source: APXvYqw5cAI8RjtjeDkOB6+hXo/ZekMaAuxfr2h4V6EAnW3+zasMzphsLfqN7Zpl6e1s3ZLsQhX+AA== X-Received: by 2002:a5d:4d8c:: with SMTP id b12mr523355wru.198.1569537688457; Thu, 26 Sep 2019 15:41:28 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id g73sm4410248wme.10.2019.09.26.15.41.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Sep 2019 15:41:27 -0700 (PDT) Date: Thu, 26 Sep 2019 23:41:26 +0100 From: "Leif Lindholm" To: devel@edk2.groups.io, abner.chang@hpe.com Subject: Re: [edk2-devel] [edk2-staging/RISC-V-V2 PATCH v2 03/29] RiscVPkg/opensbi: EDK2 RISC-V OpenSBI support Message-ID: <20190926224126.GE25504@bivouac.eciton.net> References: <1569198715-31552-1-git-send-email-abner.chang@hpe.com> <1569198715-31552-4-git-send-email-abner.chang@hpe.com> MIME-Version: 1.0 In-Reply-To: <1569198715-31552-4-git-send-email-abner.chang@hpe.com> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Sep 23, 2019 at 08:31:28AM +0800, Abner Chang wrote: > Add EDK2 RISC-V OpenSBI header files and opensbi-HOWTO.txt for users to build RISC-V platform with RISC-V OpenSBI library. > > Signed-off-by: Abner Chang > --- > RiscVPkg/Include/sbi/SbiFirmwareContext.h | 38 ++++++++++++ > RiscVPkg/Include/sbi/sbi.h | 96 +++++++++++++++++++++++++++++++ > RiscVPkg/Include/sbi/sbi_bits.h | 17 ++++++ > RiscVPkg/Include/sbi/sbi_types.h | 18 ++++++ > 4 files changed, 169 insertions(+) > create mode 100644 RiscVPkg/Include/sbi/SbiFirmwareContext.h > create mode 100644 RiscVPkg/Include/sbi/sbi.h > create mode 100644 RiscVPkg/Include/sbi/sbi_bits.h > create mode 100644 RiscVPkg/Include/sbi/sbi_types.h > > diff --git a/RiscVPkg/Include/sbi/SbiFirmwareContext.h b/RiscVPkg/Include/sbi/SbiFirmwareContext.h > new file mode 100644 > index 0000000..498faf4 > --- /dev/null > +++ b/RiscVPkg/Include/sbi/SbiFirmwareContext.h > @@ -0,0 +1,38 @@ > +/** @file > + RISC-V OpesbSBI Platform Firmware context definition > + > + Copyright (c) 2019, Hewlett Packard Enterprise Development LP. All rights reserved.
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > +#ifndef _SBI_FIRMWARE_CONTEXT_H_ > +#define _SBI_FIRMWARE_CONTEXT_H_ Please drop leading _. > + > +#include > + > +#define RISC_V_MAX_HART_SUPPORTED 16 > + > +// > +// keep the structure member in 64-bit alignment. > +// > +#pragma pack(push) > +#pragma pack(8) I don't think this has any effect. > + > +typedef struct { > + UINT64 IsaExtensionSupported; // The ISA extension this core supported. > + RISCV_UINT128 MachineVendorId; // Machine vendor ID > + RISCV_UINT128 MachineArchId; // Machine Architecture ID > + RISCV_UINT128 MachineImplId; // Machine Implementation ID > +} EFI_RISCV_FIRMWARE_CONTEXT_HART_SPECIFIC; UINT64 has 64-bit alignment requirement. RISCV_UINT128 consists of two UINT64, giving it 64-bit alignment requirement. I don't see how specifying alignment changes anything. > + > +#define FIRMWARE_CONTEXT_HART_SPECIFIC_SIZE (64 * 7) > + > +typedef struct { > + VOID *PeiServiceTable; // PEI Service table > + EFI_RISCV_FIRMWARE_CONTEXT_HART_SPECIFIC *HartSpecific[RISC_V_MAX_HART_SUPPORTED]; > +} EFI_RISCV_OPENSBI_FIRMWARE_CONTEXT; > + > +#pragma pack(pop) > +#endif > + > diff --git a/RiscVPkg/Include/sbi/sbi.h b/RiscVPkg/Include/sbi/sbi.h > new file mode 100644 > index 0000000..89d5016 > --- /dev/null > +++ b/RiscVPkg/Include/sbi/sbi.h > @@ -0,0 +1,96 @@ > +/** @file > + SBI inline function calls. > + > + Copyright (c) 2019, Hewlett Packard Enterprise Development LP. All rights reserved.
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef _SBI_H_ > +#define _SBI_H_ Please drop leading _. > + > +#include // Reference to header file wrapper > +#include // Reference to header file in opensbi > + > +#define SBI_SET_TIMER 0 > +#define SBI_CONSOLE_PUTCHAR 1 > +#define SBI_CONSOLE_GETCHAR 2 > +#define SBI_CLEAR_IPI 3 > +#define SBI_SEND_IPI 4 > +#define SBI_REMOTE_FENCE_I 5 > +#define SBI_REMOTE_SFENCE_VMA 6 > +#define SBI_REMOTE_SFENCE_VMA_ASID 7 > +#define SBI_SHUTDOWN 8 > + > +#define SBI_CALL(which, arg0, arg1, arg2) ({ \ > + register uintptr_t a0 asm ("a0") = (uintptr_t)(arg0); \ > + register uintptr_t a1 asm ("a1") = (uintptr_t)(arg1); \ > + register uintptr_t a2 asm ("a2") = (uintptr_t)(arg2); \ > + register uintptr_t a7 asm ("a7") = (uintptr_t)(which); \ > + asm volatile ("ecall" \ > + : "+r" (a0) \ > + : "r" (a1), "r" (a2), "r" (a7) \ > + : "memory"); \ > + a0; \ > +}) > + > +#define SBI_CALL_0(which) SBI_CALL(which, 0, 0, 0) > +#define SBI_CALL_1(which, arg0) SBI_CALL(which, arg0, 0, 0) > +#define SBI_CALL_2(which, arg0, arg1) SBI_CALL(which, arg0, arg1, 0) > + > +static inline void sbi_console_putchar(int ch) Static inline functions are not permitted in header files. Please convert these wrapper functions to macros. > +{ > + SBI_CALL_1(SBI_CONSOLE_PUTCHAR, ch); > +} > + > +static inline int sbi_console_getchar(void) > +{ > + return SBI_CALL_0(SBI_CONSOLE_GETCHAR); > +} > + > +static inline void sbi_set_timer(uint64_t stime_value) > +{ > +#if __riscv_xlen == 32 > + SBI_CALL_2(SBI_SET_TIMER, stime_value, stime_value >> 32); > +#else > + SBI_CALL_1(SBI_SET_TIMER, stime_value); > +#endif > +} > + > +static inline void sbi_shutdown(void) > +{ > + SBI_CALL_0(SBI_SHUTDOWN); > +} > + > +static inline void sbi_clear_ipi(void) > +{ > + SBI_CALL_0(SBI_CLEAR_IPI); > +} > + > +static inline void sbi_send_ipi(const unsigned long *hart_mask) > +{ > + SBI_CALL_1(SBI_SEND_IPI, hart_mask); > +} > + > +static inline void sbi_remote_fence_i(const unsigned long *hart_mask) > +{ > + SBI_CALL_1(SBI_REMOTE_FENCE_I, hart_mask); > +} > + > +static inline void sbi_remote_sfence_vma(const unsigned long *hart_mask, > + unsigned long start, > + unsigned long size) > +{ > + SBI_CALL_1(SBI_REMOTE_SFENCE_VMA, hart_mask); > +} > + > +static inline void sbi_remote_sfence_vma_asid(const unsigned long *hart_mask, > + unsigned long start, > + unsigned long size, > + unsigned long asid) > +{ > + SBI_CALL_1(SBI_REMOTE_SFENCE_VMA_ASID, hart_mask); > +} > + > +#endif > diff --git a/RiscVPkg/Include/sbi/sbi_bits.h b/RiscVPkg/Include/sbi/sbi_bits.h > new file mode 100644 > index 0000000..1e6bda3 > --- /dev/null > +++ b/RiscVPkg/Include/sbi/sbi_bits.h > @@ -0,0 +1,17 @@ > +/** @file > + RISC-V OpesbSBI header file reference. > + > + Copyright (c) 2019, Hewlett Packard Enterprise Development LP. All rights reserved.
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > +#ifndef _EDK2_SBI_BITS_H_ > +#define _EDK2_SBI_BITS_H_ Please drop leading _. > + > +#undef MAX > +#undef MIN > + > +#include "include/sbi/sbi_bits.h" // Reference to header file in opensbi > + > +#endif > diff --git a/RiscVPkg/Include/sbi/sbi_types.h b/RiscVPkg/Include/sbi/sbi_types.h > new file mode 100644 > index 0000000..d7ff227 > --- /dev/null > +++ b/RiscVPkg/Include/sbi/sbi_types.h > @@ -0,0 +1,18 @@ > +/** @file > + RISC-V OpesbSBI header file reference. > + > + Copyright (c) 2019, Hewlett Packard Enterprise Development LP. All rights reserved.
> + > + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > +#ifndef _EDK2_SBI_TYPES_H_ > +#define _EDK2_SBI_TYPES_H_ Please drop leading _. / Leif > + > +#undef TRUE > +#undef FALSE > +#undef NULL > + > +#include "opensbi/include/sbi/sbi_types.h" // Reference to header file in opensbi > + > +#endif > -- > 2.7.4 > > > >