From patchwork Fri Aug 5 16:28:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 595859 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D966C25B07 for ; Fri, 5 Aug 2022 16:29:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241223AbiHEQ3M (ORCPT ); Fri, 5 Aug 2022 12:29:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238451AbiHEQ3H (ORCPT ); Fri, 5 Aug 2022 12:29:07 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DD6EEE3A for ; Fri, 5 Aug 2022 09:29:06 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id v3so3884804wrp.0 for ; Fri, 05 Aug 2022 09:29:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=E8iWEu7u72D4Cl4M4gSvZHsI5dQSubGoMYwsdu1FZWU=; b=SagV/jMHKGASMD/cT6X473mBlOlzicU0AUDh9UambssZ2tjT0QWPfzhpv5CU1qTNOe Ddfy8c1bQ1yG9CeR7FDMP9QknXMcfMUE+Byise52p/JiaVA4+W+VBztftsDouBAa3t2g 2nRb2g/0ogD/BhxbNhJllKgVo1/L4hSx0dBiNp+l+3Yc7/Hwl01vZwawaVOxi2sRM6Iv +YjgoV+Oxr9NNxstRTgtAOzHe7S1zyhir5a1faOe3uBGBp8cVeuY5bGDp1CHzkixcPtb +TknqsGOz8YK3iQID272GlVw1lT7n35nGKQ+PgnmF7eMUsAREvkNRwlFU0RYzPqyT7cU OhpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=E8iWEu7u72D4Cl4M4gSvZHsI5dQSubGoMYwsdu1FZWU=; b=VQ7bjFKGGAecGc4I8w7gnKHq1L2UoKgUmJz6nBomQTD9eeo7ttbVuKfxcHlGcao0k8 q30nZ8udFXIZOZnJQdPBWltAiXFpGdMrZAtA8atLiEiUaYljFVt2CkcgjFOp1YkG5dNN MMImzsxumzTdSsBCI/rx0P16UWOl+4oeMbsql7MHMjjCTFmbxVBC5SOaC7Y3b4l41M8Q OB/uVdxmxTlsCnaZ7DrV0UwwoXR7X00a1UJURG0xuukenJssVJdUmJU1afsOtvkZCFaT 42q94jb5QTVqeXYFvw+vf3DoAsfCuSCU0wLZYgPF8HwmL/BYDyADSqwkG18r4QpV3GoF bNVA== X-Gm-Message-State: ACgBeo0MHbtaJ5TxD/FRTqlFO+6gLWpSLA4SwW85CH1d+daTzUq61ZNQ Rqld+B50+jKy/szlaKSrzyTX6g== X-Google-Smtp-Source: AA6agR76DtGocbpsn0OQ/xj8+vFW4/LZsUFl+//i/QybfiOJkv1KkQ6JSE5TvZgiPLEA4ARS2OZxvA== X-Received: by 2002:a05:6000:2c1:b0:220:5f91:62de with SMTP id o1-20020a05600002c100b002205f9162demr4920411wry.715.1659716944614; Fri, 05 Aug 2022 09:29:04 -0700 (PDT) Received: from henark71.. ([93.107.66.220]) by smtp.gmail.com with ESMTPSA id b10-20020a056000054a00b00220633d96f2sm5210086wrf.72.2022.08.05.09.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 09:29:04 -0700 (PDT) From: Conor Dooley To: Thomas Gleixner , Marc Zyngier , Rob Herring , Krzysztof Kozlowski , Palmer Dabbelt , Paul Walmsley , Albert Ou Cc: Daniel Lezcano , Anup Patel , Conor Dooley , Guo Ren , Sagar Kadam , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, qemu-riscv@nongnu.org, Rob Herring Subject: [PATCH 1/3] dt-bindings: timer: sifive,clint: add legacy riscv compatible Date: Fri, 5 Aug 2022 17:28:43 +0100 Message-Id: <20220805162844.1554247-2-mail@conchuod.ie> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220805162844.1554247-1-mail@conchuod.ie> References: <20220805162844.1554247-1-mail@conchuod.ie> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Conor Dooley While "real" hardware might not use the compatible string "riscv,clint0" it is present in the driver & QEMU uses it for automatically generated virt machine dtbs. To avoid dt-validate problems with QEMU produced dtbs, such as the following, add it to the binding. riscv-virt.dtb: clint@2000000: compatible:0: 'sifive,clint0' is not one of ['sifive,fu540-c000-clint', 'starfive,jh7100-clint', 'canaan,k210-clint'] Reported-by: Rob Herring Link: https://lore.kernel.org/linux-riscv/20220803170552.GA2250266-robh@kernel.org/ Signed-off-by: Conor Dooley --- .../bindings/timer/sifive,clint.yaml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/timer/sifive,clint.yaml b/Documentation/devicetree/bindings/timer/sifive,clint.yaml index e64f46339079..9fcf20942582 100644 --- a/Documentation/devicetree/bindings/timer/sifive,clint.yaml +++ b/Documentation/devicetree/bindings/timer/sifive,clint.yaml @@ -22,12 +22,18 @@ description: properties: compatible: - items: - - enum: - - sifive,fu540-c000-clint - - starfive,jh7100-clint - - canaan,k210-clint - - const: sifive,clint0 + oneOf: + - items: + - enum: + - sifive,fu540-c000-clint + - starfive,jh7100-clint + - canaan,k210-clint + - const: sifive,clint0 + - items: + - const: sifive,clint0 + - const: riscv,clint0 + deprecated: true + description: For legacy systems & the qemu virt machine only description: Should be ",-clint" and "sifive,clint". From patchwork Fri Aug 5 16:28:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 595605 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 521E2C00140 for ; Fri, 5 Aug 2022 16:29:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238451AbiHEQ3N (ORCPT ); Fri, 5 Aug 2022 12:29:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241071AbiHEQ3I (ORCPT ); Fri, 5 Aug 2022 12:29:08 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 355A7DF20 for ; Fri, 5 Aug 2022 09:29:07 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id 186-20020a1c02c3000000b003a34ac64bdfso1932613wmc.1 for ; Fri, 05 Aug 2022 09:29:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=XYwLdkCxi/i5yAItJxUUyXuQNOjzCE2mt/Ff4B2y6Cs=; b=D3jxpRS5zNs90vY2YI73WI0Sebg+PIYbtdcLdZdVJEXt3MBup6LCK2JIBzVVc9luf/ y+mycZVPceDjrWQVGmfZ+sxZXcbWaL3763eF+Q+DVIutHNzi0RLCew0mxmG7/kIfLpZ7 vd2UHhO6bKZq2M2BwoTDjQ3+TgKGoGMYtrEJ7e6B1dAuq64Hny8AXJO4zU7fKCqwp9Y4 XqNFWxfQxCabjC6uSb/6FW+5T/zzzug2dsC9ovC7y6kN2H0bGhe/mof5pv9jfOu9lrLj Jx8RXO1fH6Lhe+YFFJEXwg8WmUhG2kUGCItPfw3nN1RjSrrl4qMrjHweVP2pn41EcyL1 yILg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=XYwLdkCxi/i5yAItJxUUyXuQNOjzCE2mt/Ff4B2y6Cs=; b=df//aHa0J3r6DhBBQ29YkXqAfipECwKuXrt12E0fgL8DdX5ltrLzHYjWiAJzL0D9Vg ZnuuQYduHuwOYblaQLj0UR3jeI7hjxhjO0DNY06/LApC7Ih4X2OUAQl7xOhcN1R0czy7 9xOuqpA3Q6P4lsTMKr58suEgEjc7F1EWSXWefDdbjStC6TCWjQEb4oj66M18frkS7qa3 x2dtBE8RNz193AFps7nEesMS0mnNIPSpyI/DjSYNx0i6HOO5UTDN9VgF6tlDKL9URPbt /3qOgSOq2s0qwjYVhp0Pux9C0gKrGqRxfdC6nMVmK9ur/l3OWfoLR4zaxLjXhLrxGgk6 Z3Eg== X-Gm-Message-State: ACgBeo33Lk9/nXOFYUVx3VRlZyR9lZKHQuTlFugeFN8j0ZW1sCIQv/R/ 25T+y1Nn7v7PB0afS2llJwSKOQ== X-Google-Smtp-Source: AA6agR72z7gXpSrSt4MlK0Qii9Fz4lxO9+YCgAXzA44zWKFpX88wGi7wvDKIHf1SjUomkA4m7/Xc+g== X-Received: by 2002:a05:600c:3d8d:b0:3a3:15a8:a8e1 with SMTP id bi13-20020a05600c3d8d00b003a315a8a8e1mr5151407wmb.167.1659716945693; Fri, 05 Aug 2022 09:29:05 -0700 (PDT) Received: from henark71.. ([93.107.66.220]) by smtp.gmail.com with ESMTPSA id b10-20020a056000054a00b00220633d96f2sm5210086wrf.72.2022.08.05.09.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 09:29:05 -0700 (PDT) From: Conor Dooley To: Thomas Gleixner , Marc Zyngier , Rob Herring , Krzysztof Kozlowski , Palmer Dabbelt , Paul Walmsley , Albert Ou Cc: Daniel Lezcano , Anup Patel , Conor Dooley , Guo Ren , Sagar Kadam , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, qemu-riscv@nongnu.org, Rob Herring Subject: [PATCH 2/3] dt-bindings: interrupt-controller: sifive,plic: add legacy riscv compatible Date: Fri, 5 Aug 2022 17:28:44 +0100 Message-Id: <20220805162844.1554247-3-mail@conchuod.ie> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220805162844.1554247-1-mail@conchuod.ie> References: <20220805162844.1554247-1-mail@conchuod.ie> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Conor Dooley While "real" hardware might not use the compatible string "riscv,plic0" it is present in the driver & QEMU uses it for automatically generated virt machine dtbs. To avoid dt-validate problems with QEMU produced dtbs, such as the following, add it to the binding. riscv-virt.dtb: plic@c000000: compatible: 'oneOf' conditional failed, one must be fixed: 'sifive,plic-1.0.0' is not one of ['sifive,fu540-c000-plic', 'starfive,jh7100-plic', 'canaan,k210-plic'] 'sifive,plic-1.0.0' is not one of ['allwinner,sun20i-d1-plic'] 'sifive,plic-1.0.0' was expected 'thead,c900-plic' was expected riscv-virt.dtb: plic@c000000: '#address-cells' is a required property Reported-by: Rob Herring Link: https://lore.kernel.org/linux-riscv/20220803170552.GA2250266-robh@kernel.org/ Signed-off-by: Conor Dooley --- .../bindings/interrupt-controller/sifive,plic-1.0.0.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml b/Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml index 92e0f8c3eff2..eb07c4f1a201 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml +++ b/Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml @@ -66,6 +66,11 @@ properties: - enum: - allwinner,sun20i-d1-plic - const: thead,c900-plic + - items: + - const: sifive,plic-1.0.0 + - const: riscv,plic0 + deprecated: true + description: For legacy systems & the qemu virt machine only reg: maxItems: 1 From patchwork Fri Aug 5 16:28:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 595858 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0ACBFC25B07 for ; Fri, 5 Aug 2022 16:29:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240725AbiHEQ3O (ORCPT ); Fri, 5 Aug 2022 12:29:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241079AbiHEQ3I (ORCPT ); Fri, 5 Aug 2022 12:29:08 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B58F12628 for ; Fri, 5 Aug 2022 09:29:07 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id z12so3787011wrs.9 for ; Fri, 05 Aug 2022 09:29:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=Bx9G8JNLiLJhDs2y+OulTQ6Arh93SHt8PJNhnkzS76A=; b=G8MjgRH1Dn5QHvCiGLUoHF1aRHWwuzqsY8+wvXJca/a+ZTHD0d/fJq9ByzAG71C4Gm brpuYzE4q5EjV6KvPCrpP4q8RpKDe6BQP38FTgiaz7FvOaWB6HnBXC7Y+QemmGTQ6XFG Lql/qMKUyGD9o89w4PxplbuWHyocXiBfg11Ydjl3fzyMGp0iFa5haHQaEJ6LYLEGv/VD VoFzWhQ3mh9Itj2HrYNPxF09k6/cIDE9Bhv/zErgH0H7Z96OQE0yeeQlrN1EThLHsKpH JEYKHdu+rxrhXp70NsNm7i69uxBxb+6KjfurAgrsGgo0faWi1e/J/E9qFugnQXv6KItI NW8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=Bx9G8JNLiLJhDs2y+OulTQ6Arh93SHt8PJNhnkzS76A=; b=YCCmHdiRBOhfOaoWPQ+0tYft7CqS/doZWx3AOmLXw4Loek9RVD7z/MBkZ7O01FmaM2 gdgD8FUy3LRIDqnKBhxTP9XAUmiC8c4alB8p8lcDP37H7OCql9YrlnuqzFUqXAFEw1HU DgUOZtAbZ+FsXrZLjtf2ySFCX9kJYi4nyGs3BnCjL7B+8lBaVTzNt2KTI1rb8yrzAcjN tN6Pqk08lyKWABT7BLT55fc/xuY5Qt17gX07VL5bdJdjNwmDiU1l8NekjSMftmgL5i76 4FzgHY5qzQ0F9IA9UchWcZN6IDvG6aXeeX+PWc1GTinuJscj50x/jStoEmdToVyaueDp FvqA== X-Gm-Message-State: ACgBeo3XPaf9vnpAi/kuW+R5jpJhQyS9ywpgzkP9lUQBSEQj1VY2gqP5 vwG1zonM/mjnkGR/5kJ0hQ7jNg== X-Google-Smtp-Source: AA6agR4qNHuK519Im+LmKC2Dyrt7fi+TNPv6Ialp08tZQks0jZtMsiBr2xk+CxzRIiLrK+LeQ/NxSg== X-Received: by 2002:adf:fbc6:0:b0:21d:3fc3:99e with SMTP id d6-20020adffbc6000000b0021d3fc3099emr4737953wrs.550.1659716946942; Fri, 05 Aug 2022 09:29:06 -0700 (PDT) Received: from henark71.. ([93.107.66.220]) by smtp.gmail.com with ESMTPSA id b10-20020a056000054a00b00220633d96f2sm5210086wrf.72.2022.08.05.09.29.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 09:29:06 -0700 (PDT) From: Conor Dooley To: Thomas Gleixner , Marc Zyngier , Rob Herring , Krzysztof Kozlowski , Palmer Dabbelt , Paul Walmsley , Albert Ou Cc: Daniel Lezcano , Anup Patel , Conor Dooley , Guo Ren , Sagar Kadam , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, qemu-riscv@nongnu.org, Rob Herring Subject: [PATCH 3/3] dt-bindings: riscv: add new riscv,isa strings for emulators Date: Fri, 5 Aug 2022 17:28:45 +0100 Message-Id: <20220805162844.1554247-4-mail@conchuod.ie> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220805162844.1554247-1-mail@conchuod.ie> References: <20220805162844.1554247-1-mail@conchuod.ie> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Conor Dooley The QEMU virt and spike machines currently export a riscv,isa string of "rv64imafdcsuh", but this obviously has illegal extensions in it. The presense of "su" is a QEMU bug, so add an entry for the valid portion of the isa string. Reported-by: Rob Herring Link: https://lore.kernel.org/linux-riscv/20220803170552.GA2250266-robh@kernel.org/ Signed-off-by: Conor Dooley --- Although the commit message says "a" string, I have added more than one isa string. My patched version of QEMU emits the full string with the multi letter extensions and I am not sure what the policy is for including them in the binding. Obviously I am more than willing to change the patch text if needed. --- Documentation/devicetree/bindings/riscv/cpus.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/riscv/cpus.yaml b/Documentation/devicetree/bindings/riscv/cpus.yaml index d632ac76532e..59b942c5b9aa 100644 --- a/Documentation/devicetree/bindings/riscv/cpus.yaml +++ b/Documentation/devicetree/bindings/riscv/cpus.yaml @@ -77,6 +77,8 @@ properties: enum: - rv64imac - rv64imafdc + - rv64imafdch + - rv64imafdch_zicsr_zifencei_zba_zbb_zbc_zbs # RISC-V requires 'timebase-frequency' in /cpus, so disallow it here timebase-frequency: false