From patchwork Wed Dec 7 00:14:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Bostic X-Patchwork-Id: 9463607 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 D047260459 for ; Wed, 7 Dec 2016 00:22:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1E762849D for ; Wed, 7 Dec 2016 00:22:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6243284F2; Wed, 7 Dec 2016 00:22:04 +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 27D33284D0 for ; Wed, 7 Dec 2016 00:22:04 +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 1cEPy8-0000zC-01; Wed, 07 Dec 2016 00:20:20 +0000 Received: from mail-oi0-x242.google.com ([2607:f8b0:4003:c06::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cEPtf-0005iE-O4 for linux-arm-kernel@lists.infradead.org; Wed, 07 Dec 2016 00:15:45 +0000 Received: by mail-oi0-x242.google.com with SMTP id v84so43393175oie.2 for ; Tue, 06 Dec 2016 16:15:24 -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=zc0dbohcppk0sWpMeErnx64km+LaAckipyypyuwCCnU=; b=C6HdjxT/0DjNFi14pRJc2PVH7kc07OjdEITVVkt0lVgrB3yYdfF+xU4GvBhYNluQmb II3tfstG4LHxOL3beAyha/t50fgCcrz1DMqujGBw6naQaXz5szZogeSuvB1/G2ValqtZ ipsNiqrtJnDCKQ+w7GABsT8cNj/gdyTZFygbLHO8qRW699GD7Tk5CBRZtkDVWaOUeDan +1g8iuRgkcRyJoB/s6QXFJDIiOkIJrUrlmPSN1R/eQB/3Q33sTz6vE4J5/4ValpsTj9T XbSy59SVIeCrXzy/Axh0X2o9pbMTu7XSXXrCSQbgKvGSsAhoqTQK0u126Z8MefArgWaj x/Qw== 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=zc0dbohcppk0sWpMeErnx64km+LaAckipyypyuwCCnU=; b=QAySIEx9oAChvSDkJGkmTLkBJFrg3liypvMjxiVTioGuPICZz7WI4E7Jez/8AgGk6L wPlP2pIb3h4paW5uiI0UYZOjC8/IWFt81PomksLZaDcNfhDVZQhlGXbK4DNLAqkp7b8A qAgtXEPSkLU7hSolnciy+h7rPh5yTHKS3IkLu/wuWb+x9yc6nQ++sAuQjPPbUDuiTAt0 6vMjXs5CZGUW7a2z9UlAIQWLkqqBiCyy2reKeZ9yohNsM99ynXswPL9t41moV99S8VSW u31x7E6Qyb6C/krvwP13bHei4t5BTMk/lsYh85EMJX0xvfxZVWZjDnA+1GLZuzjFC/A/ RScQ== X-Gm-Message-State: AKaTC01Rv0iaF5+IshPpDd1fKOKlgtBVax1jvhyIeyYlgeXL1kkrKEhGIbqRmKiiSVJffg== X-Received: by 10.202.229.199 with SMTP id c190mr33651228oih.175.1481069723548; Tue, 06 Dec 2016 16:15:23 -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.22 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 06 Dec 2016 16:15:22 -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 14/16] drivers/fsi: Add master unscan Date: Tue, 6 Dec 2016 18:14:35 -0600 Message-Id: <1481069677-53660-15-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_161543_951887_5EEA97DE X-CRM114-Status: GOOD ( 14.20 ) 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 Allow a master to undo a previous scan. Should a master scan a bus twice it will need to ensure it doesn't double register any previously detected device. Signed-off-by: Chris Bostic --- drivers/fsi/fsi-core.c | 36 +++++++++++++++++++++++++++++++++++- drivers/fsi/fsi-master.h | 2 ++ include/linux/fsi.h | 1 + 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c index a28434b..8ccfe50 100644 --- a/drivers/fsi/fsi-core.c +++ b/drivers/fsi/fsi-core.c @@ -41,6 +41,8 @@ static atomic_t master_idx = ATOMIC_INIT(-1); struct fsi_slave { + struct list_head list_link; /* Master's list of slaves */ + struct list_head my_engines; struct device dev; struct fsi_master *master; int link; @@ -196,6 +198,8 @@ static int fsi_slave_scan(struct fsi_slave *slave) uint32_t conf; int rc, i; + INIT_LIST_HEAD(&slave->my_engines); + /* * scan engines * @@ -264,7 +268,9 @@ static int fsi_slave_scan(struct fsi_slave *slave) if (rc) { dev_warn(&slave->dev, "add failed: %d\n", rc); put_device(&dev->dev); + continue; } + list_add(&dev->link, &slave->my_engines); } engine_addr += slots * engine_page_size; @@ -357,7 +363,7 @@ static int fsi_slave_init(struct fsi_master *master, put_device(&slave->dev); return rc; } - + list_add(&slave->list_link, &master->my_slaves); fsi_slave_scan(slave); return 0; } @@ -388,6 +394,11 @@ static int fsi_master_scan(struct fsi_master *master) int link, slave_id, rc; uint32_t smode; + if (!master->slave_list) { + INIT_LIST_HEAD(&master->my_slaves); + master->slave_list = true; + } + for (link = 0; link < master->n_links; link++) { rc = fsi_master_link_enable(master, link); if (rc) { @@ -423,9 +434,31 @@ static int fsi_master_scan(struct fsi_master *master) return 0; } +static void fsi_master_unscan(struct fsi_master *master) +{ + struct fsi_slave *slave, *slave_tmp; + struct fsi_device *fsi_dev, *fsi_dev_tmp; + + if (!master->slave_list) + return; + + list_for_each_entry_safe(slave, slave_tmp, &master->my_slaves, + list_link) { + list_del(&slave->list_link); + list_for_each_entry_safe(fsi_dev, fsi_dev_tmp, + &slave->my_engines, link) { + list_del(&fsi_dev->link); + put_device(&fsi_dev->dev); + } + device_unregister(&slave->dev); + } + master->slave_list = false; +} + int fsi_master_register(struct fsi_master *master) { master->idx = atomic_inc_return(&master_idx); + master->slave_list = false; get_device(master->dev); fsi_master_scan(master); return 0; @@ -434,6 +467,7 @@ int fsi_master_register(struct fsi_master *master) void fsi_master_unregister(struct fsi_master *master) { + fsi_master_unscan(master); put_device(master->dev); } EXPORT_SYMBOL_GPL(fsi_master_unregister); diff --git a/drivers/fsi/fsi-master.h b/drivers/fsi/fsi-master.h index 56aad0e..454af2b 100644 --- a/drivers/fsi/fsi-master.h +++ b/drivers/fsi/fsi-master.h @@ -20,6 +20,8 @@ #include struct fsi_master { + struct list_head my_slaves; + bool slave_list; struct device *dev; int idx; int n_links; diff --git a/include/linux/fsi.h b/include/linux/fsi.h index 66bce48..924502b 100644 --- a/include/linux/fsi.h +++ b/include/linux/fsi.h @@ -18,6 +18,7 @@ #include struct fsi_device { + struct list_head link; /* for slave's list */ struct device dev; u8 engine_type; u8 version;