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 X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0432C2D0CD for ; Mon, 16 Dec 2019 00:15:31 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A3B4B24683 for ; Mon, 16 Dec 2019 00:15:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A3B4B24683 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=au1.ibm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvdimm-bounces@lists.01.org Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 80B8B10097F16; Sun, 15 Dec 2019 16:18:53 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=alastair@au1.ibm.com; receiver= Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 82C72100DC2C2 for ; Sun, 15 Dec 2019 16:18:50 -0800 (PST) Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xBG0CGAs041480 for ; Sun, 15 Dec 2019 19:15:26 -0500 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0a-001b2d01.pphosted.com with ESMTP id 2wwe89j3bv-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 15 Dec 2019 19:15:26 -0500 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 16 Dec 2019 00:15:24 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 16 Dec 2019 00:15:17 -0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xBG0FGtv36241512 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Dec 2019 00:15:16 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6C46DAE051; Mon, 16 Dec 2019 00:15:16 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C8DC2AE045; Mon, 16 Dec 2019 00:15:15 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 16 Dec 2019 00:15:15 +0000 (GMT) Received: from adsilva.ozlabs.ibm.com (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id F1A04A011F; Mon, 16 Dec 2019 11:15:12 +1100 (AEDT) Subject: Re: [PATCH v2 25/27] nvdimm/ocxl: Expose SMART data via ndctl From: "Alastair D'Silva" To: Dan Williams Date: Mon, 16 Dec 2019 11:15:14 +1100 In-Reply-To: <20191203034655.51561-26-alastair@au1.ibm.com> References: <20191203034655.51561-1-alastair@au1.ibm.com> <20191203034655.51561-26-alastair@au1.ibm.com> Organization: IBM Australia User-Agent: Evolution 3.34.2 (3.34.2-1.fc31) MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19121600-0016-0000-0000-000002D5288B X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19121600-0017-0000-0000-00003337596E Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-12-15_07:2019-12-13,2019-12-15 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 phishscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 adultscore=0 mlxscore=0 clxscore=1015 mlxlogscore=999 spamscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1912160000 Message-ID-Hash: ZIRNIHZ7Z3AMFVNQF2ZXZSAG24H2JEVX X-Message-ID-Hash: ZIRNIHZ7Z3AMFVNQF2ZXZSAG24H2JEVX X-MailFrom: alastair@au1.ibm.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation CC: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Frederic Barrat , Andrew Donnellan , Arnd Bergmann , Greg Kroah-Hartman , Andrew Morton , Mauro Carvalho Chehab , "David S. Miller" , Rob Herring , Anton Blanchard , Krzysztof Kozlowski , Mahesh Salgaonkar , Madhavan Srinivasan , =?ISO-8859-1?Q?C=E9dric?= Le Goater , Anju T Sudhakar , Hari Bathini , Thomas Gleixner , Greg Kurz , Nicholas Piggin , Masahiro Yamada , Alexey Kardashevskiy , linux-kernel@vger.kernel.org, linuxppc-dev@lists. ozlabs.org, linux-nvdimm@lists.01.org, linux-mm@kvack.org X-Mailman-Version: 3.1.1 Precedence: list List-Id: "Linux-nvdimm developer list." Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Tue, 2019-12-03 at 14:46 +1100, Alastair D'Silva wrote: > From: Alastair D'Silva > > This patch retrieves proprietary formatted SMART data and makes it > available via ndctl. A later contribution will be made to ndctl to > parse this data. > > Signed-off-by: Alastair D'Silva Dan, I should ask, is there a defined format that ND_CMD_SMART should be returning data in, or is it reasonable to have this implementation dependent? > --- > drivers/nvdimm/ocxl/scm.c | 156 > +++++++++++++++++++++++++++++ > drivers/nvdimm/ocxl/scm_internal.h | 21 ++++ > 2 files changed, 177 insertions(+) > > diff --git a/drivers/nvdimm/ocxl/scm.c b/drivers/nvdimm/ocxl/scm.c > index 8deb7862793c..77b9e68870a3 100644 > --- a/drivers/nvdimm/ocxl/scm.c > +++ b/drivers/nvdimm/ocxl/scm.c > @@ -94,6 +94,157 @@ static int scm_ndctl_config_size(struct > nd_cmd_get_config_size *command) > return 0; > } > > +static int read_smart_attrib(struct scm_data *scm_data, u16 offset, > + struct scm_smart_attribs *attribs) > +{ > + u64 val; > + int rc; > + struct scm_smart_attrib *attrib; > + u8 attrib_id; > + > + rc = ocxl_global_mmio_read64(scm_data->ocxl_afu, offset, > OCXL_LITTLE_ENDIAN, > + &val); > + if (rc) > + return rc; > + > + attrib_id = (val >> 56) & 0xff; > + switch (attrib_id) { > + case SCM_SMART_ATTR_POWER_ON_HOURS: > + attrib = &attribs->power_on_hours; > + break; > + > + case SCM_SMART_ATTR_TEMPERATURE: > + attrib = &attribs->temperature; > + break; > + > + case SCM_SMART_ATTR_LIFE_REMAINING: > + attrib = &attribs->life_remaining; > + break; > + > + default: > + dev_warn(&scm_data->dev, "Unknown smart attrib '%d'", > attrib_id); > + return -ENOENT; > + } > + > + attrib->id = attrib_id; > + attrib->attribute_flags = (val >> 40) & 0xffff; > + attrib->current_val = (val >> 32) & 0xff; > + attrib->threshold_val = (val >> 24) & 0xff; > + attrib->worst_val = (val >> 16) & 0xff; > + > + rc = ocxl_global_mmio_read64(scm_data->ocxl_afu, offset + 0x08, > + OCXL_LITTLE_ENDIAN, &val); > + if (rc) > + return rc; > + > + attrib->raw_val = val; > + > + return 0; > +} > + > +/** > + * scm_smart_header_parse() - Parse the first 64 bits of the SMART > admin command response > + * @scm_data: the SCM metadata > + * @length: out, returns the number of bytes in the response > (excluding the 64 bit header) > + */ > +static int scm_smart_header_parse(struct scm_data *scm_data, u32 > *length) > +{ > + int rc; > + u64 val; > + > + u16 data_identifier; > + u32 data_length; > + > + rc = ocxl_global_mmio_read64(scm_data->ocxl_afu, > + scm_data- > >admin_command.data_offset, > + OCXL_LITTLE_ENDIAN, &val); > + if (rc) > + return rc; > + > + data_identifier = val >> 48; > + data_length = val & 0xFFFFFFFF; > + > + if (data_identifier != 0x534D) { > + dev_err(&scm_data->dev, > + "Bad data identifier for smart data, expected > 'SM', got '%-.*s'\n", > + 2, (char *)&data_identifier); > + return -EINVAL; > + } > + > + *length = data_length; > + return 0; > +} > + > +static int scm_smart_update(struct scm_data *scm_data) > +{ > + u32 length, i; > + int rc; > + > + mutex_lock(&scm_data->admin_command.lock); > + > + rc = scm_admin_command_request(scm_data, ADMIN_COMMAND_SMART); > + if (rc) > + goto out; > + > + rc = scm_admin_command_execute(scm_data); > + if (rc) > + goto out; > + > + rc = scm_admin_command_complete_timeout(scm_data, > ADMIN_COMMAND_SMART); > + if (rc < 0) { > + dev_err(&scm_data->dev, "SMART timeout\n"); > + goto out; > + } > + > + rc = scm_admin_response(scm_data); > + if (rc < 0) > + goto out; > + if (rc != STATUS_SUCCESS) { > + scm_warn_status(scm_data, "Unexpected status from > SMART", rc); > + goto out; > + } > + > + rc = scm_smart_header_parse(scm_data, &length); > + if (rc) > + goto out; > + > + length /= 0x10; // Length now contains the number of attributes > + > + for (i = 0; i < length; i++) > + read_smart_attrib(scm_data, > + scm_data->admin_command.data_offset + > 0x08 + i * 0x10, > + &scm_data->smart); > + > + rc = scm_admin_response_handled(scm_data); > + if (rc) > + goto out; > + > + rc = 0; > + goto out; > + > +out: > + mutex_unlock(&scm_data->admin_command.lock); > + return rc; > +} > + > +static int scm_ndctl_smart(struct scm_data *scm_data, void *buf, > + unsigned int buf_len) > +{ > + int rc; > + > + if (buf_len != sizeof(scm_data->smart)) > + return -EINVAL; > + > + rc = scm_smart_update(scm_data); > + if (rc) > + return rc; > + > + memcpy(buf, &scm_data->smart, buf_len); > + > + return 0; > +} > + > + > static int scm_ndctl(struct nvdimm_bus_descriptor *nd_desc, > struct nvdimm *nvdimm, > unsigned int cmd, void *buf, unsigned int buf_len, > int *cmd_rc) > @@ -101,6 +252,10 @@ static int scm_ndctl(struct > nvdimm_bus_descriptor *nd_desc, > struct scm_data *scm_data = container_of(nd_desc, struct > scm_data, bus_desc); > > switch (cmd) { > + case ND_CMD_SMART: > + *cmd_rc = scm_ndctl_smart(scm_data, buf, buf_len); > + return 0; > + > case ND_CMD_GET_CONFIG_SIZE: > *cmd_rc = scm_ndctl_config_size(buf); > return 0; > @@ -300,6 +455,7 @@ static int scm_register_lpc_mem(struct scm_data > *scm_data) > set_bit(ND_CMD_GET_CONFIG_SIZE, &nvdimm_cmd_mask); > set_bit(ND_CMD_GET_CONFIG_DATA, &nvdimm_cmd_mask); > set_bit(ND_CMD_SET_CONFIG_DATA, &nvdimm_cmd_mask); > + set_bit(ND_CMD_SMART, &nvdimm_cmd_mask); > > set_bit(NDD_ALIASING, &nvdimm_flags); > > diff --git a/drivers/nvdimm/ocxl/scm_internal.h > b/drivers/nvdimm/ocxl/scm_internal.h > index 4a29088612a9..d593fefe38d5 100644 > --- a/drivers/nvdimm/ocxl/scm_internal.h > +++ b/drivers/nvdimm/ocxl/scm_internal.h > @@ -115,6 +115,26 @@ enum overwrite_state { > SCM_OVERWRITE_FAILED > }; > > +#define SCM_SMART_ATTR_POWER_ON_HOURS 0x09 > +#define SCM_SMART_ATTR_TEMPERATURE 0xC2 > +#define SCM_SMART_ATTR_LIFE_REMAINING 0xCA > + > +struct scm_smart_attrib { > + __u8 id; /* See defines above */ > + __u16 attribute_flags; > + __u8 current_val; > + __u8 threshold_val; > + __u8 worst_val; > + __u8 reserved; > + __u64 raw_val; > +}; > + > +struct scm_smart_attribs { > + struct scm_smart_attrib power_on_hours; > + struct scm_smart_attrib temperature; > + struct scm_smart_attrib life_remaining; > +}; > + > struct scm_data { > struct device dev; > struct pci_dev *pdev; > @@ -136,6 +156,7 @@ struct scm_data { > struct resource scm_res; > struct nd_region *nd_region; > struct eventfd_ctx *ev_ctx; > + struct scm_smart_attribs smart; > char fw_version[8+1]; > u32 timeouts[ADMIN_COMMAND_MAX+1]; > -- Alastair D'Silva Open Source Developer Linux Technology Centre, IBM Australia mob: 0423 762 819 _______________________________________________ Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org To unsubscribe send an email to linux-nvdimm-leave@lists.01.org