From patchwork Wed Jun 19 23:57:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 806112 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7B2C15EFD5 for ; Wed, 19 Jun 2024 23:57:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718841456; cv=none; b=C1fXwX3f07HAExadVkTNMg9f7cSBelT3eI93RfZEbCXY4gx2+jsce1ODeQBLRtugJg1Uf3JaOaXPQjhbogH2Z6BGOXnhGkhZ5wD+ROpFpR6jSV3fBsd2lJVjsT/vSQx7JjGjkvk53+gFAHGggij4TXV5VT8ZmyP/xFcxycBvYPk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718841456; c=relaxed/simple; bh=tjgGkoCryxyMgpwKP1wgkLVrqryHilEtqiGvIHEzeJ4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rofrTAYFiNsloKWaIAqWkuMOHI+Q+tOfCwtnTq9uSRz7IkTAaFliLTwiccgxaJseAXt1BsuhVjoHL96XaKBfbbVEfzk1Eqxlw7KfSKa3RAllww4AYFFUs4yTXHgHkon/6t7fCe+tSO39STnkMDDUFXs4MyN+2nKmMPuMg3/AteA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=k/3BdOrF; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="k/3BdOrF" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1f9aeb96b93so2274905ad.3 for ; Wed, 19 Jun 2024 16:57:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1718841454; x=1719446254; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=PVRPn3G2zef5mMQEBDQ1xqNlxeqh5MYrJvjgjlgTj8A=; b=k/3BdOrF4VZOLwTt8yOf6zmEq85Jas8X2ty+Scp1l2Ix6JTLgzlllXHXKo2RRR+w2K rqoEdJ+HbETdHtgSKb4xWLFr/SeE2OAC1Gss3pEnFKvJkSdsSsmfys4cyPY3dFRSg6gQ 5q6EQs+SkGVHV8/xgYSw4F9+tmvETo89VqIrI75XxWiApvyoqkoqWiOoX/08fLwA95VV 1ooc42Sae/kNvC+7tC0CNQyxvDsEewtH/ocN4Jy/Lb/Ax8e9Qvo9JqA23+WEBuI8xLeG +gM4avzASPwLbrrH2pO962oe6gcyK318PA7CV1/0zr0P+cPtYyrHlI5B/WWvgbRbSbpI AmKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718841454; x=1719446254; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PVRPn3G2zef5mMQEBDQ1xqNlxeqh5MYrJvjgjlgTj8A=; b=OdGD+YJNJp6fV2s1MxKsCocfNdwmGonmNEi3fsH1QTxvslt82vy8pkwvqfHw4+c4GZ HvXfcPmZPCEIRZglZgxKvu3C6+BfuPiTg9uNYmJy0yzdWcQSaTB1fNicRoyrqLsF01gB itwYY8w9cyI/4FnT56Zr2lDfL3HqIu+sE8HOdcx85EXB9wrm25GF/bUVi2znJBe7Y9N2 6Lq3FbIyj/ozJT9deCkEox6V/s9wKwckxgnWsWfMouQbXJLBc09JyP3tsE9b7oSCc7zY lJ+0XYruQe5pJtX/3z+Um4kd5vtBaHDSqBGo5sdymppu+MIo0XoYsEQ+/pHerb6q9Kkx 8Rdw== X-Forwarded-Encrypted: i=1; AJvYcCVYp0TAqqhTKHEjZmV5ZDl+dZKS3N/b/zDGiKf/063UPIU6E6O4bnaJr4667PZ9S+dgwG7B2noFiVWVUfoPCOitrf8Jv5GfA6jvyYIycIRU X-Gm-Message-State: AOJu0YzPokjD9fHF2t0evWcpzPdZcvV5s2gbb732tN+WjFlRee+eFS29 bIhC9a3ReEJLlWTdQclVgmvoJpisF8l8EqMzeoBHswhOB2hcrDYrARZ/cumikhc= X-Google-Smtp-Source: AGHT+IHvBlL+jGPsK4CwdZyczQLOh+yZWLb3WVYvPt2qy1wcTAy3o5XVEIa/oJCibXR81m07IaOq2Q== X-Received: by 2002:a17:903:22c5:b0:1f7:1029:df2a with SMTP id d9443c01a7336-1f9aa3bc749mr47321855ad.7.1718841453955; Wed, 19 Jun 2024 16:57:33 -0700 (PDT) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855e70ae6sm123620745ad.71.2024.06.19.16.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 16:57:33 -0700 (PDT) From: Charlie Jenkins Date: Wed, 19 Jun 2024 16:57:17 -0700 Subject: [PATCH v3 04/13] riscv: Add thead and xtheadvector as a vendor extension Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240619-xtheadvector-v3-4-bff39eb9668e@rivosinc.com> References: <20240619-xtheadvector-v3-0-bff39eb9668e@rivosinc.com> In-Reply-To: <20240619-xtheadvector-v3-0-bff39eb9668e@rivosinc.com> To: Conor Dooley , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Jisheng Zhang , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Jonathan Corbet , Shuah Khan , Guo Ren , Evan Green , Andy Chiu , Jessica Clarke Cc: linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, Charlie Jenkins , Conor Dooley X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1718841444; l=5053; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=tjgGkoCryxyMgpwKP1wgkLVrqryHilEtqiGvIHEzeJ4=; b=OFDj5veBfOnTLY+4aKrevDubw/hftENU5BMsqeaonrFs4txe1Ndco4XNP9RAU4Pn1jp/hKsPB 3OzGs1AWMMUDa7+hNMoeVp7qjKnN/iR+TxJlcj9a6WLdPLdsyIsszlb X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= Add support to the kernel for THead vendor extensions with the target of the new extension xtheadvector. Signed-off-by: Charlie Jenkins Reviewed-by: Conor Dooley --- arch/riscv/Kconfig.vendor | 13 +++++++++++++ arch/riscv/include/asm/vendor_extensions/thead.h | 16 ++++++++++++++++ arch/riscv/kernel/cpufeature.c | 1 + arch/riscv/kernel/vendor_extensions.c | 10 ++++++++++ arch/riscv/kernel/vendor_extensions/Makefile | 1 + arch/riscv/kernel/vendor_extensions/thead.c | 18 ++++++++++++++++++ 6 files changed, 59 insertions(+) diff --git a/arch/riscv/Kconfig.vendor b/arch/riscv/Kconfig.vendor index 6f1cdd32ed29..9897442bd44f 100644 --- a/arch/riscv/Kconfig.vendor +++ b/arch/riscv/Kconfig.vendor @@ -16,4 +16,17 @@ config RISCV_ISA_VENDOR_EXT_ANDES If you don't know what to do here, say Y. endmenu +menu "T-Head" +config RISCV_ISA_VENDOR_EXT_THEAD + bool "T-Head vendor extension support" + select RISCV_ISA_VENDOR_EXT + default y + help + Say N here to disable detection of and support for all T-Head vendor + extensions. Without this option enabled, T-Head vendor extensions will + not be detected at boot and their presence not reported to userspace. + + If you don't know what to do here, say Y. +endmenu + endmenu diff --git a/arch/riscv/include/asm/vendor_extensions/thead.h b/arch/riscv/include/asm/vendor_extensions/thead.h new file mode 100644 index 000000000000..48421d1553ad --- /dev/null +++ b/arch/riscv/include/asm/vendor_extensions/thead.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_RISCV_VENDOR_EXTENSIONS_THEAD_H +#define _ASM_RISCV_VENDOR_EXTENSIONS_THEAD_H + +#include + +#include + +/* + * Extension keys must be strictly less than RISCV_ISA_VENDOR_EXT_MAX. + */ +#define RISCV_ISA_VENDOR_EXT_XTHEADVECTOR 0 + +extern struct riscv_isa_vendor_ext_data_list riscv_isa_vendor_ext_list_thead; + +#endif diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index f2c24820700b..2107c59575dd 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -25,6 +25,7 @@ #include #include #include +#include #define NUM_ALPHA_EXTS ('z' - 'a' + 1) diff --git a/arch/riscv/kernel/vendor_extensions.c b/arch/riscv/kernel/vendor_extensions.c index b6c1e7b5d34b..662ba64a8f93 100644 --- a/arch/riscv/kernel/vendor_extensions.c +++ b/arch/riscv/kernel/vendor_extensions.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -14,6 +15,9 @@ struct riscv_isa_vendor_ext_data_list *riscv_isa_vendor_ext_list[] = { #ifdef CONFIG_RISCV_ISA_VENDOR_EXT_ANDES &riscv_isa_vendor_ext_list_andes, #endif +#ifdef CONFIG_RISCV_ISA_VENDOR_EXT_THEAD + &riscv_isa_vendor_ext_list_thead, +#endif }; const size_t riscv_isa_vendor_ext_list_size = ARRAY_SIZE(riscv_isa_vendor_ext_list); @@ -41,6 +45,12 @@ bool __riscv_isa_vendor_extension_available(int cpu, unsigned long vendor, unsig cpu_bmap = &riscv_isa_vendor_ext_list_andes.per_hart_isa_bitmap[cpu]; break; #endif + #ifdef CONFIG_RISCV_ISA_VENDOR_EXT_THEAD + case THEAD_VENDOR_ID: + bmap = &riscv_isa_vendor_ext_list_thead.all_harts_isa_bitmap; + cpu_bmap = &riscv_isa_vendor_ext_list_thead.per_hart_isa_bitmap[cpu]; + break; + #endif default: return false; } diff --git a/arch/riscv/kernel/vendor_extensions/Makefile b/arch/riscv/kernel/vendor_extensions/Makefile index 6a61aed944f1..353522cb3bf0 100644 --- a/arch/riscv/kernel/vendor_extensions/Makefile +++ b/arch/riscv/kernel/vendor_extensions/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_RISCV_ISA_VENDOR_EXT_ANDES) += andes.o +obj-$(CONFIG_RISCV_ISA_VENDOR_EXT_THEAD) += thead.o diff --git a/arch/riscv/kernel/vendor_extensions/thead.c b/arch/riscv/kernel/vendor_extensions/thead.c new file mode 100644 index 000000000000..0934a2086473 --- /dev/null +++ b/arch/riscv/kernel/vendor_extensions/thead.c @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include +#include +#include + +#include +#include + +/* All T-Head vendor extensions supported in Linux */ +const struct riscv_isa_ext_data riscv_isa_vendor_ext_thead[] = { + __RISCV_ISA_EXT_DATA(xtheadvector, RISCV_ISA_VENDOR_EXT_XTHEADVECTOR), +}; + +struct riscv_isa_vendor_ext_data_list riscv_isa_vendor_ext_list_thead = { + .ext_data_count = ARRAY_SIZE(riscv_isa_vendor_ext_thead), + .ext_data = riscv_isa_vendor_ext_thead, +};