Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp4009704ybg; Tue, 29 Oct 2019 00:22:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqx+/Xe93Mpgi7RoC22kBqEPysMezqYDx+rIeLjQBTQwVBV9+qIFja+UhwcuBI17b8ljYqED X-Received: by 2002:a17:906:5919:: with SMTP id h25mr1756663ejq.222.1572333762808; Tue, 29 Oct 2019 00:22:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572333762; cv=none; d=google.com; s=arc-20160816; b=PX9KzgCKZTb12g77JUH5IsDQLOp3ea7lhI1gDLQRx0cRDg/LtAWhKA80bMPCuBGAGj gZxtwJcZf5OaGiB16ebatZKm18FimgRwPEbL5YyZHSA1HRWtlQw0RA4rWqAfnr1546aJ 7bO5wCmB/wl8ELR0cHnk1vee+/075JECHJBP8Hff4J4ssMfmIZfj9rmrRu5KNGun+NsL pXRBpJHbDNagct9MU2wp5oDBDwhpwfLu4ZZ80V3yt4RalG2Bh4gf87NXkBBvVNf7dwET OqIghA/qEopTwSHAnWYn7EGKayj3s4agcSylPhql4ukB2UQOcCaYlg0VTp9WZ2KEIoer RK9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date:from :references:cc:to:subject; bh=UbOdvCuqZFrgp1lktAzgfyAik5zZhzy9S3tp3JfOZ+c=; b=yynvdfm0lRGdfey8GAr3pgCk5lu1J5XPiSpY56BRk/2/Mpi+SPwz1bv9Y3lxGeFhdU IBjpjTg+D+GOmbuvkstzhY+dv7DxP8P7PDRw4PZnOtqRW9FE2+3Lds1hTX91okrPmVNR Wv87kNvSHHPfbh/c1wLEKkYRWiwlXb7QjnCBaLLDvGf/KrTOBSpi1ccVKaKvN+f7Be/P 5H1UK0hU1+Gkf3YbewfzlCb5BgqLnRz2g8B2wSdSSay26Ft68s/GD5ibeBlkAi7IwPco puHj38IXYCrIh7Enesc9H5W4n/1ABh4j6qf5DDt0ds8JJTK5qUhOzq6FDyo1ONNFakEG WH0w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g31si10414349edg.206.2019.10.29.00.22.19; Tue, 29 Oct 2019 00:22:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728282AbfJ2Bt3 (ORCPT + 99 others); Mon, 28 Oct 2019 21:49:29 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:58030 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727364AbfJ2Bt2 (ORCPT ); Mon, 28 Oct 2019 21:49:28 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x9T1CrwN093911 for ; Mon, 28 Oct 2019 21:49:27 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2vx5ryb3sd-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 28 Oct 2019 21:49:27 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 29 Oct 2019 01:49:24 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 29 Oct 2019 01:49:15 -0000 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x9T1nEWE62849144 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Oct 2019 01:49:14 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0022852057; Tue, 29 Oct 2019 01:49:13 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 589A65204E; Tue, 29 Oct 2019 01:49:13 +0000 (GMT) Received: from [10.61.2.125] (haven.au.ibm.com [9.192.254.114]) (using TLSv1.2 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 389C5A020A; Tue, 29 Oct 2019 12:49:11 +1100 (AEDT) Subject: Re: [PATCH 04/10] powerpc: Map & release OpenCAPI LPC memory To: "Alastair D'Silva" , alastair@d-silva.org Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Frederic Barrat , Arnd Bergmann , Greg Kroah-Hartman , Dan Williams , Vishal Verma , Dave Jiang , Keith Busch , Ira Weiny , Geert Uytterhoeven , Krzysztof Kozlowski , Anton Blanchard , Allison Randal , =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , David Gibson , Vasant Hegde , Thomas Gleixner , Anju T Sudhakar , Hari Bathini , Mahesh Salgaonkar , Greg Kurz , Masahiro Yamada , Alexey Kardashevskiy , Andrew Morton , David Hildenbrand , Oscar Salvador , Michal Hocko , Pavel Tatashin , Wei Yang , Qian Cai , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org, linux-mm@kvack.org References: <20191025044721.16617-1-alastair@au1.ibm.com> <20191025044721.16617-5-alastair@au1.ibm.com> From: Andrew Donnellan Date: Tue, 29 Oct 2019 12:49:11 +1100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191025044721.16617-5-alastair@au1.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-AU Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 19102901-0012-0000-0000-0000035E9649 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19102901-0013-0000-0000-00002199D5DB Message-Id: <32caa2ef-43b2-f71d-f470-ccfed0ae094e@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-10-28_07:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1910290011 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 25/10/19 3:46 pm, Alastair D'Silva wrote: > From: Alastair D'Silva > > This patch adds platform support to map & release LPC memory. > > Signed-off-by: Alastair D'Silva > --- > arch/powerpc/include/asm/pnv-ocxl.h | 2 ++ > arch/powerpc/platforms/powernv/ocxl.c | 41 +++++++++++++++++++++++++++ > include/linux/memory_hotplug.h | 5 ++++ > mm/memory_hotplug.c | 3 +- > 4 files changed, 50 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/include/asm/pnv-ocxl.h b/arch/powerpc/include/asm/pnv-ocxl.h > index 7de82647e761..f8f8ffb48aa8 100644 > --- a/arch/powerpc/include/asm/pnv-ocxl.h > +++ b/arch/powerpc/include/asm/pnv-ocxl.h > @@ -32,5 +32,7 @@ extern int pnv_ocxl_spa_remove_pe_from_cache(void *platform_data, int pe_handle) > > extern int pnv_ocxl_alloc_xive_irq(u32 *irq, u64 *trigger_addr); > extern void pnv_ocxl_free_xive_irq(u32 irq); > +extern u64 pnv_ocxl_platform_lpc_setup(struct pci_dev *pdev, u64 size); > +extern void pnv_ocxl_platform_lpc_release(struct pci_dev *pdev); > > #endif /* _ASM_PNV_OCXL_H */ > diff --git a/arch/powerpc/platforms/powernv/ocxl.c b/arch/powerpc/platforms/powernv/ocxl.c > index 8c65aacda9c8..c6d4234e0aba 100644 > --- a/arch/powerpc/platforms/powernv/ocxl.c > +++ b/arch/powerpc/platforms/powernv/ocxl.c > @@ -475,6 +475,47 @@ void pnv_ocxl_spa_release(void *platform_data) > } > EXPORT_SYMBOL_GPL(pnv_ocxl_spa_release); > > +u64 pnv_ocxl_platform_lpc_setup(struct pci_dev *pdev, u64 size) > +{ > + struct pci_controller *hose = pci_bus_to_host(pdev->bus); > + struct pnv_phb *phb = hose->private_data; > + u32 bdfn = (pdev->bus->number << 8) | pdev->devfn; I think pci_dev_id() is the canonical way to do this? (same applies in release) > + u64 base_addr = 0; > + int rc; > + > + rc = opal_npu_mem_alloc(phb->opal_id, bdfn, size, &base_addr); > + if (rc) { > + dev_warn(&pdev->dev, > + "OPAL could not allocate LPC memory, rc=%d\n", rc); > + return 0; > + } > + > + base_addr = be64_to_cpu(base_addr); sparse doesn't like this, the way it's usually done is declare a __be64 variable, pass that to the opal call, then store the conversion in a regular u64 > + > + rc = check_hotplug_memory_addressable(base_addr >> PAGE_SHIFT, > + size >> PAGE_SHIFT); > + if (rc) > + return 0; > + > + return base_addr; > +} > +EXPORT_SYMBOL_GPL(pnv_ocxl_platform_lpc_setup); > + > +void pnv_ocxl_platform_lpc_release(struct pci_dev *pdev) > +{ > + struct pci_controller *hose = pci_bus_to_host(pdev->bus); > + struct pnv_phb *phb = hose->private_data; > + u32 bdfn = (pdev->bus->number << 8) | pdev->devfn; > + int rc; > + > + rc = opal_npu_mem_release(phb->opal_id, bdfn); > + if (rc) > + dev_warn(&pdev->dev, > + "OPAL reported rc=%d when releasing LPC memory\n", rc); > +} > +EXPORT_SYMBOL_GPL(pnv_ocxl_platform_lpc_release); > + > + > int pnv_ocxl_spa_remove_pe_from_cache(void *platform_data, int pe_handle) > { > struct spa_data *data = (struct spa_data *) platform_data; > diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h > index f46ea71b4ffd..3f5f1a642abe 100644 > --- a/include/linux/memory_hotplug.h > +++ b/include/linux/memory_hotplug.h > @@ -339,6 +339,11 @@ static inline int remove_memory(int nid, u64 start, u64 size) > static inline void __remove_memory(int nid, u64 start, u64 size) {} > #endif /* CONFIG_MEMORY_HOTREMOVE */ > > +#if CONFIG_MEMORY_HOTPLUG_SPARSE This needs to be #ifdef. > +int check_hotplug_memory_addressable(unsigned long pfn, > + unsigned long nr_pages); > +#endif /* CONFIG_MEMORY_HOTPLUG_SPARSE */ > + > extern void __ref free_area_init_core_hotplug(int nid); > extern int __add_memory(int nid, u64 start, u64 size); > extern int add_memory(int nid, u64 start, u64 size); > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index 2cecf07b396f..b39827dbd071 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -278,7 +278,7 @@ static int check_pfn_span(unsigned long pfn, unsigned long nr_pages, > return 0; > } > > -static int check_hotplug_memory_addressable(unsigned long pfn, > +int check_hotplug_memory_addressable(unsigned long pfn, > unsigned long nr_pages) > { > const u64 max_addr = PFN_PHYS(pfn + nr_pages) - 1; > @@ -294,6 +294,7 @@ static int check_hotplug_memory_addressable(unsigned long pfn, > > return 0; > } > +EXPORT_SYMBOL_GPL(check_hotplug_memory_addressable); This export seems unnecessary, you don't seem to be using this function in a module anywhere in this series AFAICT. Also it looks like a whitespace fix from removing the static ended up in patch #8 rather than here. > > /* > * Reasonably generic function for adding memory. It is > -- Andrew Donnellan OzLabs, ADL Canberra ajd@linux.ibm.com IBM Australia Limited