Commit 7b15c411 authored by Peter Colberg's avatar Peter Colberg Committed by Xu Yilun
Browse files

fpga: dfl: store MMIO resources in feature device data 



Instead of directly copying the MMIO resource of each feature to the
feature device resources, add a new member to the feature device data
to store the resources and copy them to the feature device using
platform_device_add_resources(). This prepares a subsequent commit
which completely destroys and recreates the feature device when
releasing and reassigning the corresponding port, respectively.

Signed-off-by: default avatarPeter Colberg <peter.colberg@intel.com>
Reviewed-by: default avatarMatthew Gerlach <matthew.gerlach@linux.intel.com>
Reviewed-by: default avatarBasheer Ahmed Muddebihal <basheer.ahmed.muddebihal@linux.intel.com>
Acked-by: default avatarXu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/20241120011035.230574-13-peter.colberg@intel.com


Signed-off-by: default avatarXu Yilun <yilun.xu@linux.intel.com>
parent b3245f70

drivers/fpga/dfl.c

+13 −8
Original line number Diff line number Diff line
@@ -761,6 +761,11 @@ binfo_create_feature_dev_data(struct build_feature_devs_info *binfo) 
	if (!fdata->features)

		return ERR_PTR(-ENOMEM);



	fdata->resources = devm_kcalloc(binfo->dev, binfo->feature_num,

					sizeof(*fdata->resources), GFP_KERNEL);

	if (!fdata->resources)

		return ERR_PTR(-ENOMEM);



	fdata->dev = fdev;

	fdata->type = type;

	fdata->num = binfo->feature_num;
@@ -778,13 +783,6 @@ binfo_create_feature_dev_data(struct build_feature_devs_info *binfo) 
	 */

	WARN_ON(fdata->disable_count);



	/* each sub feature has one MMIO resource */

	fdev->num_resources = binfo->feature_num;

	fdev->resource = kcalloc(binfo->feature_num, sizeof(*fdev->resource),

				 GFP_KERNEL);

	if (!fdev->resource)

		return ERR_PTR(-ENOMEM);



	/* fill features and resource information for feature dev */

	list_for_each_entry_safe(finfo, p, &binfo->sub_features, node) {

		struct dfl_feature *feature = &fdata->features[index++];
@@ -822,7 +820,7 @@ binfo_create_feature_dev_data(struct build_feature_devs_info *binfo) 
				return ERR_CAST(feature->ioaddr);

		} else {

			feature->resource_index = res_idx;

			fdev->resource[res_idx++] = finfo->mmio_res;

			fdata->resources[res_idx++] = finfo->mmio_res;

		}



		if (finfo->nr_irqs) {
@@ -843,6 +841,8 @@ binfo_create_feature_dev_data(struct build_feature_devs_info *binfo) 
		kfree(finfo);

	}



	fdata->resource_num = res_idx;



	return fdata;

}
@@ -886,6 +886,11 @@ static int feature_dev_register(struct dfl_feature_dev_data *fdata) 
	fdev->dev.parent = &fdata->dfl_cdev->region->dev;

	fdev->dev.devt = dfl_get_devt(dfl_devs[fdata->type].devt_type, fdev->id);



	ret = platform_device_add_resources(fdev, fdata->resources,

					    fdata->resource_num);

	if (ret)

		return ret;



	pdata.fdata = fdata;

	ret = platform_device_add_data(fdev, &pdata, sizeof(pdata));

	if (ret)

drivers/fpga/dfl.h

+4 −0
Original line number Diff line number Diff line
@@ -317,6 +317,8 @@ struct dfl_feature { 
 * @num: number for sub features.

 * @private: ptr to feature dev private data.

 * @features: sub features for the feature dev.

 * @resource_num: number of resources for the feature dev.

 * @resources: resources for the feature dev.

 */

struct dfl_feature_dev_data {

	struct list_head node;
@@ -331,6 +333,8 @@ struct dfl_feature_dev_data { 
	void *private;

	int num;

	struct dfl_feature *features;

	int resource_num;

	struct resource *resources;

};



/**