From patchwork Fri Apr 25 17:34:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 29114 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DFF85202E6 for ; Fri, 25 Apr 2014 17:35:20 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id f10sf15979819yha.7 for ; Fri, 25 Apr 2014 10:35:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=ZnbwJLIm+RQYPAQZpGdtUefM1w5KwHQjZN+8aE2c1zU=; b=M4u3UfDukDrVl+0cMGPNkObqnbp7YRXLxAjYXYW3z3Ym8NPD07bzxaFUM+xXnQkSMv OiUrRgkJPViSslESny0gamkQZSYpQj769n3QucdqlyscVAsBnBWPaU3C1nHa8AE6FLMU QYL9vZP4UkNRVXVpXwh7EOn/inAt8YEouO+jjNz7J8LlTQE24bU47BXf0/Cup3rDN2DT ciZpOjd0F2n4e6cMilGgUwbdyd+arh/FgW6919AfB0oSYxieh44dGPr7yHAgXNdBGkcI +DgBBqg1gJmVDRfQPYj1OT9JD1zGL8RdVl5eovROGjgPbmvLHg8CyNVKKKYDwjfz/kA5 u4YA== X-Gm-Message-State: ALoCoQnsnjyXWMZwh2+fw4LwRrM5cgH1+iutLPOl+kLyJQHmn6CCPfzxqYfghhFBCZCYnyc7UC2Y X-Received: by 10.236.209.130 with SMTP id s2mr1401821yho.18.1398447320652; Fri, 25 Apr 2014 10:35:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.66 with SMTP id l60ls1174068qge.17.gmail; Fri, 25 Apr 2014 10:35:20 -0700 (PDT) X-Received: by 10.52.251.199 with SMTP id zm7mr6500164vdc.21.1398447320460; Fri, 25 Apr 2014 10:35:20 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id sq9si1851284vdc.197.2014.04.25.10.35.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 25 Apr 2014 10:35:20 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id lg15so5243582vcb.30 for ; Fri, 25 Apr 2014 10:35:20 -0700 (PDT) X-Received: by 10.220.191.134 with SMTP id dm6mr7739532vcb.16.1398447320375; Fri, 25 Apr 2014 10:35:20 -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 ib8csp115305vcb; Fri, 25 Apr 2014 10:35:19 -0700 (PDT) X-Received: by 10.68.197.8 with SMTP id iq8mr13026025pbc.124.1398447319611; Fri, 25 Apr 2014 10:35:19 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id et3si5307357pbc.162.2014.04.25.10.35.18; Fri, 25 Apr 2014 10:35:18 -0700 (PDT) Received-SPF: none (google.com: devicetree-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 S1752823AbaDYRfR (ORCPT + 9 others); Fri, 25 Apr 2014 13:35:17 -0400 Received: from fw-tnat.cambridge.arm.com ([217.140.96.21]:50148 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752435AbaDYRfR (ORCPT ); Fri, 25 Apr 2014 13:35:17 -0400 Received: from e102109-lin.cambridge.arm.com (e102109-lin.cambridge.arm.com [10.1.203.182]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id s3PHYgMD023866; Fri, 25 Apr 2014 18:34:43 +0100 From: Catalin Marinas To: linux-arm-kernel@lists.infradead.org Cc: Loc Ho , devicetree@vger.kernel.org Subject: [PATCH 3/3] arm64: Mark the Applied Micro X-Gene SATA controller as DMA coherent Date: Fri, 25 Apr 2014 18:34:14 +0100 Message-Id: <1398447254-18527-4-git-send-email-catalin.marinas@arm.com> X-Mailer: git-send-email 1.7.12.3 In-Reply-To: <1398447254-18527-1-git-send-email-catalin.marinas@arm.com> References: <1398447254-18527-1-git-send-email-catalin.marinas@arm.com> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: catalin.marinas@arm.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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: , Since the default DMA ops for arm64 are non-coherent, mark the X-Gene controller explicitly as dma-coherent to avoid additional cache maintenance. Signed-off-by: Catalin Marinas Cc: Loc Ho --- Documentation/devicetree/bindings/ata/apm-xgene.txt | 3 +++ arch/arm64/boot/dts/apm-storm.dtsi | 3 +++ 2 files changed, 6 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Documentation/devicetree/bindings/ata/apm-xgene.txt b/Documentation/devicetree/bindings/ata/apm-xgene.txt index 7bcfbf59810e..a668f0e7d001 100644 --- a/Documentation/devicetree/bindings/ata/apm-xgene.txt +++ b/Documentation/devicetree/bindings/ata/apm-xgene.txt @@ -24,6 +24,7 @@ Required properties: * "sata-phy" for the SATA 6.0Gbps PHY Optional properties: +- dma-coherent : Present if dma operations are coherent - status : Shall be "ok" if enabled or "disabled" if disabled. Default is "ok". @@ -55,6 +56,7 @@ Example: <0x0 0x1f22e000 0x0 0x1000>, <0x0 0x1f227000 0x0 0x1000>; interrupts = <0x0 0x87 0x4>; + dma-coherent; status = "ok"; clocks = <&sataclk 0>; phys = <&phy2 0>; @@ -69,6 +71,7 @@ Example: <0x0 0x1f23e000 0x0 0x1000>, <0x0 0x1f237000 0x0 0x1000>; interrupts = <0x0 0x88 0x4>; + dma-coherent; status = "ok"; clocks = <&sataclk 0>; phys = <&phy3 0>; diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi index 93f4b2dd9248..f8c40a66e65d 100644 --- a/arch/arm64/boot/dts/apm-storm.dtsi +++ b/arch/arm64/boot/dts/apm-storm.dtsi @@ -307,6 +307,7 @@ <0x0 0x1f21e000 0x0 0x1000>, <0x0 0x1f217000 0x0 0x1000>; interrupts = <0x0 0x86 0x4>; + dma-coherent; status = "disabled"; clocks = <&sata01clk 0>; phys = <&phy1 0>; @@ -321,6 +322,7 @@ <0x0 0x1f22e000 0x0 0x1000>, <0x0 0x1f227000 0x0 0x1000>; interrupts = <0x0 0x87 0x4>; + dma-coherent; status = "ok"; clocks = <&sata23clk 0>; phys = <&phy2 0>; @@ -334,6 +336,7 @@ <0x0 0x1f23d000 0x0 0x1000>, <0x0 0x1f23e000 0x0 0x1000>; interrupts = <0x0 0x88 0x4>; + dma-coherent; status = "ok"; clocks = <&sata45clk 0>; phys = <&phy3 0>;