From patchwork Mon Sep 8 11:38:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 4861391 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5E09AC0338 for ; Mon, 8 Sep 2014 11:38:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0B0D920149 for ; Mon, 8 Sep 2014 11:38:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B15E320154 for ; Mon, 8 Sep 2014 11:38:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753802AbaIHLic (ORCPT ); Mon, 8 Sep 2014 07:38:32 -0400 Received: from mail-we0-f180.google.com ([74.125.82.180]:50009 "EHLO mail-we0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753797AbaIHLib (ORCPT ); Mon, 8 Sep 2014 07:38:31 -0400 Received: by mail-we0-f180.google.com with SMTP id t60so964372wes.11 for ; Mon, 08 Sep 2014 04:38:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Jw05C2qnKarJp8CDQUutkbz7IyvgFfIfSMbFtUFQ0JQ=; b=C5/xj3/Asc2QeSLjOjG8Y/z1Eqy0O6QWPyKWPjCGMeriATgbfJQR2twCQ2ssoWln4N SYfnN+8UpnBkdpZ1o2mRBTpsNGGNxKwRdcWYi6SPsmH0lh7AmKNUaPgpXraHJQXmxix7 zezwl95TETojI0sNk8sxhcZ7Pc9+QQsWGJmj+t2rJYLQ7CZwdEk5DQgNpu3KtFWTbpGw fgotnIe+ZmGvs0SGwEoK9uS20IGNk1/WIThJcGy8Z1kA4VfLK8KKuQJ5Od6px/oXatqD Jf+f5OxUZSVnZFm/QxfCpvJR2gKRz0+KniUapqUlMVsNJLwTsmxK4SCVemCZ2sD+d3g1 XsXw== X-Gm-Message-State: ALoCoQmQ0bwn1CiL1necxRCsnH3Adx0h5bW6cQCM7WDwGnf2AkGv1c35Fa2qcRkh3xnU4QCzilRK X-Received: by 10.181.12.7 with SMTP id em7mr22512606wid.57.1410176309701; Mon, 08 Sep 2014 04:38:29 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id iy10sm11565938wic.8.2014.09.08.04.38.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Sep 2014 04:38:28 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-leds@vger.kernel.org, linux-pm@vger.kernel.org Cc: Arnd Bergmann , Pawel Moll , Mark Rutland , Marc Zyngier , Will Deacon , Rob Herring , Florian Fainelli , Linus Walleij Subject: [PATCH 5/7 v6] ARM: l2c: parse 'cache-size' and 'cache-sets' properties Date: Mon, 8 Sep 2014 13:38:04 +0200 Message-Id: <1410176286-32533-6-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1410176286-32533-1-git-send-email-linus.walleij@linaro.org> References: <1410176286-32533-1-git-send-email-linus.walleij@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Florian Fainelli When both 'cache-size' and 'cache-sets' are specified for a L2 cache controller node, parse those properties and set up the way_size based on which type of L2 cache controller we are using. Update the L2 cache controller Device Tree binding with the optional 'cache-size' and 'cache-sets' properties. These both come from the ePAPR specification. Signed-off-by: Florian Fainelli Signed-off-by: Linus Walleij --- Documentation/devicetree/bindings/arm/l2cc.txt | 2 + arch/arm/mm/cache-l2x0.c | 61 ++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/l2cc.txt b/Documentation/devicetree/bindings/arm/l2cc.txt index af527ee111c2..d33ed2344c7e 100644 --- a/Documentation/devicetree/bindings/arm/l2cc.txt +++ b/Documentation/devicetree/bindings/arm/l2cc.txt @@ -44,6 +44,8 @@ Optional properties: I/O coherent mode. Valid only when the arm,pl310-cache compatible string is used. - interrupts : 1 combined interrupt. +- cache-size : specifies the size in bytes of the cache +- cache-sets : specifies the number of associativity sets of the cache - cache-id-part: cache id part number to be used if it is not present on hardware - wt-override: If present then L2 is forced to Write through mode diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 5f2c988a06ac..61a684c743c6 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -945,6 +945,61 @@ static int l2_wt_override; * pass it though the device tree */ static u32 cache_id_part_number_from_dt; +static void __init l2x0_cache_size_of_parse(const struct device_node *np, + u32 *aux_val, u32 *aux_mask, + u32 max_way_size) +{ + u32 mask = 0, val = 0; + u32 size = 0, sets = 0; + u32 way_size = 0, way_size_bits = 1; + + of_property_read_u32(np, "cache-size", &size); + of_property_read_u32(np, "cache-sets", &sets); + + if (!size || !sets) + return; + + way_size = size / sets; + + if (way_size > max_way_size) { + pr_warn("L2C: way size %dKB is too large\n", way_size >> 10); + return; + } + + way_size >>= 10; + switch (way_size) { + case 512: + way_size_bits = 6; + break; + case 256: + way_size_bits = 5; + break; + case 128: + way_size_bits = 4; + break; + case 64: + way_size_bits = 3; + break; + case 32: + way_size_bits = 2; + break; + case 16: + way_size_bits = 1; + break; + default: + pr_err("cache way size: %d KB is not mapped\n", + way_size); + break; + } + + mask |= L2C_AUX_CTRL_WAY_SIZE_MASK; + val |= (way_size_bits << L2C_AUX_CTRL_WAY_SIZE_SHIFT); + + *aux_val &= ~mask; + *aux_val |= val; + *aux_mask &= ~mask; +} + static void __init l2x0_of_parse(const struct device_node *np, u32 *aux_val, u32 *aux_mask) { @@ -974,6 +1029,8 @@ static void __init l2x0_of_parse(const struct device_node *np, val |= (dirty - 1) << L2X0_AUX_CTRL_DIRTY_LATENCY_SHIFT; } + l2x0_cache_size_of_parse(np, aux_val, aux_mask, SZ_256K); + *aux_val &= ~mask; *aux_val |= val; *aux_mask &= ~mask; @@ -1047,6 +1104,8 @@ static void __init l2c310_of_parse(const struct device_node *np, writel_relaxed((filter[0] & ~(SZ_1M - 1)) | L310_ADDR_FILTER_EN, l2x0_base + L310_ADDR_FILTER_START); } + + l2x0_cache_size_of_parse(np, aux_val, aux_mask, SZ_512K); } static const struct l2c_init_data of_l2c310_data __initconst = { @@ -1253,6 +1312,8 @@ static void __init aurora_of_parse(const struct device_node *np, *aux_val &= ~mask; *aux_val |= val; *aux_mask &= ~mask; + + l2x0_cache_size_of_parse(np, aux_val, aux_mask, SZ_256K); } static const struct l2c_init_data of_aurora_with_outer_data __initconst = {