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 4515BC001DC for ; Sat, 8 Jul 2023 00:33:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6781D8D0001; Fri, 7 Jul 2023 20:33:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 601536B0072; Fri, 7 Jul 2023 20:33:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4A1DB8D0001; Fri, 7 Jul 2023 20:33:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2A03E6B0071 for ; Fri, 7 Jul 2023 20:33:32 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id BBEC1140160 for ; Sat, 8 Jul 2023 00:33:31 +0000 (UTC) X-FDA: 80986571022.15.9AA6F7D Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by imf06.hostedemail.com (Postfix) with ESMTP id E306F180010 for ; Sat, 8 Jul 2023 00:33:28 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=gqDiZ4Yu; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf06.hostedemail.com: domain of shorne@gmail.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=shorne@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688776409; 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=blTNE5LO7YyFeZT8Qi4VxrAELo4nV45IRw/nlx7k0yw=; b=CPRncuhVlCAvW5hpk7zorVDSkGWwbIwhs+//U6DERZi4pFj6vCTovhLSmZqPFBsignWxic vo5dviIsZ/43j7LTpOkOW11gk2aGcU/pFBWNwD75qpAyXyIZh0o+UHBlnnsiJGmWhPRoXE MpbsZqIzSIsHh06UVJG5+aHe8m/PBW4= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=gqDiZ4Yu; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf06.hostedemail.com: domain of shorne@gmail.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=shorne@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688776409; a=rsa-sha256; cv=none; b=MG3oM+xD/tjkP3612P2ZJVr+11eNkNqSEir55UV+TaWYynkDn1ZtPk+wHrNt4vFAJ9Yn3q qoYG56m+6b9DUTcgVI4No4swVXvMtjrido7NWm53krF+GDO9DEMEX9brzZtvBx7JqK+01V 8Ya/adY+osxGi0tDjxtD7FmvhuAG87I= Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-3143493728dso2578464f8f.1 for ; Fri, 07 Jul 2023 17:33:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688776407; x=1691368407; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=blTNE5LO7YyFeZT8Qi4VxrAELo4nV45IRw/nlx7k0yw=; b=gqDiZ4Yu/zOVBSWjvqSKCXSdeLUwpGl5K4w1TULo5zJy3gfFpxOC6IzriDWVaMIVcS tBK+rcV6Mhhs2RS3cT6w188IQJfjEShq2kw3o1aYi43lNNz7LhdCWLqpYbvMorY1weF1 cxK9oy9MVoqD+bwZLE4R+TdlmFbfb/F5VPfzwpSEqRj1lwiSGWcLYChH+zvjnYc/V8vO b3TUpaKljoJ9zFH/MKevxpFx0IXRrXC/1AJl3xf05KgckuJNXVfeQP3Ych73TFtszGKB 4wgekWWBdR1IhDeE3+EQahXmibXegxBIeTaWeOaaOshWKrg7KT4CkhSD9gzV7lsG1TDk GZDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688776407; x=1691368407; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=blTNE5LO7YyFeZT8Qi4VxrAELo4nV45IRw/nlx7k0yw=; b=bGSD/Ksr5GrpKaXP1Kg14sKo3mLBClW9fVk50j3ImTI5CUmQ7EJG0RxWikaymbjMnv SBQE3gmdF7vkkePh49nrx02JxlXa92CdejVUDHQU9cEMrM+p20q03BdMjsFZKDGCI/HJ LfCX87+MHgsKbWKOftRa/9BDj3asNsFxckDYcYsW3OiahSm2meOFx4pr6E1xx6p0zDdo YuqSEH6MMjjm/G+THH1zJUTuJFsVwkDwwTqwyAGcoMjwByO+fsGb2wZxHPJMBc64Ed7v YVFGFnALp+YJCwNu33PcDmf9rwBo8aXfraM2tQLVYvzq69cOx7GeBThe99NBiglLBz34 y6RQ== X-Gm-Message-State: ABy/qLYWgBXvCTrYSy3IJOmeGxJilFfBip8UPyfyPItKeXrIta18Ao1v +IKY9yHUHnCTlJaGDU6m49Q= X-Google-Smtp-Source: APBJJlFbxGp9ywXlUDVJkA+GQPoOU92fZ9LH17UbGO+iSwV9v1HefzM3DaG83y3UzMhuKGrCVgDe8g== X-Received: by 2002:a5d:6d49:0:b0:313:f61c:42b2 with SMTP id k9-20020a5d6d49000000b00313f61c42b2mr5143685wri.69.1688776407259; Fri, 07 Jul 2023 17:33:27 -0700 (PDT) Received: from localhost (cpc1-brnt4-2-0-cust862.4-2.cable.virginm.net. [86.9.131.95]) by smtp.gmail.com with ESMTPSA id s16-20020a5d4ed0000000b0031411e46af3sm5613028wrv.97.2023.07.07.17.33.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 17:33:26 -0700 (PDT) Date: Sat, 8 Jul 2023 01:33:26 +0100 From: Stafford Horne To: Baoquan He Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, hch@lst.de, christophe.leroy@csgroup.eu, rppt@kernel.org, willy@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, David.Laight@aculab.com, deller@gmx.de, nathan@kernel.org, glaubitz@physik.fu-berlin.de, Jonas Bonn , Stefan Kristiansson , openrisc@lists.librecores.org Subject: Re: [PATCH v7 09/19] openrisc: mm: Convert to GENERIC_IOREMAP Message-ID: References: <20230620131356.25440-1-bhe@redhat.com> <20230620131356.25440-10-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230620131356.25440-10-bhe@redhat.com> X-Rspamd-Queue-Id: E306F180010 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: 9iwhjbk3qbbubiuhmxpsnpaz14c6nsfy X-HE-Tag: 1688776408-542042 X-HE-Meta: U2FsdGVkX188pepUxnHTqJA0AgPOtXV8F6SVZgBr0YdahCbwkVtpRQ24YaqaCx97/0RX9mk/zOUv2j0vhDX/Eh/QExTQPHlcH4Xh9xrdM6EOB7m/lKMUleivup95DPUKfsm3UeWVXk6RCXQRPbPAR4qzNhTTuWbUyvoUp9T2MpRMs2b+YOX9HHEpGKoDW8fuwqxC+pvjO+j55TMNJu1z6jLvWUuUoQkxz+PKJZ/JSs2Ij6OBzTMWeoFOEbHKxdcP+QYFjEW6ZUWAMtgkWVTGwawYRi/refX1/0on9i/y6z64DlQUVYb2vt+xfe4TrXGN7vxZS1eTif06OBp7y05FiyhwHvU559O7GS3Hi6J8OEbxGMlNUKoPl073YIhIf5BxXz8eu19vhUeKhzZ6VDRngdYPoaQfUKDAGEXTyvy6eqUd3cC7w8jfYRx/cBh5lvw7myWUwTrNfTcw0FGDiFMeiBcVBVzTYczZgYE+2BmKZG36xYOEvITtDAfLOU03t4EyvIeN+wRjG9vFQY20n8jYJw/Pum0PelhhcRIZPCN4O2Z5kRPLsC5fKMq6AeeDGXFFQZU/xbTJB1LEeMe4GZ/W90e/u/+2LbhcFWl0+fgTsiJtYbhprs3dSNQgp2V7Ty6ImcY0/8FK18cIagGRxh2yOuUOaoeU++EsAOginhpr81YkRAuLm/obuewZCvroF/S6rXzDTlt48U9Bzja1Dbm3cw94fagSLaT5L4jPPRWEteWI0bCRHBKztlxOCsD2uP9O2lXRCYuXwcqZWgA7ObiNPAEOommVNvK6jaCD6dRQGhBzmcblZtPjYrMvXi4rYlm+Qj8fKxXCDdoTAfbH9eI8DIdRORAo4urKM90dqXQAMftwdRM6WloKTCbWiYfSNqtTiW8b+IiW+jzV4d9MeObAMhO+o70dGuP7tNd2yITonfyRJ5wOezRrpTfljWMlulhJJIlZlhewXJa88r+Sorj SSsLXpOQ /dZHd4RVVSEwTBeYHF6P+yLaVaSLxXe6HMdjST1DlA6eyw32dMflDlw3425MlYd/XfbmsqlVnmvagzFoSq7RcwrBN4cXSU17H1zqd0S+jgbBPm7vUKkDRN8r6eYgAByXMchI2psNFMAz92KvATTuXKHUg6WRCPU5YQXrarckACmkv6pppe/18fLykAOmd2a2kVVwKgNg0iKAbDQfU+LLtqUnlF0C8OX5d8EGX5FVW9xWpmXMMG1DwpvcSNoKn8OH4WFi7K0JcVzVJpgXzjJ6JMCuTRuYzBBY+dpX2bxaLjbCM3Go/CTI8UpHXjuyNUO6KtCsl6I9B39P4cYZO3rqkPE88IR/AaimWq9ZPbZNT/TZXDxfDy/94e2Nu5xajt1OJg+TKmPMBCXlM6cYvLCktbvOcfvGrjrigOmcdaVSDRPLPfUXs8zR2vZ/9kCA88NCeenyiZUdNcQwZPjEAJcryII77TXU1oUdBNvAisCd7dX3GXKd997BUFVyqzBDjPtU7TvNrsP92UA4f9v9XlMo/0JtN1vcT8Y1Ga04Oqk9pLzxQTnqBmN79GwhqoBp/sZ2lvHyj1rWFARJBNxHTRD/8Z8wbl+ztYphIHUKJv6nVhjrDnOo8di5OGH+OEbZT/eO6KB5nJITnAQBtqxM= 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: On Tue, Jun 20, 2023 at 09:13:46PM +0800, Baoquan He wrote: > By taking GENERIC_IOREMAP method, the generic generic_ioremap_prot(), > generic_iounmap(), and their generic wrapper ioremap_prot(), ioremap() > and iounmap() are all visible and available to arch. Arch needs to > provide wrapper functions to override the generic versions if there's > arch specific handling in its ioremap_prot(), ioremap() or iounmap(). > This change will simplify implementation by removing duplicated codes > with generic_ioremap_prot() and generic_iounmap(), and has the equivalent > functioality as before. > > For openrisc, the current ioremap() and iounmap() are the same as > generic version. After taking GENERIC_IOREMAP way, the old ioremap() > and iounmap() can be completely removed. > > Signed-off-by: Baoquan He > Reviewed-by: Christoph Hellwig > Reviewed-by: Mike Rapoport (IBM) > Cc: Stafford Horne > Cc: Jonas Bonn > Cc: Stefan Kristiansson > Cc: openrisc@lists.librecores.org > --- > arch/openrisc/Kconfig | 1 + > arch/openrisc/include/asm/io.h | 11 ++++---- > arch/openrisc/mm/ioremap.c | 49 ---------------------------------- > 3 files changed, 7 insertions(+), 54 deletions(-) > > diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig > index c7f282f60f64..fd9bb76a610b 100644 > --- a/arch/openrisc/Kconfig > +++ b/arch/openrisc/Kconfig > @@ -21,6 +21,7 @@ config OPENRISC > select GENERIC_IRQ_PROBE > select GENERIC_IRQ_SHOW > select GENERIC_PCI_IOMAP > + select GENERIC_IOREMAP > select GENERIC_CPU_DEVICES > select HAVE_PCI > select HAVE_UID16 > diff --git a/arch/openrisc/include/asm/io.h b/arch/openrisc/include/asm/io.h > index ee6043a03173..5a6f0f16a5ce 100644 > --- a/arch/openrisc/include/asm/io.h > +++ b/arch/openrisc/include/asm/io.h > @@ -15,6 +15,8 @@ > #define __ASM_OPENRISC_IO_H > > #include > +#include > +#include > > /* > * PCI: We do not use IO ports in OpenRISC > @@ -27,11 +29,10 @@ > #define PIO_OFFSET 0 > #define PIO_MASK 0 > > -#define ioremap ioremap > -void __iomem *ioremap(phys_addr_t offset, unsigned long size); > - > -#define iounmap iounmap > -extern void iounmap(volatile void __iomem *addr); > +/* > + * I/O memory mapping functions. > + */ > +#define _PAGE_IOREMAP (pgprot_val(PAGE_KERNEL) | _PAGE_CI) > > #include > > diff --git a/arch/openrisc/mm/ioremap.c b/arch/openrisc/mm/ioremap.c > index cdbcc7e73684..91c8259d4b7e 100644 > --- a/arch/openrisc/mm/ioremap.c > +++ b/arch/openrisc/mm/ioremap.c > @@ -22,55 +22,6 @@ > > extern int mem_init_done; > > -/* > - * Remap an arbitrary physical address space into the kernel virtual > - * address space. Needed when the kernel wants to access high addresses > - * directly. > - * > - * NOTE! We need to allow non-page-aligned mappings too: we will obviously > - * have to convert them into an offset in a page-aligned mapping, but the > - * caller shouldn't need to know that small detail. > - */ > -void __iomem *__ref ioremap(phys_addr_t addr, unsigned long size) > -{ > - phys_addr_t p; > - unsigned long v; > - unsigned long offset, last_addr; > - struct vm_struct *area = NULL; > - > - /* Don't allow wraparound or zero size */ > - last_addr = addr + size - 1; > - if (!size || last_addr < addr) > - return NULL; > - > - /* > - * Mappings have to be page-aligned > - */ > - offset = addr & ~PAGE_MASK; > - p = addr & PAGE_MASK; > - size = PAGE_ALIGN(last_addr + 1) - p; > - > - area = get_vm_area(size, VM_IOREMAP); > - if (!area) > - return NULL; > - v = (unsigned long)area->addr; > - > - if (ioremap_page_range(v, v + size, p, > - __pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_CI))) { > - vfree(area->addr); > - return NULL; > - } > - > - return (void __iomem *)(offset + (char *)v); > -} > -EXPORT_SYMBOL(ioremap); > - > -void iounmap(volatile void __iomem *addr) > -{ > - return vfree((void *)(PAGE_MASK & (unsigned long)addr)); > -} > -EXPORT_SYMBOL(iounmap); > - Hello, Thanks for the patch, I was able to test this booting openrisc and running a few glibc tests and see no issues. Also the code cleanup looks good to me. Acked-by: Stafford Horne > /** > * OK, this one's a bit tricky... ioremap can get called before memory is > * initialized (early serial console does this) and will want to alloc a page > -- > 2.34.1 >