From patchwork Thu May 15 09:18:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 349139 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2D4181400DF for ; Thu, 15 May 2014 19:18:47 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753477AbaEOJSq (ORCPT ); Thu, 15 May 2014 05:18:46 -0400 Received: from top.free-electrons.com ([176.31.233.9]:53780 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751899AbaEOJSp (ORCPT ); Thu, 15 May 2014 05:18:45 -0400 Received: by mail.free-electrons.com (Postfix, from userid 106) id 059C4A4C; Thu, 15 May 2014 11:18:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 37556811; Thu, 15 May 2014 11:18:44 +0200 (CEST) From: Thomas Petazzoni To: Russell King , Will Deacon , Catalin Marinas , devicetree@vger.kernel.org, Grant Likely , Rob Herring Cc: Albin Tonnerre , linux-arm-kernel@lists.infradead.org, Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Tawfik Bayouk , Nadav Haklai , Lior Amsalem , Ezequiel Garcia Subject: [PATCHv3 2/3] ARM: mm: add support for HW coherent systems in PL310 Date: Thu, 15 May 2014 11:18:38 +0200 Message-Id: <1400145519-28530-3-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1400145519-28530-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1400145519-28530-1-git-send-email-thomas.petazzoni@free-electrons.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org When a PL310 cache is used on a system that provides hardware coherency, the outer cache sync operation is useless, and can be skipped. Moreover, on some systems, it is harmful as it causes deadlocks between the Marvell coherency mechanism, the Marvell PCIe controller and the Cortex-A9. To avoid this, this commit introduces a new Device Tree property 'dma-coherent' for the L2 cache controller node, valid only for the PL310 cache. It identifies the usage of the PL310 cache in an I/O coherent configuration. Internally, it makes the driver use a different set of l2x0_of_data, in which the ->sync operation is NULL. Note that technically speaking, a fully coherent system wouldn't require any of the other .outer_cache operations. However, in practice, when booting secondary CPUs, these are not yet coherent, and therefore a set of cache maintenance operations are necessary at this point. This explains why we keep the other .outer_cache operations and only ->sync is disabled. While in theory any write to a PL310 register could cause the deadlock, in practice, disabling ->sync is sufficient to workaround the deadlock, since the other cache maintenance operations are only used in very specific situations. Signed-off-by: Thomas Petazzoni Acked-by: Catalin Marinas Acked-by: Arnd Bergmann --- Documentation/devicetree/bindings/arm/l2cc.txt | 3 +++ arch/arm/mm/cache-l2x0.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/l2cc.txt b/Documentation/devicetree/bindings/arm/l2cc.txt index b513cb8..077d837 100644 --- a/Documentation/devicetree/bindings/arm/l2cc.txt +++ b/Documentation/devicetree/bindings/arm/l2cc.txt @@ -40,6 +40,9 @@ Optional properties: - arm,filter-ranges : Starting address and length of window to filter. Addresses in the filter window are directed to the M1 port. Other addresses will go to the M0 port. +- dma-coherent : indicates that the system is operating in an hardware + I/O coherent mode. Valid only when the arm,pl310-cache compatible + string is used. - interrupts : 1 combined interrupt. - cache-id-part: cache id part number to be used if it is not present on hardware diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 7abde2ce..cf0c037 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -889,6 +889,26 @@ static const struct l2x0_of_data pl310_data = { }, }; +/* + * PL310 operations used on I/O coherent systems. Theoretically, no + * outer cache operations would be needed, except that for secondary + * processors bring up, a few cache maintenance operations are needed + * because secondary processors are not directly coherent with the L2 + * cache when they start up. + */ +static const struct l2x0_of_data pl310_coherent_data = { + .setup = pl310_of_setup, + .save = pl310_save, + .outer_cache = { + .resume = pl310_resume, + .inv_range = l2x0_inv_range, + .clean_range = l2x0_clean_range, + .flush_range = l2x0_flush_range, + .flush_all = l2x0_flush_all, + .inv_all = l2x0_inv_all, + }, +}; + static const struct l2x0_of_data l2x0_data = { .setup = l2x0_of_setup, .save = NULL, @@ -989,6 +1009,10 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask) data = of_match_node(l2x0_ids, np)->data; + if (of_device_is_compatible(np, "arm,pl310-cache") && + of_property_read_bool(np, "dma-coherent")) + data = &pl310_coherent_data; + /* L2 configuration can only be changed if the cache is disabled */ if (!(readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN)) { if (data->setup)