From: Wu Hao <hao.wu@intel.com>
To: atull@kernel.org, mdf@kernel.org, linux-fpga@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: linux-api@vger.kernel.org, luwei.kang@intel.com,
yi.z.zhang@intel.com, hao.wu@intel.com,
Xiao Guangrong <guangrong.xiao@linux.intel.com>,
Tim Whisonant <tim.whisonant@intel.com>,
Enno Luebbers <enno.luebbers@intel.com>,
Shiva Rao <shiva.rao@intel.com>,
Christopher Rauer <christopher.rauer@intel.com>
Subject: [PATCH v4 07/24] fpga: dfl: add feature device infrastructure
Date: Tue, 13 Feb 2018 17:24:36 +0800 [thread overview]
Message-ID: <1518513893-4719-8-git-send-email-hao.wu@intel.com> (raw)
In-Reply-To: <1518513893-4719-1-git-send-email-hao.wu@intel.com>
From: Xiao Guangrong <guangrong.xiao@linux.intel.com>
This patch abstracts the common operations of the sub features, and defines
the feature_ops data structure, including init, uinit and ioctl function
pointers. And this patch adds some common helper functions for FME and AFU
drivers, e.g feature_dev_use_begin/end which are used to ensure exclusive
usage of the feature device file.
Signed-off-by: Tim Whisonant <tim.whisonant@intel.com>
Signed-off-by: Enno Luebbers <enno.luebbers@intel.com>
Signed-off-by: Shiva Rao <shiva.rao@intel.com>
Signed-off-by: Christopher Rauer <christopher.rauer@intel.com>
Signed-off-by: Kang Luwei <luwei.kang@intel.com>
Signed-off-by: Zhang Yi <yi.z.zhang@intel.com>
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: Wu Hao <hao.wu@intel.com>
---
v2: rebased
v3: use const for feature_ops.
replace pci related function.
v4: rebase and add more comments in code.
---
drivers/fpga/dfl.c | 59 +++++++++++++++++++++++++++++++++++++
drivers/fpga/dfl.h | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 143 insertions(+), 1 deletion(-)
diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
index 38dc819..c0aad87 100644
--- a/drivers/fpga/dfl.c
+++ b/drivers/fpga/dfl.c
@@ -74,6 +74,65 @@ static enum fpga_id_type feature_dev_id_type(struct platform_device *pdev)
return FPGA_ID_MAX;
}
+void fpga_dev_feature_uinit(struct platform_device *pdev)
+{
+ struct feature *feature;
+ struct feature_platform_data *pdata = dev_get_platdata(&pdev->dev);
+
+ fpga_dev_for_each_feature(pdata, feature)
+ if (feature->ops) {
+ feature->ops->uinit(pdev, feature);
+ feature->ops = NULL;
+ }
+}
+EXPORT_SYMBOL_GPL(fpga_dev_feature_uinit);
+
+static int
+feature_instance_init(struct platform_device *pdev,
+ struct feature_platform_data *pdata,
+ struct feature *feature, struct feature_driver *drv)
+{
+ int ret;
+
+ WARN_ON(!feature->ioaddr);
+
+ ret = drv->ops->init(pdev, feature);
+ if (ret)
+ return ret;
+
+ feature->ops = drv->ops;
+
+ return ret;
+}
+
+int fpga_dev_feature_init(struct platform_device *pdev,
+ struct feature_driver *feature_drvs)
+{
+ struct feature *feature;
+ struct feature_driver *drv = feature_drvs;
+ struct feature_platform_data *pdata = dev_get_platdata(&pdev->dev);
+ int ret;
+
+ while (drv->ops) {
+ fpga_dev_for_each_feature(pdata, feature) {
+ /* match feature and drv using id */
+ if (feature->id == drv->id) {
+ ret = feature_instance_init(pdev, pdata,
+ feature, drv);
+ if (ret)
+ goto exit;
+ }
+ }
+ drv++;
+ }
+
+ return 0;
+exit:
+ fpga_dev_feature_uinit(pdev);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(fpga_dev_feature_init);
+
struct fpga_chardev_info {
const char *name;
dev_t devt;
diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl.h
index d6ecda1..ede1e95 100644
--- a/drivers/fpga/dfl.h
+++ b/drivers/fpga/dfl.h
@@ -132,6 +132,17 @@
#define PORT_CTRL_SFTRST_ACK BIT(4) /* HW ack for reset */
/**
+ * struct feature_driver - sub feature's driver
+ *
+ * @id: sub feature id.
+ * @ops: ops of this sub feature.
+ */
+struct feature_driver {
+ u64 id;
+ const struct feature_ops *ops;
+};
+
+/**
* struct feature - sub feature of the feature devices
*
* @id: sub feature id.
@@ -139,13 +150,17 @@
* this index is used to find its mmio resource from the
* feature dev (platform device)'s reources.
* @ioaddr: mapped mmio resource address.
+ * @ops: ops of this sub feature.
*/
struct feature {
u64 id;
int resource_index;
void __iomem *ioaddr;
+ const struct feature_ops *ops;
};
+#define DEV_STATUS_IN_USE 0
+
/**
* struct feature_platform_data - platform data for feature devices
*
@@ -155,6 +170,8 @@ struct feature {
* @dev: ptr to platform device linked with this platform data.
* @disable_count: count for port disable.
* @num: number for sub features.
+ * @dev_status: dev status (e.g DEV_STATUS_IN_USE).
+ * @private: ptr to feature dev private data.
* @features: sub features of this feature dev.
*/
struct feature_platform_data {
@@ -163,11 +180,44 @@ struct feature_platform_data {
struct cdev cdev;
struct platform_device *dev;
unsigned int disable_count;
-
+ unsigned long dev_status;
+ void *private;
int num;
struct feature features[0];
};
+static inline int feature_dev_use_begin(struct feature_platform_data *pdata)
+{
+ /* Test and set IN_USE flags to ensure file is exclusively used */
+ if (test_and_set_bit_lock(DEV_STATUS_IN_USE, &pdata->dev_status))
+ return -EBUSY;
+
+ return 0;
+}
+
+static inline void feature_dev_use_end(struct feature_platform_data *pdata)
+{
+ clear_bit_unlock(DEV_STATUS_IN_USE, &pdata->dev_status);
+}
+
+static inline void
+fpga_pdata_set_private(struct feature_platform_data *pdata, void *private)
+{
+ pdata->private = private;
+}
+
+static inline void *fpga_pdata_get_private(struct feature_platform_data *pdata)
+{
+ return pdata->private;
+}
+
+struct feature_ops {
+ int (*init)(struct platform_device *pdev, struct feature *feature);
+ void (*uinit)(struct platform_device *pdev, struct feature *feature);
+ long (*ioctl)(struct platform_device *pdev, struct feature *feature,
+ unsigned int cmd, unsigned long arg);
+};
+
#define FPGA_FEATURE_DEV_FME "dfl-fme"
#define FPGA_FEATURE_DEV_PORT "dfl-port"
@@ -177,6 +227,10 @@ static inline int feature_platform_data_size(const int num)
num * sizeof(struct feature);
}
+void fpga_dev_feature_uinit(struct platform_device *pdev);
+int fpga_dev_feature_init(struct platform_device *pdev,
+ struct feature_driver *feature_drvs);
+
enum fpga_devt_type {
FPGA_DEVT_FME,
FPGA_DEVT_PORT,
@@ -257,6 +311,15 @@ static inline int fpga_port_reset(struct platform_device *pdev)
return ret;
}
+static inline
+struct platform_device *fpga_inode_to_feature_dev(struct inode *inode)
+{
+ struct feature_platform_data *pdata;
+
+ pdata = container_of(inode->i_cdev, struct feature_platform_data, cdev);
+ return pdata->dev;
+}
+
#define fpga_dev_for_each_feature(pdata, feature) \
for ((feature) = (pdata)->features; \
(feature) < (pdata)->features + (pdata)->num; (feature)++)
@@ -284,6 +347,17 @@ static inline void __iomem *get_feature_ioaddr_by_id(struct device *dev, u64 id)
return NULL;
}
+static inline bool is_feature_present(struct device *dev, u64 id)
+{
+ return !!get_feature_ioaddr_by_id(dev, id);
+}
+
+static inline struct device *
+fpga_pdata_to_parent(struct feature_platform_data *pdata)
+{
+ return pdata->dev->dev.parent->parent;
+}
+
static inline bool feature_is_fme(void __iomem *base)
{
u64 v = readq(base + DFH);
@@ -376,4 +450,13 @@ fpga_cdev_find_port(struct fpga_cdev *cdev, void *data,
return pdev;
}
+
+static inline struct fpga_cdev *
+fpga_pdata_to_fpga_cdev(struct feature_platform_data *pdata)
+{
+ struct device *dev = pdata->dev->dev.parent;
+ struct fpga_region *region = to_fpga_region(dev);
+
+ return container_of(region, struct fpga_cdev, region);
+}
#endif /* __FPGA_DFL_H */
--
2.7.4
next prev parent reply other threads:[~2018-02-13 9:24 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-13 9:24 [PATCH v4 00/24] FPGA Device Feature List (DFL) Device Drivers Wu Hao
2018-02-13 9:24 ` [PATCH v4 01/24] docs: fpga: add a document for FPGA Device Feature List (DFL) Framework Overview Wu Hao
2018-02-26 22:48 ` Alan Tull
2018-02-27 2:12 ` Wu Hao
2018-02-13 9:24 ` [PATCH v4 02/24] fpga: mgr: add region_id to fpga_image_info Wu Hao
2018-02-13 9:24 ` [PATCH v4 03/24] fpga: mgr: add status for fpga-manager Wu Hao
2018-02-14 15:55 ` Alan Tull
2018-02-15 9:42 ` Wu, Hao
2018-02-14 20:55 ` Moritz Fischer
2018-02-13 9:24 ` [PATCH v4 04/24] fpga: add device feature list support Wu Hao
2018-03-21 23:54 ` Alan Tull
2018-03-22 4:40 ` Wu Hao
2018-03-22 21:31 ` Alan Tull
2018-03-23 4:33 ` Wu Hao
2018-03-26 17:21 ` Alan Tull
2018-03-27 2:35 ` Wu Hao
2018-03-29 21:57 ` Alan Tull
2018-04-02 4:22 ` Wu Hao
2018-04-02 19:06 ` Alan Tull
2018-04-03 1:36 ` Wu Hao
2018-04-04 20:06 ` Alan Tull
2018-04-06 11:01 ` Wu Hao
2018-02-13 9:24 ` [PATCH v4 05/24] fpga: dfl: add chardev support for feature devices Wu Hao
2018-02-13 9:24 ` [PATCH v4 06/24] fpga: dfl: adds fpga_cdev_find_port Wu Hao
[not found] ` <1518513893-4719-7-git-send-email-hao.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2018-02-14 16:24 ` Alan Tull
[not found] ` <CANk1AXQgeeQm_ncn+17nrjr+YTCKvpc=PVZEsaZVOjRb3aHTQQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-02-15 9:46 ` Wu, Hao
2018-02-14 20:55 ` Moritz Fischer
2018-02-13 9:24 ` Wu Hao [this message]
[not found] ` <1518513893-4719-8-git-send-email-hao.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2018-02-14 21:03 ` [PATCH v4 07/24] fpga: dfl: add feature device infrastructure Moritz Fischer
[not found] ` <20180214210319.GC25618-KFgJe6S/L2nknyRNNOXSQ2IaLvZF3x2V0E9HWUfgJXw@public.gmane.org>
2018-02-14 21:13 ` Alan Tull
[not found] ` <CANk1AXRksJum6s5yB5727136DBLHs4UPW7xaLn_dT5qMEfqm9A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-02-15 10:05 ` Wu, Hao
[not found] ` <BE8371DA886269458E0220A16DC1F8277E154EC0-0J0gbvR4kTg/UvCtAeCM4rfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2018-02-15 19:49 ` Moritz Fischer
[not found] ` <20180215194901.GA4382-KFgJe6S/L2nknyRNNOXSQ2IaLvZF3x2V0E9HWUfgJXw@public.gmane.org>
2018-02-18 2:15 ` Wu, Hao
2018-02-13 9:24 ` [PATCH v4 10/24] fpga: dfl: add FPGA Management Engine driver basic framework Wu Hao
2018-04-05 18:35 ` Alan Tull
2018-04-06 11:04 ` Wu Hao
2018-02-13 9:24 ` [PATCH v4 11/24] fpga: dfl: fme: add header sub feature support Wu Hao
[not found] ` <1518513893-4719-12-git-send-email-hao.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2018-02-14 16:36 ` Alan Tull
2018-02-13 9:24 ` [PATCH v4 12/24] fpga: dfl: fme: add FPGA_GET_API_VERSION/CHECK_EXTENSION ioctls support Wu Hao
2018-03-19 18:29 ` Alan Tull
2018-03-20 6:46 ` Wu Hao
2018-02-13 9:24 ` [PATCH v4 13/24] fpga: region: add compat_id support Wu Hao
2018-02-28 22:55 ` Alan Tull
2018-03-01 6:17 ` Wu Hao
2018-03-05 19:42 ` Alan Tull
2018-03-06 0:56 ` Wu Hao
2018-02-13 9:24 ` [PATCH v4 14/24] fpga: dfl: fme: add partial reconfiguration sub feature support Wu Hao
2018-03-05 22:46 ` Alan Tull
2018-03-06 2:08 ` Wu Hao
2018-03-06 18:29 ` Alan Tull
2018-03-07 4:39 ` Wu Hao
2018-03-11 20:09 ` matthew.gerlach
2018-03-12 4:29 ` Wu Hao
2018-03-12 18:53 ` Alan Tull
2018-03-12 21:36 ` matthew.gerlach
2018-03-13 1:07 ` Wu Hao
2018-02-13 9:24 ` [PATCH v4 15/24] fpga: dfl-fme-pr: add compat_id support for dfl-fme-region platform device Wu Hao
2018-02-28 23:06 ` Alan Tull
2018-03-01 5:49 ` Wu Hao
2018-03-01 15:59 ` Alan Tull
2018-03-01 15:55 ` Wu Hao
2018-02-13 9:24 ` [PATCH v4 16/24] fpga: dfl: add fpga manager platform driver for FME Wu Hao
2018-03-20 20:32 ` Alan Tull
2018-03-21 2:50 ` Wu Hao
2018-03-21 16:55 ` Moritz Fischer
2018-03-22 6:07 ` Wu Hao
2018-04-05 18:45 ` Alan Tull
2018-04-06 11:11 ` Wu Hao
2018-02-13 9:24 ` [PATCH v4 18/24] fpga: dfl: add fpga region " Wu Hao
2018-02-13 9:24 ` [PATCH v4 20/24] fpga: dfl: add FPGA Accelerated Function Unit driver basic framework Wu Hao
2018-03-19 18:40 ` Alan Tull
2018-04-05 18:26 ` Alan Tull
2018-04-06 11:05 ` Wu Hao
[not found] ` <1518513893-4719-1-git-send-email-hao.wu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2018-02-13 9:24 ` [PATCH v4 08/24] fpga: add FPGA DFL PCIe device driver Wu Hao
2018-03-13 16:05 ` Alan Tull
2018-03-15 18:49 ` Moritz Fischer
2018-03-16 4:29 ` Wu Hao
2018-02-13 9:24 ` [PATCH v4 09/24] fpga: dfl-pci: add enumeration for feature devices Wu Hao
2018-03-13 18:30 ` Alan Tull
2018-03-14 5:21 ` Wu Hao
2018-03-14 14:48 ` Alan Tull
2018-02-13 9:24 ` [PATCH v4 17/24] fpga: dfl: add fpga bridge platform driver for FME Wu Hao
2018-02-13 9:24 ` [PATCH v4 19/24] fpga: dfl-fme-region: add compat_id support Wu Hao
2018-02-13 9:24 ` [PATCH v4 21/24] fpga: dfl: afu: add header sub feature support Wu Hao
2018-02-13 9:24 ` [PATCH v4 22/24] fpga: dfl: afu: add FPGA_GET_API_VERSION/CHECK_EXTENSION ioctls support Wu Hao
2018-02-13 9:24 ` [PATCH v4 23/24] fpga: dfl: afu: add user afu sub feature support Wu Hao
2018-03-19 20:10 ` Alan Tull
2018-03-20 7:10 ` Wu Hao
2018-03-20 18:17 ` Alan Tull
2018-03-21 3:00 ` Wu Hao
2018-03-21 23:50 ` Alan Tull
2018-03-22 4:41 ` Wu Hao
2018-02-13 9:24 ` [PATCH v4 24/24] fpga: dfl: afu: add FPGA_PORT_DMA_MAP/UNMAP ioctls support Wu Hao
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=1518513893-4719-8-git-send-email-hao.wu@intel.com \
--to=hao.wu@intel.com \
--cc=atull@kernel.org \
--cc=christopher.rauer@intel.com \
--cc=enno.luebbers@intel.com \
--cc=guangrong.xiao@linux.intel.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luwei.kang@intel.com \
--cc=mdf@kernel.org \
--cc=shiva.rao@intel.com \
--cc=tim.whisonant@intel.com \
--cc=yi.z.zhang@intel.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).