Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3079317ybt; Mon, 29 Jun 2020 14:47:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytwcfCaU4QapAq1QCfCepLdhmLXhBB78GOjTtH5ZaqgHjWvdXLB7MVYqVwlesdnZGuIXMi X-Received: by 2002:a17:906:3b15:: with SMTP id g21mr15150821ejf.221.1593467265479; Mon, 29 Jun 2020 14:47:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593467265; cv=none; d=google.com; s=arc-20160816; b=T/i4hIfpgr/XAR0esI5/G2rBUDBDs6B7V3ToYqlIjyF+uRh20hbcbR8PSEbPIy3bgr PjFq+CCAuAtGI9ZicxiAHzKOFpWOFoHCeRncjEk4T7WDD78609i0Lfd+GSqevAcstyhV oulVD2tjM2wOdUJScISQe52zTE2cMUJR+UDgNg7lOU7HqFYlU6rqoOel52r/WCs+EoyD I6YbxqGhsRCKtoCrsP0iAIgdv/somdP9ec0FBTHcmBu9LiSaC63Mbw5fmT2xtuHUDSxe e290f3pyXBfuCYQ2V+EHlKYYqWnDbpyRxYCTTyljjWyz6XQmkoAqe9Ap5GG7GpWktn+W DnEg== 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 :dkim-signature; bh=xHoirJ+iH3vGE+1oSfIp975Rvba6Eo4abMDy/o1vnEw=; b=RP5NbJjqQ1MwQ6T02y1tEDZvMrXuThU0yqH3tgUhfe2KHP+LKkWiuNL3/3ROyeN/tV nwhL22Uv7TQ26yqkKU3efyRNpeCXg7UtQ5lLVFww4mltnniAUroPldwu9N3Mefa7dSOI jYCwj7ee+Ezw+Y6amXfKUDQTy2yTu9/2s90ecAQNRFP8H5GCI4quYXF4m7NpUVVVLQ1+ 9i0b//JgbXqGP3E3ucSmQZCeuLx1nZPHPJkatNbMwSlonYr+3tQzmYKDZ9tZuGWbKkg4 PT+Y2ALPUDhfb91BcABqARG0uPEQgDq8G1gAybNHwJAzH0Mmg8BysiIMqm6DagwgDtK5 UcWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=I6p6hCOi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l22si510986eji.104.2020.06.29.14.47.22; Mon, 29 Jun 2020 14:47:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=I6p6hCOi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404143AbgF2Vq3 (ORCPT + 99 others); Mon, 29 Jun 2020 17:46:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:56796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726760AbgF2Sft (ORCPT ); Mon, 29 Jun 2020 14:35:49 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E7CD5246B5; Mon, 29 Jun 2020 15:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444010; bh=FNpzwp1s02R1GjuXV+0y15viWvqFwwi/HZ1PMgAv9kY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I6p6hCOi6sSuJGX/d+wGwc7E8y5I+mBH5JVVAgjerUcrLAFWIAIezYW9nG6PtvgVr wHL1AiuvK2KCdXgmnXPPRxfl3SAyQ3ogziIy7r5/haE5+DAu7k80hV/p+fHqtqJiXi shkS1yVbwQ/PDY+0v3b1dFzAqIW2OJlIkQFkoCSM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Matthew Hagan , Florian Fainelli , Sasha Levin Subject: [PATCH 5.7 116/265] ARM: dts: NSP: Disable PL330 by default, add dma-coherent property Date: Mon, 29 Jun 2020 11:15:49 -0400 Message-Id: <20200629151818.2493727-117-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629151818.2493727-1-sashal@kernel.org> References: <20200629151818.2493727-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.7.7-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.7.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.7.7-rc1 X-KernelTest-Deadline: 2020-07-01T15:14+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Hagan [ Upstream commit b9dbe0101e344e8339406a11b7a91d4a0c50ad13 ] Currently the PL330 is enabled by default. However if left in IDM reset, as is the case with the Meraki and Synology NSP devices, the system will hang when probing for the PL330's AMBA peripheral ID. We therefore should be able to disable it in these cases. The PL330 is also included among of the list of peripherals put into coherent mode, so "dma-coherent" has been added here as well. Fixes: 5fa1026a3e4d ("ARM: dts: NSP: Add PL330 support") Signed-off-by: Matthew Hagan Signed-off-by: Florian Fainelli Signed-off-by: Sasha Levin --- arch/arm/boot/dts/bcm-nsp.dtsi | 4 +++- arch/arm/boot/dts/bcm958522er.dts | 4 ++++ arch/arm/boot/dts/bcm958525er.dts | 4 ++++ arch/arm/boot/dts/bcm958525xmc.dts | 4 ++++ arch/arm/boot/dts/bcm958622hr.dts | 4 ++++ arch/arm/boot/dts/bcm958623hr.dts | 4 ++++ arch/arm/boot/dts/bcm958625hr.dts | 4 ++++ arch/arm/boot/dts/bcm958625k.dts | 4 ++++ 8 files changed, 31 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index da6d70f09ef19..920c0f561e5ce 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -200,7 +200,7 @@ status = "disabled"; }; - dma@20000 { + dma: dma@20000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x20000 0x1000>; interrupts = , @@ -215,6 +215,8 @@ clocks = <&iprocslow>; clock-names = "apb_pclk"; #dma-cells = <1>; + dma-coherent; + status = "disabled"; }; sdio: sdhci@21000 { diff --git a/arch/arm/boot/dts/bcm958522er.dts b/arch/arm/boot/dts/bcm958522er.dts index 8c388eb8a08f8..7be4c4e628e02 100644 --- a/arch/arm/boot/dts/bcm958522er.dts +++ b/arch/arm/boot/dts/bcm958522er.dts @@ -58,6 +58,10 @@ /* USB 3 support needed to be complete */ +&dma { + status = "okay"; +}; + &amac0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts index c339771bb22e0..e58ed7e953460 100644 --- a/arch/arm/boot/dts/bcm958525er.dts +++ b/arch/arm/boot/dts/bcm958525er.dts @@ -58,6 +58,10 @@ /* USB 3 support needed to be complete */ +&dma { + status = "okay"; +}; + &amac0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts index 1c72ec8288de4..716da62f57885 100644 --- a/arch/arm/boot/dts/bcm958525xmc.dts +++ b/arch/arm/boot/dts/bcm958525xmc.dts @@ -58,6 +58,10 @@ /* XHCI support needed to be complete */ +&dma { + status = "okay"; +}; + &amac0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts index 96a021cebd97b..a49c2fd21f4a8 100644 --- a/arch/arm/boot/dts/bcm958622hr.dts +++ b/arch/arm/boot/dts/bcm958622hr.dts @@ -58,6 +58,10 @@ /* USB 3 and SLIC support needed to be complete */ +&dma { + status = "okay"; +}; + &amac0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts index b2c7f21d471e6..dd6dff6452b87 100644 --- a/arch/arm/boot/dts/bcm958623hr.dts +++ b/arch/arm/boot/dts/bcm958623hr.dts @@ -58,6 +58,10 @@ /* USB 3 and SLIC support needed to be complete */ +&dma { + status = "okay"; +}; + &amac0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts index 536fb24f38bb7..a71371b4065ed 100644 --- a/arch/arm/boot/dts/bcm958625hr.dts +++ b/arch/arm/boot/dts/bcm958625hr.dts @@ -69,6 +69,10 @@ status = "okay"; }; +&dma { + status = "okay"; +}; + &amac0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts index 3fcca12d83c2d..7b84b54436edd 100644 --- a/arch/arm/boot/dts/bcm958625k.dts +++ b/arch/arm/boot/dts/bcm958625k.dts @@ -48,6 +48,10 @@ }; }; +&dma { + status = "okay"; +}; + &amac0 { status = "okay"; }; -- 2.25.1