From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0AD8C4338F for ; Thu, 19 Aug 2021 06:13:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A54D7610FF for ; Thu, 19 Aug 2021 06:13:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230274AbhHSGOe (ORCPT ); Thu, 19 Aug 2021 02:14:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229782AbhHSGOe (ORCPT ); Thu, 19 Aug 2021 02:14:34 -0400 Received: from mail-io1-xd2c.google.com (mail-io1-xd2c.google.com [IPv6:2607:f8b0:4864:20::d2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80858C061575 for ; Wed, 18 Aug 2021 23:13:58 -0700 (PDT) Received: by mail-io1-xd2c.google.com with SMTP id a21so6245075ioq.6 for ; Wed, 18 Aug 2021 23:13:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=hau+lDTq9Vb9TyOnVnIceEZbFlNptP4zxXLpB8kHO3I=; b=C+xA5UmbGF4UtYT3zBcOIEN2SxMWjm/PKCnqnMt2g+S6dDR6uuWG9uETKBgQrThB03 VQCBaexJU5bdNSyq1AxaM/tFvpTfWDOUOXMWkKe9vcj2g0siw36JBnQhfYNzQ3LLtBEK Wl5gpFXmFjTzLq867CO9XI/hthER86dl6n+vohILItMg7VNp9fGEejljpjcynaamST91 NpAATLV4B9SqzFzFKG9agtlZxHfXRAABYSGkrb3NKgcHi/lgZIIDOvISD6xpvKoTC17P 8mdmFeJxYvJsUUBlqQrCUOOqLl0I5epfnIgzD/Nv917qeSLR26xmig7AgwNkqwieV+hS z5Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hau+lDTq9Vb9TyOnVnIceEZbFlNptP4zxXLpB8kHO3I=; b=HWxVyXcyNAZLbxvS4xGUg+R6W8nHHHThsMwT0DpKUQZDlec87PxkbrC31QftLnVG0Z x13esWYCk+Ge773eLu4EXuDs979tApQA3OI34k77B72edMYk5jLo/orAR888w6uzm6Y1 6nPI7SITE7gf3ZECTV2Vo0QhyoNIREO7xGlgnvwmn5W5q/UVawNfF2W5X/fJxJuAqq4b XubX4DZj3QxdcA6mj1eEzkZC4+y7mvaTWg8No92KtlFnhYyA+5pWRMfev7d2s58x4bl0 5jIqnktmBTBVCdU7zHma1c2JiTIDmXbmt8z9DN975rTCqwlv/J22niWunvcybqHRPinM niKA== X-Gm-Message-State: AOAM530HuIWk6clOaHBsskCo4jv5NnWLIN63f6tQV2STptdMqnj6U897 RDEu+nJLJHLxM8D8tG6+FVDeNXd4ALUob6qY4P0= X-Google-Smtp-Source: ABdhPJziOzMst9AmuYG2afBE04QJKvczKncxVwPpgTJJdW1cCQh7eLl9vKVNIMOJb56juc54WB/Knn+YTqv9vc88xAc= X-Received: by 2002:a5d:8541:: with SMTP id b1mr10193893ios.105.1629353637845; Wed, 18 Aug 2021 23:13:57 -0700 (PDT) MIME-Version: 1.0 References: <20210817032447.2055-1-jiangyifei@huawei.com> <20210817032447.2055-9-jiangyifei@huawei.com> In-Reply-To: <20210817032447.2055-9-jiangyifei@huawei.com> From: Alistair Francis Date: Thu, 19 Aug 2021 16:13:31 +1000 Message-ID: Subject: Re: [PATCH RFC v6 08/12] target/riscv: Handle KVM_EXIT_RISCV_SBI exit To: Yifei Jiang Cc: "qemu-devel@nongnu.org Developers" , "open list:RISC-V" , Bin Meng , "limingwang (A)" , "open list:Overall" , libvir-list@redhat.com, Anup Patel , Alistair Francis , kvm-riscv@lists.infradead.org, wanghaibin.wang@huawei.com, Palmer Dabbelt , fanliang@huawei.com, "Wubin (H)" Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Tue, Aug 17, 2021 at 1:25 PM Yifei Jiang wrote: > > Use char-fe to handle console sbi call, which implement early > console io while apply 'earlycon=sbi' into kernel parameters. > > Signed-off-by: Yifei Jiang > Signed-off-by: Mingwang Li > --- > target/riscv/kvm.c | 42 ++++++++++++++++- > target/riscv/sbi_ecall_interface.h | 72 ++++++++++++++++++++++++++++++ > 2 files changed, 113 insertions(+), 1 deletion(-) > create mode 100644 target/riscv/sbi_ecall_interface.h > > diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c > index bc9cb5d8f9..a68f31c2f3 100644 > --- a/target/riscv/kvm.c > +++ b/target/riscv/kvm.c > @@ -38,6 +38,8 @@ > #include "qemu/log.h" > #include "hw/loader.h" > #include "kvm_riscv.h" > +#include "sbi_ecall_interface.h" > +#include "chardev/char-fe.h" > > static uint64_t kvm_riscv_reg_id(CPURISCVState *env, uint64_t type, uint64_t idx) > { > @@ -435,9 +437,47 @@ bool kvm_arch_stop_on_emulation_error(CPUState *cs) > return true; > } > > +static int kvm_riscv_handle_sbi(struct kvm_run *run) > +{ > + int ret = 0; > + unsigned char ch; > + switch (run->riscv_sbi.extension_id) { > + case SBI_EXT_0_1_CONSOLE_PUTCHAR: > + ch = run->riscv_sbi.args[0]; > + qemu_chr_fe_write(serial_hd(0)->be, &ch, sizeof(ch)); > + break; > + case SBI_EXT_0_1_CONSOLE_GETCHAR: > + ret = qemu_chr_fe_read_all(serial_hd(0)->be, &ch, sizeof(ch)); > + if (ret == sizeof(ch)) { > + run->riscv_sbi.args[0] = ch; > + } else { > + run->riscv_sbi.args[0] = -1; > + } > + break; These have been deprecated (see https://github.com/riscv/riscv-sbi-doc/blob/master/riscv-sbi.adoc#4-legacy-extensions-eids-0x00---0x0f), is it even worth supporting them? > + default: > + qemu_log_mask(LOG_UNIMP, > + "%s: un-handled SBI EXIT, specific reasons is %lu\n", > + __func__, run->riscv_sbi.extension_id); > + ret = -1; > + break; > + } > + return ret; > +} > + > int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > { > - return 0; > + int ret = 0; > + switch (run->exit_reason) { > + case KVM_EXIT_RISCV_SBI: > + ret = kvm_riscv_handle_sbi(run); > + break; > + default: > + qemu_log_mask(LOG_UNIMP, "%s: un-handled exit reason %d\n", > + __func__, run->exit_reason); > + ret = -1; > + break; > + } > + return ret; > } > > void kvm_riscv_reset_vcpu(RISCVCPU *cpu) > diff --git a/target/riscv/sbi_ecall_interface.h b/target/riscv/sbi_ecall_interface.h > new file mode 100644 > index 0000000000..fb1a3fa8f2 > --- /dev/null > +++ b/target/riscv/sbi_ecall_interface.h > @@ -0,0 +1,72 @@ > +/* > + * SPDX-License-Identifier: BSD-2-Clause > + * > + * Copyright (c) 2019 Western Digital Corporation or its affiliates. > + * > + * Authors: > + * Anup Patel > + */ > + > +#ifndef __SBI_ECALL_INTERFACE_H__ > +#define __SBI_ECALL_INTERFACE_H__ > + > +/* clang-format off */ > + > +/* SBI Extension IDs */ > +#define SBI_EXT_0_1_SET_TIMER 0x0 > +#define SBI_EXT_0_1_CONSOLE_PUTCHAR 0x1 > +#define SBI_EXT_0_1_CONSOLE_GETCHAR 0x2 > +#define SBI_EXT_0_1_CLEAR_IPI 0x3 > +#define SBI_EXT_0_1_SEND_IPI 0x4 > +#define SBI_EXT_0_1_REMOTE_FENCE_I 0x5 > +#define SBI_EXT_0_1_REMOTE_SFENCE_VMA 0x6 > +#define SBI_EXT_0_1_REMOTE_SFENCE_VMA_ASID 0x7 > +#define SBI_EXT_0_1_SHUTDOWN 0x8 > +#define SBI_EXT_BASE 0x10 > +#define SBI_EXT_TIME 0x54494D45 > +#define SBI_EXT_IPI 0x735049 > +#define SBI_EXT_RFENCE 0x52464E43 > +#define SBI_EXT_HSM 0x48534D > + > +/* SBI function IDs for BASE extension*/ > +#define SBI_EXT_BASE_GET_SPEC_VERSION 0x0 > +#define SBI_EXT_BASE_GET_IMP_ID 0x1 > +#define SBI_EXT_BASE_GET_IMP_VERSION 0x2 > +#define SBI_EXT_BASE_PROBE_EXT 0x3 > +#define SBI_EXT_BASE_GET_MVENDORID 0x4 > +#define SBI_EXT_BASE_GET_MARCHID 0x5 > +#define SBI_EXT_BASE_GET_MIMPID 0x6 > + > +/* SBI function IDs for TIME extension*/ > +#define SBI_EXT_TIME_SET_TIMER 0x0 > + > +/* SBI function IDs for IPI extension*/ > +#define SBI_EXT_IPI_SEND_IPI 0x0 > + > +/* SBI function IDs for RFENCE extension*/ > +#define SBI_EXT_RFENCE_REMOTE_FENCE_I 0x0 > +#define SBI_EXT_RFENCE_REMOTE_SFENCE_VMA 0x1 > +#define SBI_EXT_RFENCE_REMOTE_SFENCE_VMA_ASID 0x2 > +#define SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA 0x3 > +#define SBI_EXT_RFENCE_REMOTE_HFENCE_GVMA_VMID 0x4 > +#define SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA 0x5 > +#define SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID 0x6 > + > +/* SBI function IDs for HSM extension */ > +#define SBI_EXT_HSM_HART_START 0x0 > +#define SBI_EXT_HSM_HART_STOP 0x1 > +#define SBI_EXT_HSM_HART_GET_STATUS 0x2 > + > +#define SBI_HSM_HART_STATUS_STARTED 0x0 > +#define SBI_HSM_HART_STATUS_STOPPED 0x1 > +#define SBI_HSM_HART_STATUS_START_PENDING 0x2 > +#define SBI_HSM_HART_STATUS_STOP_PENDING 0x3 > + > +#define SBI_SPEC_VERSION_MAJOR_OFFSET 24 > +#define SBI_SPEC_VERSION_MAJOR_MASK 0x7f > +#define SBI_SPEC_VERSION_MINOR_MASK 0xffffff > +#define SBI_EXT_VENDOR_START 0x09000000 > +#define SBI_EXT_VENDOR_END 0x09FFFFFF > +/* clang-format on */ > + > +#endif > -- > 2.19.1 > >