Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp6679542ybi; Wed, 31 Jul 2019 19:21:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqwCqJQ9GoyF3sS14hnockjA4mIbSjgD0SBT6ZqROqAlXky/V8BEE7h02LLrnp4aAyU5BMig X-Received: by 2002:a17:902:be15:: with SMTP id r21mr120133156pls.293.1564626060793; Wed, 31 Jul 2019 19:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564626060; cv=none; d=google.com; s=arc-20160816; b=MlHOWMZeLJ/imE8VMucPMYIN/CkryBYpc5mIGkBxiOHpcwajgvIdRdIeMLj1XyD+Qx 62p6Bim4iS1gdRJEWsubruhX5ijzFmoTwfXJN8e7o3Do+aPZzDGWEgBEG9LjGmpLpyaU Fw3RaH5DweOyMCWPGK3ebSJ/WZJzuUV7cAPL6uUZraLU0el5zIgyJthyq6VI4KEeisEd WmKa5wc2YxsSssjD7FC/e+HMg6GDEpbbZSj2MmupLLlw79IGxM6E5EmizWNW6kzo5Nr+ h4NOEhpgNilFemL10YIvCoz0HRmzIpmCE+uhMW4s1mwGrrni9Q4eCF1qhaUBsbB7RBri Ic0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr:ironport-sdr:dkim-signature; bh=F/fiGBIKJFk+f/MrAcHXo2r4s0RKJQ/ZfUW8/iRbM4c=; b=eXjpV8GUm731UwEbmTWwBpJlfsMT//nQrsugneHC0aVQbcPJJcdMBkqxMPbmFzERnt sXxaCeJ5kugRbd+qH84cNxig1+su52pvzmtoU8GI8mDPFjSe+EymYy0F7Dv/5eFTLCIq wgWe9UoxjR6cOZXGAY24C64yN40Aoas/kvcffLHPz+FTWppLhi43oA7812J53DtBR3ye GqcjVEpIF6Wno3wtpzjdmiaU6xRGAZgrzER++dKZZ88342CDcmWo6PHvOBziuDkp3+K7 nHFckxOZ02o0gsVLjeJyrDMxsL3OAsQkcVOBy7te5udlXFy1woICXwFbFPv0GqcDrBwf t8uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=HjB+aHiP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wdc.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f10si2683806pjw.89.2019.07.31.19.20.45; Wed, 31 Jul 2019 19:21:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=HjB+aHiP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wdc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729072AbfHAA6s (ORCPT + 99 others); Wed, 31 Jul 2019 20:58:48 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:61766 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727370AbfHAA6k (ORCPT ); Wed, 31 Jul 2019 20:58:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1564621120; x=1596157120; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YwZBgjDKqJC0ZZ1pMUEYPgwPKNXhIZ+3mPkTf+XP88Q=; b=HjB+aHiP05xeqfHgqoPMC7ja6m7GcWNt0qNB1BQv5sCVDt2/jhsRoUHb +6WL93WKvcotJika2YMS1HtaY15CEABts7/weef7/5gdE7zgJKAFsNykY ZgqX3l9OVQ19wpap9OASMUv9oSPLKVX74XBuUSaKblWLIdWrTzE9cNg4g MJm+gFH3sel35DuGaJ7u4C6/+MC2hgsG81GMAIK4ku/OTqP5ZiMYxe7jJ B6EcL8Mio1rSa7pwCPbpeaFB0WJpDHdfZDK0YkuhZSXiAWHhdU+A6UGY2 01mWkaYotXxnY2t9SRUdzSoUVUBNF5Dy7kW/cE054/q1VuArrks84kigz w==; IronPort-SDR: rOHM2/NdwKyhoADrQr6xmsGy23nLlMi25ZkCpP9C/OYuHcnV8b3Us/9EoLKLQT+akluBiyBtwc F1zjZTwbH1tSc/zefZUwuy3QvHd0CO2JaH0pRye6aOCgL4X78Xx7s3Xw5ktqbwUtJPvTpL5TD0 wx23pM747VgnqmzpMTQI6WWKnkGLZKAGqsHJYkDEAG/rkcEyiptAzyCpZJKx0/xU8m+jlVhBh3 iJ32Lt9vRd6zwAStXeTtv2x41DSbMuSunEXzgeCBVmvpPrTtIAvzcBP8yzqP/HWGy+iP5V1gze FEo= X-IronPort-AV: E=Sophos;i="5.64,332,1559491200"; d="scan'208";a="116247212" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 01 Aug 2019 08:58:39 +0800 IronPort-SDR: yNgY3SUWndxDXNUnG9G7TmKUcEmMauNvfPP/yzKTlCiapX6+IaUEsCXZio8PQf299YiqX/40oR X4Q24vH2iFYf5I2Bur/Ev/jqFEDBBc4PlNUrbpzVrllMMoiglPSU/hHtb3S30LwcdAk+NqNQJB whIZdZlo3rGe8mCNE5bgFBHn2eCx2bTDvAEURgosDQFxoeXUyVFvDZiYhR+Qxf9hHlI3Oyz5Xf nX/zp7a5xS13VHnDsqhFGmylhWzNi/GrgjoVXM/E9mrcaaxMczLPDzEMxx0TpjVuQMSUceaxTM Sq87PGoGb0SxEU0XHy+bVHRP Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jul 2019 17:56:38 -0700 IronPort-SDR: T1e0SzIcgbeidAWvNuNAvumncUxVHFgvFczii8DqmVoy1zBX2ca85sDt0rCgDOMxQrRYSX+HKO efBEcAIq52JdipV1/Fm91RI8t24689ufuGuTcNBihFFFnfreVpC9XhebG4S+SPu7fGrT2D5+2l bxLYDGQSf58/EzfB/WVCHKONjBgfuJ0zTuiVNKOOn/5FQ/fVaLhK1kEuKdKkTWNVw/80nbjeU7 qLyZfUErNvE5RlONJDFts1toTg3uTGG0UdaPOCLI4dqgA1Lac6v4VNz3rISwyJAvLjHrPS6Ihp Tds= Received: from jedi-01.sdcorp.global.sandisk.com (HELO jedi-01.int.fusionio.com) ([10.11.143.218]) by uls-op-cesaip01.wdc.com with ESMTP; 31 Jul 2019 17:58:38 -0700 From: Atish Patra To: linux-kernel@vger.kernel.org Cc: Anup Patel , Atish Patra , Albert Ou , Allison Randal , Daniel Lezcano , devicetree@vger.kernel.org, Enrico Weigelt , Gary Guo , Greg Kroah-Hartman , Johan Hovold , linux-riscv@lists.infradead.org, Mark Rutland , Palmer Dabbelt , Paul Walmsley , Rob Herring , Thomas Gleixner , Yangtao Li Subject: [PATCH v3 2/5] RISC-V: Add riscv_isa reprensenting ISA features common across CPUs Date: Wed, 31 Jul 2019 17:58:40 -0700 Message-Id: <20190801005843.10343-3-atish.patra@wdc.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190801005843.10343-1-atish.patra@wdc.com> References: <20190801005843.10343-1-atish.patra@wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Anup Patel This patch adds riscv_isa integer to represent ISA features common across all CPUs. The riscv_isa is not same as elf_hwcap because elf_hwcap will only have ISA features relevant for user-space apps whereas riscv_isa will have ISA features relevant to both kernel and user-space apps. One of the use case is KVM hypervisor where riscv_isa will be used to do following operations: 1. Check whether hypervisor extension is available 2. Find ISA features that need to be virtualized (e.g. floating point support, vector extension, etc.) Signed-off-by: Anup Patel Signed-off-by: Atish Patra --- arch/riscv/include/asm/hwcap.h | 16 ++++++++++++++ arch/riscv/kernel/cpufeature.c | 39 +++++++++++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index 7ecb7c6a57b1..717306780add 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -22,5 +22,21 @@ enum { }; extern unsigned long elf_hwcap; + +#define RISCV_ISA_EXT_a (1UL << ('a' - 'a')) +#define RISCV_ISA_EXT_c (1UL << ('c' - 'a')) +#define RISCV_ISA_EXT_d (1UL << ('d' - 'a')) +#define RISCV_ISA_EXT_f (1UL << ('f' - 'a')) +#define RISCV_ISA_EXT_h (1UL << ('h' - 'a')) +#define RISCV_ISA_EXT_i (1UL << ('i' - 'a')) +#define RISCV_ISA_EXT_m (1UL << ('m' - 'a')) +#define RISCV_ISA_EXT_s (1UL << ('s' - 'a')) +#define RISCV_ISA_EXT_u (1UL << ('u' - 'a')) + +extern unsigned long riscv_isa; + +#define riscv_isa_extension_available(ext_char) \ + (riscv_isa & RISCV_ISA_EXT_##ext_char) + #endif #endif diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index b1ade9a49347..becc99272341 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -12,6 +12,9 @@ #include unsigned long elf_hwcap __read_mostly; +unsigned long riscv_isa __read_mostly; +EXPORT_SYMBOL_GPL(riscv_isa); + #ifdef CONFIG_FPU bool has_fpu __read_mostly; #endif @@ -20,7 +23,8 @@ void riscv_fill_hwcap(void) { struct device_node *node; const char *isa; - size_t i; + char print_str[BITS_PER_LONG+1]; + size_t i, j, isa_len; static unsigned long isa2hwcap[256] = {0}; isa2hwcap['i'] = isa2hwcap['I'] = COMPAT_HWCAP_ISA_I; @@ -31,9 +35,11 @@ void riscv_fill_hwcap(void) isa2hwcap['c'] = isa2hwcap['C'] = COMPAT_HWCAP_ISA_C; elf_hwcap = 0; + riscv_isa = 0; for_each_of_cpu_node(node) { unsigned long this_hwcap = 0; + unsigned long this_isa = 0; if (riscv_of_processor_hartid(node) < 0) continue; @@ -43,8 +49,20 @@ void riscv_fill_hwcap(void) continue; } - for (i = 0; i < strlen(isa); ++i) + i = 0; + isa_len = strlen(isa); +#if defined(CONFIG_32BIT) + if (!strncmp(isa, "rv32", 4)) + i += 4; +#elif defined(CONFIG_64BIT) + if (!strncmp(isa, "rv64", 4)) + i += 4; +#endif + for (; i < isa_len; ++i) { this_hwcap |= isa2hwcap[(unsigned char)(isa[i])]; + if ('a' <= isa[i] && isa[i] <= 'z') + this_isa |= (1UL << (isa[i] - 'a')); + } /* * All "okay" hart should have same isa. Set HWCAP based on @@ -55,6 +73,11 @@ void riscv_fill_hwcap(void) elf_hwcap &= this_hwcap; else elf_hwcap = this_hwcap; + + if (riscv_isa) + riscv_isa &= this_isa; + else + riscv_isa = this_isa; } /* We don't support systems with F but without D, so mask those out @@ -64,7 +87,17 @@ void riscv_fill_hwcap(void) elf_hwcap &= ~COMPAT_HWCAP_ISA_F; } - pr_info("elf_hwcap is 0x%lx\n", elf_hwcap); + memset(print_str, 0, sizeof(print_str)); + for (i = 0, j = 0; i < BITS_PER_LONG; i++) + if (riscv_isa & (1UL << i)) + print_str[j++] = (char)('a' + i); + pr_info("riscv: ISA extensions %s\n", print_str); + + memset(print_str, 0, sizeof(print_str)); + for (i = 0, j = 0; i < BITS_PER_LONG; i++) + if (elf_hwcap & (1UL << i)) + print_str[j++] = (char)('a' + i); + pr_info("riscv: ELF capabilities %s\n", print_str); #ifdef CONFIG_FPU if (elf_hwcap & (COMPAT_HWCAP_ISA_F | COMPAT_HWCAP_ISA_D)) -- 2.21.0