From: Tianfei Zhang <tianfei.zhang@intel.com>
To: bhelgaas@google.com, linux-pci@vger.kernel.org,
linux-fpga@vger.kernel.org, lukas@wunner.de, kabel@kernel.org,
mani@kernel.org, pali@kernel.org, mdf@kernel.org,
hao.wu@intel.com, yilun.xu@intel.com, trix@redhat.com,
jgg@ziepe.ca, ira.weiny@intel.com,
andriy.shevchenko@linux.intel.com, dan.j.williams@intel.com,
keescook@chromium.org, rafael@kernel.org,
russell.h.weight@intel.com, corbet@lwn.net,
linux-doc@vger.kernel.org, ilpo.jarvinen@linux.intel.com,
lee@kernel.org, gregkh@linuxfoundation.org,
matthew.gerlach@linux.intel.com
Cc: Tianfei Zhang <tianfei.zhang@intel.com>
Subject: [PATCH v1 09/12] fpga: dfl: remove non-reserved devices
Date: Wed, 18 Jan 2023 20:35:59 -0500 [thread overview]
Message-ID: <20230119013602.607466-10-tianfei.zhang@intel.com> (raw)
In-Reply-To: <20230119013602.607466-1-tianfei.zhang@intel.com>
Introduce a new concept of non-reserved devices and reserved devices
on DFL bus. Reserved devices mean that devices under DFL bus will be
reserved before triggering the image load, because those devices are
provided a communication link to BMC during the trigger, for example
SPI/NIOS private feature device on Intel PAC N3000 card, security
update device. On the other hand, the reset of devices are
non-reserved devices, which will be removed before triggering the
image load.
After loading a new image, all of reserved and non-reserved devices
will be removed.
Signed-off-by: Tianfei Zhang <tianfei.zhang@intel.com>
---
drivers/fpga/dfl-pci.c | 18 +++++++++++++
drivers/fpga/dfl.c | 58 ++++++++++++++++++++++++++++++++++++++++++
drivers/fpga/dfl.h | 2 ++
3 files changed, 78 insertions(+)
diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c
index 0409cb30e563..64cf6c623a5a 100644
--- a/drivers/fpga/dfl-pci.c
+++ b/drivers/fpga/dfl-pci.c
@@ -42,7 +42,24 @@ struct cci_drvdata {
struct dfl_fpga_cdev *cdev; /* container device */
};
+static int dfl_hp_prepare(struct fpgahp_manager *mgr)
+{
+ struct pci_dev *pcidev = mgr->priv;
+ struct cci_drvdata *drvdata = pci_get_drvdata(pcidev);
+ struct dfl_fpga_cdev *cdev = drvdata->cdev;
+ struct platform_device *fme = to_platform_device(cdev->fme_dev);
+
+ /* remove all of non-reserved fme devices of PF0 */
+ dfl_reload_remove_non_reserved_devs(fme, mgr->bmc.device);
+
+ /* remove all AFU devices of PF0 */
+ dfl_reload_remove_afus(cdev);
+
+ return 0;
+}
+
static const struct fpgahp_manager_ops fpgahp_ops = {
+ .hotplug_prepare = dfl_hp_prepare,
};
static void __iomem *cci_pci_ioremap_bar0(struct pci_dev *pcidev)
@@ -529,3 +546,4 @@ MODULE_DESCRIPTION("FPGA DFL PCIe Device Driver");
MODULE_AUTHOR("Intel Corporation");
MODULE_LICENSE("GPL v2");
MODULE_IMPORT_NS(FPGAHP);
+MODULE_IMPORT_NS(DFL_CORE);
diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c
index b9aae85ba930..613a8fef47d8 100644
--- a/drivers/fpga/dfl.c
+++ b/drivers/fpga/dfl.c
@@ -486,6 +486,60 @@ EXPORT_SYMBOL(dfl_driver_unregister);
#define is_header_feature(feature) ((feature)->id == FEATURE_ID_FIU_HEADER)
+static void dfl_devs_remove_non_reserved(struct dfl_feature_platform_data *pdata,
+ struct device *trigger_dev)
+{
+ struct dfl_feature *feature;
+
+ dfl_fpga_dev_for_each_feature(pdata, feature) {
+ if (!feature->ddev)
+ continue;
+
+ /* find and skip reserved dfl device */
+ if (device_is_ancestor(&feature->ddev->dev, trigger_dev))
+ continue;
+
+ device_unregister(&feature->ddev->dev);
+ feature->ddev = NULL;
+ }
+}
+
+void dfl_reload_remove_non_reserved_devs(struct platform_device *pdev, struct device *trigger_dev)
+{
+ struct dfl_feature_platform_data *pdata = dev_get_platdata(&pdev->dev);
+ struct dfl_feature *feature;
+
+ dfl_devs_remove_non_reserved(pdata, trigger_dev);
+
+ dfl_fpga_dev_for_each_feature(pdata, feature) {
+ if (feature->ops) {
+ if (feature->ops->uinit)
+ feature->ops->uinit(pdev, feature);
+ feature->ops = NULL;
+ }
+ }
+}
+EXPORT_SYMBOL_NS_GPL(dfl_reload_remove_non_reserved_devs, DFL_CORE);
+
+void dfl_reload_remove_afus(struct dfl_fpga_cdev *cdev)
+{
+ struct dfl_feature_platform_data *pdata, *ptmp;
+
+ mutex_lock(&cdev->lock);
+
+ list_for_each_entry_safe(pdata, ptmp, &cdev->port_dev_list, node) {
+ struct platform_device *port_dev = pdata->dev;
+ enum dfl_id_type type = feature_dev_id_type(port_dev);
+ int id = port_dev->id;
+
+ list_del(&pdata->node);
+ platform_device_unregister(port_dev);
+ dfl_id_free(type, id);
+ }
+ mutex_unlock(&cdev->lock);
+}
+EXPORT_SYMBOL_NS_GPL(dfl_reload_remove_afus, DFL_CORE);
+
/**
* dfl_fpga_dev_feature_uinit - uinit for sub features of dfl feature device
* @pdev: feature device.
@@ -1376,6 +1430,10 @@ static int remove_feature_dev(struct device *dev, void *data)
enum dfl_id_type type = feature_dev_id_type(pdev);
int id = pdev->id;
+ /* pdev has been released */
+ if (!device_is_registered(&pdev->dev))
+ return 0;
+
platform_device_unregister(pdev);
dfl_id_free(type, id);
diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl.h
index 898c05c269fb..3cbe1b21f001 100644
--- a/drivers/fpga/dfl.h
+++ b/drivers/fpga/dfl.h
@@ -485,6 +485,8 @@ struct dfl_fpga_cdev {
struct dfl_fpga_cdev *
dfl_fpga_feature_devs_enumerate(struct dfl_fpga_enum_info *info);
void dfl_fpga_feature_devs_remove(struct dfl_fpga_cdev *cdev);
+void dfl_reload_remove_afus(struct dfl_fpga_cdev *cdev);
+void dfl_reload_remove_non_reserved_devs(struct platform_device *pdev, struct device *trigger_dev);
/*
* need to drop the device reference with put_device() after use port platform
--
2.38.1
next prev parent reply other threads:[~2023-01-19 1:36 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 1:35 [PATCH v1 00/12] add FPGA hotplug manager driver Tianfei Zhang
2023-01-19 1:35 ` [PATCH v1 01/12] PCI: hotplug: add new callbacks on hotplug_slot_ops Tianfei Zhang
2023-01-19 13:31 ` Greg KH
2023-01-19 1:35 ` [PATCH v1 02/12] PCI: hotplug: expose APIs from pciehp driver Tianfei Zhang
2023-01-19 1:35 ` [PATCH v1 03/12] PCI: hotplug: add and expose link disable API Tianfei Zhang
2023-01-19 1:35 ` [PATCH v1 04/12] PCI: hotplug: add FPGA PCI hotplug manager driver Tianfei Zhang
2023-01-19 1:35 ` [PATCH v1 05/12] fpga: dfl: register dfl-pci device into fpgahph driver Tianfei Zhang
2023-01-19 1:35 ` [PATCH v1 06/12] driver core: expose device_is_ancestor() API Tianfei Zhang
2023-01-19 1:35 ` [PATCH v1 07/12] PCI: hotplug: add register/unregister function for BMC device Tianfei Zhang
2023-01-19 1:35 ` [PATCH v1 08/12] fpga: m10bmc-sec: register BMC device into fpgahp driver Tianfei Zhang
2023-01-19 1:35 ` Tianfei Zhang [this message]
2023-01-19 1:36 ` [PATCH v1 10/12] PCI: hotplug: implement the hotplug_slot_ops callback for fpgahp Tianfei Zhang
2023-01-19 13:28 ` Greg KH
2023-01-20 22:38 ` Russ Weight
2023-01-21 7:35 ` Greg KH
2023-01-19 1:36 ` [PATCH v1 11/12] fpga: m10bmc-sec: add m10bmc_sec_retimer_load callback Tianfei Zhang
2023-01-19 14:22 ` Lee Jones
2023-01-19 1:36 ` [PATCH v1 12/12] Documentation: fpga: add description of fpgahp driver Tianfei Zhang
2023-01-19 9:38 ` Bagas Sanjaya
2023-01-19 8:06 ` [PATCH v1 00/12] add FPGA hotplug manager driver Pali Rohár
2023-01-19 8:17 ` Zhang, Tianfei
2023-01-19 11:27 ` andriy.shevchenko
2023-01-19 12:09 ` Zhang, Tianfei
2023-01-19 13:33 ` Greg KH
2023-01-19 13:43 ` Rafael J. Wysocki
2023-01-19 15:33 ` Greg KH
2023-01-20 16:28 ` Russ Weight
2023-01-20 18:42 ` Lukas Wunner
2023-01-21 7:34 ` Greg KH
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=20230119013602.607466-10-tianfei.zhang@intel.com \
--to=tianfei.zhang@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=corbet@lwn.net \
--cc=dan.j.williams@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hao.wu@intel.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=ira.weiny@intel.com \
--cc=jgg@ziepe.ca \
--cc=kabel@kernel.org \
--cc=keescook@chromium.org \
--cc=lee@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=mani@kernel.org \
--cc=matthew.gerlach@linux.intel.com \
--cc=mdf@kernel.org \
--cc=pali@kernel.org \
--cc=rafael@kernel.org \
--cc=russell.h.weight@intel.com \
--cc=trix@redhat.com \
--cc=yilun.xu@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).