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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 00D97C2D0CD for ; Wed, 18 Dec 2019 21:39:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C1B7621582 for ; Wed, 18 Dec 2019 21:39:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lU28INLt"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="lIeHrqeF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1B7621582 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date :Subject:To:From:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=O+c9WUtL6/Lnv35RbuPb68w31uHNCt8mbEATKbG+Chg=; b=lU28INLt8fhSxd wOnBKQNxJf404HmBWyLlVNO0Xs/VGebe6z8cjfc68mDF79O6X3ptf1wCyJTCJdajYw1iO4s4jWZAb 6XOpISg7XPj6ftTbnktFQ/FLpu50SZIhqPLvxCJ6cBYVpCtCuYtmk9xoA3uV7VoYkzhuf0F5JMATc xCH8ZXeer929uq7DqsqaDRAcEIvfIQpQ3W9icqxCJwJpbrCqaR4YuBIKSdpD+IsH6TAG+PX0/cQVy ocJa3nHy9FaZWDrfAUvztbv4bh6mTt8+m5S/Xi2pteuUR78NPLZmY6Or4FgQOPFiHK7VsfrXUjibH 0705JMAVaKtbd+BsGS0w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihh2l-00075M-MK; Wed, 18 Dec 2019 21:39:43 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihh2i-00072t-17 for linux-riscv@lists.infradead.org; Wed, 18 Dec 2019 21:39:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1576705180; x=1608241180; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UorqLKP57b6PMCT+1VL4L6XYE1Vd36TEURwukvr+gSY=; b=lIeHrqeFgNybC7cKXPJTPpx1i22xQwAnfbgIZAMH4fmBHjQW6Ey5tNJd Q4ulr/jajY+qP4pTlTAspNemRbueKTPOM6yXFzxhDL0lwku13aNi9WvyT SMgWg27DAwd+Fg6Lv2zuHn0PiZM8gBnlKSBzB0NsMbca+lryLuuaYKl4Y 6I12cIR+VUPMvNvzquzcOIARSEwnjI9d2s3Q/0NtnsbhmY7wlLpRFQ8wX v1rzyuZyfzAxeT5fyo5XAXBWmm4o9lZKcMkbxcqyZamrD8yQBOnlczAaL iY7VAHzYD4NyLvgusSqscKqnBn5OnxV8cQ/0nXnLpvtJ5Sso4FreXpgJq w==; IronPort-SDR: pUchv/OLya0vPsOrfZ1tSHyIa/WZs+HXPUQpotvOI7uEeRwADqSgFw+Pw2rsVyiKVCfmxeBauR VL4ZDAcEQCp83WhDAScLo3mCC8YNytKyfkR5ICJMpJYKP+do2zcaThc1CXkDertGXa//SWq8rp RR9kuWkAagP3KDPl/0rZQvnBW0P5sGWO6N6uABTGcqPlfMqq1AC41V/R4CrkRD0Mo8ei6JMGFm M7v6TEnq+y32XZtUE3b2Btohf/gx0qeoxSwbgtNONoQye1SSYKrH3dHdxzJD2T+BNnFxeMC1LF E18= X-IronPort-AV: E=Sophos;i="5.69,330,1571673600"; d="scan'208";a="130100627" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 19 Dec 2019 05:39:37 +0800 IronPort-SDR: FP5eGkTBABtJ1KnsU3Wg0ahMYdId7vTWP3jD6c2/M4mOauKaQe8a12vTD3XmPBV/a5zgZjvbAA ah0mGKLqP+5uuXdoR/yXniXITxt/Vdg1Rdj0HppqdlR9jb7PCROP2Hy5RKEexGnpqhjYYYINaM d2oTCiFW3C0Yk4LQCEE0QU7s9qJBLubWbGzQwxE3z7kizmCYEPbqinXNLXdU03nzNJP7FtW+ZW FAsh5gl7PhblaPHNYl5M9pdISDf37LXc3HQ7Ggpxs9XP7sbLlKpZISU9Qlb7xoia56RYoU5d4D zwwNDfjFDcqYCYfZZnUKMgLo Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2019 13:34:00 -0800 IronPort-SDR: k33d6/8Qq2tLFef9blf34MF6JUeIO7D5QUdcVMhQ+c2Az4UjFSBPz2tydjOeT7kX9ikAi4vh5b aoUr23i2Jrjzq1gBmUJFS5tsF46Af4JqaqBaeYCW4gDGM/e6CyNlmwVQXuCtIBeyXW/H1YDYxB flkIkkEpW/7Tf7soaP9ccljIhP0sHHip3a0nWEH2ilIdxfvkJq1s7ceDsou8NGBSSSrCpHrpKY nqazbAINAi6+2ZZftYxT9milm86FCFLSVUtO7VVrlcqadSUKQaFjQEOnI1tF4WiQeYWWVKsYn0 n/A= WDCIronportException: Internal Received: from jedi-01.sdcorp.global.sandisk.com (HELO jedi-01.int.fusionio.com) ([10.11.143.218]) by uls-op-cesaip02.wdc.com with ESMTP; 18 Dec 2019 13:39:37 -0800 From: Atish Patra To: linux-kernel@vger.kernel.org Subject: [PATCH v6 1/5] RISC-V: Mark existing SBI as 0.1 SBI. Date: Wed, 18 Dec 2019 13:39:14 -0800 Message-Id: <20191218213918.16676-2-atish.patra@wdc.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191218213918.16676-1-atish.patra@wdc.com> References: <20191218213918.16676-1-atish.patra@wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191218_133940_100810_5AFD9646 X-CRM114-Status: GOOD ( 12.18 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Albert Ou , Atish Patra , Anup Patel , Palmer Dabbelt , Mike Rapoport , Atish Patra , Palmer Dabbelt , Paul Walmsley , linux-riscv@lists.infradead.org, Thomas Gleixner Sender: "linux-riscv" Errors-To: linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org As per the new SBI specification, current SBI implementation version is defined as 0.1 and will be removed/replaced in future. Each of the function call in 0.1 is defined as a separate extension which makes easier to replace them one at a time. Rename existing implementation to reflect that. This patch is just a preparatory patch for SBI v0.2 and doesn't introduce any functional changes. Signed-off-by: Atish Patra Reviewed-by: Anup Patel Reviewed-by: Palmer Dabbelt --- arch/riscv/include/asm/sbi.h | 44 ++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index 2570c1e683d3..b38bc36f7429 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2015 Regents of the University of California + * Copyright (c) 2019 Western Digital Corporation or its affiliates. */ #ifndef _ASM_RISCV_SBI_H @@ -9,17 +10,17 @@ #include #ifdef CONFIG_RISCV_SBI -#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_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_CALL(which, arg0, arg1, arg2, arg3) ({ \ +#define SBI_CALL(which, arg0, arg1, arg2, arg3) ({ \ 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); \ @@ -43,48 +44,50 @@ static inline void sbi_console_putchar(int ch) { - SBI_CALL_1(SBI_CONSOLE_PUTCHAR, ch); + SBI_CALL_1(SBI_EXT_0_1_CONSOLE_PUTCHAR, ch); } static inline int sbi_console_getchar(void) { - return SBI_CALL_0(SBI_CONSOLE_GETCHAR); + return SBI_CALL_0(SBI_EXT_0_1_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); + SBI_CALL_2(SBI_EXT_0_1_SET_TIMER, stime_value, + stime_value >> 32); #else - SBI_CALL_1(SBI_SET_TIMER, stime_value); + SBI_CALL_1(SBI_EXT_0_1_SET_TIMER, stime_value); #endif } static inline void sbi_shutdown(void) { - SBI_CALL_0(SBI_SHUTDOWN); + SBI_CALL_0(SBI_EXT_0_1_SHUTDOWN); } static inline void sbi_clear_ipi(void) { - SBI_CALL_0(SBI_CLEAR_IPI); + SBI_CALL_0(SBI_EXT_0_1_CLEAR_IPI); } static inline void sbi_send_ipi(const unsigned long *hart_mask) { - SBI_CALL_1(SBI_SEND_IPI, hart_mask); + SBI_CALL_1(SBI_EXT_0_1_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); + SBI_CALL_1(SBI_EXT_0_1_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_3(SBI_REMOTE_SFENCE_VMA, hart_mask, start, size); + SBI_CALL_3(SBI_EXT_0_1_REMOTE_SFENCE_VMA, hart_mask, + start, size); } static inline void sbi_remote_sfence_vma_asid(const unsigned long *hart_mask, @@ -92,7 +95,8 @@ static inline void sbi_remote_sfence_vma_asid(const unsigned long *hart_mask, unsigned long size, unsigned long asid) { - SBI_CALL_4(SBI_REMOTE_SFENCE_VMA_ASID, hart_mask, start, size, asid); + SBI_CALL_4(SBI_EXT_0_1_REMOTE_SFENCE_VMA_ASID, hart_mask, + start, size, asid); } #else /* CONFIG_RISCV_SBI */ /* stubs for code that is only reachable under IS_ENABLED(CONFIG_RISCV_SBI): */ -- 2.24.0