[PATCH] ARM: zynq: Reserve correct amount of non-DMA RAM

Path	csiph.com!news.redatomik.org!aioe.org!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	Kyle Roeschley <kyle.roeschley@ni.com>
Newsgroups	linux.kernel
Subject	[PATCH] ARM: zynq: Reserve correct amount of non-DMA RAM
Date	Mon, 31 Oct 2016 17:30:01 +0100
Message-ID	<synDb-4Pf-3@gated-at.bofh.it> (permalink)
X-Original-To	<michal.simek@xilinx.com>
X-Mailer	git-send-email 2.9.3
X-Mimetrack	Itemize by SMTP Server on US-AUS-MGWOut1/AUS/H/NIC(Release 8.5.3FP6 HF1218\|December 12, 2014) at 10/31/2016 11:25:56 AM, Serialize by Router on US-AUS-MGWOut1/AUS/H/NIC(Release 8.5.3FP6 HF1218\|December 12, 2014) at 10/31/2016 11:25:56 AM, Serialize complete at 10/31/2016 11:25:56 AM
MIME-Version	1.0
Content-Type	text/plain
X-Proofpoint-Virus-Version	vendor=fsecure engine=2.50.10432:,, definitions=2016-10-31_06:,, signatures=0
X-Proofpoint-Spam-Details	rule=notspam policy=default score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1610310294
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	32
Organization	linux.* mail to news gateway
X-Original-Cc	<soren.brinkmann@xilinx.com>, <linux@armlinux.org.uk>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>, "Kyle Roeschley" <kyle.roeschley@ni.com>
X-Original-Date	Mon, 31 Oct 2016 11:26:17 -0500
X-Original-Message-ID	<20161031162617.10565-1-kyle.roeschley@ni.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1512674

Show key headers only | View raw

On Zynq, we haven't been reserving the correct amount of DMA-incapable
RAM to keep DMA away from it (per the Zynq TRM Section 4.1, it should be
the first 512k). In older kernels, this was masked by the
memblock_reserve call in arm_memblock_init(). Now, reserve the correct
amount excplicitly rather than relying on swapper_pg_dir, which is an
address and not a size anyway.

Fixes: 46f5b96 ("ARM: zynq: Reserve not DMAable space in front of the
kernel")

Signed-off-by: Kyle Roeschley <kyle.roeschley@ni.com>
---
Found when migrating from 4.1 to 4.6.

 arch/arm/mach-zynq/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 6cefdb8..75885bc 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -59,7 +59,7 @@ void __iomem *zynq_scu_base;
 static void __init zynq_memory_init(void)
 {
 	if (!__pa(PAGE_OFFSET))
-		memblock_reserve(__pa(PAGE_OFFSET), __pa(swapper_pg_dir));
+		memblock_reserve(__pa(PAGE_OFFSET), 0x80000);
 }
 
 static struct platform_device zynq_cpuidle_device = {
-- 
2.9.3

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] ARM: zynq: Reserve correct amount of non-DMA RAM Kyle Roeschley <kyle.roeschley@ni.com> - 2016-10-31 17:30 +0100
  Re: [PATCH] ARM: zynq: Reserve correct amount of non-DMA RAM Nathan Rossi <nathan@nathanrossi.com> - 2016-11-10 10:40 +0100
    Re: [PATCH] ARM: zynq: Reserve correct amount of non-DMA RAM Nathan Rossi <nathan@nathanrossi.com> - 2016-11-10 11:00 +0100

csiph-web