From patchwork Fri Jun 10 09:22:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 12877098 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 63A4CC43334 for ; Fri, 10 Jun 2022 09:13:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C5D2F8D0083; Fri, 10 Jun 2022 05:13:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0E7D6B014C; Fri, 10 Jun 2022 05:13:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD5CD8D0083; Fri, 10 Jun 2022 05:13:51 -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 9DBE16B014B for ; Fri, 10 Jun 2022 05:13:51 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6A17A60401 for ; Fri, 10 Jun 2022 09:13:51 +0000 (UTC) X-FDA: 79561763862.01.95F1063 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf18.hostedemail.com (Postfix) with ESMTP id B08931C0042 for ; Fri, 10 Jun 2022 09:13:48 +0000 (UTC) Received: from dggpemm500024.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LKFbN54gyzjXYb; Fri, 10 Jun 2022 17:12:16 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggpemm500024.china.huawei.com (7.185.36.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 10 Jun 2022 17:13:34 +0800 Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 10 Jun 2022 17:13:33 +0800 From: Kefeng Wang To: , , , , CC: , , , Baoquan He , Kefeng Wang , Christoph Hellwig , Anshuman Khandual Subject: [PATCH v5 resend 2/6] mm: ioremap: Use more sensible name in ioremap_prot() Date: Fri, 10 Jun 2022 17:22:55 +0800 Message-ID: <20220610092255.32445-1-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220607125027.44946-3-wangkefeng.wang@huawei.com> References: <20220607125027.44946-3-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1654852430; 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; bh=B7mD6/IxeKB1ojm7xf2moahBBeEpwNPw7HBn3WNWTNY=; b=uIGZWR2yde0Q337Ca63h2WqLZvJGbBgYNcsPNh7kmm1myWu4+A8mQLR69psx/rI8K/lVzJ OCNPDx+n6rPWkltnSH1bamMLYP0WmnjAVseGbDcrRYvJiOTphdskkHUrvES5PqgHxq24r0 ZB/Q+uqmRNhapuawY6JaAy5EN97qArI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1654852430; a=rsa-sha256; cv=none; b=3lvCjdYdO+WbgSI97vxcY4Q5Z8STW0Th6DLN17Dp+gohExULXI2YhoGVQzcFpPWJ+P4nJa qBFw9VCVgm0ttRVgseXBZL2l9buO0UYUumH1Cm2AXIgkgq9oYNK/IcVCZGEJCMnuXmEXri iNcuDWwjKZl2rEFR7tifB38aUdJ6ggU= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com X-Rspam-User: Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf18.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com X-Rspamd-Server: rspam03 X-Stat-Signature: e3g7u79x3p835mayxi9gpqrtm7zftfsr X-Rspamd-Queue-Id: B08931C0042 X-HE-Tag: 1654852428-190514 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: Use more meaningful and sensible naming phys_addr instead of addr in ioremap_prot(). Suggested-by: Andrew Morton Reviewed-by: Christoph Hellwig Reviewed-by: Baoquan He Reviewed-by: Anshuman Khandual Signed-off-by: Kefeng Wang --- v5 resend: - use sensible and add RB include/asm-generic/io.h | 3 ++- mm/ioremap.c | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 7ce93aaf69f8..b76379628a02 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -964,7 +964,8 @@ static inline void iounmap(volatile void __iomem *addr) #elif defined(CONFIG_GENERIC_IOREMAP) #include -void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot); +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, + unsigned long prot); void iounmap(volatile void __iomem *addr); static inline void __iomem *ioremap(phys_addr_t addr, size_t size) diff --git a/mm/ioremap.c b/mm/ioremap.c index 5fe598ecd9b7..2d754b48d230 100644 --- a/mm/ioremap.c +++ b/mm/ioremap.c @@ -11,20 +11,21 @@ #include #include -void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot) +void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, + unsigned long prot) { unsigned long offset, vaddr; phys_addr_t last_addr; struct vm_struct *area; /* Disallow wrap-around or zero size */ - last_addr = addr + size - 1; - if (!size || last_addr < addr) + last_addr = phys_addr + size - 1; + if (!size || last_addr < phys_addr) return NULL; /* Page-align mappings */ - offset = addr & (~PAGE_MASK); - addr -= offset; + offset = phys_addr & (~PAGE_MASK); + phys_addr -= offset; size = PAGE_ALIGN(size + offset); area = get_vm_area_caller(size, VM_IOREMAP, @@ -33,7 +34,8 @@ void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot) return NULL; vaddr = (unsigned long)area->addr; - if (ioremap_page_range(vaddr, vaddr + size, addr, __pgprot(prot))) { + if (ioremap_page_range(vaddr, vaddr + size, phys_addr, + __pgprot(prot))) { free_vm_area(area); return NULL; }