From: Thomas Zimmermann <tzimmermann@suse.de>
To: mpe@ellerman.id.au, npiggin@gmail.com,
christophe.leroy@csgroup.eu, arnd@arndb.de, deller@gmx.de,
javierm@redhat.com
Cc: linuxppc-dev@lists.ozlabs.org, linux-fbdev@vger.kernel.org,
linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
linux-mips@vger.kernel.org, sparclinux@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-arch@vger.kernel.org,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: [PATCH v5 1/5] fbdev: Avoid file argument in fb_pgprotect()
Date: Fri, 22 Sep 2023 10:04:55 +0200 [thread overview]
Message-ID: <20230922080636.26762-2-tzimmermann@suse.de> (raw)
In-Reply-To: <20230922080636.26762-1-tzimmermann@suse.de>
Only PowerPC's fb_pgprotect() needs the file argument, although
the implementation in either phys_mem_access_prot() or
pci_phys_mem_access_prot() does not use it. Pass NULL to the internal
helper in preparation of further updates. A later patch will remove
the file parameter from fb_pgprotect().
While at it, replace the shift operation with PHYS_PFN().
v5:
* state function names in commit description (Javier)
Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
---
arch/powerpc/include/asm/fb.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/fb.h b/arch/powerpc/include/asm/fb.h
index 5f1a2e5f76548..61e3b8806db69 100644
--- a/arch/powerpc/include/asm/fb.h
+++ b/arch/powerpc/include/asm/fb.h
@@ -9,7 +9,12 @@
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
unsigned long off)
{
- vma->vm_page_prot = phys_mem_access_prot(file, off >> PAGE_SHIFT,
+ /*
+ * PowerPC's implementation of phys_mem_access_prot() does
+ * not use the file argument. Set it to NULL in preparation
+ * of later updates to the interface.
+ */
+ vma->vm_page_prot = phys_mem_access_prot(NULL, PHYS_PFN(off),
vma->vm_end - vma->vm_start,
vma->vm_page_prot);
}
--
2.42.0
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Zimmermann <tzimmermann@suse.de>
To: mpe@ellerman.id.au, npiggin@gmail.com,
christophe.leroy@csgroup.eu, arnd@arndb.de, deller@gmx.de,
javierm@redhat.com
Cc: linux-arch@vger.kernel.org, linux-fbdev@vger.kernel.org,
linux-ia64@vger.kernel.org, linux-mips@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-m68k@lists.linux-m68k.org,
Thomas Zimmermann <tzimmermann@suse.de>,
sparclinux@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v5 1/5] fbdev: Avoid file argument in fb_pgprotect()
Date: Fri, 22 Sep 2023 10:04:55 +0200 [thread overview]
Message-ID: <20230922080636.26762-2-tzimmermann@suse.de> (raw)
In-Reply-To: <20230922080636.26762-1-tzimmermann@suse.de>
Only PowerPC's fb_pgprotect() needs the file argument, although
the implementation in either phys_mem_access_prot() or
pci_phys_mem_access_prot() does not use it. Pass NULL to the internal
helper in preparation of further updates. A later patch will remove
the file parameter from fb_pgprotect().
While at it, replace the shift operation with PHYS_PFN().
v5:
* state function names in commit description (Javier)
Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
---
arch/powerpc/include/asm/fb.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/fb.h b/arch/powerpc/include/asm/fb.h
index 5f1a2e5f76548..61e3b8806db69 100644
--- a/arch/powerpc/include/asm/fb.h
+++ b/arch/powerpc/include/asm/fb.h
@@ -9,7 +9,12 @@
static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
unsigned long off)
{
- vma->vm_page_prot = phys_mem_access_prot(file, off >> PAGE_SHIFT,
+ /*
+ * PowerPC's implementation of phys_mem_access_prot() does
+ * not use the file argument. Set it to NULL in preparation
+ * of later updates to the interface.
+ */
+ vma->vm_page_prot = phys_mem_access_prot(NULL, PHYS_PFN(off),
vma->vm_end - vma->vm_start,
vma->vm_page_prot);
}
--
2.42.0
next prev parent reply other threads:[~2023-09-22 8:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-22 8:04 [PATCH v5 0/5] ppc, fbdev: Clean up fbdev mmap helper Thomas Zimmermann
2023-09-22 8:04 ` Thomas Zimmermann
2023-09-22 8:04 ` Thomas Zimmermann [this message]
2023-09-22 8:04 ` [PATCH v5 1/5] fbdev: Avoid file argument in fb_pgprotect() Thomas Zimmermann
2023-09-22 8:04 ` [PATCH v5 2/5] fbdev: Replace fb_pgprotect() with pgprot_framebuffer() Thomas Zimmermann
2023-09-22 8:04 ` Thomas Zimmermann
2023-09-22 8:28 ` Javier Martinez Canillas
2023-09-22 8:28 ` Javier Martinez Canillas
2023-09-22 8:04 ` [PATCH v5 3/5] arch/powerpc: Remove trailing whitespaces Thomas Zimmermann
2023-09-22 8:04 ` Thomas Zimmermann
2023-09-22 8:04 ` [PATCH v5 4/5] arch/powerpc: Remove file parameter from phys_mem_access_prot code Thomas Zimmermann
2023-09-22 8:04 ` Thomas Zimmermann
2023-09-22 8:04 ` [PATCH v5 5/5] arch/powerpc: Call internal __phys_mem_access_prot() in fbdev code Thomas Zimmermann
2023-09-22 8:04 ` Thomas Zimmermann
2023-09-25 8:00 ` [PATCH v5 0/5] ppc, fbdev: Clean up fbdev mmap helper Thomas Zimmermann
2023-09-25 8:00 ` Thomas Zimmermann
2023-10-18 10:48 ` Michael Ellerman
2023-10-18 10:48 ` Michael Ellerman
2023-11-13 2:45 ` (subset) " Michael Ellerman
2023-11-13 2:45 ` Michael Ellerman
2023-11-13 9:22 ` Thomas Zimmermann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230922080636.26762-2-tzimmermann@suse.de \
--to=tzimmermann@suse.de \
--cc=arnd@arndb.de \
--cc=christophe.leroy@csgroup.eu \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=javierm@redhat.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=sparclinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.