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 49763C43334 for ; Wed, 8 Jun 2022 07:04:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB99E6B0072; Wed, 8 Jun 2022 03:04:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A435F6B0073; Wed, 8 Jun 2022 03:04:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E32B6B0074; Wed, 8 Jun 2022 03:04:25 -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 79AB36B0072 for ; Wed, 8 Jun 2022 03:04:25 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3DFF56104D for ; Wed, 8 Jun 2022 07:04:25 +0000 (UTC) X-FDA: 79554180090.07.5901F0D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 2D43918001A for ; Wed, 8 Jun 2022 07:04:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654671863; 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: in-reply-to:in-reply-to:references:references; bh=TBjmir8iDGZC/kDjtwTXCxIWSk19ldp3h7objj82UrQ=; b=i4sF748McfersB4bJ8Z4MKVOL8nL0LAEkJx1sEo0u6muXAjhu/FBuQKbxmlAnsEVMKm1mx e2YstEcGFcNU5POxsiWep+3HPpoWQIbhZgxxzL8CJPJH2p9Y9UgDdkyrCFGGTTab19YcuU NyZ40TeQk6l8SQrKJ4cR93FYiw5yy1c= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-616-Mw-qPlKMMlaLY4Vq0STvZg-1; Wed, 08 Jun 2022 03:04:18 -0400 X-MC-Unique: Mw-qPlKMMlaLY4Vq0STvZg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A723E1C0512E; Wed, 8 Jun 2022 07:04:17 +0000 (UTC) Received: from localhost (ovpn-12-81.pek2.redhat.com [10.72.12.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D0BAF2166B26; Wed, 8 Jun 2022 07:04:16 +0000 (UTC) Date: Wed, 8 Jun 2022 15:04:11 +0800 From: Baoquan He To: Kefeng Wang Cc: catalin.marinas@arm.com, will@kernel.org, akpm@linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, hch@infradead.org, arnd@arndb.de, anshuman.khandual@arm.com Subject: Re: [PATCH v5 2/6] mm: ioremap: Use more sensibly name in ioremap_prot() Message-ID: References: <20220607125027.44946-1-wangkefeng.wang@huawei.com> <20220607125027.44946-3-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220607125027.44946-3-wangkefeng.wang@huawei.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=i4sF748M; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf16.hostedemail.com: domain of bhe@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=bhe@redhat.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 2D43918001A X-Rspam-User: X-Stat-Signature: xq6i564mick4j9s5qnhj9q99t5r7iyf7 X-HE-Tag: 1654671863-298659 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 06/07/22 at 08:50pm, Kefeng Wang wrote: > Use more meaningful and sensibly naming phys_addr ~~ sensible, typo and please fix the subject too. > instead addr in ioremap_prot(). > > Suggested-by: Andrew Morton > Reviewed-by: Anshuman Khandual > Signed-off-by: Kefeng Wang > --- > 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; > } > -- > 2.35.3 > >