diff mbox series

[v11,01/14] EDAC: Add support for EDAC device feature's control

Message ID 20240816164238.1902-2-shiju.jose@huawei.com
State Superseded
Headers show
Series EDAC: Scrub: introduce generic EDAC RAS control feature driver + CXL/ACPI-RAS2 drivers | expand

Commit Message

Shiju Jose Aug. 16, 2024, 4:42 p.m. UTC 
From: Shiju Jose <shiju.jose@huawei.com>

Add generic EDAC device feature's control supports registering
RAS features supported in the system. Driver exposes feature's
control attributes to the userspace in
/sys/bus/edac/devices/<dev-name>/<ras-feature>/

Co-developed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
---
 drivers/edac/edac_device.c | 178 +++++++++++++++++++++++++++++++++++++
 include/linux/edac.h       |  60 +++++++++++++
 2 files changed, 238 insertions(+)

Comments

kernel test robot Aug. 18, 2024, 7:11 a.m. UTC | #1 
Hi,

kernel test robot noticed the following build warnings:

[auto build test WARNING on ras/edac-for-next]
[also build test WARNING on rafael-pm/linux-next rafael-pm/bleeding-edge cxl/next linus/master cxl/pending v6.11-rc3 next-20240816]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/shiju-jose-huawei-com/EDAC-Add-support-for-EDAC-device-feature-s-control/20240817-004442
base:   https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
patch link:    https://lore.kernel.org/r/20240816164238.1902-2-shiju.jose%40huawei.com
patch subject: [PATCH v11 01/14] EDAC: Add support for EDAC device feature's control
config: i386-buildonly-randconfig-003-20240818 (https://download.01.org/0day-ci/archive/20240818/202408181416.PD0B8fMf-lkp@intel.com/config)
compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240818/202408181416.PD0B8fMf-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202408181416.PD0B8fMf-lkp@intel.com/

All warnings (new ones prefixed by >>):

>> drivers/edac/edac_device.c:608: warning: Function parameter or struct member 'ras_feat' not described in 'edac_dev_feat_init'
>> drivers/edac/edac_device.c:608: warning: expecting prototype for edac_dev_feature_init(). Prototype was for edac_dev_feat_init() instead


vim +608 drivers/edac/edac_device.c

   593	
   594	/**
   595	 * edac_dev_feature_init - Init a ras feature
   596	 * @parent: client device.
   597	 * @dev_data: pointer to struct edac_dev_data.
   598	 * @feat: pointer to struct edac_dev_feature.
   599	 * @attr_groups: pointer to attribute group's container.
   600	 *
   601	 * Returns number of scrub feature's attribute groups on success,
   602	 * error otherwise.
   603	 */
   604	static int edac_dev_feat_init(struct device *parent,
   605				      struct edac_dev_data *dev_data,
   606				      const struct edac_dev_feature *ras_feat,
   607				      const struct attribute_group **attr_groups)
 > 608	{
   609		int num;
   610	
   611		switch (ras_feat->feat) {
   612		case RAS_FEAT_SCRUB:
   613			dev_data->scrub_ops = ras_feat->scrub_ops;
   614			dev_data->private = ras_feat->scrub_ctx;
   615			return 1;
   616		case RAS_FEAT_ECS:
   617			num = ras_feat->ecs_info.num_media_frus;
   618			dev_data->ecs_ops = ras_feat->ecs_ops;
   619			dev_data->private = ras_feat->ecs_ctx;
   620			return num;
   621		case RAS_FEAT_PPR:
   622			dev_data->ppr_ops = ras_feat->ppr_ops;
   623			dev_data->private = ras_feat->ppr_ctx;
   624			return 1;
   625		default:
   626			return -EINVAL;
   627		}
   628	}
   629
kernel test robot Aug. 19, 2024, 12:29 a.m. UTC | #2 
Hi,

kernel test robot noticed the following build warnings:

[auto build test WARNING on ras/edac-for-next]
[also build test WARNING on rafael-pm/linux-next rafael-pm/bleeding-edge cxl/next linus/master cxl/pending v6.11-rc3 next-20240816]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/shiju-jose-huawei-com/EDAC-Add-support-for-EDAC-device-feature-s-control/20240817-004442
base:   https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac-for-next
patch link:    https://lore.kernel.org/r/20240816164238.1902-2-shiju.jose%40huawei.com
patch subject: [PATCH v11 01/14] EDAC: Add support for EDAC device feature's control
config: i386-randconfig-062-20240818 (https://download.01.org/0day-ci/archive/20240819/202408190825.fBBO0NTN-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240819/202408190825.fBBO0NTN-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202408190825.fBBO0NTN-lkp@intel.com/

sparse warnings: (new ones prefixed by >>)
>> drivers/edac/edac_device.c:584:26: sparse: sparse: symbol 'edac_dev_type' was not declared. Should it be static?
   drivers/edac/edac_device.c: note: in included file (through include/linux/smp.h, include/linux/lockdep.h, include/linux/spinlock.h, ...):
   include/linux/list.h:83:21: sparse: sparse: self-comparison always evaluates to true

vim +/edac_dev_type +584 drivers/edac/edac_device.c

   583	
 > 584	const struct device_type edac_dev_type = {
   585		.name = "edac_dev",
   586		.release = edac_dev_release,
   587	};
   588
Borislav Petkov Sept. 3, 2024, 4:35 p.m. UTC | #3 
On Fri, Aug 16, 2024 at 05:42:24PM +0100, shiju.jose@huawei.com wrote:
> From: Shiju Jose <shiju.jose@huawei.com>
> 
> Add generic EDAC device feature's control supports registering

"features"

Check your whole set.

> RAS features supported in the system. Driver exposes feature's
> control attributes to the userspace in

s/the //

> /sys/bus/edac/devices/<dev-name>/<ras-feature>/
> 
> Co-developed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
> ---
>  drivers/edac/edac_device.c | 178 +++++++++++++++++++++++++++++++++++++
>  include/linux/edac.h       |  60 +++++++++++++
>  2 files changed, 238 insertions(+)
> 
> diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
> index 621dc2a5d034..635a41db8b5a 100644
> --- a/drivers/edac/edac_device.c
> +++ b/drivers/edac/edac_device.c
> @@ -570,3 +570,181 @@ void edac_device_handle_ue_count(struct edac_device_ctl_info *edac_dev,
>  		      block ? block->name : "N/A", count, msg);
>  }
>  EXPORT_SYMBOL_GPL(edac_device_handle_ue_count);
> +
> +/* EDAC device feature */
> +static void edac_dev_release(struct device *dev)
> +{
> +	struct edac_dev_feat_ctx *ctx =
> +		container_of(dev, struct edac_dev_feat_ctx, dev);

Ew, no, don't do such silly linebreaks pls.

> +	kfree(ctx->dev.groups);
> +	kfree(ctx);
> +}
> +
> +const struct device_type edac_dev_type = {
> +	.name = "edac_dev",
> +	.release = edac_dev_release,
> +};
> +
> +static void edac_dev_unreg(void *data)
> +{
> +	device_unregister(data);
> +}
> +
> +/**
> + * edac_dev_feature_init - Init a ras feature

s/ras/RAS/g

Check your whole set.

> + * @parent: client device.
> + * @dev_data: pointer to struct edac_dev_data.

I can see it is a pointer. What it is used for?

> + * @feat: pointer to struct edac_dev_feature.
> + * @attr_groups: pointer to attribute group's container.
> + *
> + * Returns number of scrub feature's attribute groups on success,
> + * error otherwise.
> + */
> +static int edac_dev_feat_init(struct device *parent,
> +			      struct edac_dev_data *dev_data,
> +			      const struct edac_dev_feature *ras_feat,
> +			      const struct attribute_group **attr_groups)
> +{
> +	int num;
> +
> +	switch (ras_feat->feat) {
> +	case RAS_FEAT_SCRUB:
> +		dev_data->scrub_ops = ras_feat->scrub_ops;
> +		dev_data->private = ras_feat->scrub_ctx;
> +		return 1;
> +	case RAS_FEAT_ECS:
> +		num = ras_feat->ecs_info.num_media_frus;
> +		dev_data->ecs_ops = ras_feat->ecs_ops;
> +		dev_data->private = ras_feat->ecs_ctx;
> +		return num;
> +	case RAS_FEAT_PPR:
> +		dev_data->ppr_ops = ras_feat->ppr_ops;
> +		dev_data->private = ras_feat->ppr_ctx;
> +		return 1;
> +	default:
> +		return -EINVAL;
> +	}
> +}
> +
> +/**
> + * edac_dev_register - register device for ras features with edac

s/edac/EDAC/g

Check your whole set.

> + * @parent: client device.
> + * @name: client device's name.
> + * @private: parent driver's data to store in the context if any.
> + * @num_features: number of ras features to register.
> + * @ras_features: list of ras features to register.
> + *
> + * Returns 0 on success, error otherwise.
> + * The new edac_dev_feat_ctx would be freed automatically.
> + */
> +int edac_dev_register(struct device *parent, char *name,
> +		      void *private, int num_features,
> +		      const struct edac_dev_feature *ras_features)
> +{
> +	const struct attribute_group **ras_attr_groups;
> +	struct edac_dev_data *dev_data;
> +	struct edac_dev_feat_ctx *ctx;
> +	int ppr_cnt = 0, ppr_inst = 0;
> +	int attr_gcnt = 0;
> +	int ret, feat;
> +
> +	if (!parent || !name || !num_features || !ras_features)
> +		return -EINVAL;
> +
> +	/* Double parse so we can make space for attributes */

Who's "we"?

Please use passive voice in your comments: no "we" or "I", etc.

Personal pronouns are ambiguous in text, especially with so many
parties/companies/etc developing the kernel so let's avoid them please.

> +	for (feat = 0; feat < num_features; feat++) {
> +		switch (ras_features[feat].feat) {
> +		case RAS_FEAT_SCRUB:

Does this need "fallthrough;" or somesuch?

> +		case RAS_FEAT_PPR:
> +			attr_gcnt++;
> +			ppr_cnt++;
> +			break;
> +		case RAS_FEAT_ECS:
> +			attr_gcnt += ras_features[feat].ecs_info.num_media_frus;
> +			break;
> +		default:
> +			return -EINVAL;
> +		}
> +	}
> +
> +	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
> +	if (!ctx)
> +		return -ENOMEM;
> +
> +	ctx->dev.parent = parent;
> +	ctx->private = private;
> +
> +	ras_attr_groups = kcalloc(attr_gcnt + 1, sizeof(*ras_attr_groups), GFP_KERNEL);
> +	if (!ras_attr_groups) {
> +		ret = -ENOMEM;
> +		goto ctx_free;
> +	}
> +
> +	if (ppr_cnt) {
> +		ctx->ppr = kcalloc(ppr_cnt, sizeof(*(ctx->ppr)), GFP_KERNEL);
> +		if (!ctx->ppr) {
> +			ret = -ENOMEM;
> +			goto groups_free;
> +		}
> +	}
> +
> +	attr_gcnt = 0;
> +	for (feat = 0; feat < num_features; feat++, ras_features++) {
> +		switch (ras_features->feat) {
> +		case RAS_FEAT_SCRUB:
> +			if (!ras_features->scrub_ops)
> +				continue;
> +			dev_data = &ctx->scrub;
> +			break;
> +		case RAS_FEAT_ECS:
> +			if (!ras_features->ecs_ops)
> +				continue;
> +			dev_data = &ctx->ecs;
> +			break;
> +		case RAS_FEAT_PPR:
> +			if (!ras_features->ppr_ops)
> +				continue;
> +			dev_data = &ctx->ppr[ppr_inst];
> +			dev_data->instance = ppr_inst;
> +			ppr_inst++;
> +			break;
> +		default:
> +			ret = -EINVAL;
> +			goto data_mem_free;
> +		}
> +		ret = edac_dev_feat_init(parent, dev_data, ras_features,
> +					 &ras_attr_groups[attr_gcnt]);
> +		if (ret < 0)
> +			goto data_mem_free;
> +
> +		attr_gcnt += ret;
> +	}

Newline.

> +	ras_attr_groups[attr_gcnt] = NULL;
> +	ctx->dev.bus = edac_get_sysfs_subsys();
> +	ctx->dev.type = &edac_dev_type;
> +	ctx->dev.groups = ras_attr_groups;
> +	dev_set_drvdata(&ctx->dev, ctx);

Ditto.

> +	ret = dev_set_name(&ctx->dev, name);
> +	if (ret)
> +		goto data_mem_free;
> +
> +	ret = device_register(&ctx->dev);
> +	if (ret) {
> +		put_device(&ctx->dev);
> +		goto data_mem_free;
> +		return ret;
> +	}
> +
> +	return devm_add_action_or_reset(parent, edac_dev_unreg, &ctx->dev);
> +
> +data_mem_free:
> +	if (ppr_cnt)
> +		kfree(ctx->ppr);
> +groups_free:
> +	kfree(ras_attr_groups);
> +ctx_free:
> +	kfree(ctx);
> +	return ret;
> +}
> +EXPORT_SYMBOL_GPL(edac_dev_register);
> diff --git a/include/linux/edac.h b/include/linux/edac.h
> index b4ee8961e623..cc96f55ac714 100644
> --- a/include/linux/edac.h
> +++ b/include/linux/edac.h
> @@ -661,4 +661,64 @@ static inline struct dimm_info *edac_get_dimm(struct mem_ctl_info *mci,
>  
>  	return mci->dimms[index];
>  }
> +
> +/* EDAC device features */
> +
> +#define EDAC_FEAT_NAME_LEN	128
> +
> +enum edac_dev_feat {
> +	RAS_FEAT_SCRUB,
> +	RAS_FEAT_ECS,
> +	RAS_FEAT_PPR,

What are those? Comments ontop explaining pls.

> +	RAS_FEAT_MAX
> +};
> +
> +struct edac_ecs_ex_info {
> +	u16 num_media_frus;
> +};
> +
> +/*
> + * EDAC device feature information structure
> + */
> +struct edac_dev_data {
> +	union {
> +		const struct edac_scrub_ops *scrub_ops;
> +		const struct edac_ecs_ops *ecs_ops;
> +		const struct edac_ppr_ops *ppr_ops;
> +	};
> +	u8 instance;
> +	void *private;
> +};
> +
> +struct device;
> +
> +struct edac_dev_feat_ctx {
> +	struct device dev;
> +	void *private;
> +	struct edac_dev_data scrub;
> +	struct edac_dev_data ecs;
> +	struct edac_dev_data *ppr;
> +};
> +
> +struct edac_dev_feature {
> +	enum edac_dev_feat feat;

			ft_type;

> +	u8 instance;
> +	union {
> +		const struct edac_scrub_ops *scrub_ops;
> +		const struct edac_ecs_ops *ecs_ops;
> +		const struct edac_ppr_ops *ppr_ops;
> +	};
> +	union {
> +		void *scrub_ctx;
> +		void *ecs_ctx;
> +		void *ppr_ctx;
> +	};

Or drop the silly union and simply do

	void *ctx;

> +	union {
> +		struct edac_ecs_ex_info ecs_info;
> +	};

Union with a single member?!

> +};
> +
> +int edac_dev_register(struct device *parent, char *dev_name,
> +		      void *parent_pvt_data, int num_features,
> +		      const struct edac_dev_feature *ras_features);
>  #endif /* _LINUX_EDAC_H_ */
> -- 
> 2.34.1
>
Shiju Jose Sept. 9, 2024, 11:17 a.m. UTC | #4 
Thank you for the feedbacks.
Apologies for the delay in replying.

>-----Original Message-----
>From: Borislav Petkov <bp@alien8.de>
>Sent: 03 September 2024 17:35
>To: Shiju Jose <shiju.jose@huawei.com>
>Cc: linux-edac@vger.kernel.org; linux-cxl@vger.kernel.org; linux-
>acpi@vger.kernel.org; linux-mm@kvack.org; linux-kernel@vger.kernel.org;
>tony.luck@intel.com; rafael@kernel.org; lenb@kernel.org;
>mchehab@kernel.org; dan.j.williams@intel.com; dave@stgolabs.net; Jonathan
>Cameron <jonathan.cameron@huawei.com>; dave.jiang@intel.com;
>alison.schofield@intel.com; vishal.l.verma@intel.com; ira.weiny@intel.com;
>david@redhat.com; Vilas.Sridharan@amd.com; leo.duran@amd.com;
>Yazen.Ghannam@amd.com; rientjes@google.com; jiaqiyan@google.com;
>Jon.Grimm@amd.com; dave.hansen@linux.intel.com;
>naoya.horiguchi@nec.com; james.morse@arm.com; jthoughton@google.com;
>somasundaram.a@hpe.com; erdemaktas@google.com; pgonda@google.com;
>duenwen@google.com; mike.malvestuto@intel.com; gthelen@google.com;
>wschwartz@amperecomputing.com; dferguson@amperecomputing.com;
>wbs@os.amperecomputing.com; nifan.cxl@gmail.com; jgroves@micron.com;
>vsalve@micron.com; tanxiaofei <tanxiaofei@huawei.com>; Zengtao (B)
><prime.zeng@hisilicon.com>; Roberto Sassu <roberto.sassu@huawei.com>;
>kangkang.shen@futurewei.com; wanghuiqiang <wanghuiqiang@huawei.com>;
>Linuxarm <linuxarm@huawei.com>
>Subject: Re: [PATCH v11 01/14] EDAC: Add support for EDAC device feature's
>control
>
>On Fri, Aug 16, 2024 at 05:42:24PM +0100, shiju.jose@huawei.com wrote:
>> From: Shiju Jose <shiju.jose@huawei.com>
>>
>> Add generic EDAC device feature's control supports registering
>
>"features"
>
>Check your whole set.
Sure. Modified.
>
>> RAS features supported in the system. Driver exposes feature's control
>> attributes to the userspace in
>
>s/the //
Changed.
>
>> /sys/bus/edac/devices/<dev-name>/<ras-feature>/
>>
>> Co-developed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
>> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
>> Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
>> ---
>>  drivers/edac/edac_device.c | 178
>+++++++++++++++++++++++++++++++++++++
>>  include/linux/edac.h       |  60 +++++++++++++
>>  2 files changed, 238 insertions(+)
>>
>> diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
>> index 621dc2a5d034..635a41db8b5a 100644
>> --- a/drivers/edac/edac_device.c
>> +++ b/drivers/edac/edac_device.c
>> @@ -570,3 +570,181 @@ void edac_device_handle_ue_count(struct
>edac_device_ctl_info *edac_dev,
>>  		      block ? block->name : "N/A", count, msg);  }
>> EXPORT_SYMBOL_GPL(edac_device_handle_ue_count);
>> +
>> +/* EDAC device feature */
>> +static void edac_dev_release(struct device *dev) {
>> +	struct edac_dev_feat_ctx *ctx =
>> +		container_of(dev, struct edac_dev_feat_ctx, dev);
>
>Ew, no, don't do such silly linebreaks pls.
Changed.
>
>> +	kfree(ctx->dev.groups);
>> +	kfree(ctx);
>> +}
>> +
>> +const struct device_type edac_dev_type = {
>> +	.name = "edac_dev",
>> +	.release = edac_dev_release,
>> +};
>> +
>> +static void edac_dev_unreg(void *data) {
>> +	device_unregister(data);
>> +}
>> +
>> +/**
>> + * edac_dev_feature_init - Init a ras feature
>
>s/ras/RAS/g
>
>Check your whole set.
Sure. Modified.
>
>> + * @parent: client device.
>> + * @dev_data: pointer to struct edac_dev_data.
>
>I can see it is a pointer. What it is used for?
Updated.
>
>> + * @feat: pointer to struct edac_dev_feature.
>> + * @attr_groups: pointer to attribute group's container.
>> + *
>> + * Returns number of scrub feature's attribute groups on success,
>> + * error otherwise.
>> + */
>> +static int edac_dev_feat_init(struct device *parent,
>> +			      struct edac_dev_data *dev_data,
>> +			      const struct edac_dev_feature *ras_feat,
>> +			      const struct attribute_group **attr_groups) {
>> +	int num;
>> +
>> +	switch (ras_feat->feat) {
>> +	case RAS_FEAT_SCRUB:
>> +		dev_data->scrub_ops = ras_feat->scrub_ops;
>> +		dev_data->private = ras_feat->scrub_ctx;
>> +		return 1;
>> +	case RAS_FEAT_ECS:
>> +		num = ras_feat->ecs_info.num_media_frus;
>> +		dev_data->ecs_ops = ras_feat->ecs_ops;
>> +		dev_data->private = ras_feat->ecs_ctx;
>> +		return num;
>> +	case RAS_FEAT_PPR:
>> +		dev_data->ppr_ops = ras_feat->ppr_ops;
>> +		dev_data->private = ras_feat->ppr_ctx;
>> +		return 1;
>> +	default:
>> +		return -EINVAL;
>> +	}
>> +}
>> +
>> +/**
>> + * edac_dev_register - register device for ras features with edac
>
>s/edac/EDAC/g
>
>Check your whole set.
Modified.
>
>> + * @parent: client device.
>> + * @name: client device's name.
>> + * @private: parent driver's data to store in the context if any.
>> + * @num_features: number of ras features to register.
>> + * @ras_features: list of ras features to register.
>> + *
>> + * Returns 0 on success, error otherwise.
>> + * The new edac_dev_feat_ctx would be freed automatically.
>> + */
>> +int edac_dev_register(struct device *parent, char *name,
>> +		      void *private, int num_features,
>> +		      const struct edac_dev_feature *ras_features) {
>> +	const struct attribute_group **ras_attr_groups;
>> +	struct edac_dev_data *dev_data;
>> +	struct edac_dev_feat_ctx *ctx;
>> +	int ppr_cnt = 0, ppr_inst = 0;
>> +	int attr_gcnt = 0;
>> +	int ret, feat;
>> +
>> +	if (!parent || !name || !num_features || !ras_features)
>> +		return -EINVAL;
>> +
>> +	/* Double parse so we can make space for attributes */
>
>Who's "we"?
>
>Please use passive voice in your comments: no "we" or "I", etc.
Fixed.
>
>Personal pronouns are ambiguous in text, especially with so many
>parties/companies/etc developing the kernel so let's avoid them please.
>
>> +	for (feat = 0; feat < num_features; feat++) {
>> +		switch (ras_features[feat].feat) {
>> +		case RAS_FEAT_SCRUB:
>
>Does this need "fallthrough;" or somesuch?
It is a bug, fixed. 
>
>> +		case RAS_FEAT_PPR:
>> +			attr_gcnt++;
>> +			ppr_cnt++;
>> +			break;
>> +		case RAS_FEAT_ECS:
>> +			attr_gcnt +=
>ras_features[feat].ecs_info.num_media_frus;
>> +			break;
>> +		default:
>> +			return -EINVAL;
>> +		}
>> +	}
>> +
>> +	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
>> +	if (!ctx)
>> +		return -ENOMEM;
>> +
>> +	ctx->dev.parent = parent;
>> +	ctx->private = private;
>> +
>> +	ras_attr_groups = kcalloc(attr_gcnt + 1, sizeof(*ras_attr_groups),
>GFP_KERNEL);
>> +	if (!ras_attr_groups) {
>> +		ret = -ENOMEM;
>> +		goto ctx_free;
>> +	}
>> +
>> +	if (ppr_cnt) {
>> +		ctx->ppr = kcalloc(ppr_cnt, sizeof(*(ctx->ppr)), GFP_KERNEL);
>> +		if (!ctx->ppr) {
>> +			ret = -ENOMEM;
>> +			goto groups_free;
>> +		}
>> +	}
>> +
>> +	attr_gcnt = 0;
>> +	for (feat = 0; feat < num_features; feat++, ras_features++) {
>> +		switch (ras_features->feat) {
>> +		case RAS_FEAT_SCRUB:
>> +			if (!ras_features->scrub_ops)
>> +				continue;
>> +			dev_data = &ctx->scrub;
>> +			break;
>> +		case RAS_FEAT_ECS:
>> +			if (!ras_features->ecs_ops)
>> +				continue;
>> +			dev_data = &ctx->ecs;
>> +			break;
>> +		case RAS_FEAT_PPR:
>> +			if (!ras_features->ppr_ops)
>> +				continue;
>> +			dev_data = &ctx->ppr[ppr_inst];
>> +			dev_data->instance = ppr_inst;
>> +			ppr_inst++;
>> +			break;
>> +		default:
>> +			ret = -EINVAL;
>> +			goto data_mem_free;
>> +		}
>> +		ret = edac_dev_feat_init(parent, dev_data, ras_features,
>> +					 &ras_attr_groups[attr_gcnt]);
>> +		if (ret < 0)
>> +			goto data_mem_free;
>> +
>> +		attr_gcnt += ret;
>> +	}
>
>Newline.
Added newline.
>
>> +	ras_attr_groups[attr_gcnt] = NULL;
>> +	ctx->dev.bus = edac_get_sysfs_subsys();
>> +	ctx->dev.type = &edac_dev_type;
>> +	ctx->dev.groups = ras_attr_groups;
>> +	dev_set_drvdata(&ctx->dev, ctx);
>
>Ditto.
Added newline.
>
>> +	ret = dev_set_name(&ctx->dev, name);
>> +	if (ret)
>> +		goto data_mem_free;
>> +
>> +	ret = device_register(&ctx->dev);
>> +	if (ret) {
>> +		put_device(&ctx->dev);
>> +		goto data_mem_free;
>> +		return ret;
>> +	}
>> +
>> +	return devm_add_action_or_reset(parent, edac_dev_unreg, &ctx->dev);
>> +
>> +data_mem_free:
>> +	if (ppr_cnt)
>> +		kfree(ctx->ppr);
>> +groups_free:
>> +	kfree(ras_attr_groups);
>> +ctx_free:
>> +	kfree(ctx);
>> +	return ret;
>> +}
>> +EXPORT_SYMBOL_GPL(edac_dev_register);
>> diff --git a/include/linux/edac.h b/include/linux/edac.h index
>> b4ee8961e623..cc96f55ac714 100644
>> --- a/include/linux/edac.h
>> +++ b/include/linux/edac.h
>> @@ -661,4 +661,64 @@ static inline struct dimm_info
>> *edac_get_dimm(struct mem_ctl_info *mci,
>>
>>  	return mci->dimms[index];
>>  }
>> +
>> +/* EDAC device features */
>> +
>> +#define EDAC_FEAT_NAME_LEN	128
>> +
>> +enum edac_dev_feat {
>> +	RAS_FEAT_SCRUB,
>> +	RAS_FEAT_ECS,
>> +	RAS_FEAT_PPR,
>
>What are those? Comments ontop explaining pls.
Added comments.
>
>> +	RAS_FEAT_MAX
>> +};
>> +
>> +struct edac_ecs_ex_info {
>> +	u16 num_media_frus;
>> +};
>> +
>> +/*
>> + * EDAC device feature information structure  */ struct edac_dev_data
>> +{
>> +	union {
>> +		const struct edac_scrub_ops *scrub_ops;
>> +		const struct edac_ecs_ops *ecs_ops;
>> +		const struct edac_ppr_ops *ppr_ops;
>> +	};
>> +	u8 instance;
>> +	void *private;
>> +};
>> +
>> +struct device;
>> +
>> +struct edac_dev_feat_ctx {
>> +	struct device dev;
>> +	void *private;
>> +	struct edac_dev_data scrub;
>> +	struct edac_dev_data ecs;
>> +	struct edac_dev_data *ppr;
>> +};
>> +
>> +struct edac_dev_feature {
>> +	enum edac_dev_feat feat;
>
>			ft_type;
Sure. Changed.
>
>> +	u8 instance;
>> +	union {
>> +		const struct edac_scrub_ops *scrub_ops;
>> +		const struct edac_ecs_ops *ecs_ops;
>> +		const struct edac_ppr_ops *ppr_ops;
>> +	};
>> +	union {
>> +		void *scrub_ctx;
>> +		void *ecs_ctx;
>> +		void *ppr_ctx;
>> +	};
>
>Or drop the silly union and simply do
>
>	void *ctx;
Modified.
>
>> +	union {
>> +		struct edac_ecs_ex_info ecs_info;
>> +	};
>
>Union with a single member?!
Removed Union.
>
>> +};
>> +
>> +int edac_dev_register(struct device *parent, char *dev_name,
>> +		      void *parent_pvt_data, int num_features,
>> +		      const struct edac_dev_feature *ras_features);
>>  #endif /* _LINUX_EDAC_H_ */
>> --
>> 2.34.1
>>
>
>--
>Regards/Gruss,
>    Boris.
>
>https://people.kernel.org/tglx/notes-about-netiquette

