From: Alan Tull <atull@kernel.org> To: Moritz Fischer <moritz.fischer@ettus.com>, Jason Gunthorpe <jgunthorpe@obsidianresearch.com> Cc: Alan Tull <atull@kernel.org>, linux-kernel@vger.kernel.org, linux-fpga@vger.kernel.org Subject: [RFC 5/8] fpga-mgr: separate getting/locking FPGA manager Date: Wed, 15 Feb 2017 10:14:18 -0600 [thread overview] Message-ID: <1487175261-7051-6-git-send-email-atull@kernel.org> (raw) In-Reply-To: <1487175261-7051-1-git-send-email-atull@kernel.org> Add fpga_mgr_lock/unlock functions that get a mutex for exclusive use. of_fpga_mgr_get, fpga_mgr_get, and fpga_mgr_put no longer lock the FPGA manager mutex. This makes it more straightforward to save a reference to a FPGA manager and only attempting to lock it when programming the FPGA. Signed-off-by: Alan Tull <atull@kernel.org> --- drivers/fpga/fpga-mgr.c | 44 +++++++++++++++++++++++++++++++------------ drivers/fpga/fpga-region.c | 13 +++++++++++-- include/linux/fpga/fpga-mgr.h | 3 +++ 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index b7c719a..3206a53 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -376,28 +376,19 @@ ATTRIBUTE_GROUPS(fpga_mgr); struct fpga_manager *__fpga_mgr_get(struct device *dev) { struct fpga_manager *mgr; - int ret = -ENODEV; mgr = to_fpga_manager(dev); if (!mgr) goto err_dev; - /* Get exclusive use of fpga manager */ - if (!mutex_trylock(&mgr->ref_mutex)) { - ret = -EBUSY; - goto err_dev; - } - if (!try_module_get(dev->parent->driver->owner)) - goto err_ll_mod; + goto err_dev; return mgr; -err_ll_mod: - mutex_unlock(&mgr->ref_mutex); err_dev: put_device(dev); - return ERR_PTR(ret); + return ERR_PTR(-ENODEV); } static int fpga_mgr_dev_match(struct device *dev, const void *data) @@ -457,12 +448,41 @@ EXPORT_SYMBOL_GPL(of_fpga_mgr_get); void fpga_mgr_put(struct fpga_manager *mgr) { module_put(mgr->dev.parent->driver->owner); - mutex_unlock(&mgr->ref_mutex); put_device(&mgr->dev); } EXPORT_SYMBOL_GPL(fpga_mgr_put); /** + * fpga_mgr_lock - Lock FPGA manager for exclusive use + * @mgr: fpga manager + * + * Given a pointer to FPGA Manager (from fpga_mgr_get() or + * of_fpga_mgr_put() attempt to get the mutex). + * + * Return: 0 for success or -EBUSY + */ +int fpga_mgr_lock(struct fpga_manager *mgr) +{ + if (!mutex_trylock(&mgr->ref_mutex)) { + dev_err(&mgr->dev, "FPGA manager is in use.\n"); + return -EBUSY; + } + + return 0; +} +EXPORT_SYMBOL_GPL(fpga_mgr_lock); + +/** + * fpga_mgr_unlock - Unlock FPGA manager + * @mgr: fpga manager + */ +void fpga_mgr_unlock(struct fpga_manager *mgr) +{ + mutex_unlock(&mgr->ref_mutex); +} +EXPORT_SYMBOL_GPL(fpga_mgr_unlock); + +/** * fpga_mgr_register - register a low level fpga manager driver * @dev: fpga manager device from pdev * @name: fpga manager name diff --git a/drivers/fpga/fpga-region.c b/drivers/fpga/fpga-region.c index 3a36417..a5d8112 100644 --- a/drivers/fpga/fpga-region.c +++ b/drivers/fpga/fpga-region.c @@ -142,7 +142,7 @@ static void fpga_region_put(struct fpga_region *region) } /** - * fpga_region_get_manager - get exclusive reference for FPGA manager + * fpga_region_get_manager - get reference for FPGA manager * @region: FPGA region * * Get FPGA Manager from "fpga-mgr" property or from ancestor region. @@ -265,10 +265,16 @@ static int fpga_region_program_fpga(struct fpga_region *region, return PTR_ERR(mgr); } + ret = fpga_mgr_lock(mgr); + if (ret) { + pr_err("FPGA manager is busy\n"); + goto err_put_mgr; + } + ret = fpga_region_get_bridges(region, reg_ovl); if (ret) { pr_err("failed to get fpga region bridges\n"); - goto err_put_mgr; + goto err_unlock_mgr; } ret = fpga_bridges_disable(®ion->bridge_list); @@ -289,6 +295,7 @@ static int fpga_region_program_fpga(struct fpga_region *region, goto err_put_br; } + fpga_mgr_unlock(mgr); fpga_mgr_put(mgr); fpga_region_put(region); @@ -296,6 +303,8 @@ static int fpga_region_program_fpga(struct fpga_region *region, err_put_br: fpga_bridges_put(®ion->bridge_list); +err_unlock_mgr: + fpga_mgr_unlock(mgr); err_put_mgr: fpga_mgr_put(mgr); fpga_region_put(region); diff --git a/include/linux/fpga/fpga-mgr.h b/include/linux/fpga/fpga-mgr.h index 45df05a..ae970ca 100644 --- a/include/linux/fpga/fpga-mgr.h +++ b/include/linux/fpga/fpga-mgr.h @@ -149,6 +149,9 @@ int fpga_mgr_firmware_load(struct fpga_manager *mgr, int fpga_mgr_load(struct fpga_manager *mgr, struct fpga_image_info *info); +int fpga_mgr_lock(struct fpga_manager *mgr); +void fpga_mgr_unlock(struct fpga_manager *mgr); + struct fpga_manager *of_fpga_mgr_get(struct device_node *node); struct fpga_manager *fpga_mgr_get(struct device *dev); -- 2.7.4
next prev parent reply other threads:[~2017-02-15 16:14 UTC|newest] Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-15 16:14 FPGA Region enhancements and fixes Alan Tull 2017-02-15 16:14 ` [RFC 1/8] fpga-mgr: add a single function for fpga loading methods Alan Tull 2017-02-16 0:36 ` matthew.gerlach 2017-02-15 16:14 ` [RFC 2/8] fpga-region: support more than one overlay per FPGA region Alan Tull 2017-02-16 16:50 ` matthew.gerlach 2017-02-16 17:35 ` Alan Tull 2017-02-15 16:14 ` [RFC 3/8] fpga-bridge: add non-dt support Alan Tull 2017-02-15 16:14 ` [RFC 4/8] doc: fpga-mgr: separate getting/locking FPGA manager Alan Tull 2017-02-17 17:14 ` Li, Yi 2017-02-17 21:55 ` Alan Tull 2017-02-17 17:52 ` Moritz Fischer 2017-02-17 22:02 ` Alan Tull 2017-02-15 16:14 ` Alan Tull [this message] 2017-02-15 16:14 ` [RFC 6/8] fpga-region: separate out common code to allow non-dt support Alan Tull 2017-02-15 16:14 ` [RFC 7/8] fpga-region: add sysfs interface Alan Tull 2017-02-15 17:21 ` Jason Gunthorpe 2017-02-15 17:46 ` Alan Tull 2017-02-15 17:55 ` Moritz Fischer 2017-02-15 18:06 ` Jason Gunthorpe 2017-02-15 18:23 ` Alan Tull 2017-02-15 18:31 ` Moritz Fischer 2017-02-15 19:49 ` Jason Gunthorpe 2017-02-15 22:49 ` Alan Tull 2017-02-15 23:07 ` Jason Gunthorpe 2017-02-15 20:07 ` matthew.gerlach 2017-02-15 20:37 ` Jason Gunthorpe 2017-02-15 20:54 ` Moritz Fischer 2017-02-15 21:15 ` Jason Gunthorpe 2017-02-15 21:36 ` Moritz Fischer 2017-02-15 22:42 ` Alan Tull 2017-02-16 0:16 ` Moritz Fischer 2017-02-16 17:47 ` Alan Tull 2017-02-16 17:56 ` Jason Gunthorpe 2017-02-16 18:11 ` Moritz Fischer 2017-02-17 22:28 ` Yves Vandervennet 2017-02-18 2:30 ` Moritz Fischer 2017-02-18 12:45 ` Nadathur, Sundar 2017-02-18 20:10 ` Alan Tull 2017-02-18 20:45 ` Moritz Fischer 2017-02-19 15:00 ` Alan Tull 2017-02-19 23:16 ` Alan Tull 2017-02-20 23:49 ` Moritz Fischer 2017-02-21 18:33 ` Alan Tull 2017-02-22 3:13 ` Nadathur, Sundar 2017-02-22 3:49 ` Moritz Fischer 2017-02-22 5:12 ` Jason Gunthorpe 2017-02-22 5:38 ` Moritz Fischer 2017-02-22 5:46 ` Nadathur, Sundar 2017-02-22 6:05 ` Moritz Fischer 2017-02-22 16:44 ` Jason Gunthorpe 2017-02-22 17:50 ` Moritz Fischer 2017-02-22 17:54 ` Jason Gunthorpe 2017-02-22 17:57 ` Moritz Fischer 2017-02-22 16:33 ` Alan Tull 2017-02-22 16:44 ` Moritz Fischer 2017-02-22 16:52 ` Alan Tull 2017-02-27 20:09 ` Alan Tull 2017-02-27 22:49 ` Moritz Fischer 2017-02-28 0:04 ` matthew.gerlach 2017-02-15 21:20 ` Anatolij Gustschin 2017-02-15 16:14 ` [RFC 8/8] doc: fpga: add sysfs document for fpga region Alan Tull 2017-02-28 17:35 ` FPGA Region enhancements and fixes Alan Tull 2017-02-28 22:03 ` Alan Tull
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1487175261-7051-6-git-send-email-atull@kernel.org \ --to=atull@kernel.org \ --cc=jgunthorpe@obsidianresearch.com \ --cc=linux-fpga@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=moritz.fischer@ettus.com \ --subject='Re: [RFC 5/8] fpga-mgr: separate getting/locking FPGA manager' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.