fpga: don't use drvdata in common fpga code

Changes to the fpga manager code to not use drvdata in common code.

Change fpga_mgr_register to not set or use drvdata.

Change the register/unregister function parameters to take the mgr struct:
* int fpga_mgr_register(struct device *dev,

                        struct fpga_manager *mgr);

* void fpga_mgr_unregister(struct fpga_manager *mgr);

Change the drivers that call fpga_mgr_register to alloc the struct fpga_manager (using devm_kzalloc) and partly fill it, adding name, ops, and priv.

The rationale is that setting drvdata is fine for DT based devices that will have one manager, bridge, or region per platform device. However PCIe based devices may have multiple FPGA mgr/bridge/regions under one pcie device. Without these changes, the PCIe solution has to create an extra device for each child mgr/bridge/region to hold drvdata.

Signed-off-by Alan Tull <[email protected]>

Reported-by Jiuyue Ma <[email protected]>

---
 Documentation/fpga/fpga-mgr.txt  | 23 ++++++++++++++++-------
 drivers/fpga/altera-cvp.c        | 17 +++++++++++++----
 drivers/fpga/altera-pr-ip-core.c | 16 ++++++++++++++--
 drivers/fpga/altera-ps-spi.c     | 17 ++++++++++++++---
 drivers/fpga/fpga-mgr.c          | 28 +++++++---------------------
 drivers/fpga/ice40-spi.c         | 19 +++++++++++++++----
 drivers/fpga/socfpga-a10.c       | 15 ++++++++++++---
 drivers/fpga/socfpga.c           | 17 ++++++++++++++---
 drivers/fpga/ts73xx-fpga.c       | 17 ++++++++++++++---
 drivers/fpga/xilinx-spi.c        | 17 ++++++++++++++---
 drivers/fpga/zynq-fpga.c         | 15 ++++++++++++---
 include/linux/fpga/fpga-mgr.h    |  6 ++----
 12 files changed, 147 insertions(+), 60 deletions(-)

Documentation/fpga/fpga-mgr.txt +16 -7

index cc6413e..7e5e5c8 100644
@@ -67,11 +67,9 @@ fpga_mgr_unlock when done programming the FPGA.
 To register or unregister the low level FPGA-specific driver:
 -------------------------------------------------------------
 
-	int fpga_mgr_register(struct device *dev, const char *name,
-			      const struct fpga_manager_ops *mops,
-			      void *priv);
+	int fpga_mgr_register(struct device *dev, struct fpga_manager *mgr);
 
-	void fpga_mgr_unregister(struct device *dev);
+	void fpga_mgr_unregister(struct fpga_manager *mgr);
 
 Use of these two functions is described below in "How To Support a new FPGA
 device."

@@ -148,8 +146,13 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct socfpga_fpga_priv *priv;
+	struct fpga_manager *mgr;
 	int ret;
 
+	mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
+
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;

@@ -157,13 +160,19 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 	/* ... do ioremaps, get interrupts, etc. and save
 	   them in priv... */
 
-	return fpga_mgr_register(dev, "Altera SOCFPGA FPGA Manager",
-				 &socfpga_fpga_ops, priv);
+	mgr->name = "Altera SOCFPGA FPGA Manager";
+	mgr->mops = &socfpga_fpga_ops;
+	mgr->priv = priv;
+	platform_set_drvdata(pdev, mgr);
+
+	return fpga_mgr_register(dev, mgr);
 }
 
 static int socfpga_fpga_remove(struct platform_device *pdev)
 {
-	fpga_mgr_unregister(&pdev->dev);
+	struct fpga_manager *mgr = platform_get_drvdata(pdev);
+
+	fpga_mgr_unregister(mgr);
 
 	return 0;
 }

drivers/fpga/altera-cvp.c +13 -4