Thanks,
Shiju
diff mbox series

Patch

diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 621dc2a5d034..635a41db8b5a 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -570,3 +570,181 @@  void edac_device_handle_ue_count(struct edac_device_ctl_info *edac_dev,
 		      block ? block->name : "N/A", count, msg);
 }
 EXPORT_SYMBOL_GPL(edac_device_handle_ue_count);
+
+/* EDAC device feature */
+static void edac_dev_release(struct device *dev)
+{
+	struct edac_dev_feat_ctx *ctx =
+		container_of(dev, struct edac_dev_feat_ctx, dev);
+
+	kfree(ctx->dev.groups);
+	kfree(ctx);
+}
+
+const struct device_type edac_dev_type = {
+	.name = "edac_dev",
+	.release = edac_dev_release,
+};
+
+static void edac_dev_unreg(void *data)
+{
+	device_unregister(data);
+}
+
+/**
+ * edac_dev_feature_init - Init a ras feature
+ * @parent: client device.
+ * @dev_data: pointer to struct edac_dev_data.
+ * @feat: pointer to struct edac_dev_feature.
+ * @attr_groups: pointer to attribute group's container.
+ *
+ * Returns number of scrub feature's attribute groups on success,
+ * error otherwise.
+ */
+static int edac_dev_feat_init(struct device *parent,
+			      struct edac_dev_data *dev_data,
+			      const struct edac_dev_feature *ras_feat,
+			      const struct attribute_group **attr_groups)
+{
+	int num;
+
+	switch (ras_feat->feat) {
+	case RAS_FEAT_SCRUB:
+		dev_data->scrub_ops = ras_feat->scrub_ops;
+		dev_data->private = ras_feat->scrub_ctx;
+		return 1;
+	case RAS_FEAT_ECS:
+		num = ras_feat->ecs_info.num_media_frus;
+		dev_data->ecs_ops = ras_feat->ecs_ops;
+		dev_data->private = ras_feat->ecs_ctx;
+		return num;
+	case RAS_FEAT_PPR:
+		dev_data->ppr_ops = ras_feat->ppr_ops;
+		dev_data->private = ras_feat->ppr_ctx;
+		return 1;
+	default:
+		return -EINVAL;
+	}
+}
+
+/**
+ * edac_dev_register - register device for ras features with edac
+ * @parent: client device.
+ * @name: client device's name.
+ * @private: parent driver's data to store in the context if any.
+ * @num_features: number of ras features to register.
+ * @ras_features: list of ras features to register.
+ *
+ * Returns 0 on success, error otherwise.
+ * The new edac_dev_feat_ctx would be freed automatically.
+ */
+int edac_dev_register(struct device *parent, char *name,
+		      void *private, int num_features,
+		      const struct edac_dev_feature *ras_features)
+{
+	const struct attribute_group **ras_attr_groups;
+	struct edac_dev_data *dev_data;
+	struct edac_dev_feat_ctx *ctx;
+	int ppr_cnt = 0, ppr_inst = 0;
+	int attr_gcnt = 0;
+	int ret, feat;
+
+	if (!parent || !name || !num_features || !ras_features)
+		return -EINVAL;
+
+	/* Double parse so we can make space for attributes */
+	for (feat = 0; feat < num_features; feat++) {
+		switch (ras_features[feat].feat) {
+		case RAS_FEAT_SCRUB:
+		case RAS_FEAT_PPR:
+			attr_gcnt++;
+			ppr_cnt++;
+			break;
+		case RAS_FEAT_ECS:
+			attr_gcnt += ras_features[feat].ecs_info.num_media_frus;
+			break;
+		default:
+			return -EINVAL;
+		}
+	}
+
+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+	if (!ctx)
+		return -ENOMEM;
+
+	ctx->dev.parent = parent;
+	ctx->private = private;
+
+	ras_attr_groups = kcalloc(attr_gcnt + 1, sizeof(*ras_attr_groups), GFP_KERNEL);
+	if (!ras_attr_groups) {
+		ret = -ENOMEM;
+		goto ctx_free;
+	}
+
+	if (ppr_cnt) {
+		ctx->ppr = kcalloc(ppr_cnt, sizeof(*(ctx->ppr)), GFP_KERNEL);
+		if (!ctx->ppr) {
+			ret = -ENOMEM;
+			goto groups_free;
+		}
+	}
+
+	attr_gcnt = 0;
+	for (feat = 0; feat < num_features; feat++, ras_features++) {
+		switch (ras_features->feat) {
+		case RAS_FEAT_SCRUB:
+			if (!ras_features->scrub_ops)
+				continue;
+			dev_data = &ctx->scrub;
+			break;
+		case RAS_FEAT_ECS:
+			if (!ras_features->ecs_ops)
+				continue;
+			dev_data = &ctx->ecs;
+			break;
+		case RAS_FEAT_PPR:
+			if (!ras_features->ppr_ops)
+				continue;
+			dev_data = &ctx->ppr[ppr_inst];
+			dev_data->instance = ppr_inst;
+			ppr_inst++;
+			break;
+		default:
+			ret = -EINVAL;
+			goto data_mem_free;
+		}
+		ret = edac_dev_feat_init(parent, dev_data, ras_features,
+					 &ras_attr_groups[attr_gcnt]);
+		if (ret < 0)
+			goto data_mem_free;
+
+		attr_gcnt += ret;
+	}
+	ras_attr_groups[attr_gcnt] = NULL;
+	ctx->dev.bus = edac_get_sysfs_subsys();
+	ctx->dev.type = &edac_dev_type;
+	ctx->dev.groups = ras_attr_groups;
+	dev_set_drvdata(&ctx->dev, ctx);
+	ret = dev_set_name(&ctx->dev, name);
+	if (ret)
+		goto data_mem_free;
+
+	ret = device_register(&ctx->dev);
+	if (ret) {
+		put_device(&ctx->dev);
+		goto data_mem_free;
+		return ret;
+	}
+
+	return devm_add_action_or_reset(parent, edac_dev_unreg, &ctx->dev);
+
+data_mem_free:
+	if (ppr_cnt)
+		kfree(ctx->ppr);
+groups_free:
+	kfree(ras_attr_groups);
+ctx_free:
+	kfree(ctx);
+	return ret;
+}
+EXPORT_SYMBOL_GPL(edac_dev_register);
diff --git a/include/linux/edac.h b/include/linux/edac.h
index b4ee8961e623..cc96f55ac714 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -661,4 +661,64 @@  static inline struct dimm_info *edac_get_dimm(struct mem_ctl_info *mci,
 
 	return mci->dimms[index];
 }
