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@xxxxxxxxx>
---
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