index 00e73d2..63320ad 100644
@@ -403,6 +403,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,
 			    const struct pci_device_id *dev_id)
 {
 	struct altera_cvp_conf *conf;
+	struct fpga_manager *mgr;
 	u16 cmd, val;
 	int ret;
 

@@ -421,6 +422,10 @@ static int altera_cvp_probe(struct pci_dev *pdev,
 	if (!conf)
 		return -ENOMEM;
 
+	mgr = devm_kzalloc(&pdev->dev, sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
+
 	/*
 	 * Enable memory BAR access. We cannot use pci_enable_device() here
 	 * because it will make the driver unusable with FPGA devices that

@@ -454,8 +459,12 @@ static int altera_cvp_probe(struct pci_dev *pdev,
 	snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s @%s",
 		 ALTERA_CVP_MGR_NAME, pci_name(pdev));
 
-	ret = fpga_mgr_register(&pdev->dev, conf->mgr_name,
-				&altera_cvp_ops, conf);
+	mgr->name = conf->mgr_name;
+	mgr->mops = &altera_cvp_ops;
+	mgr->priv = conf;
+	pci_set_drvdata(pdev, mgr);
+
+	ret = fpga_mgr_register(&pdev->dev, mgr);
 	if (ret)
 		goto err_unmap;
 

@@ -463,7 +472,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,
 				 &driver_attr_chkcfg);
 	if (ret) {
 		dev_err(&pdev->dev, "Can't create sysfs chkcfg file\n");
-		fpga_mgr_unregister(&pdev->dev);
+		fpga_mgr_unregister(mgr);
 		goto err_unmap;
 	}
 

@@ -485,7 +494,7 @@ static void altera_cvp_remove(struct pci_dev *pdev)
 	u16 cmd;
 
 	driver_remove_file(&altera_cvp_driver.driver, &driver_attr_chkcfg);
-	fpga_mgr_unregister(&pdev->dev);
+	fpga_mgr_unregister(mgr);
 	pci_iounmap(pdev, conf->map);
 	pci_release_region(pdev, CVP_BAR);
 	pci_read_config_word(pdev, PCI_COMMAND, &cmd);

drivers/fpga/altera-pr-ip-core.c +14 -2

index a7b31f9..f09e54f 100644
@@ -187,8 +187,13 @@ static const struct fpga_manager_ops alt_pr_ops = {
 int alt_pr_register(struct device *dev, void __iomem *reg_base)
 {
 	struct alt_pr_priv *priv;
+	struct fpga_manager *mgr;
 	u32 val;
 
+	mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
+
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;

@@ -201,15 +206,22 @@ int alt_pr_register(struct device *dev, void __iomem *reg_base)
 		(val & ALT_PR_CSR_STATUS_MSK) >> ALT_PR_CSR_STATUS_SFT,
 		(int)(val & ALT_PR_CSR_PR_START));
 
-	return fpga_mgr_register(dev, dev_name(dev), &alt_pr_ops, priv);
+	mgr->name = dev_name(dev);
+	mgr->mops = &alt_pr_ops;
+	mgr->priv = priv;
+	dev_set_drvdata(dev, mgr);
+
+	return fpga_mgr_register(dev, mgr);
 }
 EXPORT_SYMBOL_GPL(alt_pr_register);
 
 int alt_pr_unregister(struct device *dev)
 {
+	struct fpga_manager *mgr = dev_get_drvdata(dev);
+
 	dev_dbg(dev, "%s\n", __func__);
 
-	fpga_mgr_unregister(dev);
+	fpga_mgr_unregister(mgr);
 
 	return 0;
 }

drivers/fpga/altera-ps-spi.c +14 -3

index 14f14ef..aee6517 100644
@@ -238,6 +238,11 @@ static int altera_ps_probe(struct spi_device *spi)
 {
 	struct altera_ps_conf *conf;
 	const struct of_device_id *of_id;
+	struct fpga_manager *mgr;
+
+	mgr = devm_kzalloc(&spi->dev, sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
 
 	conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL);
 	if (!conf)

@@ -273,13 +278,19 @@ static int altera_ps_probe(struct spi_device *spi)
 	snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s %s",
 		 dev_driver_string(&spi->dev), dev_name(&spi->dev));
 
-	return fpga_mgr_register(&spi->dev, conf->mgr_name,
-				 &altera_ps_ops, conf);
+	mgr->name = conf->mgr_name;
+	mgr->mops = &altera_ps_ops;
+	mgr->priv = conf;
+	spi_set_drvdata(spi, mgr);
+
+	return fpga_mgr_register(&spi->dev, mgr);
 }
 
 static int altera_ps_remove(struct spi_device *spi)
 {
-	fpga_mgr_unregister(&spi->dev);
+	struct fpga_manager *mgr = spi_get_drvdata(spi);
+
+	fpga_mgr_unregister(mgr);
 
 	return 0;
 }

drivers/fpga/fpga-mgr.c +7 -21

index 223f240..6f1c59bf4 100644
@@ -525,13 +525,13 @@ EXPORT_SYMBOL_GPL(fpga_mgr_unlock);
  *
  * Return: 0 on success, negative error code otherwise.
  */
-int fpga_mgr_register(struct device *dev, const char *name,
-		      const struct fpga_manager_ops *mops,
-		      void *priv)
+int fpga_mgr_register(struct device *dev, struct fpga_manager *mgr)
 {
-	struct fpga_manager *mgr;
+	const char *name;
+	const struct fpga_manager_ops *mops;
 	int id, ret;
 
+	mops = mgr->mops;
 	if (!mops || !mops->write_complete || !mops->state ||
 	    !mops->write_init || (!mops->write && !mops->write_sg) ||
 	    (mops->write && mops->write_sg)) {

@@ -539,27 +539,19 @@ int fpga_mgr_register(struct device *dev, const char *name,
 		return -EINVAL;
 	}
 
+	name = mgr->name;
 	if (!name || !strlen(name)) {
 		dev_err(dev, "Attempt to register with no name!\n");
 		return -EINVAL;
 	}
 
-	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-	if (!mgr)
-		return -ENOMEM;
-
 	id = ida_simple_get(&fpga_mgr_ida, 0, 0, GFP_KERNEL);
 	if (id < 0) {
-		ret = id;
-		goto error_kfree;
+		return id;
 	}
 
 	mutex_init(&mgr->ref_mutex);
 
-	mgr->name = name;
-	mgr->mops = mops;
-	mgr->priv = priv;
-
 	/*
 	 * Initialize framework state by requesting low level driver read state
 	 * from device.  FPGA may be in reset mode or may have been programmed

@@ -573,7 +565,6 @@ int fpga_mgr_register(struct device *dev, const char *name,
 	mgr->dev.parent = dev;
 	mgr->dev.of_node = dev->of_node;
 	mgr->dev.id = id;
-	dev_set_drvdata(dev, mgr);
 
 	ret = dev_set_name(&mgr->dev, "fpga%d", id);
 	if (ret)

@@ -589,8 +580,6 @@ int fpga_mgr_register(struct device *dev, const char *name,
 
 error_device:
 	ida_simple_remove(&fpga_mgr_ida, id);
-error_kfree:
-	kfree(mgr);
 
 	return ret;
 }

@@ -600,10 +589,8 @@ EXPORT_SYMBOL_GPL(fpga_mgr_register);
  * fpga_mgr_unregister - unregister a low level fpga manager driver
  * @dev:	fpga manager device from pdev
  */
-void fpga_mgr_unregister(struct device *dev)
+void fpga_mgr_unregister(struct fpga_manager *mgr)
 {
-	struct fpga_manager *mgr = dev_get_drvdata(dev);
-
 	dev_info(&mgr->dev, "%s %s\n", __func__, mgr->name);
 
 	/*

@@ -622,7 +609,6 @@ static void fpga_mgr_dev_release(struct device *dev)
 	struct fpga_manager *mgr = to_fpga_manager(dev);
 
 	ida_simple_remove(&fpga_mgr_ida, mgr->dev.id);
-	kfree(mgr);
 }
 
 static int __init fpga_mgr_class_init(void)

drivers/fpga/ice40-spi.c +15 -4

index 7fca820..92da328 100644
@@ -133,8 +133,13 @@ static int ice40_fpga_probe(struct spi_device *spi)
 {
 	struct device *dev = &spi->dev;
 	struct ice40_fpga_priv *priv;
+	struct fpga_manager *mgr;
 	int ret;
 
+	mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
+
 	priv = devm_kzalloc(&spi->dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;

@@ -174,14 +179,20 @@ static int ice40_fpga_probe(struct spi_device *spi)
 		return ret;
 	}
 
-	/* Register with the FPGA manager */
-	return fpga_mgr_register(dev, "Lattice iCE40 FPGA Manager",
-				 &ice40_fpga_ops, priv);
+	mgr->name = "Lattice iCE40 FPGA Manager";
+	mgr->mops = &ice40_fpga_ops;
+	mgr->priv = priv;
+	spi_set_drvdata(spi, mgr);
+
+	return fpga_mgr_register(dev, mgr);
 }
 
 static int ice40_fpga_remove(struct spi_device *spi)
 {
-	fpga_mgr_unregister(&spi->dev);
+	struct fpga_manager *mgr = spi_get_drvdata(spi);
+
+	fpga_mgr_unregister(mgr);
+
 	return 0;
 }
 

drivers/fpga/socfpga-a10.c +12 -3

index f8770af..3c0eae5 100644
@@ -482,6 +482,7 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	struct a10_fpga_priv *priv;
 	void __iomem *reg_base;
+	struct fpga_manager *mgr;
 	struct resource *res;
 	int ret;
 

@@ -519,8 +520,16 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
 		return -EBUSY;
 	}
 
-	return fpga_mgr_register(dev, "SoCFPGA Arria10 FPGA Manager",
-				 &socfpga_a10_fpga_mgr_ops, priv);
+	mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
+
+	mgr->name = "SoCFPGA Arria10 FPGA Manager";
+	mgr->mops = &socfpga_a10_fpga_mgr_ops;
+	mgr->priv = priv;
+	platform_set_drvdata(pdev, mgr);
+
+	return fpga_mgr_register(dev, mgr);
 }
 
 static int socfpga_a10_fpga_remove(struct platform_device *pdev)

@@ -528,7 +537,7 @@ static int socfpga_a10_fpga_remove(struct platform_device *pdev)
 	struct fpga_manager *mgr = platform_get_drvdata(pdev);
 	struct a10_fpga_priv *priv = mgr->priv;
 
-	fpga_mgr_unregister(&pdev->dev);
+	fpga_mgr_unregister(mgr);
 	clk_disable_unprepare(priv->clk);
 
 	return 0;

drivers/fpga/socfpga.c +14 -3

index b6672e6..47723d3 100644
@@ -555,9 +555,14 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct socfpga_fpga_priv *priv;
+	struct fpga_manager *mgr;
 	struct resource *res;
 	int ret;
 
+	mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
+
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;

@@ -581,13 +586,19 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return fpga_mgr_register(dev, "Altera SOCFPGA FPGA Manager",
-				 &socfpga_fpga_ops, priv);
+	mgr->name = "Altera SOCFPGA FPGA Manager";
+	mgr->mops = &socfpga_fpga_ops;
+	mgr->priv = priv;
+	platform_set_drvdata(pdev, mgr);
+
+	return fpga_mgr_register(dev, mgr);
 }
 
 static int socfpga_fpga_remove(struct platform_device *pdev)
 {
-	fpga_mgr_unregister(&pdev->dev);
+	struct fpga_manager *mgr = platform_get_drvdata(pdev);
+
+	fpga_mgr_unregister(mgr);
 
 	return 0;
 }

drivers/fpga/ts73xx-fpga.c +14 -3

index f6a96b4..e32a918 100644
@@ -116,8 +116,13 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
 {
 	struct device *kdev = &pdev->dev;
 	struct ts73xx_fpga_priv *priv;
+	struct fpga_manager *mgr;
 	struct resource *res;
 
+	mgr = devm_kzalloc(kdev, sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
+
 	priv = devm_kzalloc(kdev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;

@@ -131,13 +136,19 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
 		return PTR_ERR(priv->io_base);
 	}
 
-	return fpga_mgr_register(kdev, "TS-73xx FPGA Manager",
-				 &ts73xx_fpga_ops, priv);
+	mgr->name = "TS-73xx FPGA Manager";
+	mgr->mops = &ts73xx_fpga_ops;
+	mgr->priv = priv;
+	platform_set_drvdata(pdev, mgr);
+
+	return fpga_mgr_register(kdev, mgr);
 }
 
 static int ts73xx_fpga_remove(struct platform_device *pdev)
 {
-	fpga_mgr_unregister(&pdev->dev);
+	struct fpga_manager *mgr = platform_get_drvdata(pdev);
+
+	fpga_mgr_unregister(mgr);
 
 	return 0;
 }

drivers/fpga/xilinx-spi.c +14 -3

index 9b62a4c..601802a 100644
@@ -143,6 +143,11 @@ static const struct fpga_manager_ops xilinx_spi_ops = {
 static int xilinx_spi_probe(struct spi_device *spi)
 {
 	struct xilinx_spi_conf *conf;
+	struct fpga_manager *mgr;
+
+	mgr = devm_kzalloc(&spi->dev, sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
 
 	conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL);
 	if (!conf)

@@ -165,13 +170,19 @@ static int xilinx_spi_probe(struct spi_device *spi)
 		return PTR_ERR(conf->done);
 	}
 
-	return fpga_mgr_register(&spi->dev, "Xilinx Slave Serial FPGA Manager",
-				 &xilinx_spi_ops, conf);
+	mgr->name = "Xilinx Slave Serial FPGA Manager";
+	mgr->mops = &xilinx_spi_ops;
+	mgr->priv = conf;
+	spi_set_drvdata(spi, mgr);
+
+	return fpga_mgr_register(&spi->dev, mgr);
 }
 
 static int xilinx_spi_remove(struct spi_device *spi)
 {
-	fpga_mgr_unregister(&spi->dev);
+	struct fpga_manager *mgr = spi_get_drvdata(spi);
+
+	fpga_mgr_unregister(mgr);
 
 	return 0;
 }

drivers/fpga/zynq-fpga.c +5 -0

index 70b15b3..820bb91 100644
@@ -558,9 +558,14 @@ static int zynq_fpga_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct zynq_fpga_priv *priv;
+	struct fpga_manager *mgr;
 	struct resource *res;
 	int err;
 
+	mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+	if (!mgr)
+		return -ENOMEM;
+
 
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)

drivers/fpga/zynq-fpga.c +7 -3

 		return -ENOMEM;

@@ -613,8 +618,12 @@ static int zynq_fpga_probe(struct platform_device *pdev)
 
 	clk_disable(priv->clk);
 
-	err = fpga_mgr_register(dev, "Xilinx Zynq FPGA Manager",
-				&zynq_fpga_ops, priv);
+	mgr->name = "Xilinx Zynq FPGA Manager";
+	mgr->mops = &zynq_fpga_ops;
+	mgr->priv = priv;
+	platform_set_drvdata(pdev, mgr);
+
+	err = fpga_mgr_register(dev, mgr);
 	if (err) {
 		dev_err(dev, "unable to register FPGA manager\n");
 		clk_unprepare(priv->clk);

@@ -632,7 +641,7 @@ static int zynq_fpga_remove(struct platform_device *pdev)
 	mgr = platform_get_drvdata(pdev);
 	priv = mgr->priv;
 
-	fpga_mgr_unregister(&pdev->dev);
+	fpga_mgr_unregister(mgr);
 
 	clk_unprepare(priv->clk);
 

include/linux/fpga/fpga-mgr.h +2 -4

index 3c6de23..8b3a529 100644
@@ -170,9 +170,7 @@ struct fpga_manager *fpga_mgr_get(struct device *dev);
 
 void fpga_mgr_put(struct fpga_manager *mgr);
 
-int fpga_mgr_register(struct device *dev, const char *name,
-		      const struct fpga_manager_ops *mops, void *priv);
-
-void fpga_mgr_unregister(struct device *dev);
+int fpga_mgr_register(struct device *dev, struct fpga_manager *mgr);
+void fpga_mgr_unregister(struct fpga_manager *mgr);
 
 #endif /*_LINUX_FPGA_MGR_H */

Signature · 1 line

2.7.4

Quoted 15 lines · Alan Tull

Changes to the fpga manager code to not use drvdata in common code.

Change fpga_mgr_register to not set or use drvdata.

Change the register/unregister function parameters to take the mgr struct:
* int fpga_mgr_register(struct device *dev,

                        struct fpga_manager *mgr);

* void fpga_mgr_unregister(struct fpga_manager *mgr);

Change the drivers that call fpga_mgr_register to alloc the struct fpga_manager (using devm_kzalloc) and partly fill it, adding name, ops, and priv.

Quoted 6 lines

The rationale is that setting drvdata is fine for DT based devices that will have one manager, bridge, or region per platform device. However PCIe based devices may have multiple FPGA mgr/bridge/regions under one pcie device. Without these changes, the PCIe solution has to create an extra device for each child mgr/bridge/region to hold drvdata.

This looks very common, in fact several subsystems provide this two step way of registering things.

- Allocate fpga_mgr via fpga_mgr_alloc() where you pass in the size of the private data
- Fill in some fields
- fpga_mgr_register() where you pass in the fpga_mgr as suggested

See for example the alloc_etherdev() for ethernet devices.

The benefit of the API you proposed is that one could embed the fpga_mgr struct inside of another struct and get to the container via container_of() I guess ...

Quoted 567 lines

Signed-off-by Alan Tull <[email protected]>

Reported-by Jiuyue Ma <[email protected]>

---
 Documentation/fpga/fpga-mgr.txt  | 23 ++++++++++++++++-------
 drivers/fpga/altera-cvp.c        | 17 +++++++++++++----
 drivers/fpga/altera-pr-ip-core.c | 16 ++++++++++++++--
 drivers/fpga/altera-ps-spi.c     | 17 ++++++++++++++---
 drivers/fpga/fpga-mgr.c          | 28 +++++++---------------------
 drivers/fpga/ice40-spi.c         | 19 +++++++++++++++----
 drivers/fpga/socfpga-a10.c       | 15 ++++++++++++---
 drivers/fpga/socfpga.c           | 17 ++++++++++++++---
 drivers/fpga/ts73xx-fpga.c       | 17 ++++++++++++++---
 drivers/fpga/xilinx-spi.c        | 17 ++++++++++++++---
 drivers/fpga/zynq-fpga.c         | 15 ++++++++++++---
 include/linux/fpga/fpga-mgr.h    |  6 ++----
 12 files changed, 147 insertions(+), 60 deletions(-)

Documentation/fpga/fpga-mgr.txt +16 -7

index cc6413e..7e5e5c8 100644
@@ -67,11 +67,9 @@ fpga_mgr_unlock when done programming the FPGA.
 To register or unregister the low level FPGA-specific driver:
 -------------------------------------------------------------
 
-     int fpga_mgr_register(struct device *dev, const char *name,
-                           const struct fpga_manager_ops *mops,
-                           void *priv);
+     int fpga_mgr_register(struct device *dev, struct fpga_manager *mgr);
 
-     void fpga_mgr_unregister(struct device *dev);
+     void fpga_mgr_unregister(struct fpga_manager *mgr);
 
 Use of these two functions is described below in "How To Support a new FPGA
 device."

@@ -148,8 +146,13 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 {
      struct device *dev = &pdev->dev;
      struct socfpga_fpga_priv *priv;
+     struct fpga_manager *mgr;
      int ret;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -157,13 +160,19 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
      /* ... do ioremaps, get interrupts, etc. and save
         them in priv... */
 
-     return fpga_mgr_register(dev, "Altera SOCFPGA FPGA Manager",
-                              &socfpga_fpga_ops, priv);
+     mgr->name = "Altera SOCFPGA FPGA Manager";
+     mgr->mops = &socfpga_fpga_ops;
+     mgr->priv = priv;
+     platform_set_drvdata(pdev, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }
 
 static int socfpga_fpga_remove(struct platform_device *pdev)
 {
-     fpga_mgr_unregister(&pdev->dev);
+     struct fpga_manager *mgr = platform_get_drvdata(pdev);
+
+     fpga_mgr_unregister(mgr);
 
      return 0;
 }

drivers/fpga/altera-cvp.c +13 -4

index 00e73d2..63320ad 100644
@@ -403,6 +403,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,
                          const struct pci_device_id *dev_id)
 {
      struct altera_cvp_conf *conf;
+     struct fpga_manager *mgr;
      u16 cmd, val;
      int ret;
 

@@ -421,6 +422,10 @@ static int altera_cvp_probe(struct pci_dev *pdev,
      if (!conf)
              return -ENOMEM;
 
+     mgr = devm_kzalloc(&pdev->dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      /*
       * Enable memory BAR access. We cannot use pci_enable_device() here
       * because it will make the driver unusable with FPGA devices that

@@ -454,8 +459,12 @@ static int altera_cvp_probe(struct pci_dev *pdev,
      snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s @%s",
               ALTERA_CVP_MGR_NAME, pci_name(pdev));
 
-     ret = fpga_mgr_register(&pdev->dev, conf->mgr_name,
-                             &altera_cvp_ops, conf);
+     mgr->name = conf->mgr_name;
+     mgr->mops = &altera_cvp_ops;
+     mgr->priv = conf;
+     pci_set_drvdata(pdev, mgr);
+
+     ret = fpga_mgr_register(&pdev->dev, mgr);
      if (ret)
              goto err_unmap;
 

@@ -463,7 +472,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,
                               &driver_attr_chkcfg);
      if (ret) {
              dev_err(&pdev->dev, "Can't create sysfs chkcfg file\n");
-             fpga_mgr_unregister(&pdev->dev);
+             fpga_mgr_unregister(mgr);
              goto err_unmap;
      }
 

@@ -485,7 +494,7 @@ static void altera_cvp_remove(struct pci_dev *pdev)
      u16 cmd;
 
      driver_remove_file(&altera_cvp_driver.driver, &driver_attr_chkcfg);
-     fpga_mgr_unregister(&pdev->dev);
+     fpga_mgr_unregister(mgr);
      pci_iounmap(pdev, conf->map);
      pci_release_region(pdev, CVP_BAR);
      pci_read_config_word(pdev, PCI_COMMAND, &cmd);

drivers/fpga/altera-pr-ip-core.c +14 -2

index a7b31f9..f09e54f 100644
@@ -187,8 +187,13 @@ static const struct fpga_manager_ops alt_pr_ops = {
 int alt_pr_register(struct device *dev, void __iomem *reg_base)
 {
      struct alt_pr_priv *priv;
+     struct fpga_manager *mgr;
      u32 val;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -201,15 +206,22 @@ int alt_pr_register(struct device *dev, void __iomem *reg_base)
              (val & ALT_PR_CSR_STATUS_MSK) >> ALT_PR_CSR_STATUS_SFT,
              (int)(val & ALT_PR_CSR_PR_START));
 
-     return fpga_mgr_register(dev, dev_name(dev), &alt_pr_ops, priv);
+     mgr->name = dev_name(dev);
+     mgr->mops = &alt_pr_ops;
+     mgr->priv = priv;
+     dev_set_drvdata(dev, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }
 EXPORT_SYMBOL_GPL(alt_pr_register);
 
 int alt_pr_unregister(struct device *dev)
 {
+     struct fpga_manager *mgr = dev_get_drvdata(dev);
+
      dev_dbg(dev, "%s\n", __func__);
 
-     fpga_mgr_unregister(dev);
+     fpga_mgr_unregister(mgr);
 
      return 0;
 }

drivers/fpga/altera-ps-spi.c +14 -3

index 14f14ef..aee6517 100644
@@ -238,6 +238,11 @@ static int altera_ps_probe(struct spi_device *spi)
 {
      struct altera_ps_conf *conf;
      const struct of_device_id *of_id;
+     struct fpga_manager *mgr;
+
+     mgr = devm_kzalloc(&spi->dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
 
      conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL);
      if (!conf)

@@ -273,13 +278,19 @@ static int altera_ps_probe(struct spi_device *spi)
      snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s %s",
               dev_driver_string(&spi->dev), dev_name(&spi->dev));
 
-     return fpga_mgr_register(&spi->dev, conf->mgr_name,
-                              &altera_ps_ops, conf);
+     mgr->name = conf->mgr_name;
+     mgr->mops = &altera_ps_ops;
+     mgr->priv = conf;
+     spi_set_drvdata(spi, mgr);
+
+     return fpga_mgr_register(&spi->dev, mgr);
 }
 
 static int altera_ps_remove(struct spi_device *spi)
 {
-     fpga_mgr_unregister(&spi->dev);
+     struct fpga_manager *mgr = spi_get_drvdata(spi);
+
+     fpga_mgr_unregister(mgr);
 
      return 0;
 }

drivers/fpga/fpga-mgr.c +7 -21

index 223f240..6f1c59bf4 100644
@@ -525,13 +525,13 @@ EXPORT_SYMBOL_GPL(fpga_mgr_unlock);
  *
  * Return: 0 on success, negative error code otherwise.
  */
-int fpga_mgr_register(struct device *dev, const char *name,
-                   const struct fpga_manager_ops *mops,
-                   void *priv)
+int fpga_mgr_register(struct device *dev, struct fpga_manager *mgr)
 {
-     struct fpga_manager *mgr;
+     const char *name;
+     const struct fpga_manager_ops *mops;
      int id, ret;
 
+     mops = mgr->mops;
      if (!mops || !mops->write_complete || !mops->state ||
          !mops->write_init || (!mops->write && !mops->write_sg) ||
          (mops->write && mops->write_sg)) {

@@ -539,27 +539,19 @@ int fpga_mgr_register(struct device *dev, const char *name,
              return -EINVAL;
      }
 
+     name = mgr->name;
      if (!name || !strlen(name)) {
              dev_err(dev, "Attempt to register with no name!\n");
              return -EINVAL;
      }
 
-     mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-     if (!mgr)
-             return -ENOMEM;
-
      id = ida_simple_get(&fpga_mgr_ida, 0, 0, GFP_KERNEL);
      if (id < 0) {
-             ret = id;
-             goto error_kfree;
+             return id;
      }
 
      mutex_init(&mgr->ref_mutex);
 
-     mgr->name = name;
-     mgr->mops = mops;
-     mgr->priv = priv;
-
      /*
       * Initialize framework state by requesting low level driver read state
       * from device.  FPGA may be in reset mode or may have been programmed

@@ -573,7 +565,6 @@ int fpga_mgr_register(struct device *dev, const char *name,
      mgr->dev.parent = dev;
      mgr->dev.of_node = dev->of_node;
      mgr->dev.id = id;
-     dev_set_drvdata(dev, mgr);
 
      ret = dev_set_name(&mgr->dev, "fpga%d", id);
      if (ret)

@@ -589,8 +580,6 @@ int fpga_mgr_register(struct device *dev, const char *name,
 
 error_device:
      ida_simple_remove(&fpga_mgr_ida, id);
-error_kfree:
-     kfree(mgr);
 
      return ret;
 }

@@ -600,10 +589,8 @@ EXPORT_SYMBOL_GPL(fpga_mgr_register);
  * fpga_mgr_unregister - unregister a low level fpga manager driver
  * @dev:     fpga manager device from pdev
  */
-void fpga_mgr_unregister(struct device *dev)
+void fpga_mgr_unregister(struct fpga_manager *mgr)
 {
-     struct fpga_manager *mgr = dev_get_drvdata(dev);
-
      dev_info(&mgr->dev, "%s %s\n", __func__, mgr->name);
 
      /*

@@ -622,7 +609,6 @@ static void fpga_mgr_dev_release(struct device *dev)
      struct fpga_manager *mgr = to_fpga_manager(dev);
 
      ida_simple_remove(&fpga_mgr_ida, mgr->dev.id);
-     kfree(mgr);
 }
 
 static int __init fpga_mgr_class_init(void)

drivers/fpga/ice40-spi.c +15 -4

index 7fca820..92da328 100644
@@ -133,8 +133,13 @@ static int ice40_fpga_probe(struct spi_device *spi)
 {
      struct device *dev = &spi->dev;
      struct ice40_fpga_priv *priv;
+     struct fpga_manager *mgr;
      int ret;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(&spi->dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -174,14 +179,20 @@ static int ice40_fpga_probe(struct spi_device *spi)
              return ret;
      }
 
-     /* Register with the FPGA manager */
-     return fpga_mgr_register(dev, "Lattice iCE40 FPGA Manager",
-                              &ice40_fpga_ops, priv);
+     mgr->name = "Lattice iCE40 FPGA Manager";
+     mgr->mops = &ice40_fpga_ops;
+     mgr->priv = priv;
+     spi_set_drvdata(spi, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }
 
 static int ice40_fpga_remove(struct spi_device *spi)
 {
-     fpga_mgr_unregister(&spi->dev);
+     struct fpga_manager *mgr = spi_get_drvdata(spi);
+
+     fpga_mgr_unregister(mgr);
+
      return 0;
 }
 

drivers/fpga/socfpga-a10.c +12 -3

index f8770af..3c0eae5 100644
@@ -482,6 +482,7 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
      struct device *dev = &pdev->dev;
      struct a10_fpga_priv *priv;
      void __iomem *reg_base;
+     struct fpga_manager *mgr;
      struct resource *res;
      int ret;
 

@@ -519,8 +520,16 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
              return -EBUSY;
      }
 
-     return fpga_mgr_register(dev, "SoCFPGA Arria10 FPGA Manager",
-                              &socfpga_a10_fpga_mgr_ops, priv);
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
+     mgr->name = "SoCFPGA Arria10 FPGA Manager";
+     mgr->mops = &socfpga_a10_fpga_mgr_ops;
+     mgr->priv = priv;
+     platform_set_drvdata(pdev, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }
 
 static int socfpga_a10_fpga_remove(struct platform_device *pdev)

@@ -528,7 +537,7 @@ static int socfpga_a10_fpga_remove(struct platform_device *pdev)
      struct fpga_manager *mgr = platform_get_drvdata(pdev);
      struct a10_fpga_priv *priv = mgr->priv;
 
-     fpga_mgr_unregister(&pdev->dev);
+     fpga_mgr_unregister(mgr);
      clk_disable_unprepare(priv->clk);
 
      return 0;

drivers/fpga/socfpga.c +14 -3

index b6672e6..47723d3 100644
@@ -555,9 +555,14 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 {
      struct device *dev = &pdev->dev;
      struct socfpga_fpga_priv *priv;
+     struct fpga_manager *mgr;
      struct resource *res;
      int ret;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -581,13 +586,19 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
      if (ret)
              return ret;
 
-     return fpga_mgr_register(dev, "Altera SOCFPGA FPGA Manager",
-                              &socfpga_fpga_ops, priv);
+     mgr->name = "Altera SOCFPGA FPGA Manager";
+     mgr->mops = &socfpga_fpga_ops;
+     mgr->priv = priv;
+     platform_set_drvdata(pdev, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }
 
 static int socfpga_fpga_remove(struct platform_device *pdev)
 {
-     fpga_mgr_unregister(&pdev->dev);
+     struct fpga_manager *mgr = platform_get_drvdata(pdev);
+
+     fpga_mgr_unregister(mgr);
 
      return 0;
 }

drivers/fpga/ts73xx-fpga.c +14 -3

index f6a96b4..e32a918 100644
@@ -116,8 +116,13 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
 {
      struct device *kdev = &pdev->dev;
      struct ts73xx_fpga_priv *priv;
+     struct fpga_manager *mgr;
      struct resource *res;
 
+     mgr = devm_kzalloc(kdev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(kdev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -131,13 +136,19 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
              return PTR_ERR(priv->io_base);
      }
 
-     return fpga_mgr_register(kdev, "TS-73xx FPGA Manager",
-                              &ts73xx_fpga_ops, priv);
+     mgr->name = "TS-73xx FPGA Manager";
+     mgr->mops = &ts73xx_fpga_ops;
+     mgr->priv = priv;
+     platform_set_drvdata(pdev, mgr);
+
+     return fpga_mgr_register(kdev, mgr);
 }
 
 static int ts73xx_fpga_remove(struct platform_device *pdev)
 {
-     fpga_mgr_unregister(&pdev->dev);
+     struct fpga_manager *mgr = platform_get_drvdata(pdev);
+
+     fpga_mgr_unregister(mgr);
 
      return 0;
 }

drivers/fpga/xilinx-spi.c +14 -3

index 9b62a4c..601802a 100644
@@ -143,6 +143,11 @@ static const struct fpga_manager_ops xilinx_spi_ops = {
 static int xilinx_spi_probe(struct spi_device *spi)
 {
      struct xilinx_spi_conf *conf;
+     struct fpga_manager *mgr;
+
+     mgr = devm_kzalloc(&spi->dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
 
      conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL);
      if (!conf)

@@ -165,13 +170,19 @@ static int xilinx_spi_probe(struct spi_device *spi)
              return PTR_ERR(conf->done);
      }
 
-     return fpga_mgr_register(&spi->dev, "Xilinx Slave Serial FPGA Manager",
-                              &xilinx_spi_ops, conf);
+     mgr->name = "Xilinx Slave Serial FPGA Manager";
+     mgr->mops = &xilinx_spi_ops;
+     mgr->priv = conf;
+     spi_set_drvdata(spi, mgr);
+
+     return fpga_mgr_register(&spi->dev, mgr);
 }
 
 static int xilinx_spi_remove(struct spi_device *spi)
 {
-     fpga_mgr_unregister(&spi->dev);
+     struct fpga_manager *mgr = spi_get_drvdata(spi);
+
+     fpga_mgr_unregister(mgr);
 
      return 0;
 }

drivers/fpga/zynq-fpga.c +5 -0

index 70b15b3..820bb91 100644
@@ -558,9 +558,14 @@ static int zynq_fpga_probe(struct platform_device *pdev)
 {
      struct device *dev = &pdev->dev;
      struct zynq_fpga_priv *priv;
+     struct fpga_manager *mgr;
      struct resource *res;
      int err;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
 
      priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)

              return -ENOMEM;

drivers/fpga/zynq-fpga.c +7 -3

@@ -613,8 +618,12 @@ static int zynq_fpga_probe(struct platform_device *pdev)
 
      clk_disable(priv->clk);
 
-     err = fpga_mgr_register(dev, "Xilinx Zynq FPGA Manager",
-                             &zynq_fpga_ops, priv);
+     mgr->name = "Xilinx Zynq FPGA Manager";
+     mgr->mops = &zynq_fpga_ops;
+     mgr->priv = priv;
+     platform_set_drvdata(pdev, mgr);
+
+     err = fpga_mgr_register(dev, mgr);
      if (err) {
              dev_err(dev, "unable to register FPGA manager\n");
              clk_unprepare(priv->clk);

@@ -632,7 +641,7 @@ static int zynq_fpga_remove(struct platform_device *pdev)
      mgr = platform_get_drvdata(pdev);
      priv = mgr->priv;
 
-     fpga_mgr_unregister(&pdev->dev);
+     fpga_mgr_unregister(mgr);
 
      clk_unprepare(priv->clk);
 

include/linux/fpga/fpga-mgr.h +2 -5

index 3c6de23..8b3a529 100644
@@ -170,9 +170,7 @@ struct fpga_manager *fpga_mgr_get(struct device *dev);
 
 void fpga_mgr_put(struct fpga_manager *mgr);
 
-int fpga_mgr_register(struct device *dev, const char *name,
-                   const struct fpga_manager_ops *mops, void *priv);
-
-void fpga_mgr_unregister(struct device *dev);
+int fpga_mgr_register(struct device *dev, struct fpga_manager *mgr);
+void fpga_mgr_unregister(struct fpga_manager *mgr);
 
 #endif /*_LINUX_FPGA_MGR_H */
--

Quoted 2 lines

2.7.4

Cheers,

Moritz

Quoted 31 lines · Moritz Fischer

Quoted 15 lines · Alan Tull

Changes to the fpga manager code to not use drvdata in common code.

Change fpga_mgr_register to not set or use drvdata.

Change the register/unregister function parameters to take the mgr struct:
* int fpga_mgr_register(struct device *dev,

                        struct fpga_manager *mgr);

* void fpga_mgr_unregister(struct fpga_manager *mgr);

Change the drivers that call fpga_mgr_register to alloc the struct fpga_manager (using devm_kzalloc) and partly fill it, adding name, ops, and priv.

Quoted 6 lines

The rationale is that setting drvdata is fine for DT based devices that will have one manager, bridge, or region per platform device. However PCIe based devices may have multiple FPGA mgr/bridge/regions under one pcie device. Without these changes, the PCIe solution has to create an extra device for each child mgr/bridge/region to hold drvdata.

This looks very common, in fact several subsystems provide this two step way of registering things.

- Allocate fpga_mgr via fpga_mgr_alloc() where you pass in the size of the private data
- Fill in some fields
- fpga_mgr_register() where you pass in the fpga_mgr as suggested

Quoted 2 lines

See for example the alloc_etherdev() for ethernet devices.

Yes, I considered it when I was writing this. I've seen it both ways. In the case you mention, they've got reasons they absolutely needed to do it that way. alloc_etherdev() calls eventually to alloc_netdev_mqs() which is about 100 lines of alloc'ing and initializing a network device struct.

Quoted 4 lines

The benefit of the API you proposed is that one could embed the fpga_mgr struct inside of another struct and get to the container via container_of() I guess ...

Yes, let's keep it simple for now, as that gives us greater flexibility. We can add alloc functions when it becomes clear that it won't get in the way of someone's use.

Alan

Quoted 27 lines

Quoted 27 lines

Signed-off-by Alan Tull <[email protected]>

Reported-by Jiuyue Ma <[email protected]>

---
 Documentation/fpga/fpga-mgr.txt  | 23 ++++++++++++++++-------
 drivers/fpga/altera-cvp.c        | 17 +++++++++++++----
 drivers/fpga/altera-pr-ip-core.c | 16 ++++++++++++++--
 drivers/fpga/altera-ps-spi.c     | 17 ++++++++++++++---
 drivers/fpga/fpga-mgr.c          | 28 +++++++---------------------
 drivers/fpga/ice40-spi.c         | 19 +++++++++++++++----
 drivers/fpga/socfpga-a10.c       | 15 ++++++++++++---
 drivers/fpga/socfpga.c           | 17 ++++++++++++++---
 drivers/fpga/ts73xx-fpga.c       | 17 ++++++++++++++---
 drivers/fpga/xilinx-spi.c        | 17 ++++++++++++++---
 drivers/fpga/zynq-fpga.c         | 15 ++++++++++++---
 include/linux/fpga/fpga-mgr.h    |  6 ++----
 12 files changed, 147 insertions(+), 60 deletions(-)

Documentation/fpga/fpga-mgr.txt +0 -0

index cc6413e..7e5e5c8 100644
@@ -67,11 +67,9 @@ fpga_mgr_unlock when done programming the FPGA.
 To register or unregister the low level FPGA-specific driver:
 -------------------------------------------------------------
 

Quoted 4 lines

Documentation/fpga/fpga-mgr.txt fpga_mgr_unlock when done programming the FPGA. · line 70

Quoted 4 lines

Documentation/fpga/fpga-mgr.txt +1 -3

-     int fpga_mgr_register(struct device *dev, const char *name,
-                           const struct fpga_manager_ops *mops,
-                           void *priv);
+     int fpga_mgr_register(struct device *dev, struct fpga_manager *mgr);

Quoted 24 lines

Quoted 24 lines

Documentation/fpga/fpga-mgr.txt +6 -1

-     void fpga_mgr_unregister(struct device *dev);
+     void fpga_mgr_unregister(struct fpga_manager *mgr);
 
 Use of these two functions is described below in "How To Support a new FPGA
 device."

@@ -148,8 +146,13 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 {
      struct device *dev = &pdev->dev;
      struct socfpga_fpga_priv *priv;
+     struct fpga_manager *mgr;
      int ret;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -157,13 +160,19 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
      /* ... do ioremaps, get interrupts, etc. and save
         them in priv... */
 

Quoted 5 lines

Documentation/fpga/fpga-mgr.txt static int socfpga_fpga_probe(struct platform_device *pdev) · line 165

Quoted 5 lines

Documentation/fpga/fpga-mgr.txt +3 -2

-     return fpga_mgr_register(dev, "Altera SOCFPGA FPGA Manager",
-                              &socfpga_fpga_ops, priv);
+     mgr->name = "Altera SOCFPGA FPGA Manager";
+     mgr->mops = &socfpga_fpga_ops;
+     mgr->priv = priv;

Quoted 505 lines

Quoted 505 lines

Documentation/fpga/fpga-mgr.txt +6 -1

+     platform_set_drvdata(pdev, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }
 
 static int socfpga_fpga_remove(struct platform_device *pdev)
 {
-     fpga_mgr_unregister(&pdev->dev);
+     struct fpga_manager *mgr = platform_get_drvdata(pdev);
+
+     fpga_mgr_unregister(mgr);
 
      return 0;
 }

drivers/fpga/altera-cvp.c +13 -4

index 00e73d2..63320ad 100644
@@ -403,6 +403,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,
                          const struct pci_device_id *dev_id)
 {
      struct altera_cvp_conf *conf;
+     struct fpga_manager *mgr;
      u16 cmd, val;
      int ret;
 

@@ -421,6 +422,10 @@ static int altera_cvp_probe(struct pci_dev *pdev,
      if (!conf)
              return -ENOMEM;
 
+     mgr = devm_kzalloc(&pdev->dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      /*
       * Enable memory BAR access. We cannot use pci_enable_device() here
       * because it will make the driver unusable with FPGA devices that

@@ -454,8 +459,12 @@ static int altera_cvp_probe(struct pci_dev *pdev,
      snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s @%s",
               ALTERA_CVP_MGR_NAME, pci_name(pdev));
 
-     ret = fpga_mgr_register(&pdev->dev, conf->mgr_name,
-                             &altera_cvp_ops, conf);
+     mgr->name = conf->mgr_name;
+     mgr->mops = &altera_cvp_ops;
+     mgr->priv = conf;
+     pci_set_drvdata(pdev, mgr);
+
+     ret = fpga_mgr_register(&pdev->dev, mgr);
      if (ret)
              goto err_unmap;
 

@@ -463,7 +472,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,
                               &driver_attr_chkcfg);
      if (ret) {
              dev_err(&pdev->dev, "Can't create sysfs chkcfg file\n");
-             fpga_mgr_unregister(&pdev->dev);
+             fpga_mgr_unregister(mgr);
              goto err_unmap;
      }
 

@@ -485,7 +494,7 @@ static void altera_cvp_remove(struct pci_dev *pdev)
      u16 cmd;
 
      driver_remove_file(&altera_cvp_driver.driver, &driver_attr_chkcfg);
-     fpga_mgr_unregister(&pdev->dev);
+     fpga_mgr_unregister(mgr);
      pci_iounmap(pdev, conf->map);
      pci_release_region(pdev, CVP_BAR);
      pci_read_config_word(pdev, PCI_COMMAND, &cmd);

drivers/fpga/altera-pr-ip-core.c +14 -2

index a7b31f9..f09e54f 100644
@@ -187,8 +187,13 @@ static const struct fpga_manager_ops alt_pr_ops = {
 int alt_pr_register(struct device *dev, void __iomem *reg_base)
 {
      struct alt_pr_priv *priv;
+     struct fpga_manager *mgr;
      u32 val;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -201,15 +206,22 @@ int alt_pr_register(struct device *dev, void __iomem *reg_base)
              (val & ALT_PR_CSR_STATUS_MSK) >> ALT_PR_CSR_STATUS_SFT,
              (int)(val & ALT_PR_CSR_PR_START));
 
-     return fpga_mgr_register(dev, dev_name(dev), &alt_pr_ops, priv);
+     mgr->name = dev_name(dev);
+     mgr->mops = &alt_pr_ops;
+     mgr->priv = priv;
+     dev_set_drvdata(dev, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }
 EXPORT_SYMBOL_GPL(alt_pr_register);
 
 int alt_pr_unregister(struct device *dev)
 {
+     struct fpga_manager *mgr = dev_get_drvdata(dev);
+
      dev_dbg(dev, "%s\n", __func__);
 
-     fpga_mgr_unregister(dev);
+     fpga_mgr_unregister(mgr);
 
      return 0;
 }

drivers/fpga/altera-ps-spi.c +14 -3

index 14f14ef..aee6517 100644
@@ -238,6 +238,11 @@ static int altera_ps_probe(struct spi_device *spi)
 {
      struct altera_ps_conf *conf;
      const struct of_device_id *of_id;
+     struct fpga_manager *mgr;
+
+     mgr = devm_kzalloc(&spi->dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
 
      conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL);
      if (!conf)

@@ -273,13 +278,19 @@ static int altera_ps_probe(struct spi_device *spi)
      snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s %s",
               dev_driver_string(&spi->dev), dev_name(&spi->dev));
 
-     return fpga_mgr_register(&spi->dev, conf->mgr_name,
-                              &altera_ps_ops, conf);
+     mgr->name = conf->mgr_name;
+     mgr->mops = &altera_ps_ops;
+     mgr->priv = conf;
+     spi_set_drvdata(spi, mgr);
+
+     return fpga_mgr_register(&spi->dev, mgr);
 }
 
 static int altera_ps_remove(struct spi_device *spi)
 {
-     fpga_mgr_unregister(&spi->dev);
+     struct fpga_manager *mgr = spi_get_drvdata(spi);
+
+     fpga_mgr_unregister(mgr);
 
      return 0;
 }

drivers/fpga/fpga-mgr.c +7 -21

index 223f240..6f1c59bf4 100644
@@ -525,13 +525,13 @@ EXPORT_SYMBOL_GPL(fpga_mgr_unlock);
  *
  * Return: 0 on success, negative error code otherwise.
  */
-int fpga_mgr_register(struct device *dev, const char *name,
-                   const struct fpga_manager_ops *mops,
-                   void *priv)
+int fpga_mgr_register(struct device *dev, struct fpga_manager *mgr)
 {
-     struct fpga_manager *mgr;
+     const char *name;
+     const struct fpga_manager_ops *mops;
      int id, ret;
 
+     mops = mgr->mops;
      if (!mops || !mops->write_complete || !mops->state ||
          !mops->write_init || (!mops->write && !mops->write_sg) ||
          (mops->write && mops->write_sg)) {

@@ -539,27 +539,19 @@ int fpga_mgr_register(struct device *dev, const char *name,
              return -EINVAL;
      }
 
+     name = mgr->name;
      if (!name || !strlen(name)) {
              dev_err(dev, "Attempt to register with no name!\n");
              return -EINVAL;
      }
 
-     mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
-     if (!mgr)
-             return -ENOMEM;
-
      id = ida_simple_get(&fpga_mgr_ida, 0, 0, GFP_KERNEL);
      if (id < 0) {
-             ret = id;
-             goto error_kfree;
+             return id;
      }
 
      mutex_init(&mgr->ref_mutex);
 
-     mgr->name = name;
-     mgr->mops = mops;
-     mgr->priv = priv;
-
      /*
       * Initialize framework state by requesting low level driver read state
       * from device.  FPGA may be in reset mode or may have been programmed

@@ -573,7 +565,6 @@ int fpga_mgr_register(struct device *dev, const char *name,
      mgr->dev.parent = dev;
      mgr->dev.of_node = dev->of_node;
      mgr->dev.id = id;
-     dev_set_drvdata(dev, mgr);
 
      ret = dev_set_name(&mgr->dev, "fpga%d", id);
      if (ret)

@@ -589,8 +580,6 @@ int fpga_mgr_register(struct device *dev, const char *name,
 
 error_device:
      ida_simple_remove(&fpga_mgr_ida, id);
-error_kfree:
-     kfree(mgr);
 
      return ret;
 }

@@ -600,10 +589,8 @@ EXPORT_SYMBOL_GPL(fpga_mgr_register);
  * fpga_mgr_unregister - unregister a low level fpga manager driver
  * @dev:     fpga manager device from pdev
  */
-void fpga_mgr_unregister(struct device *dev)
+void fpga_mgr_unregister(struct fpga_manager *mgr)
 {
-     struct fpga_manager *mgr = dev_get_drvdata(dev);
-
      dev_info(&mgr->dev, "%s %s\n", __func__, mgr->name);
 
      /*

@@ -622,7 +609,6 @@ static void fpga_mgr_dev_release(struct device *dev)
      struct fpga_manager *mgr = to_fpga_manager(dev);
 
      ida_simple_remove(&fpga_mgr_ida, mgr->dev.id);
-     kfree(mgr);
 }
 
 static int __init fpga_mgr_class_init(void)

drivers/fpga/ice40-spi.c +15 -4

index 7fca820..92da328 100644
@@ -133,8 +133,13 @@ static int ice40_fpga_probe(struct spi_device *spi)
 {
      struct device *dev = &spi->dev;
      struct ice40_fpga_priv *priv;
+     struct fpga_manager *mgr;
      int ret;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(&spi->dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -174,14 +179,20 @@ static int ice40_fpga_probe(struct spi_device *spi)
              return ret;
      }
 
-     /* Register with the FPGA manager */
-     return fpga_mgr_register(dev, "Lattice iCE40 FPGA Manager",
-                              &ice40_fpga_ops, priv);
+     mgr->name = "Lattice iCE40 FPGA Manager";
+     mgr->mops = &ice40_fpga_ops;
+     mgr->priv = priv;
+     spi_set_drvdata(spi, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }
 
 static int ice40_fpga_remove(struct spi_device *spi)
 {
-     fpga_mgr_unregister(&spi->dev);
+     struct fpga_manager *mgr = spi_get_drvdata(spi);
+
+     fpga_mgr_unregister(mgr);
+
      return 0;
 }
 

drivers/fpga/socfpga-a10.c +12 -3

index f8770af..3c0eae5 100644
@@ -482,6 +482,7 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
      struct device *dev = &pdev->dev;
      struct a10_fpga_priv *priv;
      void __iomem *reg_base;
+     struct fpga_manager *mgr;
      struct resource *res;
      int ret;
 

@@ -519,8 +520,16 @@ static int socfpga_a10_fpga_probe(struct platform_device *pdev)
              return -EBUSY;
      }
 
-     return fpga_mgr_register(dev, "SoCFPGA Arria10 FPGA Manager",
-                              &socfpga_a10_fpga_mgr_ops, priv);
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
+     mgr->name = "SoCFPGA Arria10 FPGA Manager";
+     mgr->mops = &socfpga_a10_fpga_mgr_ops;
+     mgr->priv = priv;
+     platform_set_drvdata(pdev, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }
 
 static int socfpga_a10_fpga_remove(struct platform_device *pdev)

@@ -528,7 +537,7 @@ static int socfpga_a10_fpga_remove(struct platform_device *pdev)
      struct fpga_manager *mgr = platform_get_drvdata(pdev);
      struct a10_fpga_priv *priv = mgr->priv;
 
-     fpga_mgr_unregister(&pdev->dev);
+     fpga_mgr_unregister(mgr);
      clk_disable_unprepare(priv->clk);
 
      return 0;

drivers/fpga/socfpga.c +14 -3

index b6672e6..47723d3 100644
@@ -555,9 +555,14 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 {
      struct device *dev = &pdev->dev;
      struct socfpga_fpga_priv *priv;
+     struct fpga_manager *mgr;
      struct resource *res;
      int ret;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -581,13 +586,19 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
      if (ret)
              return ret;
 
-     return fpga_mgr_register(dev, "Altera SOCFPGA FPGA Manager",
-                              &socfpga_fpga_ops, priv);
+     mgr->name = "Altera SOCFPGA FPGA Manager";
+     mgr->mops = &socfpga_fpga_ops;
+     mgr->priv = priv;
+     platform_set_drvdata(pdev, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }
 
 static int socfpga_fpga_remove(struct platform_device *pdev)
 {
-     fpga_mgr_unregister(&pdev->dev);
+     struct fpga_manager *mgr = platform_get_drvdata(pdev);
+
+     fpga_mgr_unregister(mgr);
 
      return 0;
 }

drivers/fpga/ts73xx-fpga.c +14 -3

index f6a96b4..e32a918 100644
@@ -116,8 +116,13 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
 {
      struct device *kdev = &pdev->dev;
      struct ts73xx_fpga_priv *priv;
+     struct fpga_manager *mgr;
      struct resource *res;
 
+     mgr = devm_kzalloc(kdev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(kdev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -131,13 +136,19 @@ static int ts73xx_fpga_probe(struct platform_device *pdev)
              return PTR_ERR(priv->io_base);
      }
 
-     return fpga_mgr_register(kdev, "TS-73xx FPGA Manager",
-                              &ts73xx_fpga_ops, priv);
+     mgr->name = "TS-73xx FPGA Manager";
+     mgr->mops = &ts73xx_fpga_ops;
+     mgr->priv = priv;
+     platform_set_drvdata(pdev, mgr);
+
+     return fpga_mgr_register(kdev, mgr);
 }
 
 static int ts73xx_fpga_remove(struct platform_device *pdev)
 {
-     fpga_mgr_unregister(&pdev->dev);
+     struct fpga_manager *mgr = platform_get_drvdata(pdev);
+
+     fpga_mgr_unregister(mgr);
 
      return 0;
 }

drivers/fpga/xilinx-spi.c +14 -3

index 9b62a4c..601802a 100644
@@ -143,6 +143,11 @@ static const struct fpga_manager_ops xilinx_spi_ops = {
 static int xilinx_spi_probe(struct spi_device *spi)
 {
      struct xilinx_spi_conf *conf;
+     struct fpga_manager *mgr;
+
+     mgr = devm_kzalloc(&spi->dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
 
      conf = devm_kzalloc(&spi->dev, sizeof(*conf), GFP_KERNEL);
      if (!conf)

@@ -165,13 +170,19 @@ static int xilinx_spi_probe(struct spi_device *spi)
              return PTR_ERR(conf->done);
      }
 
-     return fpga_mgr_register(&spi->dev, "Xilinx Slave Serial FPGA Manager",
-                              &xilinx_spi_ops, conf);
+     mgr->name = "Xilinx Slave Serial FPGA Manager";
+     mgr->mops = &xilinx_spi_ops;
+     mgr->priv = conf;
+     spi_set_drvdata(spi, mgr);
+
+     return fpga_mgr_register(&spi->dev, mgr);
 }
 
 static int xilinx_spi_remove(struct spi_device *spi)
 {
-     fpga_mgr_unregister(&spi->dev);
+     struct fpga_manager *mgr = spi_get_drvdata(spi);
+
+     fpga_mgr_unregister(mgr);
 
      return 0;
 }

drivers/fpga/zynq-fpga.c +5 -0

index 70b15b3..820bb91 100644
@@ -558,9 +558,14 @@ static int zynq_fpga_probe(struct platform_device *pdev)
 {
      struct device *dev = &pdev->dev;
      struct zynq_fpga_priv *priv;
+     struct fpga_manager *mgr;
      struct resource *res;
      int err;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
 
      priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)

              return -ENOMEM;

drivers/fpga/zynq-fpga.c +7 -3

@@ -613,8 +618,12 @@ static int zynq_fpga_probe(struct platform_device *pdev)
 
      clk_disable(priv->clk);
 
-     err = fpga_mgr_register(dev, "Xilinx Zynq FPGA Manager",
-                             &zynq_fpga_ops, priv);
+     mgr->name = "Xilinx Zynq FPGA Manager";
+     mgr->mops = &zynq_fpga_ops;
+     mgr->priv = priv;
+     platform_set_drvdata(pdev, mgr);
+
+     err = fpga_mgr_register(dev, mgr);
      if (err) {
              dev_err(dev, "unable to register FPGA manager\n");
              clk_unprepare(priv->clk);

@@ -632,7 +641,7 @@ static int zynq_fpga_remove(struct platform_device *pdev)
      mgr = platform_get_drvdata(pdev);
      priv = mgr->priv;
 
-     fpga_mgr_unregister(&pdev->dev);
+     fpga_mgr_unregister(mgr);
 
      clk_unprepare(priv->clk);
 

include/linux/fpga/fpga-mgr.h +2 -4

index 3c6de23..8b3a529 100644
@@ -170,9 +170,7 @@ struct fpga_manager *fpga_mgr_get(struct device *dev);
 
 void fpga_mgr_put(struct fpga_manager *mgr);
 
-int fpga_mgr_register(struct device *dev, const char *name,
-                   const struct fpga_manager_ops *mops, void *priv);
-
-void fpga_mgr_unregister(struct device *dev);
+int fpga_mgr_register(struct device *dev, struct fpga_manager *mgr);
+void fpga_mgr_unregister(struct fpga_manager *mgr);
 

Quoted 7 lines

Quoted 4 lines

include/linux/fpga/fpga-mgr.h +0 -1

 #endif /*_LINUX_FPGA_MGR_H */
--

2.7.4

Cheers,

Moritz

Quoted 32 lines · Alan Tull

Quoted 31 lines · Moritz Fischer

Quoted 15 lines · Alan Tull

Changes to the fpga manager code to not use drvdata in common code.

Change fpga_mgr_register to not set or use drvdata.

Change the register/unregister function parameters to take the mgr struct:
* int fpga_mgr_register(struct device *dev,

                        struct fpga_manager *mgr);

* void fpga_mgr_unregister(struct fpga_manager *mgr);

Change the drivers that call fpga_mgr_register to alloc the struct fpga_manager (using devm_kzalloc) and partly fill it, adding name, ops, and priv.

Quoted 6 lines

The rationale is that setting drvdata is fine for DT based devices that will have one manager, bridge, or region per platform device. However PCIe based devices may have multiple FPGA mgr/bridge/regions under one pcie device. Without these changes, the PCIe solution has to create an extra device for each child mgr/bridge/region to hold drvdata.

This looks very common, in fact several subsystems provide this two step way of registering things.

- Allocate fpga_mgr via fpga_mgr_alloc() where you pass in the size of the private data
- Fill in some fields
- fpga_mgr_register() where you pass in the fpga_mgr as suggested

Quoted 8 lines

Quoted 2 lines

See for example the alloc_etherdev() for ethernet devices.

Yes, I considered it when I was writing this. I've seen it both ways. In the case you mention, they've got reasons they absolutely needed to do it that way. alloc_etherdev() calls eventually to alloc_netdev_mqs() which is about 100 lines of alloc'ing and initializing a network device struct.

Yeah, sure. I looked around some more. Other subsystems just alloc manually, seems fine with me.

Quoted 8 lines

Quoted 4 lines

The benefit of the API you proposed is that one could embed the fpga_mgr struct inside of another struct and get to the container via container_of() I guess ...

Yes, let's keep it simple for now, as that gives us greater flexibility. We can add alloc functions when it becomes clear that it won't get in the way of someone's use.

Agreed.

Quoted 30 lines

Alan

Quoted 27 lines

Quoted 27 lines

Signed-off-by Alan Tull <[email protected]>

Reported-by Jiuyue Ma <[email protected]>

---
 Documentation/fpga/fpga-mgr.txt  | 23 ++++++++++++++++-------
 drivers/fpga/altera-cvp.c        | 17 +++++++++++++----
 drivers/fpga/altera-pr-ip-core.c | 16 ++++++++++++++--
 drivers/fpga/altera-ps-spi.c     | 17 ++++++++++++++---
 drivers/fpga/fpga-mgr.c          | 28 +++++++---------------------
 drivers/fpga/ice40-spi.c         | 19 +++++++++++++++----
 drivers/fpga/socfpga-a10.c       | 15 ++++++++++++---
 drivers/fpga/socfpga.c           | 17 ++++++++++++++---
 drivers/fpga/ts73xx-fpga.c       | 17 ++++++++++++++---
 drivers/fpga/xilinx-spi.c        | 17 ++++++++++++++---
 drivers/fpga/zynq-fpga.c         | 15 ++++++++++++---
 include/linux/fpga/fpga-mgr.h    |  6 ++----
 12 files changed, 147 insertions(+), 60 deletions(-)

Documentation/fpga/fpga-mgr.txt +0 -0

index cc6413e..7e5e5c8 100644
@@ -67,11 +67,9 @@ fpga_mgr_unlock when done programming the FPGA.
 To register or unregister the low level FPGA-specific driver:
 -------------------------------------------------------------
 

Quoted 4 lines

Quoted 4 lines

Documentation/fpga/fpga-mgr.txt fpga_mgr_unlock when done programming the FPGA. · line 70

Quoted 4 lines

Documentation/fpga/fpga-mgr.txt +1 -3

-     int fpga_mgr_register(struct device *dev, const char *name,
-                           const struct fpga_manager_ops *mops,
-                           void *priv);
+     int fpga_mgr_register(struct device *dev, struct fpga_manager *mgr);

At that point you could also just give the struct fpga_manager a ->parent or ->dev that you populate with &pdev->dev or &spi->dev etc instead of making it a separate parameter, this makes an odd mix of half and half here.

Quoted 24 lines

Quoted 24 lines

Quoted 24 lines

Documentation/fpga/fpga-mgr.txt +6 -1

-     void fpga_mgr_unregister(struct device *dev);
+     void fpga_mgr_unregister(struct fpga_manager *mgr);
 
 Use of these two functions is described below in "How To Support a new FPGA
 device."

@@ -148,8 +146,13 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 {
      struct device *dev = &pdev->dev;
      struct socfpga_fpga_priv *priv;
+     struct fpga_manager *mgr;
      int ret;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -157,13 +160,19 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
      /* ... do ioremaps, get interrupts, etc. and save
         them in priv... */
 

Quoted 5 lines

Quoted 5 lines

Documentation/fpga/fpga-mgr.txt static int socfpga_fpga_probe(struct platform_device *pdev) · line 165

Quoted 5 lines

Documentation/fpga/fpga-mgr.txt +3 -2

-     return fpga_mgr_register(dev, "Altera SOCFPGA FPGA Manager",
-                              &socfpga_fpga_ops, priv);
+     mgr->name = "Altera SOCFPGA FPGA Manager";
+     mgr->mops = &socfpga_fpga_ops;
+     mgr->priv = priv;

Like here: mgr->dev = &pdev->dev

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Documentation/fpga/fpga-mgr.txt +3 -0

+     platform_set_drvdata(pdev, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }

Quoted 84 lines · Alan Tull

Quoted 32 lines · Moritz Fischer

Quoted 31 lines · Alan Tull

Quoted 15 lines

Changes to the fpga manager code to not use drvdata in common code.

Change fpga_mgr_register to not set or use drvdata.

Change the register/unregister function parameters to take the mgr struct:
* int fpga_mgr_register(struct device *dev,

                        struct fpga_manager *mgr);

* void fpga_mgr_unregister(struct fpga_manager *mgr);

Change the drivers that call fpga_mgr_register to alloc the struct fpga_manager (using devm_kzalloc) and partly fill it, adding name, ops, and priv.

Quoted 6 lines

The rationale is that setting drvdata is fine for DT based devices that will have one manager, bridge, or region per platform device. However PCIe based devices may have multiple FPGA mgr/bridge/regions under one pcie device. Without these changes, the PCIe solution has to create an extra device for each child mgr/bridge/region to hold drvdata.

This looks very common, in fact several subsystems provide this two step way of registering things.

- Allocate fpga_mgr via fpga_mgr_alloc() where you pass in the size of the private data
- Fill in some fields
- fpga_mgr_register() where you pass in the fpga_mgr as suggested

Quoted 8 lines

Quoted 2 lines

See for example the alloc_etherdev() for ethernet devices.

Yes, I considered it when I was writing this. I've seen it both ways. In the case you mention, they've got reasons they absolutely needed to do it that way. alloc_etherdev() calls eventually to alloc_netdev_mqs() which is about 100 lines of alloc'ing and initializing a network device struct.

Yeah, sure. I looked around some more. Other subsystems just alloc manually, seems fine with me.

Quoted 8 lines

Quoted 4 lines

The benefit of the API you proposed is that one could embed the fpga_mgr struct inside of another struct and get to the container via container_of() I guess ...

Yes, let's keep it simple for now, as that gives us greater flexibility. We can add alloc functions when it becomes clear that it won't get in the way of someone's use.

Agreed.

Quoted 30 lines

Alan

Quoted 27 lines

Quoted 27 lines

Signed-off-by Alan Tull <[email protected]>

Reported-by Jiuyue Ma <[email protected]>

---
 Documentation/fpga/fpga-mgr.txt  | 23 ++++++++++++++++-------
 drivers/fpga/altera-cvp.c        | 17 +++++++++++++----
 drivers/fpga/altera-pr-ip-core.c | 16 ++++++++++++++--
 drivers/fpga/altera-ps-spi.c     | 17 ++++++++++++++---
 drivers/fpga/fpga-mgr.c          | 28 +++++++---------------------
 drivers/fpga/ice40-spi.c         | 19 +++++++++++++++----
 drivers/fpga/socfpga-a10.c       | 15 ++++++++++++---
 drivers/fpga/socfpga.c           | 17 ++++++++++++++---
 drivers/fpga/ts73xx-fpga.c       | 17 ++++++++++++++---
 drivers/fpga/xilinx-spi.c        | 17 ++++++++++++++---
 drivers/fpga/zynq-fpga.c         | 15 ++++++++++++---
 include/linux/fpga/fpga-mgr.h    |  6 ++----
 12 files changed, 147 insertions(+), 60 deletions(-)

Documentation/fpga/fpga-mgr.txt +0 -0

index cc6413e..7e5e5c8 100644
@@ -67,11 +67,9 @@ fpga_mgr_unlock when done programming the FPGA.
 To register or unregister the low level FPGA-specific driver:
 -------------------------------------------------------------
 

Quoted 8 lines

Quoted 4 lines

Quoted 4 lines

Documentation/fpga/fpga-mgr.txt fpga_mgr_unlock when done programming the FPGA. · line 70

Quoted 4 lines

Documentation/fpga/fpga-mgr.txt +1 -3

-     int fpga_mgr_register(struct device *dev, const char *name,
-                           const struct fpga_manager_ops *mops,
-                           void *priv);
+     int fpga_mgr_register(struct device *dev, struct fpga_manager *mgr);

At that point you could also just give the struct fpga_manager a ->parent or ->dev that you populate with &pdev->dev or &spi->dev etc instead of making it a separate parameter, this makes an odd mix of half and half here.

Yes, I'd have to call it parent as dev is taken. I also noticed that I forgot to edit the function parameter documentation in the c file.

Quoted 24 lines

Quoted 24 lines

Quoted 24 lines

Quoted 24 lines

Documentation/fpga/fpga-mgr.txt +6 -1

-     void fpga_mgr_unregister(struct device *dev);
+     void fpga_mgr_unregister(struct fpga_manager *mgr);
 
 Use of these two functions is described below in "How To Support a new FPGA
 device."

@@ -148,8 +146,13 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 {
      struct device *dev = &pdev->dev;
      struct socfpga_fpga_priv *priv;
+     struct fpga_manager *mgr;
      int ret;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -157,13 +160,19 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
      /* ... do ioremaps, get interrupts, etc. and save
         them in priv... */
 

Quoted 6 lines

Quoted 5 lines

Quoted 5 lines

Documentation/fpga/fpga-mgr.txt static int socfpga_fpga_probe(struct platform_device *pdev) · line 165

Quoted 5 lines

Documentation/fpga/fpga-mgr.txt +3 -2

-     return fpga_mgr_register(dev, "Altera SOCFPGA FPGA Manager",
-                              &socfpga_fpga_ops, priv);
+     mgr->name = "Altera SOCFPGA FPGA Manager";
+     mgr->mops = &socfpga_fpga_ops;
+     mgr->priv = priv;

Like here: mgr->dev = &pdev->dev

Yes, good catch. By the way, I pushed these patches on a branch to linux-fpga (branch name is review-v4.14-rc7-non-dt-support-v5.1).

Thanks for reviewing,
Alan

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Documentation/fpga/fpga-mgr.txt +3 -0

+     platform_set_drvdata(pdev, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }

On Tue, Oct 31, 2017 at 9:22 PM, Alan Tull <[email protected]> wrote:

Any further comments on v5? I'm getting ready to send v6. If I do it today, most of these patches will have no changes (again), the only changes will be in the patches that move drvdata out of the common code.

I've gone to a lot of trouble to break out functional patches to make them easy to review and to keep what I was trying to accomplish clear here. I think this stuff is necessary going forward. If this stuff doesn't have errors, let's move forward and make whatever changes we want to make on top of this.

Quoted 132 lines · Moritz Fischer

Quoted 84 lines · Alan Tull

Quoted 32 lines · Moritz Fischer

Quoted 31 lines · Alan Tull

Quoted 15 lines

Changes to the fpga manager code to not use drvdata in common code.

Change fpga_mgr_register to not set or use drvdata.

Change the register/unregister function parameters to take the mgr struct:
* int fpga_mgr_register(struct device *dev,

                        struct fpga_manager *mgr);

* void fpga_mgr_unregister(struct fpga_manager *mgr);

Change the drivers that call fpga_mgr_register to alloc the struct fpga_manager (using devm_kzalloc) and partly fill it, adding name, ops, and priv.

Quoted 6 lines

The rationale is that setting drvdata is fine for DT based devices that will have one manager, bridge, or region per platform device. However PCIe based devices may have multiple FPGA mgr/bridge/regions under one pcie device. Without these changes, the PCIe solution has to create an extra device for each child mgr/bridge/region to hold drvdata.

This looks very common, in fact several subsystems provide this two step way of registering things.

- Allocate fpga_mgr via fpga_mgr_alloc() where you pass in the size of the private data
- Fill in some fields
- fpga_mgr_register() where you pass in the fpga_mgr as suggested

Quoted 8 lines

Quoted 2 lines

See for example the alloc_etherdev() for ethernet devices.

Yes, I considered it when I was writing this. I've seen it both ways. In the case you mention, they've got reasons they absolutely needed to do it that way. alloc_etherdev() calls eventually to alloc_netdev_mqs() which is about 100 lines of alloc'ing and initializing a network device struct.

Yeah, sure. I looked around some more. Other subsystems just alloc manually, seems fine with me.

Quoted 8 lines

Quoted 4 lines

The benefit of the API you proposed is that one could embed the fpga_mgr struct inside of another struct and get to the container via container_of() I guess ...

Yes, let's keep it simple for now, as that gives us greater flexibility. We can add alloc functions when it becomes clear that it won't get in the way of someone's use.

Agreed.

Quoted 30 lines

Alan

Quoted 27 lines

Quoted 27 lines

Signed-off-by Alan Tull <[email protected]>

Reported-by Jiuyue Ma <[email protected]>

---
 Documentation/fpga/fpga-mgr.txt  | 23 ++++++++++++++++-------
 drivers/fpga/altera-cvp.c        | 17 +++++++++++++----
 drivers/fpga/altera-pr-ip-core.c | 16 ++++++++++++++--
 drivers/fpga/altera-ps-spi.c     | 17 ++++++++++++++---
 drivers/fpga/fpga-mgr.c          | 28 +++++++---------------------
 drivers/fpga/ice40-spi.c         | 19 +++++++++++++++----
 drivers/fpga/socfpga-a10.c       | 15 ++++++++++++---
 drivers/fpga/socfpga.c           | 17 ++++++++++++++---
 drivers/fpga/ts73xx-fpga.c       | 17 ++++++++++++++---
 drivers/fpga/xilinx-spi.c        | 17 ++++++++++++++---
 drivers/fpga/zynq-fpga.c         | 15 ++++++++++++---
 include/linux/fpga/fpga-mgr.h    |  6 ++----
 12 files changed, 147 insertions(+), 60 deletions(-)

Documentation/fpga/fpga-mgr.txt +0 -0

index cc6413e..7e5e5c8 100644
@@ -67,11 +67,9 @@ fpga_mgr_unlock when done programming the FPGA.
 To register or unregister the low level FPGA-specific driver:
 -------------------------------------------------------------
 

Quoted 8 lines

Quoted 4 lines

Quoted 4 lines

Documentation/fpga/fpga-mgr.txt fpga_mgr_unlock when done programming the FPGA. · line 70

Quoted 4 lines

Documentation/fpga/fpga-mgr.txt +1 -3

-     int fpga_mgr_register(struct device *dev, const char *name,
-                           const struct fpga_manager_ops *mops,
-                           void *priv);
+     int fpga_mgr_register(struct device *dev, struct fpga_manager *mgr);

At that point you could also just give the struct fpga_manager a ->parent or ->dev that you populate with &pdev->dev or &spi->dev etc instead of making it a separate parameter, this makes an odd mix of half and half here.

Yes, I'd have to call it parent as dev is taken. I also noticed that I forgot to edit the function parameter documentation in the c file.

Quoted 24 lines

Quoted 24 lines

Quoted 24 lines

Quoted 24 lines

Documentation/fpga/fpga-mgr.txt +6 -1

-     void fpga_mgr_unregister(struct device *dev);
+     void fpga_mgr_unregister(struct fpga_manager *mgr);
 
 Use of these two functions is described below in "How To Support a new FPGA
 device."

@@ -148,8 +146,13 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
 {
      struct device *dev = &pdev->dev;
      struct socfpga_fpga_priv *priv;
+     struct fpga_manager *mgr;
      int ret;
 
+     mgr = devm_kzalloc(dev, sizeof(*mgr), GFP_KERNEL);
+     if (!mgr)
+             return -ENOMEM;
+
      priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
      if (!priv)
              return -ENOMEM;

@@ -157,13 +160,19 @@ static int socfpga_fpga_probe(struct platform_device *pdev)
      /* ... do ioremaps, get interrupts, etc. and save
         them in priv... */
 

Quoted 6 lines

Quoted 5 lines

Quoted 5 lines

Documentation/fpga/fpga-mgr.txt static int socfpga_fpga_probe(struct platform_device *pdev) · line 165

Quoted 5 lines

Documentation/fpga/fpga-mgr.txt +3 -2

-     return fpga_mgr_register(dev, "Altera SOCFPGA FPGA Manager",
-                              &socfpga_fpga_ops, priv);
+     mgr->name = "Altera SOCFPGA FPGA Manager";
+     mgr->mops = &socfpga_fpga_ops;
+     mgr->priv = priv;

Like here: mgr->dev = &pdev->dev

Yes, good catch. By the way, I pushed these patches on a branch to linux-fpga (branch name is review-v4.14-rc7-non-dt-support-v5.1).

Quoted 8 lines

Thanks for reviewing,
Alan

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

Documentation/fpga/fpga-mgr.txt +3 -0

+     platform_set_drvdata(pdev, mgr);
+
+     return fpga_mgr_register(dev, mgr);
 }

Changes to the fpga bridge code to not use drvdata in common code.

Change fpga_bridge_register to not set drvdata.

Change the register/unregister functions parameters to take the bridge struct:
* int fpga_bridge_register(struct device *dev,

                           struct fpga_bridge *bridge);

* void fpga_bridge_unregister(struct fpga_bridge *bridge);

Change the drivers that call fpga_bridge_register to alloc the struct fpga_bridge (using devm_kzalloc) and partly fill it, adding name, ops, and priv.

The rationale is that setting drvdata is fine for DT based devices that will have one manager, bridge, or region per platform device. However PCIe based devices may have multiple FPGA mgr/bridge/regions under one pcie device. Without these changes, the PCIe solution has to create an extra device for each child mgr/bridge/region to hold drvdata.

Signed-off-by Alan Tull <[email protected]>

Reported-by Jiuyue Ma <[email protected]>

---
 drivers/fpga/altera-fpga2sdram.c    | 19 +++++++++++++++----
 drivers/fpga/altera-freeze-bridge.c | 17 ++++++++++++++---
 drivers/fpga/altera-hps2fpga.c      | 15 ++++++++++++---
 drivers/fpga/fpga-bridge.c          | 30 +++++++-----------------------
 drivers/fpga/xilinx-pr-decoupler.c  | 14 +++++++++++---
 include/linux/fpga/fpga-bridge.h    |  5 ++---
 6 files changed, 61 insertions(+), 39 deletions(-)

drivers/fpga/altera-fpga2sdram.c +15 -4

index d4eeb74..73c7bf6 100644
@@ -106,10 +106,15 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct alt_fpga2sdram_data *priv;
+       struct fpga_bridge *br;
        u32 enable;
        struct regmap *sysmgr;
        int ret = 0;
 
+       br = devm_kzalloc(dev, sizeof(*br), GFP_KERNEL);
+       if (!br)
+               return -ENOMEM;
+
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;

@@ -131,8 +136,12 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
        /* Get f2s bridge configuration saved in handoff register */
        regmap_read(sysmgr, SYSMGR_ISWGRP_HANDOFF3, &priv->mask);
 
-       ret = fpga_bridge_register(dev, F2S_BRIDGE_NAME,
-                                  &altera_fpga2sdram_br_ops, priv);
+       br->name = F2S_BRIDGE_NAME;
+       br->br_ops = &altera_fpga2sdram_br_ops;
+       br->priv = priv;
+       platform_set_drvdata(pdev, br);
+
+       ret = fpga_bridge_register(dev, br);
        if (ret)
                return ret;
 

@@ -146,7 +155,7 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
                                 (enable ? "enabling" : "disabling"));
                        ret = _alt_fpga2sdram_enable_set(priv, enable);
                        if (ret) {
-                               fpga_bridge_unregister(&pdev->dev);
+                               fpga_bridge_unregister(br);
                                return ret;
                        }
                }

@@ -157,7 +166,9 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
 
 static int alt_fpga_bridge_remove(struct platform_device *pdev)
 {
-       fpga_bridge_unregister(&pdev->dev);
+       struct fpga_bridge *br = platform_get_drvdata(pdev);
+
+       fpga_bridge_unregister(br);
 
        return 0;
 }

drivers/fpga/altera-freeze-bridge.c +14 -3

index 6159cfcf..5fd424b 100644
@@ -219,6 +219,7 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct device_node *np = pdev->dev.of_node;
+       struct fpga_bridge *br;
        void __iomem *base_addr;
        struct altera_freeze_br_data *priv;
        struct resource *res;

@@ -227,6 +228,10 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
        if (!np)
                return -ENODEV;
 
+       br = devm_kzalloc(dev, sizeof(*br), GFP_KERNEL);
+       if (!br)
+               return -ENOMEM;
+
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        base_addr = devm_ioremap_resource(dev, res);
        if (IS_ERR(base_addr))

@@ -254,13 +259,19 @@ static int altera_freeze_br_probe(struct platform_device *pdev)
 
        priv->base_addr = base_addr;
 
-       return fpga_bridge_register(dev, FREEZE_BRIDGE_NAME,
-                                   &altera_freeze_br_br_ops, priv);
+       br->name = FREEZE_BRIDGE_NAME;
+       br->br_ops = &altera_freeze_br_br_ops;
+       br->priv = priv;
+       platform_set_drvdata(pdev, br);
+
+       return fpga_bridge_register(dev, br);
 }
 
 static int altera_freeze_br_remove(struct platform_device *pdev)
 {
-       fpga_bridge_unregister(&pdev->dev);
+       struct fpga_bridge *br = platform_get_drvdata(pdev);
+
+       fpga_bridge_unregister(br);
 
        return 0;
 }

drivers/fpga/altera-hps2fpga.c +12 -3

index 406d2f1..4539057 100644
@@ -139,6 +139,7 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct altera_hps2fpga_data *priv;
        const struct of_device_id *of_id;
+       struct fpga_bridge *br;
        u32 enable;
        int ret;
 

@@ -150,6 +151,10 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
 
        priv = (struct altera_hps2fpga_data *)of_id->data;
 
+       br = devm_kzalloc(dev, sizeof(*br), GFP_KERNEL);
+       if (!br)
+               return -ENOMEM;
+
        priv->bridge_reset = of_reset_control_get_exclusive_by_index(dev->of_node,
                                                                     0);
        if (IS_ERR(priv->bridge_reset)) {

@@ -190,8 +195,12 @@ static int alt_fpga_bridge_probe(struct platform_device *pdev)
                }
        }
 
-       ret = fpga_bridge_register(dev, priv->name, &altera_hps2fpga_br_ops,
-                                  priv);
+       br->name = priv->name;
+       br->br_ops = &altera_hps2fpga_br_ops;
+       br->priv = priv;
+       platform_set_drvdata(pdev, br);
+
+       ret = fpga_bridge_register(dev, br);
 err:
        if (ret)
                clk_disable_unprepare(priv->clk);

@@ -204,7 +213,7 @@ static int alt_fpga_bridge_remove(struct platform_device *pdev)
        struct fpga_bridge *bridge = platform_get_drvdata(pdev);
        struct altera_hps2fpga_data *priv = bridge->priv;
 
-       fpga_bridge_unregister(&pdev->dev);
+       fpga_bridge_unregister(bridge);
 
        clk_disable_unprepare(priv->clk);
 

drivers/fpga/fpga-bridge.c +7 -23

index 15ce9f1..10b582e 100644
@@ -338,41 +338,30 @@ ATTRIBUTE_GROUPS(fpga_bridge);
  *
  * Return: 0 for success, error code otherwise.
  */
-int fpga_bridge_register(struct device *dev, const char *name,
-                        const struct fpga_bridge_ops *br_ops, void *priv)
+int fpga_bridge_register(struct device *dev, struct fpga_bridge *bridge)
 {
-       struct fpga_bridge *bridge;
+       const char *name;
        int id, ret = 0;
 
+       name = bridge->name;
        if (!name || !strlen(name)) {
                dev_err(dev, "Attempt to register with no name!\n");
                return -EINVAL;
        }
 
-       bridge = kzalloc(sizeof(*bridge), GFP_KERNEL);
-       if (!bridge)
-               return -ENOMEM;
-
        id = ida_simple_get(&fpga_bridge_ida, 0, 0, GFP_KERNEL);
-       if (id < 0) {
-               ret = id;
-               goto error_kfree;
-       }
+       if (id < 0)
+               return id;
 
        mutex_init(&bridge->mutex);
        INIT_LIST_HEAD(&bridge->node);
 
-       bridge->name = name;
-       bridge->br_ops = br_ops;
-       bridge->priv = priv;
-
        device_initialize(&bridge->dev);
-       bridge->dev.groups = br_ops->groups;
+       bridge->dev.groups = bridge->br_ops->groups;
        bridge->dev.class = fpga_bridge_class;
        bridge->dev.parent = dev;
        bridge->dev.of_node = dev->of_node;
        bridge->dev.id = id;
-       dev_set_drvdata(dev, bridge);
 
        ret = dev_set_name(&bridge->dev, "br%d", id);
        if (ret)

@@ -391,8 +380,6 @@ int fpga_bridge_register(struct device *dev, const char *name,
 
 error_device:
        ida_simple_remove(&fpga_bridge_ida, id);
-error_kfree:
-       kfree(bridge);
 
        return ret;
 }

@@ -402,10 +389,8 @@ EXPORT_SYMBOL_GPL(fpga_bridge_register);
  * fpga_bridge_unregister - unregister a fpga bridge driver
  * @dev: FPGA bridge device from pdev
  */
-void fpga_bridge_unregister(struct device *dev)
+void fpga_bridge_unregister(struct fpga_bridge *bridge)
 {
-       struct fpga_bridge *bridge = dev_get_drvdata(dev);
-
        /*
         * If the low level driver provides a method for putting bridge into
         * a desired state upon unregister, do it.

@@ -422,7 +407,6 @@ static void fpga_bridge_dev_release(struct device *dev)
        struct fpga_bridge *bridge = to_fpga_bridge(dev);
 
        ida_simple_remove(&fpga_bridge_ida, bridge->dev.id);
-       kfree(bridge);
 }
 
 static int __init fpga_bridge_dev_init(void)

drivers/fpga/xilinx-pr-decoupler.c +0 -0

index e359930..317b2fb 100644

drivers/fpga/xilinx-pr-decoupler.c +9 -3

+       if (!br)
+               return -ENOMEM;
+
        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;

@@ -120,9 +125,12 @@ static int xlnx_pr_decoupler_probe(struct platform_device *pdev)
 
        clk_disable(priv->clk);
 
-       err = fpga_bridge_register(&pdev->dev, "Xilinx PR Decoupler",
-                                  &xlnx_pr_decoupler_br_ops, priv);
+       br->name = "Xilinx PR Decoupler";
+       br->br_ops = &xlnx_pr_decoupler_br_ops;
+       br->priv = priv;
+       platform_set_drvdata(pdev, br);
 
+       err = fpga_bridge_register(&pdev->dev, br);
        if (err) {
                dev_err(&pdev->dev, "unable to register Xilinx PR Decoupler");
                clk_unprepare(priv->clk);

@@ -137,7 +145,7 @@ static int xlnx_pr_decoupler_remove(struct platform_device *pdev)
        struct fpga_bridge *bridge = platform_get_drvdata(pdev);
        struct xlnx_pr_decoupler_data *p = bridge->priv;
 
-       fpga_bridge_unregister(&pdev->dev);
+       fpga_bridge_unregister(bridge);
 
        clk_unprepare(p->clk);
 

include/linux/fpga/fpga-bridge.h +2 -4

index 65d3311..9e80dbf 100644
@@ -60,8 +60,7 @@ int of_fpga_bridge_get_to_list(struct device_node *np,
                               struct fpga_image_info *info,
                               struct list_head *bridge_list);
 
-int fpga_bridge_register(struct device *dev, const char *name,
-                        const struct fpga_bridge_ops *br_ops, void *priv);
-void fpga_bridge_unregister(struct device *dev);
+int fpga_bridge_register(struct device *dev, struct fpga_bridge *br);
+void fpga_bridge_unregister(struct fpga_bridge *br);
 
 #endif /* _LINUX_FPGA_BRIDGE_H */
--

2.7.4