+
+/* EDAC device features */
+
+#define EDAC_FEAT_NAME_LEN	128
+
+enum edac_dev_feat {
+	RAS_FEAT_SCRUB,
+	RAS_FEAT_ECS,
+	RAS_FEAT_PPR,
+	RAS_FEAT_MAX
+};
+
+struct edac_ecs_ex_info {
+	u16 num_media_frus;
+};
+
+/*
+ * EDAC device feature information structure
+ */
+struct edac_dev_data {
+	union {
+		const struct edac_scrub_ops *scrub_ops;
+		const struct edac_ecs_ops *ecs_ops;
+		const struct edac_ppr_ops *ppr_ops;
+	};
+	u8 instance;
+	void *private;
+};
+
+struct device;
+
+struct edac_dev_feat_ctx {
+	struct device dev;
+	void *private;
+	struct edac_dev_data scrub;
+	struct edac_dev_data ecs;
+	struct edac_dev_data *ppr;
+};
+
+struct edac_dev_feature {
+	enum edac_dev_feat feat;
+	u8 instance;
+	union {
+		const struct edac_scrub_ops *scrub_ops;
+		const struct edac_ecs_ops *ecs_ops;
+		const struct edac_ppr_ops *ppr_ops;
+	};
+	union {
+		void *scrub_ctx;
+		void *ecs_ctx;
+		void *ppr_ctx;
+	};
+	union {
+		struct edac_ecs_ex_info ecs_info;
+	};
+};
+
+int edac_dev_register(struct device *parent, char *dev_name,
+		      void *parent_pvt_data, int num_features,
+		      const struct edac_dev_feature *ras_features);
 #endif /* _LINUX_EDAC_H_ */