From patchwork Mon Feb 23 18:28:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 5867711 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1E576BF440 for ; Mon, 23 Feb 2015 18:32:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DA08320634 for ; Mon, 23 Feb 2015 18:32:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 90FBF2062A for ; Mon, 23 Feb 2015 18:32:31 +0000 (UTC) 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 1YPxkT-0004kf-K6; Mon, 23 Feb 2015 18:28:53 +0000 Received: from foss-mx-na.foss.arm.com ([217.140.108.86]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YPxkF-0004fJ-VL for linux-arm-kernel@lists.infradead.org; Mon, 23 Feb 2015 18:28:41 +0000 Received: from foss-smtp-na-1.foss.arm.com (unknown [10.80.61.8]) by foss-mx-na.foss.arm.com (Postfix) with ESMTP id 890294E9; Mon, 23 Feb 2015 12:28:07 -0600 (CST) Received: from collaborate-mta1.arm.com (highbank-bc01-b06.austin.arm.com [10.112.81.134]) by foss-smtp-na-1.foss.arm.com (Postfix) with ESMTP id 3B1655FAE4; Mon, 23 Feb 2015 12:28:05 -0600 (CST) Received: from e103737-lin.cambridge.arm.com (e103737-lin.cambridge.arm.com [10.1.207.150]) by collaborate-mta1.arm.com (Postfix) with ESMTP id 59B5213F6D0; Mon, 23 Feb 2015 12:28:04 -0600 (CST) From: Sudeep Holla To: linux-arm-kernel@lists.infradead.org, Russell King Subject: [PATCH 2/2] ARM: kernel: add outer cache support for cacheinfo implementation Date: Mon, 23 Feb 2015 18:28:11 +0000 Message-Id: <1424716091-22914-2-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424716091-22914-1-git-send-email-sudeep.holla@arm.com> References: <1424716091-22914-1-git-send-email-sudeep.holla@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150223_102840_093263_EE7FEAD7 X-CRM114-Status: GOOD ( 19.75 ) X-Spam-Score: -0.0 (/) Cc: Lorenzo Pieralisi , Will Deacon , Sudeep Holla X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 In order to support outer cache in the cacheinfo infrastructure, a new function 'get_info' is added to outer_cache_fns. This function is used to get the outer cache information namely: line size, number of ways of associativity and number of sets. This patch adds 'get_info' supports to all L2 cache implementations on ARM except Marvell's Feroceon L2 cache. Signed-off-by: Sudeep Holla Cc: Russell King Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/include/asm/outercache.h | 9 +++++++++ arch/arm/kernel/cacheinfo.c | 14 +++++++++++++- arch/arm/mm/cache-l2x0.c | 35 ++++++++++++++++++++++++++++++++++- arch/arm/mm/cache-tauros2.c | 36 ++++++++++++++++++++++++++++++++++++ arch/arm/mm/cache-xsc3l2.c | 17 +++++++++++++++++ 5 files changed, 109 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h index 563b92fc2f41..ba16c7e1661d 100644 --- a/arch/arm/include/asm/outercache.h +++ b/arch/arm/include/asm/outercache.h @@ -25,7 +25,10 @@ struct l2x0_regs; +struct cacheinfo; + struct outer_cache_fns { + void (*get_info)(struct cacheinfo *); void (*inv_range)(unsigned long, unsigned long); void (*clean_range)(unsigned long, unsigned long); void (*flush_range)(unsigned long, unsigned long); @@ -115,6 +118,11 @@ static inline void outer_resume(void) outer_cache.resume(); } +static inline void outer_get_info(struct cacheinfo *this_leaf) +{ + if (outer_cache.get_info) + outer_cache.get_info(this_leaf); +} #else static inline void outer_inv_range(phys_addr_t start, phys_addr_t end) @@ -126,6 +134,7 @@ static inline void outer_flush_range(phys_addr_t start, phys_addr_t end) static inline void outer_flush_all(void) { } static inline void outer_disable(void) { } static inline void outer_resume(void) { } +static inline void outer_get_info(struct cacheinfo *this_leaf) { } #endif diff --git a/arch/arm/kernel/cacheinfo.c b/arch/arm/kernel/cacheinfo.c index 0c4a67dcbcaf..c6c32fdb037e 100644 --- a/arch/arm/kernel/cacheinfo.c +++ b/arch/arm/kernel/cacheinfo.c @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -227,11 +228,19 @@ static inline enum cache_type get_cache_type(int level) return __get_cache_type(level); } +static inline void __outer_ci_leaf_init(struct cacheinfo *this_leaf) +{ + outer_get_info(this_leaf); + BUG_ON(this_leaf->type == CACHE_TYPE_SEPARATE); +} + static void ci_leaf_init(struct cacheinfo *this_leaf, enum cache_type type, unsigned int level) { this_leaf->level = level; - if (cache_is_armv7()) + if (type == CACHE_TYPE_NOCACHE) /* must be outer cache */ + __outer_ci_leaf_init(this_leaf); + else if (cache_is_armv7()) __armv7_ci_leaf_init(type, this_leaf); else __ci_leaf_init(type, this_leaf); @@ -255,6 +264,9 @@ static int __init_cache_level(unsigned int cpu) this_cpu_ci->num_levels = level; this_cpu_ci->num_leaves = leaves; + if (IS_ENABLED(CONFIG_OUTER_CACHE) && outer_cache.get_info) + this_cpu_ci->num_leaves++, this_cpu_ci->num_levels++; + return 0; } diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index c6c7696b8db9..9955635a1c77 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -17,6 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include +#include #include #include #include @@ -121,6 +122,22 @@ static void l2c_configure(void __iomem *base) l2c_write_sec(l2x0_saved_regs.aux_ctrl, base, L2X0_AUX_CTRL); } +static void __l2x0_getinfo(struct cacheinfo *this_leaf) +{ + unsigned int assoc = get_count_order(l2x0_way_mask); + + this_leaf->size = l2x0_size; + this_leaf->coherency_line_size = CACHE_LINE_SIZE; + this_leaf->ways_of_associativity = assoc; + this_leaf->number_of_sets = l2x0_size / (assoc * CACHE_LINE_SIZE); +} + +static void l2x0_getinfo(struct cacheinfo *this_leaf) +{ + this_leaf->type = CACHE_TYPE_UNIFIED; + __l2x0_getinfo(this_leaf); +} + /* * Enable the L2 cache controller. This function must only be * called when the cache controller is known to be disabled. @@ -260,6 +277,7 @@ static const struct l2c_init_data l2c210_data __initconst = { .disable = l2c_disable, .sync = l2c210_sync, .resume = l2c_resume, + .get_info = l2x0_getinfo, }, }; @@ -417,6 +435,7 @@ static const struct l2c_init_data l2c220_data = { .disable = l2c_disable, .sync = l2c220_sync, .resume = l2c_resume, + .get_info = l2x0_getinfo, }, }; @@ -771,6 +790,7 @@ static const struct l2c_init_data l2c310_init_fns __initconst = { .disable = l2c310_disable, .sync = l2c210_sync, .resume = l2c310_resume, + .get_info = l2x0_getinfo, }, }; @@ -860,7 +880,6 @@ static int __init __l2c_init(const struct l2c_init_data *data, data->enable(l2x0_base, aux, data->num_lock); outer_cache = fns; - /* * It is strange to save the register state before initialisation, * but hey, this is what the DT implementations decided to do. @@ -1074,6 +1093,7 @@ static const struct l2c_init_data of_l2c210_data __initconst = { .disable = l2c_disable, .sync = l2c210_sync, .resume = l2c_resume, + .get_info = l2x0_getinfo, }, }; @@ -1092,6 +1112,7 @@ static const struct l2c_init_data of_l2c220_data __initconst = { .disable = l2c_disable, .sync = l2c220_sync, .resume = l2c_resume, + .get_info = l2x0_getinfo, }, }; @@ -1220,6 +1241,7 @@ static const struct l2c_init_data of_l2c310_data __initconst = { .disable = l2c310_disable, .sync = l2c210_sync, .resume = l2c310_resume, + .get_info = l2x0_getinfo, }, }; @@ -1248,6 +1270,7 @@ static const struct l2c_init_data of_l2c310_coherent_data __initconst = { .flush_all = l2c210_flush_all, .disable = l2c310_disable, .resume = l2c310_resume, + .get_info = l2x0_getinfo, }, }; @@ -1409,6 +1432,12 @@ static void __init aurora_of_parse(const struct device_node *np, *aux_mask &= ~mask; } +static void aurora_no_outer_data_getinfo(struct cacheinfo *this_leaf) +{ + this_leaf->type = CACHE_TYPE_INST; + __l2x0_getinfo(this_leaf); +} + static const struct l2c_init_data of_aurora_with_outer_data __initconst = { .type = "Aurora", .way_size_0 = SZ_4K, @@ -1425,6 +1454,7 @@ static const struct l2c_init_data of_aurora_with_outer_data __initconst = { .disable = aurora_disable, .sync = aurora_cache_sync, .resume = l2c_resume, + .get_info = l2x0_getinfo, }, }; @@ -1438,6 +1468,7 @@ static const struct l2c_init_data of_aurora_no_outer_data __initconst = { .save = aurora_save, .outer_cache = { .resume = l2c_resume, + .get_info = aurora_no_outer_data_getinfo, }, }; @@ -1594,6 +1625,7 @@ static const struct l2c_init_data of_bcm_l2x0_data __initconst = { .disable = l2c310_disable, .sync = l2c210_sync, .resume = l2c310_resume, + .get_info = l2x0_getinfo, }, }; @@ -1625,6 +1657,7 @@ static const struct l2c_init_data of_tauros3_data __initconst = { /* Tauros3 broadcasts L1 cache operations to L2 */ .outer_cache = { .resume = l2c_resume, + .get_info = l2x0_getinfo, }, }; diff --git a/arch/arm/mm/cache-tauros2.c b/arch/arm/mm/cache-tauros2.c index 1e373d268c04..0cff878c588e 100644 --- a/arch/arm/mm/cache-tauros2.c +++ b/arch/arm/mm/cache-tauros2.c @@ -14,6 +14,7 @@ * Document ID MV-S105190-00, Rev 0.7, March 14 2008. */ +#include #include #include #include @@ -60,6 +61,7 @@ static inline void tauros2_inv_pa(unsigned long addr) * noninclusive. */ #define CACHE_LINE_SIZE 32 +#define CACHE_LINE_SHIFT 5 static void tauros2_inv_range(unsigned long start, unsigned long end) { @@ -131,6 +133,39 @@ static void tauros2_resume(void) "mcr p15, 0, %0, c1, c0, 0 @Enable L2 Cache\n\t" : : "r" (0x0)); } + +/* + * +----------------------------------------+ + * | 11 10 9 8 | 7 6 5 4 3 | 2 | 1 0 | + * +----------------------------------------+ + * | way size | associativity | - |line_sz| + * +----------------------------------------+ + */ +#define L2CTR_ASSOCIAT_SHIFT 3 +#define L2CTR_ASSOCIAT_MASK 0x1F +#define L2CTR_WAYSIZE_SHIFT 8 +#define L2CTR_WAYSIZE_MASK 0xF +#define CACHE_WAY_PER_SET(l2ctr) \ + (((l2_ctr) >> L2CTR_ASSOCIAT_SHIFT) & L2CTR_ASSOCIAT_MASK) +#define CACHE_WAY_SIZE(l2ctr) \ + (8192 << (((l2ctr) >> L2CTR_WAYSIZE_SHIFT) & L2CTR_WAYSIZE_MASK)) +#define CACHE_SET_SIZE(l2ctr) (CACHE_WAY_SIZE(l2ctr) >> CACHE_LINE_SHIFT) + +static void tauros2_getinfo(struct cacheinfo *this_leaf) +{ + unsigned int l2_ctr; + + __asm__("mrc p15, 1, %0, c0, c0, 1" : "=r" (l2_ctr)); + + this_leaf->type = CACHE_TYPE_UNIFIED; + this_leaf->coherency_line_size = CACHE_LINE_SIZE; + this_leaf->ways_of_associativity = CACHE_WAY_PER_SET(l2_ctr); + this_leaf->number_of_sets = CACHE_SET_SIZE(l2_ctr); + this_leaf->size = this_leaf->coherency_line_size * + this_leaf->number_of_sets * + this_leaf->ways_of_associativity; +} + #endif static inline u32 __init read_extra_features(void) @@ -226,6 +261,7 @@ static void __init tauros2_internal_init(unsigned int features) outer_cache.flush_range = tauros2_flush_range; outer_cache.disable = tauros2_disable; outer_cache.resume = tauros2_resume; + outer_cache.get_info = tauros2_getinfo; } #endif diff --git a/arch/arm/mm/cache-xsc3l2.c b/arch/arm/mm/cache-xsc3l2.c index 6c3edeb66e74..175bf44eb039 100644 --- a/arch/arm/mm/cache-xsc3l2.c +++ b/arch/arm/mm/cache-xsc3l2.c @@ -16,6 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include @@ -201,6 +202,21 @@ static void xsc3_l2_flush_range(unsigned long start, unsigned long end) dsb(); } +static void xsc3_l2_getinfo(struct cacheinfo *this_leaf) +{ + unsigned long l2ctype; + + __asm__("mrc p15, 1, %0, c0, c0, 1" : "=r" (l2ctype)); + + this_leaf->type = CACHE_TYPE_UNIFIED; + this_leaf->coherency_line_size = CACHE_LINE_SIZE; + this_leaf->ways_of_associativity = CACHE_WAY_PER_SET; + this_leaf->number_of_sets = CACHE_SET_SIZE(l2ctype); + this_leaf->size = this_leaf->coherency_line_size * + this_leaf->number_of_sets * + this_leaf->ways_of_associativity; +} + static int __init xsc3_l2_init(void) { if (!cpu_is_xsc3() || !xsc3_l2_present()) @@ -213,6 +229,7 @@ static int __init xsc3_l2_init(void) outer_cache.inv_range = xsc3_l2_inv_range; outer_cache.clean_range = xsc3_l2_clean_range; outer_cache.flush_range = xsc3_l2_flush_range; + outer_cache.get_info = xsc3_l2_getinfo; } return 0;