From patchwork Wed Dec 7 00:14:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Bostic X-Patchwork-Id: 9463603 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 78F8160459 for ; Wed, 7 Dec 2016 00:20:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 69C92284D0 for ; Wed, 7 Dec 2016 00:20:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5CB74284F2; Wed, 7 Dec 2016 00:20:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DF512284D0 for ; Wed, 7 Dec 2016 00:20:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEPwl-0007rl-Mo; Wed, 07 Dec 2016 00:18:55 +0000 Received: from mail-oi0-x244.google.com ([2607:f8b0:4003:c06::244]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEPta-0005i6-JC for linux-arm-kernel@lists.infradead.org; Wed, 07 Dec 2016 00:15:40 +0000 Received: by mail-oi0-x244.google.com with SMTP id m75so43646259oig.1 for ; Tue, 06 Dec 2016 16:15:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ka17knM9kNTTjnkjZhoIgQDao07wZyPafFou1OHGHx8=; b=h1q+2K0Hto2BQWy3/zZXAJ8cD8NbQKS9K9tYMR3a7B6xDDDQO09WvENcEpwxGHlzbH AUOzG2BR1e9qcYmhZxjlV/cqnOIofFYLEzwkSvjV8G5sq5DQpBnMszu2NaooWBLVRuhX e23qzSltj8AynGz7Ne2ZVPp3Oi5jet8xsCy32zlH1Z9xI2K4ePCWR7iqf/+55S1INnmg rBvpP4Jw2hSVK5wICNhJtoQWnOINLbpwbB3IxcHEtYtjEYre+VLeCynivVJxUMpaZvtU tRWq4VClSYllRAjGOuYfoldSENqqefa/cFl9jpaSS4mPAQQzxjjvC00M6CmtsuYoXjAI ZD5w== 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=ka17knM9kNTTjnkjZhoIgQDao07wZyPafFou1OHGHx8=; b=NIDszksLMxat1VIE602P+dykcv8vY25cnXbbbX6pCY0/qq459j+11C4a8jrdMlmWKI N6j5u2BcH+H2/9SK562/SotVa7XMGjciqoOIyhzSL1svUqmiFMHeQGqgTLb9vuHix4tE UgQfgnxIPGFd63dSIPaviG/XHErkZRJ7Z/6LCKXuDimSi1PtAP20OyPxhVGIEVndB8oU 5zR2kpM27KwMZFwNBrgDRZRIrkDM0YF95vH0cokmSDfXlJAlQDvl2GvjByaqt+T+wTaZ TzbAB0Pk/LpH5fIASbXIh1ZBVlcX4wRcGSwkm/MaJvy/sHLX896HrWQscL1oU1h8mayx i2EA== X-Gm-Message-State: AKaTC01U3ou9pRSOLxU3jJAamc3rNr4RpJxENKtHQy7HFf7Y1/jPyNPU0cGF8hcxMXitOQ== X-Received: by 10.157.61.98 with SMTP id a89mr38847026otc.86.1481069722061; Tue, 06 Dec 2016 16:15:22 -0800 (PST) Received: from Christophers-MacBook-Pro.local.com (45-20-192-79.lightspeed.austtx.sbcglobal.net. [45.20.192.79]) by smtp.gmail.com with ESMTPSA id r102sm8568294ota.11.2016.12.06.16.15.20 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 06 Dec 2016 16:15:21 -0800 (PST) From: Chris Bostic To: robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, gregkh@linuxfoundation.org, sre@kernel.org, mturquette@baylibre.com, geert+renesas@glider.be, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 13/16] drivers/fsi: Set slave SMODE to init communication Date: Tue, 6 Dec 2016 18:14:34 -0600 Message-Id: <1481069677-53660-14-git-send-email-christopher.lee.bostic@gmail.com> X-Mailer: git-send-email 2.7.4 (Apple Git-66) In-Reply-To: <1481069677-53660-1-git-send-email-christopher.lee.bostic@gmail.com> References: <1481069677-53660-1-git-send-email-christopher.lee.bostic@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161206_161538_787489_7BD05E68 X-CRM114-Status: GOOD ( 14.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrew@aj.id.au, alistair@popple.id.au, linux-kernel@vger.kernel.org, Chris Bostic , joel@jms.id.au, benh@kernel.crashing.org, jk@ozlabs.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chris Bostic Set CFAM to appropriate ID so that the controlling master can manage link memory ranges. Add slave engine register definitions. Signed-off-by: Chris Bostic --- drivers/fsi/fsi-core.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c index 93de0f1..a28434b 100644 --- a/drivers/fsi/fsi-core.c +++ b/drivers/fsi/fsi-core.c @@ -34,6 +34,7 @@ #define FSI_SLAVE_CONF_DATA_BITS 28 #define FSI_PEEK_BASE 0x410 +#define FSI_SLAVE_BASE 0x800 static const int engine_page_size = 0x400; @@ -53,8 +54,26 @@ static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr, static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr, const void *val, size_t size); -/* FSI endpoint-device support */ +/* + * FSI slave engine control register offsets + */ +#define FSI_SMODE 0x0 /* R/W: Mode register */ + +/* + * SMODE fields + */ +#define FSI_SMODE_WSC 0x80000000 /* Warm start done */ +#define FSI_SMODE_ECRC 0x20000000 /* Hw CRC check */ +#define FSI_SMODE_SID_SHIFT 24 /* ID shift */ +#define FSI_SMODE_SID_MASK 3 /* ID Mask */ +#define FSI_SMODE_ED_SHIFT 20 /* Echo delay shift */ +#define FSI_SMODE_ED_MASK 0xf /* Echo delay mask */ +#define FSI_SMODE_SD_SHIFT 16 /* Send delay shift */ +#define FSI_SMODE_SD_MASK 0xf /* Send delay mask */ +#define FSI_SMODE_LBCRR_SHIFT 8 /* Clk ratio shift */ +#define FSI_SMODE_LBCRR_MASK 0xf /* Clk ratio mask */ +/* FSI endpoint-device support */ int fsi_device_read(struct fsi_device *dev, uint32_t addr, void *val, size_t size) { @@ -133,6 +152,30 @@ uint8_t fsi_crc4(uint8_t c, uint64_t x, int bits) /* FSI slave support */ +/* Encode slave local bus echo delay */ +static inline uint32_t fsi_smode_echodly(int x) +{ + return (x & FSI_SMODE_ED_MASK) << FSI_SMODE_ED_SHIFT; +} + +/* Encode slave local bus send delay */ +static inline uint32_t fsi_smode_senddly(int x) +{ + return (x & FSI_SMODE_SD_MASK) << FSI_SMODE_SD_SHIFT; +} + +/* Encode slave local bus clock rate ratio */ +static inline uint32_t fsi_smode_lbcrr(int x) +{ + return (x & FSI_SMODE_LBCRR_MASK) << FSI_SMODE_LBCRR_SHIFT; +} + +/* Encode slave ID */ +static inline uint32_t fsi_smode_sid(int x) +{ + return (x & FSI_SMODE_SID_MASK) << FSI_SMODE_SID_SHIFT; +} + static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr, void *val, size_t size) { @@ -240,6 +283,22 @@ static void fsi_slave_release(struct device *dev) kfree(slave); } +static uint32_t set_smode_defaults(struct fsi_master *master) +{ + return FSI_SMODE_WSC | FSI_SMODE_ECRC + | fsi_smode_echodly(0xf) | fsi_smode_senddly(0xf) + | fsi_smode_lbcrr(1); +} + +static int fsi_slave_set_smode(struct fsi_master *master, int link, int id) +{ + uint32_t smode = set_smode_defaults(master); + + smode |= fsi_smode_sid(id); + return master->write(master, link, 3, FSI_SLAVE_BASE + FSI_SMODE, + &smode, sizeof(smode)); +} + static int fsi_slave_init(struct fsi_master *master, int link, uint8_t slave_id) { @@ -248,6 +307,21 @@ static int fsi_slave_init(struct fsi_master *master, int rc; uint8_t crc; + /* + * todo: Due to CFAM hardware issues related to BREAK commands we're + * limited to only one CFAM per link. Once issues are resolved this + * restriction can be removed. + */ + if (slave_id > 0) + return 0; + + rc = fsi_slave_set_smode(master, link, slave_id); + if (rc) { + dev_warn(master->dev, "can't set smode on slave:%02x:%02x %d\n", + link, slave_id, rc); + return -ENODEV; + } + rc = master->read(master, link, slave_id, 0, &chip_id, sizeof(chip_id)); if (rc) { dev_warn(master->dev, "can't read slave %02x:%02x: %d\n", @@ -312,6 +386,7 @@ static int fsi_master_break(struct fsi_master *master, int link) static int fsi_master_scan(struct fsi_master *master) { int link, slave_id, rc; + uint32_t smode; for (link = 0; link < master->n_links; link++) { rc = fsi_master_link_enable(master, link); @@ -327,6 +402,19 @@ static int fsi_master_scan(struct fsi_master *master) continue; } + /* + * Verify can read slave at default ID location. If fails + * there must be nothing on other end of link + */ + rc = master->read(master, link, 3, FSI_SLAVE_BASE + FSI_SMODE, + &smode, sizeof(smode)); + if (rc) { + dev_dbg(master->dev, + "Read link:%d smode default id failed:%d\n", + link, rc); + continue; + } + for (slave_id = 0; slave_id < FSI_N_SLAVES; slave_id++) fsi_slave_init(master, link, slave_id);