From patchwork Wed May 27 09:04:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1298723 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=jV7mn6bC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49X4g44TXNz9sSd for ; Wed, 27 May 2020 19:05:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BB50080929; Wed, 27 May 2020 11:05:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jV7mn6bC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 24AFC81583; Wed, 27 May 2020 11:05:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C3FFA808A1 for ; Wed, 27 May 2020 11:05:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pl1-x644.google.com with SMTP id m7so9924175plt.5 for ; Wed, 27 May 2020 02:05:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=33mK+4g6QQokhAUYu5ZmVflGBhsNH21O2+M0GEAVKUo=; b=jV7mn6bChLUsuZu9ExaBoFpTtYN6eS0avt/VV4EBcjgxAFmItWDYp0p0Jad6ajYjEL Icro2GJPDPxfvXROhuQnMbJXtkyXwyoIYsBld3Zt9VtD6lXMYXD6qozaOH+hQgZDk1YN rxRl1sVjBfq3mU+rAdxlKA40n2m42+aAB6e19Mv4vxOqb9gglbfJ0LfxrD43AdBzba6U Y+Kxd0JEz7nmKYDp/y/gz+amUptNcThMlsT1mzrtXTLP9TMZRH6EjSUrOrZSTwU1ImeO kj2us4jLaQZDFRlGvS8Ck9Pld6mycP7w0f1t7gNtJwHPEPQ0zstYb7V+0w8hTk7fjapd QP4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=33mK+4g6QQokhAUYu5ZmVflGBhsNH21O2+M0GEAVKUo=; b=ntMhv0fdYGT298sWxhstJqXd4drXaByEAnP2fFMt6f8lAZDV0gBEoCNw1zPVF9Q+Qw gxiXOb05pa0DsLRjxsBGxNI1pVNQcChTNMYpxnQB/9VFi5LDjiMeyZT04J0HRb5lmT0J OJt6OxBXRuOoCI8jX2tOIEFMOjyD8CoebyNMKW0XglDoVIlhid4SErWxrhQ56v+mJ3/Y uVnL5Wnz/h9JaMlDZ+PQWY+uw1fCkBg8Ymt+6N6JHiqAZt4sNnoaSSKhT1subd+eK/vZ D6MRCooJhfmuRJ76k9pQyxnAQwic2gAqwpkyAhjU34MusDOA6IqKMaZz3iYM+v8t47Vg DErQ== X-Gm-Message-State: AOAM533NunUaNoiFki//o/17WzpVX9nM/bRn2BDBEnn/F1hsNes0eqQ4 6qoo+sLJ+UPmkgGO3bWUfsY= X-Google-Smtp-Source: ABdhPJyxVkUktqo774vuySTnBFv/32oZXkKaHPJKzkimbi4jUbK0amXR3BZgvlAc3KIRLDeNyBn/7A== X-Received: by 2002:a17:902:cb03:: with SMTP id c3mr5154368ply.307.1590570315182; Wed, 27 May 2020 02:05:15 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id q26sm1534164pfh.74.2020.05.27.02.05.13 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 May 2020 02:05:14 -0700 (PDT) From: Bin Meng To: Rick Chen , U-Boot Mailing List Cc: Atish Patra , Bin Meng Subject: [PATCH 1/2] riscv: sbi: Remove sbi_spec_version Date: Wed, 27 May 2020 02:04:52 -0700 Message-Id: <1590570293-14225-1-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Bin Meng U-Boot defaults to use SBI v0.2. Howerver there is a global variable sbi_spec_version that stills refers to v0.1. Since it is not used anywhere, let's remove it. Signed-off-by: Bin Meng Reviewed-by: Rick Chen --- arch/riscv/include/asm/sbi.h | 2 -- arch/riscv/lib/sbi.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index 453cb5c..08e1ac0 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -77,7 +77,6 @@ enum sbi_ext_rfence_fid { #define SBI_FID_REMOTE_SFENCE_VMA_ASID SBI_EXT_RFENCE_REMOTE_SFENCE_VMA_ASID #endif -#define SBI_SPEC_VERSION_DEFAULT 0x1 #define SBI_SPEC_VERSION_MAJOR_SHIFT 24 #define SBI_SPEC_VERSION_MAJOR_MASK 0x7f #define SBI_SPEC_VERSION_MINOR_MASK 0xffffff @@ -90,7 +89,6 @@ enum sbi_ext_rfence_fid { #define SBI_ERR_DENIED -4 #define SBI_ERR_INVALID_ADDRESS -5 -extern unsigned long sbi_spec_version; struct sbiret { long error; long value; diff --git a/arch/riscv/lib/sbi.c b/arch/riscv/lib/sbi.c index 993597e..f298846 100644 --- a/arch/riscv/lib/sbi.c +++ b/arch/riscv/lib/sbi.c @@ -11,9 +11,6 @@ #include #include -/* default SBI version is 0.1 */ -unsigned long sbi_spec_version = SBI_SPEC_VERSION_DEFAULT; - struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0, unsigned long arg1, unsigned long arg2, unsigned long arg3, unsigned long arg4, From patchwork Wed May 27 09:04:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1298724 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EEn2rkZ2; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49X4gB6Df9z9sSd for ; Wed, 27 May 2020 19:05:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E8C1C81798; Wed, 27 May 2020 11:05:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EEn2rkZ2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 908E7812EA; Wed, 27 May 2020 11:05:21 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5128E80929 for ; Wed, 27 May 2020 11:05:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pg1-x544.google.com with SMTP id m1so5252528pgk.1 for ; Wed, 27 May 2020 02:05:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YeYDeb4Zu9xcQ0RcO7cqx2kwsByyc2vs5JnUnwOLvb0=; b=EEn2rkZ2tyxBSTGqL66EBR2qBEW+VjZFMIBhWTsRayrj2pkz6CQClJ741aTW+HZWi+ 2PsZmEYRGzahZ7B2yDPMxJpEAdElR+1IiszObz5MzEo/FA3Twd8oDsKCutyiqbAma097 eEf7NsoVRaq7LIpXGW1vit9oIxSIv3BjrTOssgFacDO9Gxqj8htf1pO/jcarMtYsUpH9 ihDmT6UsLgMX0H7Pn96oHJeYEfSD0XAhFA32numbjU+t0laI0MtVVqYvRI2Px3cN2Fa2 CWiShHLtYymlbDcutC6+fTHc66C8Ip/leZeXXNOKIdDSU0Ys/F72nBUXQfVOHm+Tph61 658A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YeYDeb4Zu9xcQ0RcO7cqx2kwsByyc2vs5JnUnwOLvb0=; b=NgRoSGsDUXVxFau7HRx2Hv9HOjFdB8aUN2Pel83igp3uvtLNql8R8GcmpqzUDLV6UR /yZwyDqsfsrxaNFuT6hsmyFfWWwoA8rQowPrLhtOK0dR/0C5pxJtAy4k33ZW1rHfWWvE LgQajKRHYbPsHnq7caixdEDgrewxA66vpr0DMzLB6pWVWZBpWUSmzdz9JPNMkZCPz7wv mZflMLmg0TSIi0XKffpnOP2+Zy3UM8oXqC3NNuljRPiJOtRFBsSx4mRakhutmTBc8yTq KAPC/uI0GDd8JRZvYa/m/+mXMWW7LHxdr36k/eNKnS8r36v9mlwsg19twHVf4jLow1Jq nVuQ== X-Gm-Message-State: AOAM533nZTCFMMJftADxVI9rZGR2mgRr05x+Ja4froLhyAlYMN4y1wEw BvZr2vRfvapJ4EpVquaqs3M= X-Google-Smtp-Source: ABdhPJxe6/JIMqgB6BEMPLTQFLpP9DKPp7XsGbWz3m22jfOMMjIeukTuA7UmCpiIiiTW26DNJnF7LA== X-Received: by 2002:a62:e707:: with SMTP id s7mr2869699pfh.208.1590570316499; Wed, 27 May 2020 02:05:16 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id q26sm1534164pfh.74.2020.05.27.02.05.15 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 May 2020 02:05:15 -0700 (PDT) From: Bin Meng To: Rick Chen , U-Boot Mailing List Cc: Atish Patra , Bin Meng Subject: [PATCH 2/2] riscv: sbi: Move sbi_probe_extension() out of CONFIG_SBI_V01 Date: Wed, 27 May 2020 02:04:53 -0700 Message-Id: <1590570293-14225-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1590570293-14225-1-git-send-email-bmeng.cn@gmail.com> References: <1590570293-14225-1-git-send-email-bmeng.cn@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Bin Meng sbi_probe_extension() is an API defined in SBI v0.2, not v0.1. Fixes 7e249bc13aaf: ("riscv: Move all SMP related SBI calls to SBI_v01") Signed-off-by: Bin Meng Reviewed-by: Rick Chen --- arch/riscv/lib/sbi.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/arch/riscv/lib/sbi.c b/arch/riscv/lib/sbi.c index f298846..8fbc238 100644 --- a/arch/riscv/lib/sbi.c +++ b/arch/riscv/lib/sbi.c @@ -53,6 +53,25 @@ void sbi_set_timer(uint64_t stime_value) #endif } +/** + * sbi_probe_extension() - Check if an SBI extension ID is supported or not. + * @extid: The extension ID to be probed. + * + * Return: Extension specific nonzero value f yes, -ENOTSUPP otherwise. + */ +int sbi_probe_extension(int extid) +{ + struct sbiret ret; + + ret = sbi_ecall(SBI_EXT_BASE, SBI_EXT_BASE_PROBE_EXT, extid, + 0, 0, 0, 0, 0); + if (!ret.error) + if (ret.value) + return ret.value; + + return -ENOTSUPP; +} + #ifdef CONFIG_SBI_V01 /** @@ -162,22 +181,4 @@ void sbi_remote_sfence_vma_asid(const unsigned long *hart_mask, (unsigned long)hart_mask, start, size, asid, 0, 0); } -/** - * sbi_probe_extension() - Check if an SBI extension ID is supported or not. - * @extid: The extension ID to be probed. - * - * Return: Extension specific nonzero value f yes, -ENOTSUPP otherwise. - */ -int sbi_probe_extension(int extid) -{ - struct sbiret ret; - - ret = sbi_ecall(SBI_EXT_BASE, SBI_EXT_BASE_PROBE_EXT, extid, - 0, 0, 0, 0, 0); - if (!ret.error) - if (ret.value) - return ret.value; - - return -ENOTSUPP; -} #endif /* CONFIG_SBI_V01 */