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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham 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 02816C3F2D1 for ; Mon, 2 Mar 2020 17:51:22 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A1AAD2465E for ; Mon, 2 Mar 2020 17:51:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A1AAD2465E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2C2BD6B0003; Mon, 2 Mar 2020 12:51:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 299186B0005; Mon, 2 Mar 2020 12:51:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1B0FD6B0006; Mon, 2 Mar 2020 12:51:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0117.hostedemail.com [216.40.44.117]) by kanga.kvack.org (Postfix) with ESMTP id 046B56B0003 for ; Mon, 2 Mar 2020 12:51:21 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id A5840BF01 for ; Mon, 2 Mar 2020 17:51:21 +0000 (UTC) X-FDA: 76551163962.22.vase53_4604ca20d994a X-HE-Tag: vase53_4604ca20d994a X-Filterd-Recvd-Size: 12432 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf33.hostedemail.com (Postfix) with ESMTP for ; Mon, 2 Mar 2020 17:51:21 +0000 (UTC) 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 022Hnj48095357 for ; Mon, 2 Mar 2020 12:51:20 -0500 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2yfmu43f78-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 02 Mar 2020 12:51:20 -0500 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 2 Mar 2020 17:51:17 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 2 Mar 2020 17:51:10 -0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 022Hp8EA36372512 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 2 Mar 2020 17:51:08 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8B71B4C04E; Mon, 2 Mar 2020 17:51:08 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7F86F4C046; Mon, 2 Mar 2020 17:51:07 +0000 (GMT) Received: from pic2.home (unknown [9.145.49.157]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 2 Mar 2020 17:51:07 +0000 (GMT) Subject: Re: [PATCH v3 13/27] powerpc/powernv/pmem: Read the capability registers & wait for device ready To: "Alastair D'Silva" , alastair@d-silva.org Cc: "Aneesh Kumar K . V" , "Oliver O'Halloran" , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Andrew Donnellan , Arnd Bergmann , Greg Kroah-Hartman , Dan Williams , Vishal Verma , Dave Jiang , Ira Weiny , Andrew Morton , Mauro Carvalho Chehab , "David S. Miller" , Rob Herring , Anton Blanchard , Krzysztof Kozlowski , Mahesh Salgaonkar , Madhavan Srinivasan , =?UTF-8?Q?C=c3=a9dric_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 References: <20200221032720.33893-1-alastair@au1.ibm.com> <20200221032720.33893-14-alastair@au1.ibm.com> From: Frederic Barrat Date: Mon, 2 Mar 2020 18:51:07 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200221032720.33893-14-alastair@au1.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US X-TM-AS-GCONF: 00 x-cbid: 20030217-0028-0000-0000-000003E01506 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20030217-0029-0000-0000-000024A53ED2 Message-Id: <3d2de7c1-ee95-ed6c-0346-4a1d20a0b75e@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-03-02_06:2020-03-02,2020-03-02 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 spamscore=0 malwarescore=0 adultscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 impostorscore=0 clxscore=1015 phishscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2003020118 Content-Transfer-Encoding: quoted-printable 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: Le 21/02/2020 =C3=A0 04:27, Alastair D'Silva a =C3=A9crit=C2=A0: > From: Alastair D'Silva >=20 > This patch reads timeouts & firmware version from the controller, and > uses those timeouts to wait for the controller to report that it is rea= dy > before handing the memory over to libnvdimm. >=20 > Signed-off-by: Alastair D'Silva > --- > arch/powerpc/platforms/powernv/pmem/Makefile | 2 +- > arch/powerpc/platforms/powernv/pmem/ocxl.c | 92 ++++++++++++++++++= + > .../platforms/powernv/pmem/ocxl_internal.c | 19 ++++ > .../platforms/powernv/pmem/ocxl_internal.h | 24 +++++ > 4 files changed, 136 insertions(+), 1 deletion(-) > create mode 100644 arch/powerpc/platforms/powernv/pmem/ocxl_internal.= c >=20 > diff --git a/arch/powerpc/platforms/powernv/pmem/Makefile b/arch/powerp= c/platforms/powernv/pmem/Makefile > index 1c55c4193175..4ceda25907d4 100644 > --- a/arch/powerpc/platforms/powernv/pmem/Makefile > +++ b/arch/powerpc/platforms/powernv/pmem/Makefile > @@ -4,4 +4,4 @@ ccflags-$(CONFIG_PPC_WERROR) +=3D -Werror > =20 > obj-$(CONFIG_OCXL_PMEM) +=3D ocxlpmem.o > =20 > -ocxlpmem-y :=3D ocxl.o > +ocxlpmem-y :=3D ocxl.o ocxl_internal.o > diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl.c b/arch/powerpc/= platforms/powernv/pmem/ocxl.c > index 3c4eeb5dcc0f..431212c9f0cc 100644 > --- a/arch/powerpc/platforms/powernv/pmem/ocxl.c > +++ b/arch/powerpc/platforms/powernv/pmem/ocxl.c > @@ -8,6 +8,7 @@ > =20 > #include > #include > +#include > #include > #include > #include > @@ -215,6 +216,36 @@ static int register_lpc_mem(struct ocxlpmem *ocxlp= mem) > return 0; > } > =20 > +/** > + * is_usable() - Is a controller usable? > + * @ocxlpmem: the device metadata > + * @verbose: True to log errors > + * Return: true if the controller is usable > + */ > +static bool is_usable(const struct ocxlpmem *ocxlpmem, bool verbose) > +{ > + u64 chi =3D 0; > + int rc =3D ocxlpmem_chi(ocxlpmem, &chi); > + > + if (rc < 0) > + return false; > + > + if (!(chi & GLOBAL_MMIO_CHI_CRDY)) { > + if (verbose) > + dev_err(&ocxlpmem->dev, "controller is not ready.\n"); > + return false; > + } > + > + if (!(chi & GLOBAL_MMIO_CHI_MA)) { > + if (verbose) > + dev_err(&ocxlpmem->dev, > + "controller does not have memory available.\n"); > + return false; > + } > + > + return true; > +} > + > /** > * allocate_minor() - Allocate a minor number to use for an OpenCAPI = pmem device > * @ocxlpmem: the device metadata > @@ -328,6 +359,48 @@ static void ocxlpmem_remove(struct pci_dev *pdev) > } > } > =20 > +/** > + * read_device_metadata() - Retrieve config information from the AFU a= nd save it for future use > + * @ocxlpmem: the device metadata > + * Return: 0 on success, negative on failure > + */ > +static int read_device_metadata(struct ocxlpmem *ocxlpmem) > +{ > + u64 val; > + int rc; > + > + rc =3D ocxl_global_mmio_read64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_CCAP0, > + OCXL_LITTLE_ENDIAN, &val); > + if (rc) > + return rc; > + > + ocxlpmem->scm_revision =3D val & 0xFFFF; > + ocxlpmem->read_latency =3D (val >> 32) & 0xFF; > + ocxlpmem->readiness_timeout =3D (val >> 48) & 0x0F; > + ocxlpmem->memory_available_timeout =3D val >> 52; > + > + rc =3D ocxl_global_mmio_read64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_CCAP1, > + OCXL_LITTLE_ENDIAN, &val); > + if (rc) > + return rc; > + > + ocxlpmem->max_controller_dump_size =3D val & 0xFFFFFFFF; > + > + // Extract firmware version text > + rc =3D ocxl_global_mmio_read64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_FWVER, > + OCXL_HOST_ENDIAN, (u64 *)ocxlpmem->fw_version); > + if (rc) > + return rc; > + > + ocxlpmem->fw_version[8] =3D '\0'; > + > + dev_info(&ocxlpmem->dev, > + "Firmware version '%s' SCM revision %d:%d\n", ocxlpmem->fw_version, > + ocxlpmem->scm_revision >> 4, ocxlpmem->scm_revision & 0x0F); > + > + return 0; > +} > + > /** > * probe_function0() - Set up function 0 for an OpenCAPI persistent m= emory device > * This is important as it enables templates higher than 0 across all= other functions, > @@ -368,6 +441,7 @@ static int probe(struct pci_dev *pdev, const struct= pci_device_id *ent) > { > struct ocxlpmem *ocxlpmem; > int rc; > + u16 elapsed, timeout; > =20 > if (PCI_FUNC(pdev->devfn) =3D=3D 0) > return probe_function0(pdev); > @@ -422,6 +496,24 @@ static int probe(struct pci_dev *pdev, const struc= t pci_device_id *ent) > goto err; > } > =20 > + if (read_device_metadata(ocxlpmem)) { > + dev_err(&pdev->dev, "Could not read metadata\n"); Need to set rc > + goto err; > + } > + > + elapsed =3D 0; > + timeout =3D ocxlpmem->readiness_timeout + ocxlpmem->memory_available_= timeout; > + while (!is_usable(ocxlpmem, false)) { > + if (elapsed++ > timeout) { > + dev_warn(&ocxlpmem->dev, "OpenCAPI Persistent Memory ready timeout.= \n"); > + (void)is_usable(ocxlpmem, true); I guess that extra call to is_usable() is just to log the cause of the=20 error. However, with some bad luck, the call could now succeed. Fred > + rc =3D -ENXIO; > + goto err; > + } > + > + msleep(1000); > + } > + > rc =3D register_lpc_mem(ocxlpmem); > if (rc) { > dev_err(&pdev->dev, "Could not register OpenCAPI persistent memory = with libnvdimm\n"); > diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.c b/arch= /powerpc/platforms/powernv/pmem/ocxl_internal.c > new file mode 100644 > index 000000000000..617ca943b1b8 > --- /dev/null > +++ b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.c > @@ -0,0 +1,19 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +// Copyright 2019 IBM Corp. > + > +#include > +#include > +#include "ocxl_internal.h" > + > +int ocxlpmem_chi(const struct ocxlpmem *ocxlpmem, u64 *chi) > +{ > + u64 val; > + int rc =3D ocxl_global_mmio_read64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_CH= I, > + OCXL_LITTLE_ENDIAN, &val); > + if (rc) > + return rc; > + > + *chi =3D val; > + > + return 0; > +} > diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h b/arch= /powerpc/platforms/powernv/pmem/ocxl_internal.h > index 9cf3e42750e7..ba0301533d00 100644 > --- a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h > +++ b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h > @@ -97,4 +97,28 @@ struct ocxlpmem { > void *metadata_addr; > struct resource pmem_res; > struct nd_region *nd_region; > + char fw_version[8+1]; > + > + u32 max_controller_dump_size; > + u16 scm_revision; // major/minor > + u8 readiness_timeout; /* The worst case time (in seconds) that the h= ost shall > + * wait for the controller to become operational following a reset = (CHI.CRDY). > + */ > + u8 memory_available_timeout; /* The worst case time (in seconds) th= at the host shall > + * wait for memory to become available following a reset (CHI.MA). > + */ > + > + u16 read_latency; /* The nominal measure of latency (in nanoseconds) > + * associated with an unassisted read of a memory block. > + * This represents the capability of the raw media technology wit= hout assistance > + */ > }; > + > +/** > + * ocxlpmem_chi() - Get the value of the CHI register > + * @ocxlpmem: the device metadata > + * @chi: returns the CHI value > + * > + * Returns 0 on success, negative on error > + */ > +int ocxlpmem_chi(const struct ocxlpmem *ocxlpmem, u64 *chi); >=20