From patchwork Mon May 15 09:08:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13240991 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 8B10FC77B75 for ; Mon, 15 May 2023 09:10:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 21EC0900003; Mon, 15 May 2023 05:10:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1CF15900002; Mon, 15 May 2023 05:10:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 09739900003; Mon, 15 May 2023 05:10:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id EED7B900002 for ; Mon, 15 May 2023 05:10:27 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id AE48A141363 for ; Mon, 15 May 2023 09:10:27 +0000 (UTC) X-FDA: 80791918494.22.8E821A6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf13.hostedemail.com (Postfix) with ESMTP id A00ED20006 for ; Mon, 15 May 2023 09:10:25 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=A8qEwoR9; spf=pass (imf13.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684141826; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fY3gRwzRURcZWtcbcQurri6vCUgFw9upurCvoIMXj/I=; b=T/ixe8l4ZBIy92ucOZue9CNqIz9YYGIswnPM/8r0qOA4iuzVLYQykOEutKwlkLIY6BtV// pTrnYNBuRGhwT6Gmzg6rpq/u1A3KAeBDgGerRxSxDDunTnkp74UUjQSPZFEMqU3GGsKX3m OzA9Y6P9roVwLkaQKjMAwStiGtIvpcE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684141826; a=rsa-sha256; cv=none; b=AQ/kbFu1rG8bjoz/xrNc0Wb0vuDUdyYw2IBjTpv858zI6GSHQB4Si8nLbOsLacz1X5Rrg/ 8x/gfglSNB9BwhLZP7FszUr72BAzu5YQ+ldZFgkybEKPDIfnjFDUX2fPYARgr5WMAiihMC 4ql6gZajC3Z4NYB8actKGPSTWTbpfMs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=A8qEwoR9; spf=pass (imf13.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684141824; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fY3gRwzRURcZWtcbcQurri6vCUgFw9upurCvoIMXj/I=; b=A8qEwoR9pLww2leDUJo7SnkbKv8GBxElXk0Ba+IP7zo0iFaefFi8WreiIj5jWdwz/9Wila 0hHO5wbTV9NUUIYVS16s4AUzjmwjfUk9SSLdoEvMKlE4wAKrDtj7rHJzWc4ncuHTF7LjdY QB1E5xLNoMn++B7/AxK+3+I+ywP4O+k= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-609-gB0tK1tDMqSr0rE7U-c66Q-1; Mon, 15 May 2023 05:10:19 -0400 X-MC-Unique: gB0tK1tDMqSr0rE7U-c66Q-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 20D8981DA1A; Mon, 15 May 2023 09:10:18 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (ovpn-12-32.pek2.redhat.com [10.72.12.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91BA040C2063; Mon, 15 May 2023 09:10:09 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, arnd@arndb.de, christophe.leroy@csgroup.eu, hch@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, David.Laight@ACULAB.COM, shorne@gmail.com, willy@infradead.org, deller@gmx.de, Baoquan He , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , linux-s390@vger.kernel.org Subject: [PATCH v5 RESEND 10/17] s390: mm: Convert to GENERIC_IOREMAP Date: Mon, 15 May 2023 17:08:41 +0800 Message-Id: <20230515090848.833045-11-bhe@redhat.com> In-Reply-To: <20230515090848.833045-1-bhe@redhat.com> References: <20230515090848.833045-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Stat-Signature: 6rcetsb5u37ukczbabpjjkcuk16f68s5 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: A00ED20006 X-Rspam-User: X-HE-Tag: 1684141825-231283 X-HE-Meta: U2FsdGVkX19H2aLBJdVLAIHWSmjrsOZutxIC7O+7ZYy5hctnTQd/c/N7QvIDn4l5eLDIkM6tQyJIyqpcE4o7mVVLruUfMtxo20U2Z+vv0scXjJs7F63aOO44E+t+3UkgiWSfcCkkleLv4IlaZU9PAfhLpKHGUIq2guu4cw6+BLEfQlE2zdGzsr48VsQm7HuUFVrduNAkRbdKEcz4AJIGD80zEeamhQqYHK2G4j5LeEvgpfBlH5lRi8vdWrkMl3/JOczGaYZCTm6TYf6FFn5KWCGZA1edrMNgnsH0pOn3NBmzqzJ2d5Lncygb5pjNwY7DcmbNBx1J4g6R806ZJu9q8BrPXbq/AxM9MLf6Gi2cwMhe/7DNSQQimLOqO/VD4P9+7pck9PyBrvvgCA65LmwS74mhcZRFUew5iQLkVUe/kD1CO7u7JNxt8tsOFXSK5CvqrHKz0v7EgvJC2RYHDR3Fm9lxHXiik8mST75JBTNmZJ45z2Z0AuejbAlMlMOqlosUbtkZh6AB0Q+/yOoZxNKmJe6WVfr8e7u/w2rJfoBY03YekbanWF6f7rF1Rh3GhAJcSzaLicyZmyFYtGHGk4AKiZML+4YKID4wTynNxRzpCWNpLQpjWH7gxI7w8P/TURixZ/bEkMOnTNMTZC+pMOnSpw5MB8gmU6KY0rLaXL7SdDu2E5vKnQTrxPqSTA85Lv28/UPwG1JJcc1q030I5MIisJ4xeeFUcmgOEHUTa/i5NpLlDGOHMGkWsw0BWHvr0Nw8eQX2Mk4/YVTfP553Ky7Qp8PtohAuqu1cLHtjN1fIgm0XTTXhGgULd7P1pFQZStplec7kCIaLoJBrXrP7v5826Z7NfQmg41KKgBDnvl1jHW9/CRDR/c0WQkaD+roPV8kaNE9VjrcGLsbEr2GXGnDcGXh3M2eOEdZBZE7D6v2ezsnafZNdvEthnoYOCceLqbVKyGh2h6RswYQ+Vro4HfW F5NVeaW+ qfJPb1hTGpKVIXUJ3T+eLgT7Go7lkNWvmvwxIk4fuzYn6AOrVmQmb3uQt4oqPEsUN7NqPF8f4JRDUylgDv+hG3SzhQAE4A4JNasUKWJF33i7O6B2geUMvNntw2FgR2VjuB3cbmW98C5IabEPVQovTLm/D2D9hg9y0rTGJ8Ce8AAmkrlq148jk8i/NWGYZgL7aSBSvP4ln4DQRBEnQEiBw7a0y1zLl2+1lnSvhweRY/lFD8LSVQQZiJeL2bdjVelYtylW561zPI4RFWEqRWSC397SsQy6zAs9IXwo+hYdiK3tR/TSk3F6gKCUtfw== 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: 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. Here, add wrapper functions ioremap_prot() and iounmap() for s390's special operation when ioremap() and iounmap(). Signed-off-by: Baoquan He Reviewed-by: Niklas Schnelle Tested-by: Niklas Schnelle Cc: Gerald Schaefer Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Alexander Gordeev Cc: Christian Borntraeger Cc: Sven Schnelle Cc: linux-s390@vger.kernel.org Reviewed-by: Mike Rapoport (IBM) Reviewed-by: Christoph Hellwig --- arch/s390/Kconfig | 1 + arch/s390/include/asm/io.h | 21 ++++++++------ arch/s390/pci/pci.c | 57 +++++++------------------------------- 3 files changed, 23 insertions(+), 56 deletions(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index db20c1589a98..f33923fa8c99 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -142,6 +142,7 @@ config S390 select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL select GENERIC_VDSO_TIME_NS + select GENERIC_IOREMAP if PCI select HAVE_ALIGNED_STRUCT_PAGE if SLUB select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_JUMP_LABEL diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h index e3882b012bfa..4453ad7c11ac 100644 --- a/arch/s390/include/asm/io.h +++ b/arch/s390/include/asm/io.h @@ -22,11 +22,18 @@ void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr); #define IO_SPACE_LIMIT 0 -void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot); -void __iomem *ioremap(phys_addr_t addr, size_t size); -void __iomem *ioremap_wc(phys_addr_t addr, size_t size); -void __iomem *ioremap_wt(phys_addr_t addr, size_t size); -void iounmap(volatile void __iomem *addr); +/* + * I/O memory mapping functions. + */ +#define ioremap_prot ioremap_prot +#define iounmap iounmap + +#define _PAGE_IOREMAP pgprot_val(PAGE_KERNEL) + +#define ioremap_wc(addr, size) \ + ioremap_prot((addr), (size), pgprot_val(pgprot_writecombine(PAGE_KERNEL))) +#define ioremap_wt(addr, size) \ + ioremap_prot((addr), (size), pgprot_val(pgprot_writethrough(PAGE_KERNEL))) static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) { @@ -51,10 +58,6 @@ static inline void ioport_unmap(void __iomem *p) #define pci_iomap_wc pci_iomap_wc #define pci_iomap_wc_range pci_iomap_wc_range -#define ioremap ioremap -#define ioremap_wt ioremap_wt -#define ioremap_wc ioremap_wc - #define memcpy_fromio(dst, src, count) zpci_memcpy_fromio(dst, src, count) #define memcpy_toio(dst, src, count) zpci_memcpy_toio(dst, src, count) #define memset_io(dst, val, count) zpci_memset_io(dst, val, count) diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index afc3f33788da..d34d5813d006 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -244,62 +244,25 @@ void __iowrite64_copy(void __iomem *to, const void *from, size_t count) zpci_memcpy_toio(to, from, count); } -static void __iomem *__ioremap(phys_addr_t addr, size_t size, pgprot_t prot) +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, + unsigned long prot) { - unsigned long offset, vaddr; - struct vm_struct *area; - phys_addr_t last_addr; - - last_addr = addr + size - 1; - if (!size || last_addr < addr) - return NULL; - + /* + * When PCI MIO instructions are unavailable the "physical" address + * encodes a hint for accessing the PCI memory space it represents. + * Just pass it unchanged such that ioread/iowrite can decode it. + */ if (!static_branch_unlikely(&have_mio)) - return (void __iomem *) addr; + return (void __iomem *)phys_addr; - offset = addr & ~PAGE_MASK; - addr &= PAGE_MASK; - size = PAGE_ALIGN(size + offset); - area = get_vm_area(size, VM_IOREMAP); - if (!area) - return NULL; - - vaddr = (unsigned long) area->addr; - if (ioremap_page_range(vaddr, vaddr + size, addr, prot)) { - free_vm_area(area); - return NULL; - } - return (void __iomem *) ((unsigned long) area->addr + offset); -} - -void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot) -{ - return __ioremap(addr, size, __pgprot(prot)); + return generic_ioremap_prot(phys_addr, size, __pgprot(prot)); } EXPORT_SYMBOL(ioremap_prot); -void __iomem *ioremap(phys_addr_t addr, size_t size) -{ - return __ioremap(addr, size, PAGE_KERNEL); -} -EXPORT_SYMBOL(ioremap); - -void __iomem *ioremap_wc(phys_addr_t addr, size_t size) -{ - return __ioremap(addr, size, pgprot_writecombine(PAGE_KERNEL)); -} -EXPORT_SYMBOL(ioremap_wc); - -void __iomem *ioremap_wt(phys_addr_t addr, size_t size) -{ - return __ioremap(addr, size, pgprot_writethrough(PAGE_KERNEL)); -} -EXPORT_SYMBOL(ioremap_wt); - void iounmap(volatile void __iomem *addr) { if (static_branch_likely(&have_mio)) - vunmap((__force void *) ((unsigned long) addr & PAGE_MASK)); + generic_iounmap(addr); } EXPORT_SYMBOL(iounmap);