From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07B04D5D695 for ; Fri, 8 Nov 2024 00:36:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 823A26B00B3; Thu, 7 Nov 2024 19:36:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7AA0A6B00B5; Thu, 7 Nov 2024 19:36:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D4BD6B00B6; Thu, 7 Nov 2024 19:36:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 36E226B00B3 for ; Thu, 7 Nov 2024 19:36:26 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B9D4D1C5568 for ; Fri, 8 Nov 2024 00:36:25 +0000 (UTC) X-FDA: 82761060900.11.D8D8DE2 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf04.hostedemail.com (Postfix) with ESMTP id 0015840005 for ; Fri, 8 Nov 2024 00:35:37 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=DZmD3G+A; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731026124; a=rsa-sha256; cv=none; b=cOEQXq7x+gDYB1rNV27mfVf1Pi9R7YVveWVMUzvBE1ElhJKwq6heomMghuKWU2LhlPy4l6 hgGEA/oucqBgHKz6NpC8Fmmb0YfAH1H/qJPIdAbmALve4U0A8t9OdXRZRzROn3d81SfZkk W6pVsArN2JzSkH7sTbOL14xhCL9mvnA= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=DZmD3G+A; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731026124; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CjUJNAqUSD0fpIJN7hsUnikhrlQCt4BCY1mQOMqITlo=; b=sMkx5hH96BOz0aukmzVm1fPt/No7Tz/5v7+czObAmsrs5qQ7pgU5Y0UcoFV0ZvCtihxUF/ gCHaip1DJYuMAQT3wLvdOnYhuLY9XgI1ZOIAQ6ANpyIhQ4iA26P6AwiDv2VgznSYdBJACw fB99HcKPJxIu+TWemW5HkbAIe8arURQ= Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-71e61b47c6cso1315840b3a.2 for ; Thu, 07 Nov 2024 16:36:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731026182; x=1731630982; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=CjUJNAqUSD0fpIJN7hsUnikhrlQCt4BCY1mQOMqITlo=; b=DZmD3G+AajZFvTnq47lZh5tfuxH9YDreUqfnxmancD05mChDUrfUsXxOEXqN0EjePM 8WJehwGtlj0WSUpFCP1MrRWrhiOChzy3t3FXG3Ztu3CdVM7HkqNnJbYa+ggoGCr+6sUf s7SV4KNCanGxxWlpovU3hkaeU8vV1ZgdWGkTPFeV4xpIZKcmRHtvPrUHkJYHhxTPyvYK QFWEkV17NfofwNAC7+xNOqMJOLJNgiwVLHe+9fXgJ3+lP3H1Fi5FwasHIBrCMVPmmBPK c0xXA9urNdlJ6vrnFjs/gWmvKnLGTZhgmLjccUVn2VY4d0FlmZqvQgKW0REaYv+bi4MR oM0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731026182; x=1731630982; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=CjUJNAqUSD0fpIJN7hsUnikhrlQCt4BCY1mQOMqITlo=; b=xQfFTtF3d4CMJ4w0SdmlaGcXpdJ4icNgDBGja9tWeknNtJU6u5m61QtUI3RiIs8xU4 /VQU5McqAogRwGJgy68wvfpCAPsFDySqkcVIJNB2Hwz14xMoNDwIPJq9uKyzHaMEM4nv 7OZXFsKOEqGJN0l8LQ/UNGz9p0+Pi35KBFrWccqHBqiCfQk8FwZUbSdxD3FWgYectyiX 6OooXR7+5csTXsNUDocGP8Dl/m4Lk39nnI5UmMf4rCJH10vUoZPuG6JL2KoaKWgLC8Kn v732tWzwEBUNWLDrvvDPoQOlWsXyy00kszET5bk9TitUu6tRQhjmSnrXge6OYkm26m25 G4BQ== X-Forwarded-Encrypted: i=1; AJvYcCUN4M1M2LSVkPO7xgHR14IFan+TB8H6lMtRS1F945Q9I6pdRWGRy1fGg19ScH/OdSezTm75eLlThg==@kvack.org X-Gm-Message-State: AOJu0Yy18W9r0RgUdMECvpr4WDQhcnrh7ROyQpxoz6+WAewa2NTZZvSo S+D5z+wmSaDpUGcm7LrF4BqJ95KvfxCGKnu5kqyJUF3/ULi0mjT5keNBAiay X-Google-Smtp-Source: AGHT+IGSNyH5XzLu6nhj/EOmVCetKhN54ggz5hDC7V0Mbx8kGXnmU8chmzVyuRxDOUtddvysNrWqxQ== X-Received: by 2002:aa7:8882:0:b0:71e:6c67:2ebf with SMTP id d2e1a72fcca58-724132bff58mr1393036b3a.11.1731026182280; Thu, 07 Nov 2024 16:36:22 -0800 (PST) Received: from fan ([2601:646:8f03:9fee:6ed1:b454:5fd2:3850]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724079a3d38sm2429530b3a.122.2024.11.07.16.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2024 16:36:21 -0800 (PST) From: Fan Ni X-Google-Original-From: Fan Ni Date: Thu, 7 Nov 2024 16:36:17 -0800 To: 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, bp@alien8.de, tony.luck@intel.com, rafael@kernel.org, lenb@kernel.org, mchehab@kernel.org, dan.j.williams@intel.com, dave@stgolabs.net, jonathan.cameron@huawei.com, gregkh@linuxfoundation.org, sudeep.holla@arm.com, jassisinghbrar@gmail.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, gthelen@google.com, wschwartz@amperecomputing.com, dferguson@amperecomputing.com, wbs@os.amperecomputing.com, nifan.cxl@gmail.com, tanxiaofei@huawei.com, prime.zeng@hisilicon.com, roberto.sassu@huawei.com, kangkang.shen@futurewei.com, wanghuiqiang@huawei.com, linuxarm@huawei.com Subject: Re: [PATCH v15 02/15] EDAC: Add scrub control feature Message-ID: References: <20241101091735.1465-1-shiju.jose@huawei.com> <20241101091735.1465-3-shiju.jose@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241101091735.1465-3-shiju.jose@huawei.com> X-Rspam-User: X-Rspamd-Queue-Id: 0015840005 X-Rspamd-Server: rspam01 X-Stat-Signature: d8aqpnyr7bxm9xyda9smjqtue5jxwgzo X-HE-Tag: 1731026137-67938 X-HE-Meta: U2FsdGVkX1/VA0vsBr26a+f21MzuAggyJ2dxjDPkoig89OoSpt381/dL3Bnelc/3+e71D7GgMy0RVxd+Zimug5j01LwmMgE2svjokS71Hvy3PxMI3flSI081/lazs7bSxZrc74fol7/3ps/NjXUIXrv34RqtqDro7+g483m/ptgElSh15SyHhbzfLYID6AntpMbhH+UJDfl3q09NoDMRMJAHVuSmspo3IftgSR4L7RNrJx4bPg77dIyBju2Wj1x7fKvj4nEu8L0rvJhXkrQwvjIX6X/8xecVNorkKYrZDQsEx782yYfs0tWTtDLXxCQwtTSiHWgUf9AsshsUWw6YYbraMnk22adXKUbKBFkNTgFPWzzL9Kvz86VdqANytttsRnNoKbPQ5B4dHyaXG199Ks3c4r1GJK38j037zLNzAfRWstLwwiHZeNuGxOoHSauiuDSVWYodU1ETVtm4+bxmzZA4mq7JDwvW/wKbiZnBWZeL50EAzB7oo9qLiO1NQmFMfYSLu0luSLdAyXiWvaixVQt6PJ5qHjHX6WLzrju3JmUG22UkLjP6YLSeHIZ1ovd+5ASwqMv39Zx5QaFXXrwaR6Hmid3pPP9eCxvSODDFkekxP13mjRe58tfbbjksMBN1FXVtkEnfbLem8LcZZeBT9H1JLB7DNSL5HtDFuPCDrKD66u1eMWB0NduliYbxXvMoJuJ6NaUmruchCdf1xts8ZT+vGhJGPDI8+aL5/HLWXePkJISRE8U44tJnGXAzphjV+UmGiyMhQ8Hg4Kvm5hWshU4U2f1mLPXHldgpcB8XHin4GVX+oQ2aRbHLo3VZI1py1MvtTJ0dOwGL6QqkFQu7p+Qd26m2MHQ4WPpVXo2XsrZY8ElQrsDpNqfkTK9zy5Sxn+S88auwl5cACbgQWo2TEGTOZliFQ6Klgo6LEG7PU140Np/PsbNG+cidZpkN6N53jtYDnjHMqkdFW5v8uqQ YDvFnzUP XVwxJBqjaFh4zCKdFKBDQEeNiPlTmq68KTW9LXumvqauBkMQEkIAOWWj5TysQYkzWP/GWOy7N0ctyq6lXstu1ioSGl+ZttTpSoe9n1dvW8FquNww1gS4PpQGyh9KP8XVqt4iy66RHwNlNGIByfzJsarL6h4AnKSdkX1O2ARrThWQFWj3t6MKtbkIRyEgZ5bp1w24YFu0CSHryj1vhxc1AxSGZSVg/piOkgGAfsKCIcKiR+3fl04eMqFIMxD0XsrRmQN8JFnlT9AtUZvZveGNWlsyaIrMfdnPK/pqMctuFz/V54K28feJBrtPND17W1VxNoNa1/Fxlrm76agunYyIso5tPTOiYW52C1pbkRPu8mAj9tfc4eIJfHsKsUWS1zCf/7nJENP30rQ85x4J24CdqYV+nhEF4bRPEnAkUvo5jlbl6xMi0ohsn/WTPZCtnFcY349lPPNPtfjb+lWs/3dYWiAo1e1DMMLVrdkHQ2z8p3mzcCf8g+2R/J69tRXO/+UnCP2pHBgXT+lqnmrh2S/Bhy/0rdaHXBlvMj3eGKTi+Jjhl22PrTATrBQUQrA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Fri, Nov 01, 2024 at 09:17:20AM +0000, shiju.jose@huawei.com wrote: > From: Shiju Jose > > Add a generic EDAC scrub control to manage memory scrubbers in the system. > Devices with a scrub feature register with the EDAC device driver, which > retrieves the scrub descriptor from the EDAC scrub driver and exposes the > sysfs scrub control attributes for a scrub instance to userspace at > /sys/bus/edac/devices//scrubX/. > > The common sysfs scrub control interface abstracts the control of > arbitrary scrubbing functionality into a common set of functions. The > sysfs scrub attribute nodes are only present if the client driver has > implemented the corresponding attribute callback function and passed the > operations(ops) to the EDAC device driver during registration. > > Co-developed-by: Jonathan Cameron > Signed-off-by: Jonathan Cameron > Signed-off-by: Shiju Jose > --- Minor comments inline. > Documentation/ABI/testing/sysfs-edac-scrub | 74 ++++++++ > drivers/edac/Makefile | 1 + > drivers/edac/edac_device.c | 40 +++- > drivers/edac/scrub.c | 209 +++++++++++++++++++++ > include/linux/edac.h | 34 ++++ > 5 files changed, 354 insertions(+), 4 deletions(-) > create mode 100644 Documentation/ABI/testing/sysfs-edac-scrub > create mode 100755 drivers/edac/scrub.c > > diff --git a/Documentation/ABI/testing/sysfs-edac-scrub b/Documentation/ABI/testing/sysfs-edac-scrub > new file mode 100644 > index 000000000000..d8d11165ff2a > --- /dev/null > +++ b/Documentation/ABI/testing/sysfs-edac-scrub ... > diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c > index e9229b5f8afe..cd700a64406e 100644 > --- a/drivers/edac/edac_device.c > +++ b/drivers/edac/edac_device.c > @@ -576,6 +576,7 @@ 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->scrub); > kfree(ctx->dev.groups); > kfree(ctx); > } > @@ -609,6 +610,8 @@ int edac_dev_register(struct device *parent, char *name, > const struct edac_dev_feature *ras_features) > { > const struct attribute_group **ras_attr_groups; > + int scrub_cnt = 0, scrub_inst = 0; > + struct edac_dev_data *dev_data; > struct edac_dev_feat_ctx *ctx; > int attr_gcnt = 0; > int ret, feat; > @@ -619,7 +622,10 @@ int edac_dev_register(struct device *parent, char *name, > /* Double parse to make space for attributes */ > for (feat = 0; feat < num_features; feat++) { > switch (ras_features[feat].ft_type) { > - /* Add feature specific code */ > + case RAS_FEAT_SCRUB: > + attr_gcnt++; > + scrub_cnt++; > + break; > default: > return -EINVAL; > } > @@ -635,13 +641,37 @@ int edac_dev_register(struct device *parent, char *name, > goto ctx_free; > } > > + if (scrub_cnt) { > + ctx->scrub = kcalloc(scrub_cnt, sizeof(*ctx->scrub), GFP_KERNEL); > + if (!ctx->scrub) { > + ret = -ENOMEM; > + goto groups_free; > + } > + } > + > attr_gcnt = 0; If we use scrub_cnt the same way as we use attr_gcnt, we do not need scrub_inst. Fan > for (feat = 0; feat < num_features; feat++, ras_features++) { > switch (ras_features->ft_type) { > - /* Add feature specific code */ > + case RAS_FEAT_SCRUB: > + if (!ras_features->scrub_ops || > + scrub_inst != ras_features->instance) > + goto data_mem_free; > + > + dev_data = &ctx->scrub[scrub_inst]; > + dev_data->instance = scrub_inst; > + dev_data->scrub_ops = ras_features->scrub_ops; > + dev_data->private = ras_features->ctx; > + ret = edac_scrub_get_desc(parent, &ras_attr_groups[attr_gcnt], > + ras_features->instance); > + if (ret) > + goto data_mem_free; > + > + scrub_inst++; > + attr_gcnt++; > + break; > default: > ret = -EINVAL; > - goto groups_free; > + goto data_mem_free; > } > } > > @@ -654,7 +684,7 @@ int edac_dev_register(struct device *parent, char *name, > > ret = dev_set_name(&ctx->dev, name); > if (ret) > - goto groups_free; > + goto data_mem_free; > > ret = device_register(&ctx->dev); > if (ret) { > @@ -664,6 +694,8 @@ int edac_dev_register(struct device *parent, char *name, > > return devm_add_action_or_reset(parent, edac_dev_unreg, &ctx->dev); > > +data_mem_free: > + kfree(ctx->scrub); > groups_free: > kfree(ras_attr_groups); > ctx_free: > diff --git a/drivers/edac/scrub.c b/drivers/edac/scrub.c > new file mode 100755 > index 000000000000..3978201c4bfc > --- /dev/null > +++ b/drivers/edac/scrub.c > @@ -0,0 +1,209 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * The generic EDAC scrub driver controls the memory scrubbers in the > + * system. The common sysfs scrub interface abstracts the control of > + * various arbitrary scrubbing functionalities into a unified set of > + * functions. > + * > + * Copyright (c) 2024 HiSilicon Limited. > + */ > + > +#include > + > +enum edac_scrub_attributes { > + SCRUB_ADDRESS, > + SCRUB_SIZE, > + SCRUB_ENABLE_BACKGROUND, > + SCRUB_MIN_CYCLE_DURATION, > + SCRUB_MAX_CYCLE_DURATION, > + SCRUB_CUR_CYCLE_DURATION, > + SCRUB_MAX_ATTRS > +}; > + > +struct edac_scrub_dev_attr { > + struct device_attribute dev_attr; > + u8 instance; > +}; > + > +struct edac_scrub_context { > + char name[EDAC_FEAT_NAME_LEN]; > + struct edac_scrub_dev_attr scrub_dev_attr[SCRUB_MAX_ATTRS]; > + struct attribute *scrub_attrs[SCRUB_MAX_ATTRS + 1]; > + struct attribute_group group; > +}; > + > +#define TO_SCRUB_DEV_ATTR(_dev_attr) \ > + container_of(_dev_attr, struct edac_scrub_dev_attr, dev_attr) > + > +#define EDAC_SCRUB_ATTR_SHOW(attrib, cb, type, format) \ > +static ssize_t attrib##_show(struct device *ras_feat_dev, \ > + struct device_attribute *attr, char *buf) \ > +{ \ > + u8 inst = TO_SCRUB_DEV_ATTR(attr)->instance; \ > + struct edac_dev_feat_ctx *ctx = dev_get_drvdata(ras_feat_dev); \ > + const struct edac_scrub_ops *ops = ctx->scrub[inst].scrub_ops; \ > + type data; \ > + int ret; \ > + \ > + ret = ops->cb(ras_feat_dev->parent, ctx->scrub[inst].private, &data); \ > + if (ret) \ > + return ret; \ > + \ > + return sysfs_emit(buf, format, data); \ > +} > + > +EDAC_SCRUB_ATTR_SHOW(addr, read_addr, u64, "0x%llx\n") > +EDAC_SCRUB_ATTR_SHOW(size, read_size, u64, "0x%llx\n") > +EDAC_SCRUB_ATTR_SHOW(enable_background, get_enabled_bg, bool, "%u\n") > +EDAC_SCRUB_ATTR_SHOW(min_cycle_duration, get_min_cycle, u32, "%u\n") > +EDAC_SCRUB_ATTR_SHOW(max_cycle_duration, get_max_cycle, u32, "%u\n") > +EDAC_SCRUB_ATTR_SHOW(current_cycle_duration, get_cycle_duration, u32, "%u\n") > + > +#define EDAC_SCRUB_ATTR_STORE(attrib, cb, type, conv_func) \ > +static ssize_t attrib##_store(struct device *ras_feat_dev, \ > + struct device_attribute *attr, \ > + const char *buf, size_t len) \ > +{ \ > + u8 inst = TO_SCRUB_DEV_ATTR(attr)->instance; \ > + struct edac_dev_feat_ctx *ctx = dev_get_drvdata(ras_feat_dev); \ > + const struct edac_scrub_ops *ops = ctx->scrub[inst].scrub_ops; \ > + type data; \ > + int ret; \ > + \ > + ret = conv_func(buf, 0, &data); \ > + if (ret < 0) \ > + return ret; \ > + \ > + ret = ops->cb(ras_feat_dev->parent, ctx->scrub[inst].private, data); \ > + if (ret) \ > + return ret; \ > + \ > + return len; \ > +} > + > +EDAC_SCRUB_ATTR_STORE(addr, write_addr, u64, kstrtou64) > +EDAC_SCRUB_ATTR_STORE(size, write_size, u64, kstrtou64) > +EDAC_SCRUB_ATTR_STORE(enable_background, set_enabled_bg, unsigned long, kstrtoul) > +EDAC_SCRUB_ATTR_STORE(current_cycle_duration, set_cycle_duration, unsigned long, kstrtoul) > + > +static umode_t scrub_attr_visible(struct kobject *kobj, struct attribute *a, int attr_id) > +{ > + struct device *ras_feat_dev = kobj_to_dev(kobj); > + struct device_attribute *dev_attr = container_of(a, struct device_attribute, attr); > + u8 inst = TO_SCRUB_DEV_ATTR(dev_attr)->instance; > + struct edac_dev_feat_ctx *ctx = dev_get_drvdata(ras_feat_dev); > + const struct edac_scrub_ops *ops = ctx->scrub[inst].scrub_ops; > + > + switch (attr_id) { > + case SCRUB_ADDRESS: > + if (ops->read_addr) { > + if (ops->write_addr) > + return a->mode; > + else > + return 0444; > + } > + break; > + case SCRUB_SIZE: > + if (ops->read_size) { > + if (ops->write_size) > + return a->mode; > + else > + return 0444; > + } > + break; > + case SCRUB_ENABLE_BACKGROUND: > + if (ops->get_enabled_bg) { > + if (ops->set_enabled_bg) > + return a->mode; > + else > + return 0444; > + } > + break; > + case SCRUB_MIN_CYCLE_DURATION: > + if (ops->get_min_cycle) > + return a->mode; > + break; > + case SCRUB_MAX_CYCLE_DURATION: > + if (ops->get_max_cycle) > + return a->mode; > + break; > + case SCRUB_CUR_CYCLE_DURATION: > + if (ops->get_cycle_duration) { > + if (ops->set_cycle_duration) > + return a->mode; > + else > + return 0444; > + } > + break; > + default: > + break; > + } > + > + return 0; > +} > + > +#define EDAC_SCRUB_ATTR_RO(_name, _instance) \ > + ((struct edac_scrub_dev_attr) { .dev_attr = __ATTR_RO(_name), \ > + .instance = _instance }) > + > +#define EDAC_SCRUB_ATTR_WO(_name, _instance) \ > + ((struct edac_scrub_dev_attr) { .dev_attr = __ATTR_WO(_name), \ > + .instance = _instance }) > + > +#define EDAC_SCRUB_ATTR_RW(_name, _instance) \ > + ((struct edac_scrub_dev_attr) { .dev_attr = __ATTR_RW(_name), \ > + .instance = _instance }) > + > +static int scrub_create_desc(struct device *scrub_dev, > + const struct attribute_group **attr_groups, u8 instance) > +{ > + struct edac_scrub_context *scrub_ctx; > + struct attribute_group *group; > + int i; > + struct edac_scrub_dev_attr dev_attr[] = { > + [SCRUB_ADDRESS] = EDAC_SCRUB_ATTR_RW(addr, instance), > + [SCRUB_SIZE] = EDAC_SCRUB_ATTR_RW(size, instance), > + [SCRUB_ENABLE_BACKGROUND] = EDAC_SCRUB_ATTR_RW(enable_background, instance), > + [SCRUB_MIN_CYCLE_DURATION] = EDAC_SCRUB_ATTR_RO(min_cycle_duration, instance), > + [SCRUB_MAX_CYCLE_DURATION] = EDAC_SCRUB_ATTR_RO(max_cycle_duration, instance), > + [SCRUB_CUR_CYCLE_DURATION] = EDAC_SCRUB_ATTR_RW(current_cycle_duration, instance) > + }; > + > + scrub_ctx = devm_kzalloc(scrub_dev, sizeof(*scrub_ctx), GFP_KERNEL); > + if (!scrub_ctx) > + return -ENOMEM; > + > + group = &scrub_ctx->group; > + for (i = 0; i < SCRUB_MAX_ATTRS; i++) { > + memcpy(&scrub_ctx->scrub_dev_attr[i], &dev_attr[i], sizeof(dev_attr[i])); > + scrub_ctx->scrub_attrs[i] = &scrub_ctx->scrub_dev_attr[i].dev_attr.attr; > + } > + sprintf(scrub_ctx->name, "%s%d", "scrub", instance); > + group->name = scrub_ctx->name; > + group->attrs = scrub_ctx->scrub_attrs; > + group->is_visible = scrub_attr_visible; > + > + attr_groups[0] = group; > + > + return 0; > +} > + > +/** > + * edac_scrub_get_desc - get EDAC scrub descriptors > + * @scrub_dev: client device, with scrub support > + * @attr_groups: pointer to attribute group container > + * @instance: device's scrub instance number. > + * > + * Return: > + * * %0 - Success. > + * * %-EINVAL - Invalid parameters passed. > + * * %-ENOMEM - Dynamic memory allocation failed. > + */ > +int edac_scrub_get_desc(struct device *scrub_dev, > + const struct attribute_group **attr_groups, u8 instance) > +{ > + if (!scrub_dev || !attr_groups) > + return -EINVAL; > + > + return scrub_create_desc(scrub_dev, attr_groups, instance); > +} > diff --git a/include/linux/edac.h b/include/linux/edac.h > index e19706311ec0..3620a09c0476 100644 > --- a/include/linux/edac.h > +++ b/include/linux/edac.h > @@ -668,11 +668,43 @@ static inline struct dimm_info *edac_get_dimm(struct mem_ctl_info *mci, > > /* RAS feature type */ > enum edac_dev_feat { > + RAS_FEAT_SCRUB, > RAS_FEAT_MAX > }; > > +/** > + * struct edac_scrub_ops - scrub device operations (all elements optional) > + * @read_addr: read base address of scrubbing range. > + * @read_size: read offset of scrubbing range. > + * @write_addr: set base address of the scrubbing range. > + * @write_size: set offset of the scrubbing range. > + * @get_enabled_bg: check if currently performing background scrub. > + * @set_enabled_bg: start or stop a bg-scrub. > + * @get_min_cycle: get minimum supported scrub cycle duration in seconds. > + * @get_max_cycle: get maximum supported scrub cycle duration in seconds. > + * @get_cycle_duration: get current scrub cycle duration in seconds. > + * @set_cycle_duration: set current scrub cycle duration in seconds. > + */ > +struct edac_scrub_ops { > + int (*read_addr)(struct device *dev, void *drv_data, u64 *base); > + int (*read_size)(struct device *dev, void *drv_data, u64 *size); > + int (*write_addr)(struct device *dev, void *drv_data, u64 base); > + int (*write_size)(struct device *dev, void *drv_data, u64 size); > + int (*get_enabled_bg)(struct device *dev, void *drv_data, bool *enable); > + int (*set_enabled_bg)(struct device *dev, void *drv_data, bool enable); > + int (*get_min_cycle)(struct device *dev, void *drv_data, u32 *min); > + int (*get_max_cycle)(struct device *dev, void *drv_data, u32 *max); > + int (*get_cycle_duration)(struct device *dev, void *drv_data, u32 *cycle); > + int (*set_cycle_duration)(struct device *dev, void *drv_data, u32 cycle); > +}; > + > +int edac_scrub_get_desc(struct device *scrub_dev, > + const struct attribute_group **attr_groups, > + u8 instance); > + > /* EDAC device feature information structure */ > struct edac_dev_data { > + const struct edac_scrub_ops *scrub_ops; > u8 instance; > void *private; > }; > @@ -680,11 +712,13 @@ struct edac_dev_data { > struct edac_dev_feat_ctx { > struct device dev; > void *private; > + struct edac_dev_data *scrub; > }; > > struct edac_dev_feature { > enum edac_dev_feat ft_type; > u8 instance; > + const struct edac_scrub_ops *scrub_ops; > void *ctx; > }; > > -- > 2.34.1 > -- Fan Ni