From patchwork Thu Feb 13 00:38:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Inochi Amaoto X-Patchwork-Id: 13972636 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9FC68C021A0 for ; Thu, 13 Feb 2025 00:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Hz8rH1w7w5wYwL3lkKWdsg3a1j6P8Du1bjqPZrgWEDU=; b=DLQRbbX3JxzpeU Kwz5wk8yjyijQjPur02eAcK1nm4BiNxzThAxJcoBrq83jHK5sZWU4mAEfyYNBzqhAR4zr9EJKPdte aGXXHAiBjW8XSSvkKq1V9o8Ym5c932PmPzmPQsaW5zBbMNKasjr5d3+h7vaOSvWgD635T/MMP8lEY lUk53TfkemtX3GVdrA2d5XTdw9jCi5Cfeif3PT9tcWs5FURX/t45cpa20n/dbfCH/ipesyQ5Gh6yy mi5EmodPdZrZnRsFj2GKPsmBO3QzyF77buIO+Ym0MADx794P4Bvboi/NckHz2B6Xc5qIA9tgZBGPr j4t/T7rOLDW0tp6PTzmA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tiNG3-00000009Ifo-01zw; Thu, 13 Feb 2025 00:39:11 +0000 Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tiNG0-00000009Idj-2mw4 for linux-riscv@lists.infradead.org; Thu, 13 Feb 2025 00:39:09 +0000 Received: by mail-qt1-x831.google.com with SMTP id d75a77b69052e-471963ae31bso3048411cf.3 for ; Wed, 12 Feb 2025 16:39:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739407147; x=1740011947; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dUrtJevhcm0CKbwqKbK4CuYq0Bi82l+4WvPMumL72xI=; b=fz2Sh45m0uW79x1NVs5jtIeztfzAQbJ9o/8mDvlaZyX+Z1RSmN2vri/FdaKeiPjqap Ul8TvRrW+GX3S/wqnl2lo/H8Kf+My7IeDbb9DAN62zEYhHp0R/OJGYLnH4EMkjV9E9Y9 U6ZwcPmgizobzGPfrrAoXCpzHlD42WCk2+08rpA6Hdr2LI8/x0xJ+qBJUR7S5WfgnFge 10Vk9DyywnIZoa+LN3LktOWxGJ1lMd0GTC7ewFaeoZXAwuUx0J4CXIQhpS8w4v+BTk0J pNgyxLWIn3nO2ZDH83nthwdBHD49murKzb8DbOnUEAfj2G+Jm/HwiUfVXVe1JzBT014c UibQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739407147; x=1740011947; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dUrtJevhcm0CKbwqKbK4CuYq0Bi82l+4WvPMumL72xI=; b=B9xt6J1fQFgVbK5MhdLABkOpkrw6mLWmWazfUGst64KXmQdf3eb1lY8gQ8XFeo/AXg W8QNG3bjFxefpVgfn1q0AV3D+jXgRA0LKgy2wOzQGI5Y4+uN3qBa5NKKeXyH5GI8atEV w7nU6GVZBRvaP4VVWN5nDpasrV4/07IqS73CrfBGdUPKjMNytdhCKJ0YUux+/BQhwh1w MyFHzZ1BB1m0bwRhlpjsHD/7sb6fhztYEYj87LN/uLcN1Fs+ypHSrKdpQZbeFQqhjUG+ LYXua5Sked2mRA2ojmBTTrLWIroLmDKC3WgIMZ2lH5AP6YzNTuTENx7SQ5Fb7kB0+Rbo HWRg== X-Forwarded-Encrypted: i=1; AJvYcCVBBn0IaCEpZLjmGCLhcL98XMW5Rq/bIu/ENhBPCeo8G7CXQFUWvoT6LesEj3nL+we07nSsY45T69EzuQ==@lists.infradead.org X-Gm-Message-State: AOJu0YzhmNMvNCtbLVd+5NabUsyENAyJMOPFUeoKukWlA0LgiPBokYnn RDECddZf70WWE/Hw5uWIeNs+Vu4XRalQYYgxGbw23CEYiNNb3VI+ X-Gm-Gg: ASbGnctPL6kzzp8cOdTcmkFAud8G2AUJdeGVensVtG1oc4NqpBZgcZnL67vadark1KG evtA0Ky5hfulxSgYGkQ7WQwgrdXxJUszHldVM7DS3sEtKY9tn+/Adr1i4fN6kwyXAn8+bFxHvOj e+GpN+l+o4Gy+I3eQJZ5pmGj8aGbs52k0+pm6quT3fDdXc2oHirhVUnYRZFPZiZIMl9QdOxHXKe Z6TnUuAdnEIEjUKIMbw4yQ4GnQiISuIa7WhVwr9N3Xdi39n/A4I1dvmOJMLuX9K8kw= X-Google-Smtp-Source: AGHT+IH4Lace1X98ZnWBEvY1cymlk72VSYPPy3ZXrC1eukrH19AoRSIo1KXtdbZz9LKA1vAlD6ac/A== X-Received: by 2002:ac8:5a15:0:b0:471:a602:e75 with SMTP id d75a77b69052e-471bed7567dmr20929571cf.25.1739407147286; Wed, 12 Feb 2025 16:39:07 -0800 (PST) Received: from localhost ([2001:da8:7001:11::cb]) by smtp.gmail.com with UTF8SMTPSA id d75a77b69052e-471c2b06002sm1152481cf.77.2025.02.12.16.39.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 16:39:07 -0800 (PST) From: Inochi Amaoto To: Jonathan Corbet , Paul Walmsley , Palmer Dabbelt , Albert Ou , Rob Herring , Krzysztof Kozlowski , Conor Dooley , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Charlie Jenkins , Evan Green , Inochi Amaoto , Andrew Jones , Jesse Taube , Andy Chiu , Alexandre Ghiti , Yong-Xuan Wang , Yu Chien Peter Lin , Samuel Holland Cc: linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yixun Lan , Longbin Li Subject: [PATCH v4 2/3] riscv: add ISA extension parsing for bfloat16 ISA extension Date: Thu, 13 Feb 2025 08:38:46 +0800 Message-ID: <20250213003849.147358-3-inochiama@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250213003849.147358-1-inochiama@gmail.com> References: <20250213003849.147358-1-inochiama@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250212_163908_704299_E02C338A X-CRM114-Status: GOOD ( 11.48 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Add parsing for Zfbmin, Zvfbfmin, Zvfbfwma ISA extension which were ratified in 4dc23d62 ("Added Chapter title to BF16") of the riscv-isa-manual. Signed-off-by: Inochi Amaoto Reviewed-by: Clément Léger --- arch/riscv/include/asm/hwcap.h | 3 +++ arch/riscv/kernel/cpufeature.c | 35 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index 869da082252a..14cc29f2a723 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -100,6 +100,9 @@ #define RISCV_ISA_EXT_ZICCRSE 91 #define RISCV_ISA_EXT_SVADE 92 #define RISCV_ISA_EXT_SVADU 93 +#define RISCV_ISA_EXT_ZFBFMIN 94 +#define RISCV_ISA_EXT_ZVFBFMIN 95 +#define RISCV_ISA_EXT_ZVFBFWMA 96 #define RISCV_ISA_EXT_XLINUXENVCFG 127 diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index c6ba750536c3..37fb6b07281e 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -80,6 +80,15 @@ bool __riscv_isa_extension_available(const unsigned long *isa_bitmap, unsigned i } EXPORT_SYMBOL_GPL(__riscv_isa_extension_available); +static int riscv_ext_f_depends(const struct riscv_isa_ext_data *data, + const unsigned long *isa_bitmap) +{ + if (__riscv_isa_extension_available(isa_bitmap, RISCV_ISA_EXT_f)) + return 0; + + return -EPROBE_DEFER; +} + static int riscv_ext_zicbom_validate(const struct riscv_isa_ext_data *data, const unsigned long *isa_bitmap) { @@ -140,6 +149,28 @@ static int riscv_ext_zcf_validate(const struct riscv_isa_ext_data *data, return -EPROBE_DEFER; } +static int riscv_vector_f_validate(const struct riscv_isa_ext_data *data, + const unsigned long *isa_bitmap) +{ + if (!IS_ENABLED(CONFIG_RISCV_ISA_V)) + return -EINVAL; + + if (__riscv_isa_extension_available(isa_bitmap, RISCV_ISA_EXT_ZVE32F)) + return 0; + + return -EPROBE_DEFER; +} + +static int riscv_ext_zvfbfwma_validate(const struct riscv_isa_ext_data *data, + const unsigned long *isa_bitmap) +{ + if (__riscv_isa_extension_available(isa_bitmap, RISCV_ISA_EXT_ZFBFMIN) && + __riscv_isa_extension_available(isa_bitmap, RISCV_ISA_EXT_ZVFBFMIN)) + return 0; + + return -EPROBE_DEFER; +} + static int riscv_ext_svadu_validate(const struct riscv_isa_ext_data *data, const unsigned long *isa_bitmap) { @@ -345,6 +376,7 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = { __RISCV_ISA_EXT_DATA(zacas, RISCV_ISA_EXT_ZACAS), __RISCV_ISA_EXT_DATA(zawrs, RISCV_ISA_EXT_ZAWRS), __RISCV_ISA_EXT_DATA(zfa, RISCV_ISA_EXT_ZFA), + __RISCV_ISA_EXT_DATA_VALIDATE(zfbfmin, RISCV_ISA_EXT_ZFBFMIN, riscv_ext_f_depends), __RISCV_ISA_EXT_DATA(zfh, RISCV_ISA_EXT_ZFH), __RISCV_ISA_EXT_DATA(zfhmin, RISCV_ISA_EXT_ZFHMIN), __RISCV_ISA_EXT_DATA(zca, RISCV_ISA_EXT_ZCA), @@ -377,6 +409,9 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = { __RISCV_ISA_EXT_SUPERSET(zve64d, RISCV_ISA_EXT_ZVE64D, riscv_zve64d_exts), __RISCV_ISA_EXT_SUPERSET(zve64f, RISCV_ISA_EXT_ZVE64F, riscv_zve64f_exts), __RISCV_ISA_EXT_SUPERSET(zve64x, RISCV_ISA_EXT_ZVE64X, riscv_zve64x_exts), + __RISCV_ISA_EXT_DATA_VALIDATE(zvfbfmin, RISCV_ISA_EXT_ZVFBFMIN, riscv_vector_f_validate), + __RISCV_ISA_EXT_DATA_VALIDATE(zvfbfwma, RISCV_ISA_EXT_ZVFBFWMA, + riscv_ext_zvfbfwma_validate), __RISCV_ISA_EXT_DATA(zvfh, RISCV_ISA_EXT_ZVFH), __RISCV_ISA_EXT_DATA(zvfhmin, RISCV_ISA_EXT_ZVFHMIN), __RISCV_ISA_EXT_DATA(zvkb, RISCV_ISA_EXT_ZVKB),