| Message ID | 20230405150554.30540-1-tzimmermann@suse.de |
|---|---|
| Headers | show |
| Series | arch: Consolidate <asm/fb.h> | expand |
On Wed, Apr 5, 2023, at 17:05, Thomas Zimmermann wrote: > Generic implementations of fb_pgprotect() and fb_is_primary_device() > have been in the source code for a long time. Prepare the header file > to make use of them. > > Improve the code by using an inline function for fb_pgprotect() and > by removing include statements. > > Symbols are protected by preprocessor guards. Architectures that > provide a symbol need to define a preprocessor token of the same > name and value. Otherwise the header file will provide a generic > implementation. This pattern has been taken from <asm/io.h>. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Moving this into generic code is good, but I'm not sure about the default for fb_pgprotect(): > + > +#ifndef fb_pgprotect > +#define fb_pgprotect fb_pgprotect > +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, > + unsigned long off) > +{ } > +#endif I think most architectures will want the version we have on arc, arm, arm64, loongarch, and sh already: static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, unsigned long off) { vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); } so I'd suggest making that version the default, and treating the empty ones (m68knommu, sparc32) as architecture specific workarounds. I see that sparc64 and parisc use pgprot_uncached here, but as they don't define a custom pgprot_writecombine, this ends up being the same, and they can use the above definition as well. mips defines pgprot_writecombine but uses pgprot_noncached in fb_pgprotect(), which is probably a mistake and should have been updated as part of commit 4b050ba7a66c ("MIPS: pgtable.h: Implement the pgprot_writecombine function for MIPS"). Arnd
On Wed, Apr 05, 2023 at 05:53:03PM +0200, Arnd Bergmann wrote: > On Wed, Apr 5, 2023, at 17:05, Thomas Zimmermann wrote: > > Generic implementations of fb_pgprotect() and fb_is_primary_device() > > have been in the source code for a long time. Prepare the header file > > to make use of them. > > > > Improve the code by using an inline function for fb_pgprotect() and > > by removing include statements. > > > > Symbols are protected by preprocessor guards. Architectures that > > provide a symbol need to define a preprocessor token of the same > > name and value. Otherwise the header file will provide a generic > > implementation. This pattern has been taken from <asm/io.h>. > > > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > > Moving this into generic code is good, but I'm not sure > about the default for fb_pgprotect(): > > > + > > +#ifndef fb_pgprotect > > +#define fb_pgprotect fb_pgprotect > > +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, > > + unsigned long off) > > +{ } > > +#endif > > I think most architectures will want the version we have on > arc, arm, arm64, loongarch, and sh already: > > static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, > unsigned long off) > { > vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); > } > > so I'd suggest making that version the default, and treating the > empty ones (m68knommu, sparc32) as architecture specific > workarounds. Yeah I was about to type the same suggestion :-) -Daniel > I see that sparc64 and parisc use pgprot_uncached here, but as > they don't define a custom pgprot_writecombine, this ends up being > the same, and they can use the above definition as well. > > mips defines pgprot_writecombine but uses pgprot_noncached > in fb_pgprotect(), which is probably a mistake and should have > been updated as part of commit 4b050ba7a66c ("MIPS: pgtable.h: > Implement the pgprot_writecombine function for MIPS"). > > Arnd
Hi Am 05.04.23 um 17:53 schrieb Arnd Bergmann: > On Wed, Apr 5, 2023, at 17:05, Thomas Zimmermann wrote: >> Generic implementations of fb_pgprotect() and fb_is_primary_device() >> have been in the source code for a long time. Prepare the header file >> to make use of them. >> >> Improve the code by using an inline function for fb_pgprotect() and >> by removing include statements. >> >> Symbols are protected by preprocessor guards. Architectures that >> provide a symbol need to define a preprocessor token of the same >> name and value. Otherwise the header file will provide a generic >> implementation. This pattern has been taken from <asm/io.h>. >> >> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > > Moving this into generic code is good, but I'm not sure > about the default for fb_pgprotect(): > >> + >> +#ifndef fb_pgprotect >> +#define fb_pgprotect fb_pgprotect >> +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, >> + unsigned long off) >> +{ } >> +#endif > > I think most architectures will want the version we have on > arc, arm, arm64, loongarch, and sh already: > > static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, > unsigned long off) > { > vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); > } > > so I'd suggest making that version the default, and treating the > empty ones (m68knommu, sparc32) as architecture specific > workarounds. Make sense, thanks for the feedback. I'll send out an update soon. Best regards Thomas > > I see that sparc64 and parisc use pgprot_uncached here, but as > they don't define a custom pgprot_writecombine, this ends up being > the same, and they can use the above definition as well. > > mips defines pgprot_writecombine but uses pgprot_noncached > in fb_pgprotect(), which is probably a mistake and should have > been updated as part of commit 4b050ba7a66c ("MIPS: pgtable.h: > Implement the pgprot_writecombine function for MIPS"). > > Arnd
Hi Am 05.04.23 um 17:53 schrieb Arnd Bergmann: > On Wed, Apr 5, 2023, at 17:05, Thomas Zimmermann wrote: >> Generic implementations of fb_pgprotect() and fb_is_primary_device() >> have been in the source code for a long time. Prepare the header file >> to make use of them. >> >> Improve the code by using an inline function for fb_pgprotect() and >> by removing include statements. >> >> Symbols are protected by preprocessor guards. Architectures that >> provide a symbol need to define a preprocessor token of the same >> name and value. Otherwise the header file will provide a generic >> implementation. This pattern has been taken from <asm/io.h>. >> >> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > > Moving this into generic code is good, but I'm not sure > about the default for fb_pgprotect(): > >> + >> +#ifndef fb_pgprotect >> +#define fb_pgprotect fb_pgprotect >> +static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, >> + unsigned long off) >> +{ } >> +#endif > > I think most architectures will want the version we have on > arc, arm, arm64, loongarch, and sh already: > > static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, > unsigned long off) > { > vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); > } > > so I'd suggest making that version the default, and treating the > empty ones (m68knommu, sparc32) as architecture specific > workarounds. > > I see that sparc64 and parisc use pgprot_uncached here, but as > they don't define a custom pgprot_writecombine, this ends up being > the same, and they can use the above definition as well. > > mips defines pgprot_writecombine but uses pgprot_noncached > in fb_pgprotect(), which is probably a mistake and should have > been updated as part of commit 4b050ba7a66c ("MIPS: pgtable.h: > Implement the pgprot_writecombine function for MIPS"). I would not want to change any of the other platform's functions unless the rsp platform maintainers ask me to. Best regards Thomas > > Arnd
Am Mittwoch, 5. April 2023, 17:05:36 CEST schrieb Thomas Zimmermann:
> Various architectures provide <arm/fb.h> with helpers for fbdev
^ *lol*
Eike
Am Mittwoch, 5. April 2023, 17:05:48 CEST schrieb Thomas Zimmermann: > Move PARISC's implementation of fb_is_primary_device() into the > architecture directory. This the place of the declaration and > where other architectures implement this function. No functional > changes. > diff --git a/arch/parisc/video/fbdev.c b/arch/parisc/video/fbdev.c > new file mode 100644 > index 000000000000..4a0ae08fc75b > --- /dev/null > +++ b/arch/parisc/video/fbdev.c > @@ -0,0 +1,27 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org> > + * Copyright (C) 2001-2020 Helge Deller <deller@gmx.de> > + * Copyright (C) 2001-2002 Thomas Bogendoerfer <tsbogend@alpha.franken.de> > + */ > + > +#include <linux/module.h> > + > +#include <asm/fb.h> > + > +#include <video/sticore.h> > + > +int fb_is_primary_device(struct fb_info *info) > +{ Looking at this makes me wonder why the argument to all of these functions isn't const? Not your fault, but could be a candidate for patch #19? Eike
Various architectures provide <arm/fb.h> with helpers for fbdev framebuffer devices. Share the contained code where possible. There is already <asm-generic/fb.h>, which implements generic (as in 'empty') functions of the fbdev helpers. The header was added in commit aafe4dbed0bf ("asm-generic: add generic versions of common headers"), but never used. Each per-architecture header file declares and/or implements fbdev helpers and defines a preprocessor token for each. The generic header then provides the remaining helpers. It works like the I/O helpers in <asm/io.h>. For PARISC, the architecture helpers are mixed up with helpers for the system's STI graphics firmware. We first move the STI code to appropriate locations under video/ and then move the architecture helper under arch/parisc. For Sparc, there's an additional patch that moves the implementation from the header into a source file. This allows to avoid some include statements in the header file. Built on arm, arm64, m68k, mips, parisc, powerpc, sparc and x86. Thomas Zimmermann (18): fbdev: Prepare generic architecture helpers arch/arc: Implement <asm/fb.h> with generic helpers arch/arm: Implement <asm/fb.h> with generic helpers arch/arm64: Implement <asm/fb.h> with generic helpers arch/ia64: Implement <asm/fb.h> with generic helpers arch/loongarch: Implement <asm/fb.h> with generic helpers arch/m68k: Implement <asm/fb.h> with generic helpers arch/mips: Implement <asm/fb.h> with generic helpers video: Remove trailing whitespaces video: Move HP PARISC STI core code to shared location arch/parisc: Remove trailing whitespaces arch/parisc: Implement fb_is_primary_device() under arch/parisc arch/parisc: Implement <asm/fb.h> with generic helpers arch/powerpc: Implement <asm/fb.h> with generic helpers arch/sh: Implement <asm/fb.h> with generic helpers arch/sparc: Implement fb_is_primary_device() in source file arch/sparc: Implement <asm/fb.h> with generic helpers arch/x86: Implement <asm/fb.h> with generic helpers arch/arc/include/asm/fb.h | 11 +- arch/arm/include/asm/fb.h | 10 +- arch/arm64/include/asm/fb.h | 10 +- arch/ia64/include/asm/fb.h | 11 +- arch/loongarch/include/asm/fb.h | 10 +- arch/m68k/include/asm/fb.h | 10 +- arch/mips/include/asm/fb.h | 10 +- arch/parisc/Makefile | 4 +- arch/parisc/include/asm/fb.h | 17 +- arch/parisc/video/Makefile | 3 + arch/parisc/video/fbdev.c | 27 +++ arch/powerpc/include/asm/fb.h | 8 +- arch/sh/include/asm/fb.h | 10 +- arch/sparc/Makefile | 1 + arch/sparc/include/asm/fb.h | 30 ++-- arch/sparc/video/Makefile | 3 + arch/sparc/video/fbdev.c | 24 +++ arch/x86/include/asm/fb.h | 11 +- drivers/video/Kconfig | 7 + drivers/video/Makefile | 1 + drivers/video/console/Kconfig | 1 + drivers/video/console/Makefile | 4 +- drivers/video/console/sticon.c | 6 +- drivers/video/fbdev/Kconfig | 3 +- drivers/video/fbdev/stifb.c | 158 +++++++++--------- drivers/video/{console => }/sticore.c | 123 ++++++-------- include/asm-generic/fb.h | 20 ++- .../video/fbdev => include/video}/sticore.h | 16 +- 28 files changed, 297 insertions(+), 252 deletions(-) create mode 100644 arch/parisc/video/Makefile create mode 100644 arch/parisc/video/fbdev.c create mode 100644 arch/sparc/video/Makefile create mode 100644 arch/sparc/video/fbdev.c rename drivers/video/{console => }/sticore.c (95%) rename {drivers/video/fbdev => include/video}/sticore.h (99%) base-commit: a7180debb9c631375684f4d717466cfb9f238660