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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 E47B4C11D00 for ; Fri, 21 Feb 2020 03:28:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 99768208E4 for ; Fri, 21 Feb 2020 03:28:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99768208E4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=au1.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A69196B000E; Thu, 20 Feb 2020 22:28:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A19A36B0010; Thu, 20 Feb 2020 22:28:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BABA6B0032; Thu, 20 Feb 2020 22:28:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0044.hostedemail.com [216.40.44.44]) by kanga.kvack.org (Postfix) with ESMTP id 676DB6B000E for ; Thu, 20 Feb 2020 22:28:23 -0500 (EST) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 4BCAC180AD80F for ; Fri, 21 Feb 2020 03:28:23 +0000 (UTC) X-FDA: 76512701286.13.swing74_6645f9d719527 X-HE-Tag: swing74_6645f9d719527 X-Filterd-Recvd-Size: 11685 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf22.hostedemail.com (Postfix) with ESMTP for ; Fri, 21 Feb 2020 03:28:22 +0000 (UTC) Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01L3KHlE104676 for ; Thu, 20 Feb 2020 22:28:22 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2y8ubqh1js-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 20 Feb 2020 22:28:21 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 21 Feb 2020 03:28:18 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 21 Feb 2020 03:28:10 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 01L3S9lD55246944 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Feb 2020 03:28:09 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BC3FD52052; Fri, 21 Feb 2020 03:28:09 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 213D552050; Fri, 21 Feb 2020 03:28:09 +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 52EA8A03CF; Fri, 21 Feb 2020 14:28:03 +1100 (AEDT) From: "Alastair D'Silva" To: alastair@d-silva.org Cc: "Aneesh Kumar K . V" , "Oliver O'Halloran" , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Frederic Barrat , 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=20Le=20Goater?= , 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 Subject: [PATCH v3 13/27] powerpc/powernv/pmem: Read the capability registers & wait for device ready Date: Fri, 21 Feb 2020 14:27:06 +1100 X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200221032720.33893-1-alastair@au1.ibm.com> References: <20200221032720.33893-1-alastair@au1.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 20022103-0020-0000-0000-000003AC2211 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20022103-0021-0000-0000-000022042A33 Message-Id: <20200221032720.33893-14-alastair@au1.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-02-20_19:2020-02-19,2020-02-20 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 clxscore=1015 priorityscore=1501 suspectscore=1 spamscore=0 bulkscore=0 impostorscore=0 mlxlogscore=999 lowpriorityscore=0 malwarescore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2002210020 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: From: Alastair D'Silva This patch reads timeouts & firmware version from the controller, and uses those timeouts to wait for the controller to report that it is ready before handing the memory over to libnvdimm. 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 diff --git a/arch/powerpc/platforms/powernv/pmem/Makefile b/arch/powerpc/= 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/pl= atforms/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 *ocxlpme= m) 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 pme= m 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 and= 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 memo= ry device * This is important as it enables templates higher than 0 across all ot= her functions, @@ -368,6 +441,7 @@ static int probe(struct pci_dev *pdev, const struct p= ci_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 struct = pci_device_id *ent) goto err; } =20 + if (read_device_metadata(ocxlpmem)) { + dev_err(&pdev->dev, "Could not read metadata\n"); + goto err; + } + + elapsed =3D 0; + timeout =3D ocxlpmem->readiness_timeout + ocxlpmem->memory_available_ti= meout; + while (!is_usable(ocxlpmem, false)) { + if (elapsed++ > timeout) { + dev_warn(&ocxlpmem->dev, "OpenCAPI Persistent Memory ready timeout.\n= "); + (void)is_usable(ocxlpmem, true); + 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 wit= h libnvdimm\n"); diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.c b/arch/p= owerpc/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_CHI, + 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/p= owerpc/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 hos= t shall + * wait for the controller to become operational following a reset (C= HI.CRDY). + */ + u8 memory_available_timeout; /* The worst case time (in seconds) that= 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 witho= ut 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 2.24.1