From patchwork Tue Jun 23 19:51:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191539 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp2291915ile; Tue, 23 Jun 2020 13:05:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVKOiRBN4T6FgDNYXLSUI9Alem3pSRk/gWflZpwcy+Qzj3qaQNBayWd0tKHSUP6MaILQh3 X-Received: by 2002:a05:6402:1606:: with SMTP id f6mr22849398edv.286.1592942742078; Tue, 23 Jun 2020 13:05:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592942742; cv=none; d=google.com; s=arc-20160816; b=THGfuaPTRZ1UKwFrj1kiPs8rMUQVlb7wixxW6YpYVbJCEzAcwB87iuU26nC3vDmYCQ Dvut8of3wr04kSLHgCmF9+0Gvien99BXgIjr/sVENxi19VUlqe5kTpIf1E/iu7umezBT mmnVb6TgkQeEYt97SjLBtT/IBfysgBRW3INbzWjgJnYr3mq7olOcg1KqxCGiYCjHphLw +crVCn4AVWWI+fEkux+JxRrdir8nLHRL69KMOaQiTJ8qzBqg2SXi3oAC8zQvL4lfGAJU tES8fmoW21poSTd7frN5vWQ1+iXxatgw4utypgU9plTop9MYgDLLMFldro3Nwl7ujitC KeUw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NdcAurV6c6jH2ypvOC+JmBohCODfmxTHlrLnGjpUnLM=; b=d2hCHyfTfZQhMnNMYfLH9fKLloQtLebkH4NLJtw/wXpIOV7hGpYWjZX3q5EMhgqScK hLsQT0aW7BAEbQgEV8wrYwcauNfHrbPAmp06pvYrrpFnBJPqaHQvsB7pTKrPAUd0geD1 Ufs5eIEIqEJmbuJ3ycywtRsphJ/g82TXPyXbAINKw7itDBajESMC8vZlk0sGfPaQ0GiF wIx9ReU+TNgmZwkHSL79Zg/552KvTuJ6tKdMjKulxOy+buTB2a4JRpmwvW2Lickus21c ydbyAuLvOTrDodKNhVb8WIhimp5BTTQ004a9Ua1RwDWumRRvqfR6A1ZBiKPY+pR0K+3T 9osw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nNuv6ogF; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b88si4339801edf.364.2020.06.23.13.05.41; Tue, 23 Jun 2020 13:05:42 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=nNuv6ogF; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387832AbgFWUFd (ORCPT + 15 others); Tue, 23 Jun 2020 16:05:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:45026 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387753AbgFWUFc (ORCPT ); Tue, 23 Jun 2020 16:05:32 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3AB9E20DD4; Tue, 23 Jun 2020 20:05:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942731; bh=joL/9IAFY40Wqexpgd8IxuHmzXpJOJQ1HdE6Mho+sGg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nNuv6ogFZ7kHFNASUOWQ3FZJIQJWPEN+dPYmer+fqGUEVlkny+ItLW3Fa5geOHkUW DdpAvl0UTvvAdzvUU91VSJ/Ngknl3HJjglMDHhA3RspzP9ql+AV9SlBAJRBBYmJlF2 XbTSU+Jg4h5anNkSfZYt5glfTOOKIKHXkRLn1q40= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?Andreas_F=C3=A4rber?= , Sasha Levin Subject: [PATCH 5.7 114/477] arm64: dts: realtek: rtd129x: Fix GIC CPU masks for RTD1293 Date: Tue, 23 Jun 2020 21:51:51 +0200 Message-Id: <20200623195412.984811431@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andreas Färber [ Upstream commit 31888c8be1486daf2c34ba6c58129635e49d564a ] Convert from GIC_CPU_MASK_RAW() to GIC_CPU_MASK_SIMPLE(). In case of RTD1293 adjust the arch timer and VGIC interrupts' CPU masks to its smaller number of CPUs. Fixes: cf976f660ee8 ("arm64: dts: realtek: Add RTD1293 and Synology DS418j") Signed-off-by: Andreas Färber Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/realtek/rtd1293.dtsi | 12 ++++++++---- arch/arm64/boot/dts/realtek/rtd1295.dtsi | 8 ++++---- arch/arm64/boot/dts/realtek/rtd1296.dtsi | 8 ++++---- 3 files changed, 16 insertions(+), 12 deletions(-) -- 2.25.1 diff --git a/arch/arm64/boot/dts/realtek/rtd1293.dtsi b/arch/arm64/boot/dts/realtek/rtd1293.dtsi index bd4e22723f7b0..2d92b56ac94d6 100644 --- a/arch/arm64/boot/dts/realtek/rtd1293.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd1293.dtsi @@ -36,16 +36,20 @@ timer { compatible = "arm,armv8-timer"; interrupts = , + (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, ; + (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>; }; }; &arm_pmu { interrupt-affinity = <&cpu0>, <&cpu1>; }; + +&gic { + interrupts = ; +}; diff --git a/arch/arm64/boot/dts/realtek/rtd1295.dtsi b/arch/arm64/boot/dts/realtek/rtd1295.dtsi index 93f0e1d977212..34f6cc6f16fe7 100644 --- a/arch/arm64/boot/dts/realtek/rtd1295.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd1295.dtsi @@ -61,13 +61,13 @@ timer { compatible = "arm,armv8-timer"; interrupts = , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, ; + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; }; }; diff --git a/arch/arm64/boot/dts/realtek/rtd1296.dtsi b/arch/arm64/boot/dts/realtek/rtd1296.dtsi index 0f9e59cac086e..fb864a139c97e 100644 --- a/arch/arm64/boot/dts/realtek/rtd1296.dtsi +++ b/arch/arm64/boot/dts/realtek/rtd1296.dtsi @@ -50,13 +50,13 @@ timer { compatible = "arm,armv8-timer"; interrupts = , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, , + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, ; + (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; }; };