From patchwork Wed May 28 08:23:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 31041 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f71.google.com (mail-qg0-f71.google.com [209.85.192.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9B4EF203AB for ; Wed, 28 May 2014 08:23:27 +0000 (UTC) Received: by mail-qg0-f71.google.com with SMTP id a108sf25676550qge.6 for ; Wed, 28 May 2014 01:23:27 -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:mime-version:in-reply-to:references :date:message-id:subject:from:to:cc:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=4k2IK5a6qzMFhfZwn+hZftxQnqTl1pVpNhXk0dRKGHI=; b=V/W/4lmxi2x88g51NagwIXwvF0n2ZRaf5krtZ0/msLaofHkWlHTBEELl4il+ZlxPVa QV22O1fegGE7K0KuZ9KcKsPZQPTuUBqEnS50tJbrzxQ8r5O0Y6lxqI1coEokejsXSlmL hH40OdljzamfCp7z9xCCDaY93SvgnbeAEvnmQn3wLGUzGU/cIgvZY+B3t/v9PfHbBdMV b2jDQrNXl40wqq0hwp7AXLVMcVwk6TzRm6ETdS8ShQFlIyZ7SluWG0F7D/3Yyxwr5P4+ 9XD0MJ7lmyNKGUaedqPyAcM3RSLZkfSsmgNlm68SwD2nKnr+oi5RDllZoLwiV7nYTsJi gx3g== X-Gm-Message-State: ALoCoQmfyIpNm0o35ldZ66cTnOYXipx6+s0F2zuVmsBLnPJmvG/+ksQ0RRLzduaf1sw+ImuisyXQ X-Received: by 10.236.140.42 with SMTP id d30mr15530459yhj.2.1401265407498; Wed, 28 May 2014 01:23:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.247 with SMTP id b110ls3377888qge.16.gmail; Wed, 28 May 2014 01:23:27 -0700 (PDT) X-Received: by 10.221.40.193 with SMTP id tr1mr22832695vcb.31.1401265407376; Wed, 28 May 2014 01:23:27 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id ui3si9950804vdc.91.2014.05.28.01.23.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 28 May 2014 01:23:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hq11so6135434vcb.22 for ; Wed, 28 May 2014 01:23:27 -0700 (PDT) X-Received: by 10.221.24.207 with SMTP id rf15mr32628351vcb.17.1401265407259; Wed, 28 May 2014 01:23:27 -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.220.221.72 with SMTP id ib8csp183066vcb; Wed, 28 May 2014 01:23:26 -0700 (PDT) X-Received: by 10.66.66.199 with SMTP id h7mr44284691pat.30.1401265406125; Wed, 28 May 2014 01:23:26 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yj9si13209053pab.135.2014.05.28.01.23.25; Wed, 28 May 2014 01:23:25 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754497AbaE1IXO (ORCPT + 27 others); Wed, 28 May 2014 04:23:14 -0400 Received: from mail-oa0-f46.google.com ([209.85.219.46]:41167 "EHLO mail-oa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754471AbaE1IXK (ORCPT ); Wed, 28 May 2014 04:23:10 -0400 Received: by mail-oa0-f46.google.com with SMTP id g18so74062oah.33 for ; Wed, 28 May 2014 01:23:09 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.60.178.171 with SMTP id cz11mr9987523oec.86.1401265389908; Wed, 28 May 2014 01:23:09 -0700 (PDT) Received: by 10.182.20.76 with HTTP; Wed, 28 May 2014 01:23:09 -0700 (PDT) In-Reply-To: <5840140.8yGnd4Ycx3@wuerfel> References: <1398353407-2345-1-git-send-email-santosh.shilimkar@ti.com> <5279118.J5305KQNjB@wuerfel> <20140527125655.63A46C40FCB@trevor.secretlab.ca> <5840140.8yGnd4Ycx3@wuerfel> Date: Wed, 28 May 2014 10:23:09 +0200 Message-ID: Subject: Re: [PATCH v3 4/7] of: configure the platform device dma parameters From: Linus Walleij To: Arnd Bergmann Cc: Grant Likely , "linux-arm-kernel@lists.infradead.org" , Santosh Shilimkar , "linux-kernel@vger.kernel.org" , "devicetree@vger.kernel.org" , Grygorii Strashko , Russell King , Greg Kroah-Hartman , Rob Herring , Catalin Marinas , Olof Johansson Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , On Tue, May 27, 2014 at 3:30 PM, Arnd Bergmann wrote: > On Tuesday 27 May 2014 13:56:55 Grant Likely wrote: >> Come to think of it, doesn't PCI DMA have to deal with that situation if >> the PCI window is not 1:1 mapped into the CPU address space? > > I think all PCI buses we support so far only need a single entry in the > dma-ranges property. Here is the patch I've cooked for the Integrator (PCIv3), identical to the keystone: commit b326b94a58ff476fca2b57cf7912b00bec1363c0 Author: Linus Walleij Date: Fri Feb 14 10:26:15 2014 +0100 ARM: integrator: get rid of The Integrator has a custom header defining the BUS_OFFSET for *_to_bus and bus_to_* operations as offset from 0x80000000. This switches the Integrator over to using the mechanism introduced for the Keystone to provide the same offset using the device tree, deletes and augments the Integrator device tree to provide the bus offset. Cc: Santosh Shilimkar Cc: Grygorii Strashko Cc: Will Deacon Cc: Jonathan Austin Cc: Russell King Signed-off-by: Linus Walleij diff --git a/arch/arm/mach-integrator/include/mach/memory.h b/arch/arm/mach-integrator/include/mach/memory.h deleted file mode 100644 index 334d5e271889..000000000000 --- a/arch/arm/mach-integrator/include/mach/memory.h +++ /dev/null (...) Yours, Linus Walleij --- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ab438cb5af55..2b29a1a7f26f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -329,7 +329,6 @@ config ARCH_INTEGRATOR select HAVE_TCM select ICST select MULTI_IRQ_HANDLER - select NEED_MACH_MEMORY_H select PLAT_VERSATILE select SPARSE_IRQ select USE_OF diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts index b10e6351da53..f0c397fd45c5 100644 --- a/arch/arm/boot/dts/integratorap.dts +++ b/arch/arm/boot/dts/integratorap.dts @@ -8,6 +8,7 @@ / { model = "ARM Integrator/AP"; compatible = "arm,integrator-ap"; + dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>; aliases { arm,timer-primary = &timer2;