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 21AFAC7EE23 for ; Sun, 11 Jun 2023 05:47:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AEC4C6B0072; Sun, 11 Jun 2023 01:47:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A9CC56B0074; Sun, 11 Jun 2023 01:47:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 964E86B0075; Sun, 11 Jun 2023 01:47:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 869746B0072 for ; Sun, 11 Jun 2023 01:47:02 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5938EAF619 for ; Sun, 11 Jun 2023 05:47:02 +0000 (UTC) X-FDA: 80889383484.13.9326213 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf20.hostedemail.com (Postfix) with ESMTP id 9A4C81C0008 for ; Sun, 11 Jun 2023 05:47:00 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Jd4eumXt; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf20.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686462420; 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=I+5Xkax/0KhZM6zam/ixND4WccoLBP2m7+wn1PHZ0Fo=; b=WGbKxKR+83XKmMe62YD0E4lkTI0KSKh0BtiQATBPv3m5IknQwewRHIdBAPt7UI6sprQKHX h54+3kFW3i8I6I2k5wqDooniolFOz5IJ5iN6Az7cHX4VlQDPB8E7Dcg0c81KOW3/+X93Jw H0vsG2/FfE4iM50L/tc0h2jpHqbuLHE= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Jd4eumXt; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf20.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686462420; a=rsa-sha256; cv=none; b=GDdypHRtb8A9CQXyZkKqWVsCyiigv6Rm5GSuDeBKxkg0XJ1OOapKD7rSOJh+db8nCtzv+q RkhQ+nyKHPJCEGtGmRtGm5qGf81hHUceBW69peXO07o4DfLt3ym76kUMQqO1ZWWvSb5AeL NLE2RTnR1AEUjpYiBX24xRzw4+geBR0= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9D2D261B77; Sun, 11 Jun 2023 05:46:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2C92C433D2; Sun, 11 Jun 2023 05:46:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686462419; bh=O9j38rKvMVG5O3ukrTC4yMTzG2KbbH0vhzA1Rh1tk+c=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Jd4eumXtF0wx4g8vSY4RHkxq2YVdv4/UgBqrDp+WZoNxtSnkj/905qyCBvJ7Pl0QW vGdBlWEBPSd7EbZ7pwNLf7RKBfzrLJqxTjvjxjAdj2HQtA6bo6tOrPnsGF/C3hcNOG MBRrovnRwXNEmgik8zw0drVHfVB0YBXjAcaaj6z00BmIKJyG/NyULDnik0RYt7qAcv aAwwUyH6wZA2ieLb6yG1PIEQqCRnF0yUNiWPeYcNhdZM/zJQs5Qj8nHkc4PU3QjjxO 95kPMCBQpSJ20EaMmfjKhppAmyp1gGsGfOuui/+2u7GRuAequjxj5O7/MUZVyZotEW OqBrT1vrCwwrg== Date: Sun, 11 Jun 2023 08:46:27 +0300 From: Mike Rapoport To: Baoquan He Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, christophe.leroy@csgroup.eu, hch@lst.de, willy@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, David.Laight@ACULAB.COM, shorne@gmail.com, deller@gmx.de, Jonas Bonn , Stefan Kristiansson , openrisc@lists.librecores.org Subject: Re: [PATCH v6 09/19] openrisc: mm: Convert to GENERIC_IOREMAP Message-ID: <20230611054627.GN52412@kernel.org> References: <20230609075528.9390-1-bhe@redhat.com> <20230609075528.9390-10-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230609075528.9390-10-bhe@redhat.com> X-Rspamd-Queue-Id: 9A4C81C0008 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: catfk83g4qjxbf8m9fqfe7xti4kkwrmc X-HE-Tag: 1686462420-195506 X-HE-Meta: U2FsdGVkX188Z5uVg9ucU9QBxhPqDDXOu7JDpRjLED8c+pLxW6QhRMQErimDDoibCV9ZGFdLgHfuQxsmeJX/tVrq1pbd1J/vbQ74mnYyodHblrkySGyWPznKrlT6LXzPVvRq+UqCLII/Pp+zJWHgs3iHYcS70XmeA6+bRxRJ0tbD0iso4zgH5oBgbQIE+qB+Qs2N6Ki5MVFhcEy0NCLZSxM2SHfYUechoORY8Rg78+j71EZ9yEL7eIa/OdGzc2V0ff8oHMS0ojReAW16SWVWgK/bLDXzP0dMZTj6XWWa5dSATU1QmmBovXSsD7vP0ORyE850/rDKcszwa0t+rKNWIM8uBPYgf6zBd1uEZI9tHbD8LHh4YFuoLfUilhCf5C8qGgA5RSoljZbfPX9gJ3p9w/sajZcwrTNWhcJNVUIQGKHzzb9SLafEkCTC32qFIFGMtuifgNcrMD7/68hLSdTPs3F6s9PxOMMabB0BV1+M1PXW9JsXeLL2U9+Anihptnf/JYHNsMfK95VKCvbIJ6n/plSFdtP4C0ls6n0STWhRrfS5bg9+jLAoW1ZvShjDT9tuLkXzEJFKwybINvd9Q8bxRLGjOZCW8yeRXgBfx0m0hhqsl+3QJfBDJ0Cj2ZipNwl7b6XjvQlb+N3Ff95TgmYliNQxXWbTTHXiDQu22Dr4KiBLkouS0+A3GFprHHiOdlRfvAC15aqwyspRxckq/XUOWuW9B5/XiFx6+RzR49PbTdYuZO//nqgBV3cN0hoD3I2hgH2644fsMK74XCPInhU690syaSSW+0J54/Jr/LPplKv4FEn0S6pYaoLQ2raVuwTSY1fcD9ti2kt952hdR3SAFXsqIiHnVEpYDQO0cpy3+eekZlNmF3Vs2AM8EBffP9RGJ14EtGvwIFhQ2JdqIJ2WvU4dZsUboDuy44aueNDTxjoqU9UfIIEioH+jam4Sg9mgZzNJugjoF9WtWJtlg62 TnmXvDit 1pNbBzBIsmySjwEqZr8VXgMz9WbIzrtHcuXm5kJUkanI2BD0oVLRMqH3x5tD+h+J5m+6eRySx5LQX6fOPUK27HqmSWXQF9MnTy5ON1nO/vsNEPDQtqCTif2UOgY43fu9/O5fH/a+5Xt8YynjICyI2ofECblznvM5rWJomM8EAbhBcgvS29K3rG7aIDZGkV3OL54vD0lwO1m7usasfjBXZ1BtaGimwLtSTwCnfT0wvwEqgyS37fFMyYoG88Rund2AqbB5W+2aeD3u7MkTyzXnJVAyxzCjvT3RGIi/nAIVDcnXDHcAKwkkLoJPS+1AaqB4SnrzwwSVT2+3f5UR7zW5YlUvmPetin9SLAlZ1SwOFEWvN4agPnH+hUaATIFdv9VahcD/HJ3nM0KZIyCUQMTbeX6GrZcSOUvpSpnt3BtAuzRvL53B2BN44CG8vhern9/locb+U5hI/EjCDEPCKL+Q6sjKg0BybJk3Nmr5g82tX4gXanaYw5YcQ343+8A== 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 Fri, Jun 09, 2023 at 03:55:18PM +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 > Cc: Stafford Horne > Cc: Jonas Bonn > Cc: Stefan Kristiansson > Cc: openrisc@lists.librecores.org Reviewed-by: Mike Rapoport (IBM) > --- > v5->v6: > Remove iounmap() because it's the same as the generic version since we > have removed the code handling ealry mapping from fixmap pool in > patch 3 - Mike > > 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); > - > /** > * 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 > -- Sincerely yours, Mike.