From patchwork Thu Jan 12 22:29:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Bostic X-Patchwork-Id: 9514323 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 12AF460476 for ; Thu, 12 Jan 2017 22:29:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19E6D28709 for ; Thu, 12 Jan 2017 22:29:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D0B32871C; Thu, 12 Jan 2017 22:29:36 +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 AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A311228709 for ; Thu, 12 Jan 2017 22:29:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cRnsE-0005u0-Vn; Thu, 12 Jan 2017 22:29:34 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cRnsC-0005tL-4X for linux-arm-kernel@bombadil.infradead.org; Thu, 12 Jan 2017 22:29:32 +0000 Received: from mail-oi0-x243.google.com ([2607:f8b0:4003:c06::243]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cRnsA-0002m0-Pg for linux-arm-kernel@lists.infradead.org; Thu, 12 Jan 2017 22:29:31 +0000 Received: by mail-oi0-x243.google.com with SMTP id j15so4827919oih.0 for ; Thu, 12 Jan 2017 14:29:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=4qY0hvCmqV6x8wQGJgg6TdxUXtMn1FawP0czJRo2cSs=; b=RwVaIvFpSZ2eq52xl49C/QAbBqnXluVkmCBUeiJuBeeK1hYNpKDQygZf+bbmisjann 0mlV85yVIUZLHhrB2gFnmaN70fQDQUow1n1FLKJrVjKGYPUIydYr6PLtM3Nw9fK4zMpP g+FAH7c4/hjIpAZ4UMVgQmVw2XFN8ASeZm4g3xICs2rb5Y0CuKHXDxWwNbVDpLjZnQrZ S6eCT2QJnrz8rOEsr6LpaTy7jjRFH0a85aH/Fz96vhqXrBeb5R0rtK+6cANmS/YDIQMS oKPhxhV5iX/mKIV/weFaOcfqIFXIyTLjvETsgP5WbLWDsiX6RNk963HnSlmv+WVzTPf1 er7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4qY0hvCmqV6x8wQGJgg6TdxUXtMn1FawP0czJRo2cSs=; b=MGeEe12Flp0Udvkiv9PeQrxVD+VbRPOC3HODPfytixN0NzfqBzJFgVXBAU40ezn9Yl //i/3t7OphiJ6hgfd3sRoA4YKrpPsMhqj9dFV9VxSD+mEtM4biHpDpA++x0rO2tyUuP7 k9ad4fvtRBqU7xxvmQTF+VtACcjmlDs4Q+LzQXah/5HFViwn+DO1xgbUad5/+DasAgvr VrhytvtcQevBtcQytn28pFXAS3bcqNpRaadmVshYrKyWSjTQEcums8b2jqxXYI1P3rTY tAjguZIkGqiylLaTJWfed9UgZKgzuXQrrtZXsMoUsNxkEqiBhx7tG1kjcUUo9u/C3vxO Ivqg== X-Gm-Message-State: AIkVDXIZ9hLBEbipDN0Kw29kf8a6uScsitQ6OiKSlcEClyLinBZ9BfYwquR7Tq1Eoa6VHg== X-Received: by 10.157.27.134 with SMTP id z6mr8157474otd.189.1484260149005; Thu, 12 Jan 2017 14:29:09 -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 r41sm1116915otc.40.2017.01.12.14.29.07 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 12 Jan 2017 14:29:08 -0800 (PST) From: christopher.lee.bostic@gmail.com To: robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, gregkh@linuxfoundation.org, mturquette@baylibre.com, geert+renesas@glider.be, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, joel@jms.id.au, jk@ozlabs.org, linux-kernel@vger.kernel.org, andrew@aj.id.au, alistair@popple.id.au, benh@kernel.crashing.org Subject: [PATCH v2 08/18] drivers/fsi: Implement slave initialisation Date: Thu, 12 Jan 2017 16:29:04 -0600 Message-Id: <1484260144-79428-1-git-send-email-christopher.lee.bostic@gmail.com> X-Mailer: git-send-email 2.7.4 (Apple Git-66) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170112_172930_902737_EC9A5C1D X-CRM114-Status: GOOD ( 14.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Chris Bostic 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: Jeremy Kerr Create fsi_slave devices during the master scan. Signed-off-by: Jeremy Kerr Signed-off-by: Chris Bostic --- drivers/fsi/fsi-core.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c index 5f9f7a9..931bcba 100644 --- a/drivers/fsi/fsi-core.c +++ b/drivers/fsi/fsi-core.c @@ -17,10 +17,15 @@ #include #include #include +#include +#include #include "fsi-master.h" #define FSI_N_SLAVES 4 +#define FSI_SLAVE_CONF_CRC_SHIFT 4 +#define FSI_SLAVE_CONF_CRC_MASK 0x0000000f +#define FSI_SLAVE_CONF_DATA_BITS 28 static DEFINE_IDA(master_ida); @@ -34,12 +39,59 @@ struct fsi_slave { #define to_fsi_slave(d) container_of(d, struct fsi_slave, dev) /* FSI slave support */ + +static void fsi_slave_release(struct device *dev) +{ + struct fsi_slave *slave = to_fsi_slave(dev); + + kfree(slave); +} + static int fsi_slave_init(struct fsi_master *master, int link, uint8_t slave_id) { - /* todo: initialise slave device, perform engine scan */ + struct fsi_slave *slave; + uint32_t chip_id; + int rc; + uint8_t crc; + + 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", + link, slave_id, rc); + return -ENODEV; + } + crc = crc_fsi(0, chip_id >> FSI_SLAVE_CONF_CRC_SHIFT, + FSI_SLAVE_CONF_DATA_BITS); + if (crc != (chip_id & FSI_SLAVE_CONF_CRC_MASK)) { + dev_warn(master->dev, "slave %02x:%02x invalid chip id CRC!\n", + link, slave_id); + return -EIO; + } + + pr_debug("fsi: found chip %08x at %02x:%02x:%02x\n", + master->idx, chip_id, link, slave_id); + + /* we can communicate with a slave; create devices and scan */ + slave = kzalloc(sizeof(*slave), GFP_KERNEL); + if (!slave) + return -ENOMEM; + + slave->master = master; + slave->id = slave_id; + slave->dev.parent = master->dev; + slave->dev.release = fsi_slave_release; + + dev_set_name(&slave->dev, "slave@%02x:%02x", link, slave_id); + rc = device_register(&slave->dev); + if (rc < 0) { + dev_warn(master->dev, "failed to create slave device: %d\n", + rc); + put_device(&slave->dev); + return rc; + } - return -ENODEV; + return rc; } /* FSI master support */