From: Finn Thain <fthain@telegraphics.com.au>
To: <linux-kernel@vger.kernel.org>, <linux-m68k@vger.kernel.org>,
<linuxppc-dev@lists.ozlabs.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [RFC v5 15/26] powerpc: Implement arch_nvram_ops.get_size() and remove old nvram_* exports
Date: Sat, 25 Jul 2015 17:46:14 +1000 [thread overview]
Message-ID: <20150725074603.183300268@telegraphics.com.au> (raw)
In-Reply-To: 20150725074559.543547894@telegraphics.com.au
Implement arch_nvram_ops for PPC32 and make use of it in the generic_nvram
misc device module so that the nvram_* function exports can be removed.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
arch/powerpc/include/asm/nvram.h | 3 ---
arch/powerpc/kernel/setup_32.c | 10 +++++++---
drivers/char/generic_nvram.c | 24 ++++++++++++------------
3 files changed, 19 insertions(+), 18 deletions(-)
Index: linux/arch/powerpc/include/asm/nvram.h
===================================================================
--- linux.orig/arch/powerpc/include/asm/nvram.h 2015-07-25 17:45:38.000000000 +1000
+++ linux/arch/powerpc/include/asm/nvram.h 2015-07-25 17:45:41.000000000 +1000
@@ -98,7 +98,4 @@ extern int nvram_write_os_partition(stru
unsigned int err_type,
unsigned int error_log_cnt);
-/* Determine NVRAM size */
-extern ssize_t nvram_get_size(void);
-
#endif /* _ASM_POWERPC_NVRAM_H */
Index: linux/arch/powerpc/kernel/setup_32.c
===================================================================
--- linux.orig/arch/powerpc/kernel/setup_32.c 2015-07-25 17:45:38.000000000 +1000
+++ linux/arch/powerpc/kernel/setup_32.c 2015-07-25 17:45:41.000000000 +1000
@@ -186,13 +186,12 @@ void nvram_write_byte(unsigned char val,
}
EXPORT_SYMBOL(nvram_write_byte);
-ssize_t nvram_get_size(void)
+static ssize_t ppc_nvram_get_size(void)
{
if (ppc_md.nvram_size)
return ppc_md.nvram_size();
- return -1;
+ return -ENODEV;
}
-EXPORT_SYMBOL(nvram_get_size);
void nvram_sync(void)
{
@@ -201,6 +200,11 @@ void nvram_sync(void)
}
EXPORT_SYMBOL(nvram_sync);
+const struct nvram_ops arch_nvram_ops = {
+ .get_size = ppc_nvram_get_size,
+};
+EXPORT_SYMBOL(arch_nvram_ops);
+
#endif /* CONFIG_NVRAM */
int __init ppc_init(void)
Index: linux/drivers/char/generic_nvram.c
===================================================================
--- linux.orig/drivers/char/generic_nvram.c 2015-07-25 17:45:38.000000000 +1000
+++ linux/drivers/char/generic_nvram.c 2015-07-25 17:45:41.000000000 +1000
@@ -27,8 +27,6 @@
#include <asm/machdep.h>
#endif
-#define NVRAM_SIZE 8192
-
static DEFINE_MUTEX(nvram_mutex);
static ssize_t nvram_len;
@@ -149,20 +147,22 @@ static struct miscdevice nvram_dev = {
int __init nvram_init(void)
{
- int ret = 0;
+ int ret;
- printk(KERN_INFO "Generic non-volatile memory driver v%s\n",
- NVRAM_VERSION);
- ret = misc_register(&nvram_dev);
- if (ret != 0)
- goto out;
+ if (arch_nvram_ops.get_size == NULL)
+ return -ENODEV;
- nvram_len = nvram_get_size();
+ nvram_len = arch_nvram_ops.get_size();
if (nvram_len < 0)
- nvram_len = NVRAM_SIZE;
+ return nvram_len;
-out:
- return ret;
+ ret = misc_register(&nvram_dev);
+ if (ret)
+ return ret;
+
+ pr_info("Generic non-volatile memory driver v%s\n", NVRAM_VERSION);
+
+ return 0;
}
void __exit nvram_cleanup(void)
next prev parent reply other threads:[~2015-07-25 7:56 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-25 7:45 [RFC v5 00/26] Re-use nvram module Finn Thain
2015-07-25 7:46 ` [RFC v5 01/26] scsi/atari_scsi: Dont select CONFIG_NVRAM Finn Thain
2015-07-25 7:46 ` [RFC v5 02/26] char/nvram: Use bitwise OR to obtain Atari video mode data Finn Thain
2015-07-25 7:46 ` [RFC v5 03/26] m68k/atari: Move Atari-specific code out of drivers/char/nvram.c Finn Thain
2015-07-25 7:46 ` [RFC v5 04/26] m68k/atari: Replace nvram_{read, write}_byte with arch_nvram_ops Finn Thain
2015-07-25 7:46 ` [RFC v5 05/26] char/nvram: Re-order functions to remove forward declarations and #ifdefs Finn Thain
2015-07-25 7:46 ` [RFC v5 06/26] char/nvram: Adopt arch_nvram_ops Finn Thain
2015-07-25 7:46 ` [RFC v5 07/26] x86/thinkpad_acpi: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte() Finn Thain
2015-07-25 7:46 ` [RFC v5 08/26] char/nvram: Allow the set_checksum and initialize ioctls to be omitted Finn Thain
2015-07-25 7:46 ` [RFC v5 09/26] char/nvram: Implement NVRAM read/write methods Finn Thain
2015-07-25 7:46 ` [RFC v5 10/26] char/nvram: Use generic fixed_size_llseek() Finn Thain
2015-07-25 7:46 ` [RFC v5 11/26] m68k/atari: Implement arch_nvram_ops methods and enable CONFIG_HAVE_ARCH_NVRAM_OPS Finn Thain
2015-07-25 7:46 ` [RFC v5 12/26] char/nvram: Add "devname:nvram" module alias Finn Thain
2015-07-25 7:46 ` [RFC v5 13/26] powerpc: Cleanup nvram includes Finn Thain
2015-07-25 7:46 ` [RFC v5 14/26] powerpc: Add missing ppc_md.nvram_size for CHRP and PowerMac Finn Thain
2015-07-25 7:46 ` Finn Thain [this message]
2015-07-25 7:46 ` [RFC v5 16/26] powerpc: Implement nvram sync ioctl Finn Thain
2015-07-25 7:46 ` [RFC v5 17/26] powerpc, fbdev: Use NV_CMODE and NV_VMODE only when CONFIG_PPC32 and CONFIG_PPC_PMAC and CONFIG_NVRAM Finn Thain
2015-07-25 7:46 ` [RFC v5 18/26] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte() Finn Thain
2015-07-25 7:46 ` [RFC v5 19/26] nvram: Drop nvram_* symbol exports and prototypes Finn Thain
2015-07-25 7:46 ` [RFC v5 20/26] powerpc: Remove CONFIG_GENERIC_NVRAM and adopt CONFIG_HAVE_ARCH_NVRAM_OPS Finn Thain
2015-07-25 7:46 ` [RFC v5 21/26] char/generic_nvram: Remove as unused Finn Thain
2015-07-25 7:46 ` [RFC v5 22/26] powerpc: Adopt nvram module for PPC64 Finn Thain
2015-07-25 7:46 ` [RFC v5 23/26] m68k/mac: Adopt naming and calling conventions for PRAM routines Finn Thain
2015-07-25 7:46 ` [RFC v5 24/26] m68k/mac: Use macros for RTC accesses not magic numbers Finn Thain
2015-07-25 7:46 ` [RFC v5 25/26] m68k/mac: Fix PRAM accessors Finn Thain
2015-07-25 7:46 ` [RFC v5 26/26] m68k: Dispatch nvram_ops calls to Atari or Mac functions Finn Thain
2015-08-16 9:15 ` [RFC v5 00/26] Re-use nvram module Geert Uytterhoeven
2015-08-17 8:04 ` Finn Thain
2015-08-17 8:20 ` Geert Uytterhoeven
2015-08-17 8:48 ` Finn Thain
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=20150725074603.183300268@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).