From patchwork Wed Feb 8 18:55:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 13133589 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 A7E4CC636D3 for ; Wed, 8 Feb 2023 18:56:39 +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: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:In-Reply-To:References: List-Owner; bh=U2uwE0xKT20XechPJPftt7zulfMd9XLMRALN4gxN1XI=; b=oTkAYLO8hVDijE u3xXGMbnTMTynglpGmmYkAj46NRWyPUlQy90QDn0vHj9wFzB6tbaBUZT5+FyV/pKmb2rxTwRq7duI VQu2BO7MP+WamUrwWxmDgNpSqzoLf9de1FuTkalrZ7zuJxJt/8OoJvjmhXeFKrjcR18DM/dKUCJ1B kOANxFlpl5/c2dT7NzqzRO7P/EabpxJEwlJ6cOzhWGT4NqUUf3smjJimkw4iVhPb6JBCxdE3yaYJl c3VttUH2t4Wlm8WK9s2uJzpka1o/myoJL+gXRczC7CJxKZzf5EuT9B3TuYiHN1oJ8ti6YteTh/VvC UzQDPPna69Qj7zGi/kDg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pPpba-00GgNo-BW; Wed, 08 Feb 2023 18:55:42 +0000 Received: from mail-oi1-f173.google.com ([209.85.167.173]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pPpbX-00GgMG-Qo for linux-arm-kernel@lists.infradead.org; Wed, 08 Feb 2023 18:55:41 +0000 Received: by mail-oi1-f173.google.com with SMTP id v15so9142485oie.9 for ; Wed, 08 Feb 2023 10:55:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=M8d0ESE5MK3b2wd99nPGv7KGBzjZjqzw2XHEjluBMZs=; b=pYK0cM+k3860lSXnJ9MF3DEUH/eF9kG92pT9UC14EU1gHu/ylt+9QbnhQtQgUDyaFc jxS0mB5Q6HIsGqqFistq0Z88aSLhQefzLZpf8ma6IqOBNPxOs+CZmUOXN1cCBZzdMDJc PUwReEkpU8gGU27LKY++gG8UkdFO8MY/adcQLIrjKHg3FiVZ+lih9NJ9nZ/aPEqZJ6Vc +Hgy4hHvU5i4HCvc/+6vaLVJl6qJNhHh7S1fMwW1aibx3fU/rXtWvm3eGB34L4yo7D1+ 7pFo/BR37jx0NwjK2FEE0dvOkpA+kfm23Xt2rfmX3QzvZ6283qFRN80rRx4LhGKHUV6M QMcQ== X-Gm-Message-State: AO0yUKWpHJYdDaSmrTdAHpLfCqrojfL+Io505KIq1Pxmbu75yPe1/aaf M9mRfNjayHWKp9qowunr4Q== X-Google-Smtp-Source: AK7set8KL0fKVdt4dp3+enkzwIWYhrqb88oVzpwYio6H74+ost/bBV8ObwJWto6+y+cJg4mdOFOpew== X-Received: by 2002:a05:6808:643:b0:367:18a6:eb26 with SMTP id z3-20020a056808064300b0036718a6eb26mr3739093oih.42.1675882536219; Wed, 08 Feb 2023 10:55:36 -0800 (PST) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id p2-20020a0568301d4200b0068be61a7ac6sm8384747oth.56.2023.02.08.10.55.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 10:55:35 -0800 (PST) Received: (nullmailer pid 2305872 invoked by uid 1000); Wed, 08 Feb 2023 18:55:35 -0000 From: Rob Herring To: Krzysztof Kozlowski , Robert Richter Cc: Robin Murphy , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: dts: cavium: Fix GICv3 ITS nodes Date: Wed, 8 Feb 2023 12:55:06 -0600 Message-Id: <20230208185506.2305349-1-robh@kernel.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230208_105539_886549_66D85684 X-CRM114-Status: GOOD ( 13.31 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The GICv3 ITS is an MSI controller, therefore its node name should be 'msi-controller'. The ITS node is also expected to have '#msi-cells'. Add it on Thunder as there are no users. Thunder2 uses 'msi-parent', but Robin says that should be 'msi-map' instead and I'm not sure what's correct for it. The unit-addresses of both the ITS and main GIC node on thunder2 are also wrong, so fix them while we're here. Cc: Robin Murphy Signed-off-by: Rob Herring --- arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 3 ++- arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/cavium/thunder-88xx.dtsi b/arch/arm64/boot/dts/cavium/thunder-88xx.dtsi index e0a71795261b..8ad31dee11a3 100644 --- a/arch/arm64/boot/dts/cavium/thunder-88xx.dtsi +++ b/arch/arm64/boot/dts/cavium/thunder-88xx.dtsi @@ -389,9 +389,10 @@ gic0: interrupt-controller@8010,00000000 { <0x8010 0x80000000 0x0 0x600000>; /* GICR */ interrupts = <1 9 0xf04>; - its: gic-its@8010,00020000 { + its: msi-controller@801000020000 { compatible = "arm,gic-v3-its"; msi-controller; + #msi-cells = <1>; reg = <0x8010 0x20000 0x0 0x200000>; }; }; diff --git a/arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi b/arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi index dfb41705a9a9..3419bd252696 100644 --- a/arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi +++ b/arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi @@ -55,7 +55,7 @@ psci { method = "smc"; }; - gic: interrupt-controller@400080000 { + gic: interrupt-controller@4000080000 { compatible = "arm,gic-v3"; #interrupt-cells = <3>; #address-cells = <2>; @@ -67,7 +67,7 @@ gic: interrupt-controller@400080000 { <0x04 0x01000000 0x0 0x1000000>; /* GICR */ interrupts = ; - gicits: gic-its@40010000 { + gicits: msi-controller@4000100000 { compatible = "arm,gic-v3-its"; msi-controller; reg = <0x04 0x00100000 0x0 0x20000>; /* GIC ITS */