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 X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E6D4C43387 for ; Sat, 29 Dec 2018 17:02:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A6362145D for ; Sat, 29 Dec 2018 17:02:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727517AbeL2RCl convert rfc822-to-8bit (ORCPT ); Sat, 29 Dec 2018 12:02:41 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:55279 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727471AbeL2RCk (ORCPT ); Sat, 29 Dec 2018 12:02:40 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 43Rqd70g3vz9tyyN; Sat, 29 Dec 2018 18:02:35 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id pekT2GIuErhr; Sat, 29 Dec 2018 18:02:35 +0100 (CET) Received: from vm-hermes.si.c-s.fr (vm-hermes.si.c-s.fr [192.168.25.253]) by pegase1.c-s.fr (Postfix) with ESMTP id 43Rqd66s6Tz9tyyM; Sat, 29 Dec 2018 18:02:34 +0100 (CET) Received: by vm-hermes.si.c-s.fr (Postfix, from userid 33) id B277E63B; Sat, 29 Dec 2018 18:02:36 +0100 (CET) Received: from 37.164.147.219 ([37.164.147.219]) by messagerie.si.c-s.fr (Horde Framework) with HTTP; Sat, 29 Dec 2018 18:02:36 +0100 Date: Sat, 29 Dec 2018 18:02:36 +0100 Message-ID: <20181229180236.Horde.idY3gOIzkSWywjIrqlXJMA1@messagerie.si.c-s.fr> From: LEROY Christophe To: Finn Thain Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-m68k@lists.linux-m68k.org, Bartlomiej Zolnierkiewicz , Michael Ellerman , Paul Mackerras , Benjamin Herrenschmidt , Greg Kroah-Hartman , Arnd Bergmann Subject: Re: [PATCH v8 20/25] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte() References: <7e8eb87ea829c03941c895c968df2ebd0f80512f.1545784679.git.fthain@telegraphics.com.au> In-Reply-To: <7e8eb87ea829c03941c895c968df2ebd0f80512f.1545784679.git.fthain@telegraphics.com.au> User-Agent: Internet Messaging Program (IMP) H5 (6.2.3) Content-Type: text/plain; charset=UTF-8; format=flowed; DelSp=Yes MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Finn Thain a écrit : > Make use of arch_nvram_ops in device drivers so that the nvram_* function > exports can be removed. > > Since they are no longer global symbols, rename the PPC32 nvram_* functions > appropriately. > > Signed-off-by: Finn Thain > --- > arch/powerpc/kernel/setup_32.c | 8 ++++---- > drivers/char/generic_nvram.c | 4 ++-- > drivers/video/fbdev/controlfb.c | 4 ++-- > drivers/video/fbdev/imsttfb.c | 4 ++-- > drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- > drivers/video/fbdev/platinumfb.c | 4 ++-- > drivers/video/fbdev/valkyriefb.c | 4 ++-- > 7 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c > index e0d045677472..bdbe6acbef11 100644 > --- a/arch/powerpc/kernel/setup_32.c > +++ b/arch/powerpc/kernel/setup_32.c > @@ -152,20 +152,18 @@ __setup("l3cr=", ppc_setup_l3cr); > > #ifdef CONFIG_GENERIC_NVRAM > > -unsigned char nvram_read_byte(int addr) > +static unsigned char ppc_nvram_read_byte(int addr) > { > if (ppc_md.nvram_read_val) > return ppc_md.nvram_read_val(addr); > return 0xff; > } > -EXPORT_SYMBOL(nvram_read_byte); > > -void nvram_write_byte(unsigned char val, int addr) > +static void ppc_nvram_write_byte(unsigned char val, int addr) > { > if (ppc_md.nvram_write_val) > ppc_md.nvram_write_val(addr, val); > } > -EXPORT_SYMBOL(nvram_write_byte); > > static ssize_t ppc_nvram_get_size(void) > { > @@ -182,6 +180,8 @@ static long ppc_nvram_sync(void) > } > > const struct nvram_ops arch_nvram_ops = { > + .read_byte = ppc_nvram_read_byte, > + .write_byte = ppc_nvram_write_byte, > .get_size = ppc_nvram_get_size, > .sync = ppc_nvram_sync, > }; > diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c > index f32d5663de95..41b76bf9614e 100644 > --- a/drivers/char/generic_nvram.c > +++ b/drivers/char/generic_nvram.c > @@ -48,7 +48,7 @@ static ssize_t read_nvram(struct file *file, char > __user *buf, > if (*ppos >= nvram_len) > return 0; > for (i = *ppos; count > 0 && i < nvram_len; ++i, ++p, --count) > - if (__put_user(nvram_read_byte(i), p)) > + if (__put_user(arch_nvram_ops.read_byte(i), p)) Instead of modifying all drivers (in this patch and previous ones related to other arches), wouldn't it be better to add helpers like the following in nvram.h: Static inline unsigned char nvram_read_byte(int addr) { return arch_nvram_ops.read_byte(addr); } Christophe > return -EFAULT; > *ppos = i; > return p - buf; > @@ -68,7 +68,7 @@ static ssize_t write_nvram(struct file *file, > const char __user *buf, > for (i = *ppos; count > 0 && i < nvram_len; ++i, ++p, --count) { > if (__get_user(c, p)) > return -EFAULT; > - nvram_write_byte(c, i); > + arch_nvram_ops.write_byte(c, i); > } > *ppos = i; > return p - buf; > diff --git a/drivers/video/fbdev/controlfb.c > b/drivers/video/fbdev/controlfb.c > index 9cb0ef7ac29e..27ff33ccafcb 100644 > --- a/drivers/video/fbdev/controlfb.c > +++ b/drivers/video/fbdev/controlfb.c > @@ -413,7 +413,7 @@ static int __init init_control(struct fb_info_control *p) > /* Try to pick a video mode out of NVRAM if we have one. */ > #ifdef CONFIG_NVRAM > if (default_cmode == CMODE_NVRAM) { > - cmode = nvram_read_byte(NV_CMODE); > + cmode = arch_nvram_ops.read_byte(NV_CMODE); > if(cmode < CMODE_8 || cmode > CMODE_32) > cmode = CMODE_8; > } else > @@ -421,7 +421,7 @@ static int __init init_control(struct fb_info_control *p) > cmode=default_cmode; > #ifdef CONFIG_NVRAM > if (default_vmode == VMODE_NVRAM) { > - vmode = nvram_read_byte(NV_VMODE); > + vmode = arch_nvram_ops.read_byte(NV_VMODE); > if (vmode < 1 || vmode > VMODE_MAX || > control_mac_modes[vmode - 1].m[full] < cmode) { > sense = read_control_sense(p); > diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c > index 8d231591ff0e..e9f3b8914145 100644 > --- a/drivers/video/fbdev/imsttfb.c > +++ b/drivers/video/fbdev/imsttfb.c > @@ -1393,12 +1393,12 @@ static void init_imstt(struct fb_info *info) > int vmode = init_vmode, cmode = init_cmode; > > if (vmode == -1) { > - vmode = nvram_read_byte(NV_VMODE); > + vmode = arch_nvram_ops.read_byte(NV_VMODE); > if (vmode <= 0 || vmode > VMODE_MAX) > vmode = VMODE_640_480_67; > } > if (cmode == -1) { > - cmode = nvram_read_byte(NV_CMODE); > + cmode = arch_nvram_ops.read_byte(NV_CMODE); > if (cmode < CMODE_8 || cmode > CMODE_32) > cmode = CMODE_8; > } > diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c > b/drivers/video/fbdev/matrox/matroxfb_base.c > index cac5865d461c..3fecc628752c 100644 > --- a/drivers/video/fbdev/matrox/matroxfb_base.c > +++ b/drivers/video/fbdev/matrox/matroxfb_base.c > @@ -1876,7 +1876,7 @@ static int initMatrox2(struct matrox_fb_info > *minfo, struct board *b) > default_vmode = VMODE_640_480_60; > #if defined(CONFIG_PPC32) && defined(CONFIG_NVRAM) > if (default_cmode == CMODE_NVRAM) > - default_cmode = nvram_read_byte(NV_CMODE); > + default_cmode = arch_nvram_ops.read_byte(NV_CMODE); > #endif > if (default_cmode < CMODE_8 || default_cmode > CMODE_32) > default_cmode = CMODE_8; > diff --git a/drivers/video/fbdev/platinumfb.c > b/drivers/video/fbdev/platinumfb.c > index bf6b7fb83cf4..3efceaf38f98 100644 > --- a/drivers/video/fbdev/platinumfb.c > +++ b/drivers/video/fbdev/platinumfb.c > @@ -347,7 +347,7 @@ static int platinum_init_fb(struct fb_info *info) > printk(KERN_INFO "platinumfb: Monitor sense value = 0x%x, ", sense); > if (default_vmode == VMODE_NVRAM) { > #ifdef CONFIG_NVRAM > - default_vmode = nvram_read_byte(NV_VMODE); > + default_vmode = arch_nvram_ops.read_byte(NV_VMODE); > if (default_vmode <= 0 || default_vmode > VMODE_MAX || > !platinum_reg_init[default_vmode-1]) > #endif > @@ -360,7 +360,7 @@ static int platinum_init_fb(struct fb_info *info) > default_vmode = VMODE_640_480_60; > #ifdef CONFIG_NVRAM > if (default_cmode == CMODE_NVRAM) > - default_cmode = nvram_read_byte(NV_CMODE); > + default_cmode = arch_nvram_ops.read_byte(NV_CMODE); > #endif > if (default_cmode < CMODE_8 || default_cmode > CMODE_32) > default_cmode = CMODE_8; > diff --git a/drivers/video/fbdev/valkyriefb.c > b/drivers/video/fbdev/valkyriefb.c > index 8022316ee9c9..81f66d69d9dd 100644 > --- a/drivers/video/fbdev/valkyriefb.c > +++ b/drivers/video/fbdev/valkyriefb.c > @@ -283,7 +283,7 @@ static void __init valkyrie_choose_mode(struct > fb_info_valkyrie *p) > /* Try to pick a video mode out of NVRAM if we have one. */ > #if defined(CONFIG_PPC_PMAC) && defined(CONFIG_NVRAM) > if (default_vmode == VMODE_NVRAM) { > - default_vmode = nvram_read_byte(NV_VMODE); > + default_vmode = arch_nvram_ops.read_byte(NV_VMODE); > if (default_vmode <= 0 > || default_vmode > VMODE_MAX > || !valkyrie_reg_init[default_vmode - 1]) > @@ -296,7 +296,7 @@ static void __init valkyrie_choose_mode(struct > fb_info_valkyrie *p) > default_vmode = VMODE_640_480_67; > #if defined(CONFIG_PPC_PMAC) && defined(CONFIG_NVRAM) > if (default_cmode == CMODE_NVRAM) > - default_cmode = nvram_read_byte(NV_CMODE); > + default_cmode = arch_nvram_ops.read_byte(NV_CMODE); > #endif > > /* > -- > 2.19.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: LEROY Christophe Date: Sat, 29 Dec 2018 17:02:36 +0000 Subject: Re: [PATCH v8 20/25] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvr Message-Id: <20181229180236.Horde.idY3gOIzkSWywjIrqlXJMA1@messagerie.si.c-s.fr> List-Id: References: <7e8eb87ea829c03941c895c968df2ebd0f80512f.1545784679.git.fthain@telegraphics.com.au> In-Reply-To: <7e8eb87ea829c03941c895c968df2ebd0f80512f.1545784679.git.fthain@telegraphics.com.au> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: Finn Thain Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-m68k@lists.linux-m68k.org, Bartlomiej Zolnierkiewicz , Michael Ellerman , Paul Mackerras , Benjamin Herrenschmidt , Greg Kroah-Hartman , Arnd Bergmann Finn Thain a =C3=A9crit=C2=A0: > Make use of arch_nvram_ops in device drivers so that the nvram_* function > exports can be removed. > > Since they are no longer global symbols, rename the PPC32 nvram_* functio= ns > appropriately. > > Signed-off-by: Finn Thain > --- > arch/powerpc/kernel/setup_32.c | 8 ++++---- > drivers/char/generic_nvram.c | 4 ++-- > drivers/video/fbdev/controlfb.c | 4 ++-- > drivers/video/fbdev/imsttfb.c | 4 ++-- > drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- > drivers/video/fbdev/platinumfb.c | 4 ++-- > drivers/video/fbdev/valkyriefb.c | 4 ++-- > 7 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_3= 2.c > index e0d045677472..bdbe6acbef11 100644 > --- a/arch/powerpc/kernel/setup_32.c > +++ b/arch/powerpc/kernel/setup_32.c > @@ -152,20 +152,18 @@ __setup("l3cr=3D", ppc_setup_l3cr); > > #ifdef CONFIG_GENERIC_NVRAM > > -unsigned char nvram_read_byte(int addr) > +static unsigned char ppc_nvram_read_byte(int addr) > { > if (ppc_md.nvram_read_val) > return ppc_md.nvram_read_val(addr); > return 0xff; > } > -EXPORT_SYMBOL(nvram_read_byte); > > -void nvram_write_byte(unsigned char val, int addr) > +static void ppc_nvram_write_byte(unsigned char val, int addr) > { > if (ppc_md.nvram_write_val) > ppc_md.nvram_write_val(addr, val); > } > -EXPORT_SYMBOL(nvram_write_byte); > > static ssize_t ppc_nvram_get_size(void) > { > @@ -182,6 +180,8 @@ static long ppc_nvram_sync(void) > } > > const struct nvram_ops arch_nvram_ops =3D { > + .read_byte =3D ppc_nvram_read_byte, > + .write_byte =3D ppc_nvram_write_byte, > .get_size =3D ppc_nvram_get_size, > .sync =3D ppc_nvram_sync, > }; > diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c > index f32d5663de95..41b76bf9614e 100644 > --- a/drivers/char/generic_nvram.c > +++ b/drivers/char/generic_nvram.c > @@ -48,7 +48,7 @@ static ssize_t read_nvram(struct file *file, char =20 > __user *buf, > if (*ppos >=3D nvram_len) > return 0; > for (i =3D *ppos; count > 0 && i < nvram_len; ++i, ++p, --count) > - if (__put_user(nvram_read_byte(i), p)) > + if (__put_user(arch_nvram_ops.read_byte(i), p)) Instead of modifying all drivers (in this patch and previous ones =20 related to other arches), wouldn't it be better to add helpers like =20 the following in nvram.h: Static inline unsigned char nvram_read_byte(int addr) { return arch_nvram_ops.read_byte(addr); } Christophe > return -EFAULT; > *ppos =3D i; > return p - buf; > @@ -68,7 +68,7 @@ static ssize_t write_nvram(struct file *file, =20 > const char __user *buf, > for (i =3D *ppos; count > 0 && i < nvram_len; ++i, ++p, --count) { > if (__get_user(c, p)) > return -EFAULT; > - nvram_write_byte(c, i); > + arch_nvram_ops.write_byte(c, i); > } > *ppos =3D i; > return p - buf; > diff --git a/drivers/video/fbdev/controlfb.c =20 > b/drivers/video/fbdev/controlfb.c > index 9cb0ef7ac29e..27ff33ccafcb 100644 > --- a/drivers/video/fbdev/controlfb.c > +++ b/drivers/video/fbdev/controlfb.c > @@ -413,7 +413,7 @@ static int __init init_control(struct fb_info_control= *p) > /* Try to pick a video mode out of NVRAM if we have one. */ > #ifdef CONFIG_NVRAM > if (default_cmode =3D CMODE_NVRAM) { > - cmode =3D nvram_read_byte(NV_CMODE); > + cmode =3D arch_nvram_ops.read_byte(NV_CMODE); > if(cmode < CMODE_8 || cmode > CMODE_32) > cmode =3D CMODE_8; > } else > @@ -421,7 +421,7 @@ static int __init init_control(struct fb_info_control= *p) > cmode=DEfault_cmode; > #ifdef CONFIG_NVRAM > if (default_vmode =3D VMODE_NVRAM) { > - vmode =3D nvram_read_byte(NV_VMODE); > + vmode =3D arch_nvram_ops.read_byte(NV_VMODE); > if (vmode < 1 || vmode > VMODE_MAX || > control_mac_modes[vmode - 1].m[full] < cmode) { > sense =3D read_control_sense(p); > diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c > index 8d231591ff0e..e9f3b8914145 100644 > --- a/drivers/video/fbdev/imsttfb.c > +++ b/drivers/video/fbdev/imsttfb.c > @@ -1393,12 +1393,12 @@ static void init_imstt(struct fb_info *info) > int vmode =3D init_vmode, cmode =3D init_cmode; > > if (vmode =3D -1) { > - vmode =3D nvram_read_byte(NV_VMODE); > + vmode =3D arch_nvram_ops.read_byte(NV_VMODE); > if (vmode <=3D 0 || vmode > VMODE_MAX) > vmode =3D VMODE_640_480_67; > } > if (cmode =3D -1) { > - cmode =3D nvram_read_byte(NV_CMODE); > + cmode =3D arch_nvram_ops.read_byte(NV_CMODE); > if (cmode < CMODE_8 || cmode > CMODE_32) > cmode =3D CMODE_8; > } > diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c =20 > b/drivers/video/fbdev/matrox/matroxfb_base.c > index cac5865d461c..3fecc628752c 100644 > --- a/drivers/video/fbdev/matrox/matroxfb_base.c > +++ b/drivers/video/fbdev/matrox/matroxfb_base.c > @@ -1876,7 +1876,7 @@ static int initMatrox2(struct matrox_fb_info =20 > *minfo, struct board *b) > default_vmode =3D VMODE_640_480_60; > #if defined(CONFIG_PPC32) && defined(CONFIG_NVRAM) > if (default_cmode =3D CMODE_NVRAM) > - default_cmode =3D nvram_read_byte(NV_CMODE); > + default_cmode =3D arch_nvram_ops.read_byte(NV_CMODE); > #endif > if (default_cmode < CMODE_8 || default_cmode > CMODE_32) > default_cmode =3D CMODE_8; > diff --git a/drivers/video/fbdev/platinumfb.c =20 > b/drivers/video/fbdev/platinumfb.c > index bf6b7fb83cf4..3efceaf38f98 100644 > --- a/drivers/video/fbdev/platinumfb.c > +++ b/drivers/video/fbdev/platinumfb.c > @@ -347,7 +347,7 @@ static int platinum_init_fb(struct fb_info *info) > printk(KERN_INFO "platinumfb: Monitor sense value =3D 0x%x, ", sense); > if (default_vmode =3D VMODE_NVRAM) { > #ifdef CONFIG_NVRAM > - default_vmode =3D nvram_read_byte(NV_VMODE); > + default_vmode =3D arch_nvram_ops.read_byte(NV_VMODE); > if (default_vmode <=3D 0 || default_vmode > VMODE_MAX || > !platinum_reg_init[default_vmode-1]) > #endif > @@ -360,7 +360,7 @@ static int platinum_init_fb(struct fb_info *info) > default_vmode =3D VMODE_640_480_60; > #ifdef CONFIG_NVRAM > if (default_cmode =3D CMODE_NVRAM) > - default_cmode =3D nvram_read_byte(NV_CMODE); > + default_cmode =3D arch_nvram_ops.read_byte(NV_CMODE); > #endif > if (default_cmode < CMODE_8 || default_cmode > CMODE_32) > default_cmode =3D CMODE_8; > diff --git a/drivers/video/fbdev/valkyriefb.c =20 > b/drivers/video/fbdev/valkyriefb.c > index 8022316ee9c9..81f66d69d9dd 100644 > --- a/drivers/video/fbdev/valkyriefb.c > +++ b/drivers/video/fbdev/valkyriefb.c > @@ -283,7 +283,7 @@ static void __init valkyrie_choose_mode(struct =20 > fb_info_valkyrie *p) > /* Try to pick a video mode out of NVRAM if we have one. */ > #if defined(CONFIG_PPC_PMAC) && defined(CONFIG_NVRAM) > if (default_vmode =3D VMODE_NVRAM) { > - default_vmode =3D nvram_read_byte(NV_VMODE); > + default_vmode =3D arch_nvram_ops.read_byte(NV_VMODE); > if (default_vmode <=3D 0 > || default_vmode > VMODE_MAX > || !valkyrie_reg_init[default_vmode - 1]) > @@ -296,7 +296,7 @@ static void __init valkyrie_choose_mode(struct =20 > fb_info_valkyrie *p) > default_vmode =3D VMODE_640_480_67; > #if defined(CONFIG_PPC_PMAC) && defined(CONFIG_NVRAM) > if (default_cmode =3D CMODE_NVRAM) > - default_cmode =3D nvram_read_byte(NV_CMODE); > + default_cmode =3D arch_nvram_ops.read_byte(NV_CMODE); > #endif > > /* > -- > 2.19.2 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 X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BAA5C43387 for ; Sat, 29 Dec 2018 17:04:37 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B4552145D for ; Sat, 29 Dec 2018 17:04:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B4552145D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=c-s.fr Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 43RqgQ4jz9zDqFJ for ; Sun, 30 Dec 2018 04:04:34 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=c-s.fr Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=c-s.fr (client-ip=93.17.236.30; helo=pegase1.c-s.fr; envelope-from=christophe.leroy@c-s.fr; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=c-s.fr Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 43RqdG0xDKzDq8F for ; Sun, 30 Dec 2018 04:02:42 +1100 (AEDT) Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 43Rqd70g3vz9tyyN; Sat, 29 Dec 2018 18:02:35 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id pekT2GIuErhr; Sat, 29 Dec 2018 18:02:35 +0100 (CET) Received: from vm-hermes.si.c-s.fr (vm-hermes.si.c-s.fr [192.168.25.253]) by pegase1.c-s.fr (Postfix) with ESMTP id 43Rqd66s6Tz9tyyM; Sat, 29 Dec 2018 18:02:34 +0100 (CET) Received: by vm-hermes.si.c-s.fr (Postfix, from userid 33) id B277E63B; Sat, 29 Dec 2018 18:02:36 +0100 (CET) Received: from 37.164.147.219 ([37.164.147.219]) by messagerie.si.c-s.fr (Horde Framework) with HTTP; Sat, 29 Dec 2018 18:02:36 +0100 Date: Sat, 29 Dec 2018 18:02:36 +0100 Message-ID: <20181229180236.Horde.idY3gOIzkSWywjIrqlXJMA1@messagerie.si.c-s.fr> From: LEROY Christophe To: Finn Thain Subject: Re: [PATCH v8 20/25] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte() References: <7e8eb87ea829c03941c895c968df2ebd0f80512f.1545784679.git.fthain@telegraphics.com.au> In-Reply-To: <7e8eb87ea829c03941c895c968df2ebd0f80512f.1545784679.git.fthain@telegraphics.com.au> User-Agent: Internet Messaging Program (IMP) H5 (6.2.3) Content-Type: text/plain; charset=UTF-8; format=flowed; DelSp=Yes MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-fbdev@vger.kernel.org, Arnd Bergmann , Bartlomiej Zolnierkiewicz , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-m68k@lists.linux-m68k.org, Paul Mackerras , linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Finn Thain a =C3=A9crit=C2=A0: > Make use of arch_nvram_ops in device drivers so that the nvram_* function > exports can be removed. > > Since they are no longer global symbols, rename the PPC32 nvram_* functio= ns > appropriately. > > Signed-off-by: Finn Thain > --- > arch/powerpc/kernel/setup_32.c | 8 ++++---- > drivers/char/generic_nvram.c | 4 ++-- > drivers/video/fbdev/controlfb.c | 4 ++-- > drivers/video/fbdev/imsttfb.c | 4 ++-- > drivers/video/fbdev/matrox/matroxfb_base.c | 2 +- > drivers/video/fbdev/platinumfb.c | 4 ++-- > drivers/video/fbdev/valkyriefb.c | 4 ++-- > 7 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_3= 2.c > index e0d045677472..bdbe6acbef11 100644 > --- a/arch/powerpc/kernel/setup_32.c > +++ b/arch/powerpc/kernel/setup_32.c > @@ -152,20 +152,18 @@ __setup("l3cr=3D", ppc_setup_l3cr); > > #ifdef CONFIG_GENERIC_NVRAM > > -unsigned char nvram_read_byte(int addr) > +static unsigned char ppc_nvram_read_byte(int addr) > { > if (ppc_md.nvram_read_val) > return ppc_md.nvram_read_val(addr); > return 0xff; > } > -EXPORT_SYMBOL(nvram_read_byte); > > -void nvram_write_byte(unsigned char val, int addr) > +static void ppc_nvram_write_byte(unsigned char val, int addr) > { > if (ppc_md.nvram_write_val) > ppc_md.nvram_write_val(addr, val); > } > -EXPORT_SYMBOL(nvram_write_byte); > > static ssize_t ppc_nvram_get_size(void) > { > @@ -182,6 +180,8 @@ static long ppc_nvram_sync(void) > } > > const struct nvram_ops arch_nvram_ops =3D { > + .read_byte =3D ppc_nvram_read_byte, > + .write_byte =3D ppc_nvram_write_byte, > .get_size =3D ppc_nvram_get_size, > .sync =3D ppc_nvram_sync, > }; > diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c > index f32d5663de95..41b76bf9614e 100644 > --- a/drivers/char/generic_nvram.c > +++ b/drivers/char/generic_nvram.c > @@ -48,7 +48,7 @@ static ssize_t read_nvram(struct file *file, char=20=20 >=20__user *buf, > if (*ppos >=3D nvram_len) > return 0; > for (i =3D *ppos; count > 0 && i < nvram_len; ++i, ++p, --count) > - if (__put_user(nvram_read_byte(i), p)) > + if (__put_user(arch_nvram_ops.read_byte(i), p)) Instead of modifying all drivers (in this patch and previous ones=20=20 related=20to other arches), wouldn't it be better to add helpers like=20=20 the=20following in nvram.h: Static inline unsigned char nvram_read_byte(int addr) { return arch_nvram_ops.read_byte(addr); } Christophe > return -EFAULT; > *ppos =3D i; > return p - buf; > @@ -68,7 +68,7 @@ static ssize_t write_nvram(struct file *file,=20=20 >=20const char __user *buf, > for (i =3D *ppos; count > 0 && i < nvram_len; ++i, ++p, --count) { > if (__get_user(c, p)) > return -EFAULT; > - nvram_write_byte(c, i); > + arch_nvram_ops.write_byte(c, i); > } > *ppos =3D i; > return p - buf; > diff --git a/drivers/video/fbdev/controlfb.c=20=20 >=20b/drivers/video/fbdev/controlfb.c > index 9cb0ef7ac29e..27ff33ccafcb 100644 > --- a/drivers/video/fbdev/controlfb.c > +++ b/drivers/video/fbdev/controlfb.c > @@ -413,7 +413,7 @@ static int __init init_control(struct fb_info_control= *p) > /* Try to pick a video mode out of NVRAM if we have one. */ > #ifdef CONFIG_NVRAM > if (default_cmode =3D=3D CMODE_NVRAM) { > - cmode =3D nvram_read_byte(NV_CMODE); > + cmode =3D arch_nvram_ops.read_byte(NV_CMODE); > if(cmode < CMODE_8 || cmode > CMODE_32) > cmode =3D CMODE_8; > } else > @@ -421,7 +421,7 @@ static int __init init_control(struct fb_info_control= *p) > cmode=3Ddefault_cmode; > #ifdef CONFIG_NVRAM > if (default_vmode =3D=3D VMODE_NVRAM) { > - vmode =3D nvram_read_byte(NV_VMODE); > + vmode =3D arch_nvram_ops.read_byte(NV_VMODE); > if (vmode < 1 || vmode > VMODE_MAX || > control_mac_modes[vmode - 1].m[full] < cmode) { > sense =3D read_control_sense(p); > diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.= c > index 8d231591ff0e..e9f3b8914145 100644 > --- a/drivers/video/fbdev/imsttfb.c > +++ b/drivers/video/fbdev/imsttfb.c > @@ -1393,12 +1393,12 @@ static void init_imstt(struct fb_info *info) > int vmode =3D init_vmode, cmode =3D init_cmode; > > if (vmode =3D=3D -1) { > - vmode =3D nvram_read_byte(NV_VMODE); > + vmode =3D arch_nvram_ops.read_byte(NV_VMODE); > if (vmode <=3D 0 || vmode > VMODE_MAX) > vmode =3D VMODE_640_480_67; > } > if (cmode =3D=3D -1) { > - cmode =3D nvram_read_byte(NV_CMODE); > + cmode =3D arch_nvram_ops.read_byte(NV_CMODE); > if (cmode < CMODE_8 || cmode > CMODE_32) > cmode =3D CMODE_8; > } > diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c=20=20 >=20b/drivers/video/fbdev/matrox/matroxfb_base.c > index cac5865d461c..3fecc628752c 100644 > --- a/drivers/video/fbdev/matrox/matroxfb_base.c > +++ b/drivers/video/fbdev/matrox/matroxfb_base.c > @@ -1876,7 +1876,7 @@ static int initMatrox2(struct matrox_fb_info=20=20 >=20*minfo, struct board *b) > default_vmode =3D VMODE_640_480_60; > #if defined(CONFIG_PPC32) && defined(CONFIG_NVRAM) > if (default_cmode =3D=3D CMODE_NVRAM) > - default_cmode =3D nvram_read_byte(NV_CMODE); > + default_cmode =3D arch_nvram_ops.read_byte(NV_CMODE); > #endif > if (default_cmode < CMODE_8 || default_cmode > CMODE_32) > default_cmode =3D CMODE_8; > diff --git a/drivers/video/fbdev/platinumfb.c=20=20 >=20b/drivers/video/fbdev/platinumfb.c > index bf6b7fb83cf4..3efceaf38f98 100644 > --- a/drivers/video/fbdev/platinumfb.c > +++ b/drivers/video/fbdev/platinumfb.c > @@ -347,7 +347,7 @@ static int platinum_init_fb(struct fb_info *info) > printk(KERN_INFO "platinumfb: Monitor sense value =3D 0x%x, ", sense); > if (default_vmode =3D=3D VMODE_NVRAM) { > #ifdef CONFIG_NVRAM > - default_vmode =3D nvram_read_byte(NV_VMODE); > + default_vmode =3D arch_nvram_ops.read_byte(NV_VMODE); > if (default_vmode <=3D 0 || default_vmode > VMODE_MAX || > !platinum_reg_init[default_vmode-1]) > #endif > @@ -360,7 +360,7 @@ static int platinum_init_fb(struct fb_info *info) > default_vmode =3D VMODE_640_480_60; > #ifdef CONFIG_NVRAM > if (default_cmode =3D=3D CMODE_NVRAM) > - default_cmode =3D nvram_read_byte(NV_CMODE); > + default_cmode =3D arch_nvram_ops.read_byte(NV_CMODE); > #endif > if (default_cmode < CMODE_8 || default_cmode > CMODE_32) > default_cmode =3D CMODE_8; > diff --git a/drivers/video/fbdev/valkyriefb.c=20=20 >=20b/drivers/video/fbdev/valkyriefb.c > index 8022316ee9c9..81f66d69d9dd 100644 > --- a/drivers/video/fbdev/valkyriefb.c > +++ b/drivers/video/fbdev/valkyriefb.c > @@ -283,7 +283,7 @@ static void __init valkyrie_choose_mode(struct=20=20 >=20fb_info_valkyrie *p) > /* Try to pick a video mode out of NVRAM if we have one. */ > #if defined(CONFIG_PPC_PMAC) && defined(CONFIG_NVRAM) > if (default_vmode =3D=3D VMODE_NVRAM) { > - default_vmode =3D nvram_read_byte(NV_VMODE); > + default_vmode =3D arch_nvram_ops.read_byte(NV_VMODE); > if (default_vmode <=3D 0 > || default_vmode > VMODE_MAX > || !valkyrie_reg_init[default_vmode - 1]) > @@ -296,7 +296,7 @@ static void __init valkyrie_choose_mode(struct=20=20 >=20fb_info_valkyrie *p) > default_vmode =3D VMODE_640_480_67; > #if defined(CONFIG_PPC_PMAC) && defined(CONFIG_NVRAM) > if (default_cmode =3D=3D CMODE_NVRAM) > - default_cmode =3D nvram_read_byte(NV_CMODE); > + default_cmode =3D arch_nvram_ops.read_byte(NV_CMODE); > #endif > > /* > -- > 2.19.2