From patchwork Sun Nov 22 07:53:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 547288 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3A6D31402C2 for ; Sun, 22 Nov 2015 18:58:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=semihalf-com.20150623.gappssmtp.com header.i=@semihalf-com.20150623.gappssmtp.com header.b=pCv4X0r+; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752022AbbKVHyz (ORCPT ); Sun, 22 Nov 2015 02:54:55 -0500 Received: from mail-lf0-f52.google.com ([209.85.215.52]:35581 "EHLO mail-lf0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751568AbbKVHyA (ORCPT ); Sun, 22 Nov 2015 02:54:00 -0500 Received: by lfdl133 with SMTP id l133so10118236lfd.2 for ; Sat, 21 Nov 2015 23:53:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PMudCuEiA5jv4GbWPaQ69AJB07GWHwJ9Ck/qdCAB50I=; b=pCv4X0r+ZROSXDn8x00KOOkc0a76wju3rcp8Kxk5o1LCS3peDCMfEp+fdOPHhbxeQ3 SkJb853jelipDQ2vNsii81vpsPp/QGmFIpzbGjiCYrDqxfQKOTKwxrJXkSC4hSap69QU cbYinZ5+Rvbm9drrET5TXAqh7ChJfBo6DptkOVhYBG2l2fEkcwZ2s7Y5WLhbNQ6q6NIj GH4vx7zLs5dWhfVLSX+FZb/JfmNpU4rbLdrkUSWMRhPzGOBpYA9vj82MoH+iPHdB+07h NyqjNKcKko1IIh5rjEjnzc9KJ4/CaU6O7Gm8jJsmL/nG16HHuNG9XocPB1mEqXi9K/wK m/cg== 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=PMudCuEiA5jv4GbWPaQ69AJB07GWHwJ9Ck/qdCAB50I=; b=IkNIT83rLIvn86H0Yb4mcKzk0kHtSKk/ZwvUMS9HP0rN/wcsLZ7ccgYwKH/2gyL79O NF4Zk2PINfOFy17maNjDy1Jbm6zjIQnmgpzwFxk9GTe8r/jUhAcj7Co1X3FFKl/Vt2xR htY3+ZdHbVJp6OWT3U+BVXmH00ghQD6Lh6rgUHYRD2mt27sRJM2FAIEBfL25LQjGg38n 2tjGXqV+Nr52assLEmDjmljMHfDFuoqkHeMTUP/F51fqYyqXeQCvffVQOIZr3JaMCW+z zjBje582ru4+tA8Foujb/PYKv/FcvqrJAzPA0uAtQeA43Y6KCSXxb5I8KDmoCFiLMpCC jrlg== X-Gm-Message-State: ALoCoQkKH8QDd8bd1klGTwRZpJU2pd/9QhT+we+QJrsPNuHd4xqYl4aFJt3CAf5TrKTyu60g8lHo X-Received: by 10.25.211.209 with SMTP id k200mr8833188lfg.125.1448178838501; Sat, 21 Nov 2015 23:53:58 -0800 (PST) Received: from enkidu.semihalf.local (cardhu.semihalf.com. [213.17.239.108]) by smtp.gmail.com with ESMTPSA id y79sm1010840lfd.45.2015.11.21.23.53.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Nov 2015 23:53:57 -0800 (PST) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Cc: davem@davemloft.net, linux@arm.linux.org.uk, sebastian.hesselbarth@gmail.com, andrew@lunn.ch, jason@lakedaemon.net, thomas.petazzoni@free-electrons.com, gregory.clement@free-electrons.com, simon.guinot@sequanux.org, nadavh@marvell.com, alior@marvell.com, xswang@marvell.com, myair@marvell.com, nitroshift@yahoo.com, mw@semihalf.com, jaz@semihalf.com, tn@semihalf.com Subject: [PATCH 07/13] bus: mvebu-mbus: provide api for obtaining IO and DRAM window information Date: Sun, 22 Nov 2015 08:53:53 +0100 Message-Id: <1448178839-3541-8-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1448178839-3541-1-git-send-email-mw@semihalf.com> References: <1448178839-3541-1-git-send-email-mw@semihalf.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This commit enables finding appropriate mbus window and obtaining its target id and attribute for given physical address in two separate routines, both for IO and DRAM windows. This functionality is needed for Armada XP/38x Network Controller's Buffer Manager and PnC configuration. Signed-off-by: Marcin Wojtas [DRAM window information reference in LKv3.10] Signed-off-by: Evan Wang --- drivers/bus/mvebu-mbus.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/mbus.h | 3 +++ 2 files changed, 54 insertions(+) diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index c43c3d2..3d1c0c3 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c @@ -948,6 +948,57 @@ void mvebu_mbus_get_pcie_io_aperture(struct resource *res) *res = mbus_state.pcie_io_aperture; } +int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 *target, u8 *attr) +{ + const struct mbus_dram_target_info *dram; + int i; + + /* Get dram info */ + dram = mv_mbus_dram_info(); + if (!dram) { + pr_err("missing DRAM information\n"); + return -ENODEV; + } + + /* Try to find matching DRAM window for phyaddr */ + for (i = 0; i < dram->num_cs; i++) { + const struct mbus_dram_window *cs = dram->cs + i; + + if (cs->base <= phyaddr && phyaddr <= (cs->base + cs->size)) { + *target = dram->mbus_dram_target_id; + *attr = cs->mbus_attr; + return 0; + } + } + + pr_err("invalid dram address 0x%x\n", phyaddr); + return -EINVAL; +} +EXPORT_SYMBOL_GPL(mvebu_mbus_get_dram_win_info); + +int mvebu_mbus_get_io_win_info(phys_addr_t phyaddr, u32 *size, u8 *target, + u8 *attr) +{ + int win; + + for (win = 0; win < mbus_state.soc->num_wins; win++) { + u64 wbase; + int enabled; + + mvebu_mbus_read_window(&mbus_state, win, &enabled, &wbase, + size, target, attr, NULL); + + if (!enabled) + continue; + + if (wbase <= phyaddr && phyaddr <= wbase + *size) + return win; + } + + return -EINVAL; +} +EXPORT_SYMBOL_GPL(mvebu_mbus_get_io_win_info); + static __init int mvebu_mbus_debugfs_init(void) { struct mvebu_mbus_state *s = &mbus_state; diff --git a/include/linux/mbus.h b/include/linux/mbus.h index 1f7bc63..ea34a86 100644 --- a/include/linux/mbus.h +++ b/include/linux/mbus.h @@ -69,6 +69,9 @@ static inline const struct mbus_dram_target_info *mv_mbus_dram_info_nooverlap(vo int mvebu_mbus_save_cpu_target(u32 *store_addr); void mvebu_mbus_get_pcie_mem_aperture(struct resource *res); void mvebu_mbus_get_pcie_io_aperture(struct resource *res); +int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 *target, u8 *attr); +int mvebu_mbus_get_io_win_info(phys_addr_t phyaddr, u32 *size, u8 *target, + u8 *attr); int mvebu_mbus_add_window_remap_by_id(unsigned int target, unsigned int attribute, phys_addr_t base, size_t size,