From patchwork Thu Jun 5 19:22:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 31435 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f199.google.com (mail-we0-f199.google.com [74.125.82.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CC37220BF9 for ; Thu, 5 Jun 2014 19:24:41 +0000 (UTC) Received: by mail-we0-f199.google.com with SMTP id q59sf1364118wes.2 for ; Thu, 05 Jun 2014 12:24:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:date:from:user-agent :mime-version:to:subject:references:in-reply-to:cc:precedence :list-id:list-unsubscribe:list-archive:list-post:list-help :list-subscribe:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=TRorrqS0xBJbVFhEU/GzLNXF2ks0EabWUTnZIkA+/BQ=; b=TrTKejdctPZXvKBWhVii1CulcK9WZQ913N9LDSyX03JXA0rN3mKHU5FwWtgMzgieiQ qCBRM9lx0W/2DkfoTSc8sD/05etDWFBtYqtmXhfk3bR7WHOzFiJQikXnzebxYYpKBkuV dIlc/m7JLll9v2u3zI0ib3uVV+NBcG1PcFgV+5VSVVseZsonUqYZR8NMsrwr0CZCEkcI poYw21smJX6+cAicp2QIvCeTb4PX2/r6fv3Aj6Zvc2DrxDBAOaEsiz2QgSvViwpkwtuy DtPOham/TauDvbJwAv0Q/nvIq9JaxzbTjuCAJdBZulnebvtG5SobnNNqpCwXIS3MTMm0 AL3A== X-Gm-Message-State: ALoCoQn5mGYjk63W+RAD12/8FodH8SaLu0haC7Q3uTd+gjghsRUeZ3a6UiLQ8HSDu0DmcphMgo/C X-Received: by 10.180.87.71 with SMTP id v7mr2830785wiz.2.1401996280796; Thu, 05 Jun 2014 12:24:40 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.72 with SMTP id j66ls352306qge.99.gmail; Thu, 05 Jun 2014 12:24:40 -0700 (PDT) X-Received: by 10.52.96.8 with SMTP id do8mr44861153vdb.4.1401996280583; Thu, 05 Jun 2014 12:24:40 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id r6si3153460vcy.51.2014.06.05.12.24.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 05 Jun 2014 12:24:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.169 as permitted sender) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id jx11so1807876veb.28 for ; Thu, 05 Jun 2014 12:24:40 -0700 (PDT) X-Received: by 10.58.186.207 with SMTP id fm15mr53787825vec.4.1401996280450; Thu, 05 Jun 2014 12:24:40 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp41045vcb; Thu, 5 Jun 2014 12:24:40 -0700 (PDT) X-Received: by 10.140.48.161 with SMTP id o30mr83282942qga.68.1401996279852; Thu, 05 Jun 2014 12:24:39 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id t8si9708976qat.98.2014.06.05.12.24.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jun 2014 12:24:39 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WsdG4-0007qB-Qn; Thu, 05 Jun 2014 19:23:28 +0000 Received: from devils.ext.ti.com ([198.47.26.153]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WsdG2-0007fm-6F for linux-arm-kernel@lists.infradead.org; Thu, 05 Jun 2014 19:23:26 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s55JMsdO019824; Thu, 5 Jun 2014 14:22:54 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s55JMrEo004971; Thu, 5 Jun 2014 14:22:53 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Thu, 5 Jun 2014 14:22:53 -0500 Received: from [158.218.103.31] (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s55JMqgW021741; Thu, 5 Jun 2014 14:22:52 -0500 Message-ID: <5390C38C.9050606@ti.com> Date: Thu, 5 Jun 2014 15:22:52 -0400 From: Santosh Shilimkar User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: Russell King - ARM Linux , Arnd Bergmann , Olof Johansson Subject: Re: keystone breakage References: <20140605183223.GF23430@n2100.arm.linux.org.uk> In-Reply-To: <20140605183223.GF23430@n2100.arm.linux.org.uk> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140605_122326_315618_C542B2DD X-CRM114-Status: GOOD ( 19.62 ) X-Spam-Score: -5.7 (-----) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-5.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [198.47.26.153 listed in list.dnswl.org] -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: santosh.shilimkar@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 On Thursday 05 June 2014 02:32 PM, Russell King - ARM Linux wrote: > It's worth pointing out that with Laura's removal of meminfo, keystone > is now broken - I see that despite Laura's patches being on LAKML for > a while, this fact has been ignored, and now that Keystone support > for the LPAE mappings has been merged, Keystone now breaks: > > arch/arm/mach-keystone/keystone.c: In function 'keystone_init_meminfo': > arch/arm/mach-keystone/keystone.c:71:31: error: 'meminfo' undeclared (first use in this function) > > I guess this is something that will have to be fixed later. > I have tried Laura's series(v3 or v4 mostly) in past while reviewing it. But since I wasn't sure about when it is going to get merged, the meminfo usage remained in my code. I should have removed the usage of meminfo irrespectively. Thanks for reporting the issue. So far neither Laura's series nor my series is showing up in Linus's tip so I couldn't see the breakage myself but patch at the end of the email should fix the breakage. Arnd, Olof, Will you be able to pick up the below fix from this email ? If you prefer, I can send the same after rc1 is tagged. >From 661e238f98171082a7b080720b837283551ff80d Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Thu, 5 Jun 2014 14:51:33 -0400 Subject: [PATCH] ARM: keystone: Drop use of meminfo since its not available anymore Laura's series removed the meminfo structure and its no longer available. Update keystone code to remove the usage of it. Reported-by: Russell King - ARM Linux Signed-off-by: Santosh Shilimkar --- arch/arm/mach-keystone/keystone.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c index 59b8383..4388267 100644 --- a/arch/arm/mach-keystone/keystone.c +++ b/arch/arm/mach-keystone/keystone.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -83,9 +84,8 @@ static void __init keystone_init_meminfo(void) phys_addr_t offset = PHYS_OFFSET - KEYSTONE_LOW_PHYS_START; phys_addr_t mem_start, mem_end; - BUG_ON(meminfo.nr_banks < 1); - mem_start = meminfo.bank[0].start; - mem_end = mem_start + meminfo.bank[0].size - 1; + mem_start = memblock_start_of_DRAM(); + mem_end = memblock_end_of_DRAM(); /* nothing to do if we are running out of the <32-bit space */ if (mem_start >= KEYSTONE_LOW_PHYS_START &&