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 v6 15/25] powerpc: Implement nvram sync ioctl
Date: Sun, 23 Aug 2015 20:41:44 +1000 [thread overview]
Message-ID: <20150823104133.287719763@telegraphics.com.au> (raw)
In-Reply-To: 20150823104129.517600532@telegraphics.com.au
Add the powerpc-specific sync() method to struct nvram_ops and implement
the corresponding ioctl in the nvram module. This allows the nvram module
to replace the generic_nvram module.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
On PPC32, the IOC_NVRAM_SYNC ioctl call always returns 0, even for those
platforms that don't implement ppc_md.nvram_sync. This patch retains
that quirk. It might be better to return -EINVAL (which is what PPC64 does).
Changed since v1:
- Don't bother acquiring the mutex for unimplemented ioctls.
Changed since v5:
- The IOC_NVRAM_GET_OFFSET ioctl returns -EINVAL on PowerPC platforms
other than Power Mac, and -ENOTTY on architectures other than PowerPC.
This is more consistent with the old generic_nvram module.
---
arch/powerpc/include/asm/nvram.h | 3 ---
arch/powerpc/kernel/setup_32.c | 6 +++---
drivers/char/generic_nvram.c | 2 +-
drivers/char/nvram.c | 39 +++++++++++++++++++++++++++++++++++++++
include/linux/nvram.h | 4 ++++
5 files changed, 47 insertions(+), 7 deletions(-)
Index: linux/drivers/char/nvram.c
===================================================================
--- linux.orig/drivers/char/nvram.c 2015-08-23 20:41:07.000000000 +1000
+++ linux/drivers/char/nvram.c 2015-08-23 20:41:11.000000000 +1000
@@ -48,6 +48,11 @@
#include <linux/mutex.h>
+#ifdef CONFIG_PPC
+#include <asm/nvram.h>
+#include <asm/machdep.h>
+#endif
+
static DEFINE_MUTEX(nvram_mutex);
static DEFINE_SPINLOCK(nvram_state_lock);
static int nvram_open_cnt; /* #times opened */
@@ -338,6 +343,37 @@ static long nvram_misc_ioctl(struct file
long ret = -ENOTTY;
switch (cmd) {
+#ifdef CONFIG_PPC
+ case OBSOLETE_PMAC_NVRAM_GET_OFFSET:
+ pr_warn("nvram: Using obsolete PMAC_NVRAM_GET_OFFSET ioctl\n");
+ /* fall through */
+ case IOC_NVRAM_GET_OFFSET:
+ ret = -EINVAL;
+#ifdef CONFIG_PPC_PMAC
+ if (machine_is(powermac)) {
+ int part, offset;
+
+ if (copy_from_user(&part, (void __user *)arg,
+ sizeof(part)) != 0)
+ return -EFAULT;
+ if (part < pmac_nvram_OF || part > pmac_nvram_NR)
+ return -EINVAL;
+ offset = pmac_get_partition(part);
+ if (copy_to_user((void __user *)arg,
+ &offset, sizeof(offset)) != 0)
+ return -EFAULT;
+ ret = 0;
+ }
+#endif
+ break;
+ case IOC_NVRAM_SYNC:
+ if (arch_nvram_ops.sync != NULL) {
+ mutex_lock(&nvram_mutex);
+ ret = arch_nvram_ops.sync();
+ mutex_unlock(&nvram_mutex);
+ }
+ break;
+#else /* !CONFIG_PPC */
case NVRAM_INIT:
/* initialize NVRAM contents and checksum */
if (!capable(CAP_SYS_ADMIN))
@@ -361,6 +397,7 @@ static long nvram_misc_ioctl(struct file
mutex_unlock(&nvram_mutex);
}
break;
+#endif /* CONFIG_PPC */
}
return ret;
}
@@ -376,6 +413,7 @@ static int nvram_misc_open(struct inode
return -EBUSY;
}
+#ifndef CONFIG_PPC
/* Prevent multiple writers if the set_checksum ioctl is implemented. */
if ((arch_nvram_ops.set_checksum != NULL) &&
(file->f_mode & FMODE_WRITE) &&
@@ -383,6 +421,7 @@ static int nvram_misc_open(struct inode
spin_unlock(&nvram_state_lock);
return -EBUSY;
}
+#endif
if (file->f_flags & O_EXCL)
nvram_open_mode |= NVRAM_EXCL;
Index: linux/include/linux/nvram.h
===================================================================
--- linux.orig/include/linux/nvram.h 2015-08-23 20:41:02.000000000 +1000
+++ linux/include/linux/nvram.h 2015-08-23 20:41:11.000000000 +1000
@@ -17,8 +17,12 @@ struct nvram_ops {
unsigned char (*read_byte)(int);
void (*write_byte)(unsigned char, int);
ssize_t (*get_size)(void);
+#ifdef CONFIG_PPC
+ long (*sync)(void);
+#else
long (*set_checksum)(void);
long (*initialize)(void);
+#endif
};
extern const struct nvram_ops arch_nvram_ops;
Index: linux/arch/powerpc/include/asm/nvram.h
===================================================================
--- linux.orig/arch/powerpc/include/asm/nvram.h 2015-08-23 20:41:10.000000000 +1000
+++ linux/arch/powerpc/include/asm/nvram.h 2015-08-23 20:41:11.000000000 +1000
@@ -78,9 +78,6 @@ extern int pmac_get_partition(int partit
extern u8 pmac_xpram_read(int xpaddr);
extern void pmac_xpram_write(int xpaddr, u8 data);
-/* Synchronize NVRAM */
-extern void nvram_sync(void);
-
/* Initialize NVRAM OS partition */
extern int __init nvram_init_os_partition(struct nvram_os_partition *part);
Index: linux/arch/powerpc/kernel/setup_32.c
===================================================================
--- linux.orig/arch/powerpc/kernel/setup_32.c 2015-08-23 20:41:10.000000000 +1000
+++ linux/arch/powerpc/kernel/setup_32.c 2015-08-23 20:41:11.000000000 +1000
@@ -170,7 +170,6 @@ __setup("l3cr=", ppc_setup_l3cr);
#ifdef CONFIG_GENERIC_NVRAM
-/* Generic nvram hooks used by drivers/char/gen_nvram.c */
unsigned char nvram_read_byte(int addr)
{
if (ppc_md.nvram_read_val)
@@ -193,15 +192,16 @@ static ssize_t ppc_nvram_get_size(void)
return -ENODEV;
}
-void nvram_sync(void)
+static long ppc_nvram_sync(void)
{
if (ppc_md.nvram_sync)
ppc_md.nvram_sync();
+ return 0;
}
-EXPORT_SYMBOL(nvram_sync);
const struct nvram_ops arch_nvram_ops = {
.get_size = ppc_nvram_get_size,
+ .sync = ppc_nvram_sync,
};
EXPORT_SYMBOL(arch_nvram_ops);
Index: linux/drivers/char/generic_nvram.c
===================================================================
--- linux.orig/drivers/char/generic_nvram.c 2015-08-23 20:41:10.000000000 +1000
+++ linux/drivers/char/generic_nvram.c 2015-08-23 20:41:11.000000000 +1000
@@ -111,7 +111,7 @@ static int nvram_ioctl(struct file *file
}
#endif /* CONFIG_PPC_PMAC */
case IOC_NVRAM_SYNC:
- nvram_sync();
+ arch_nvram_ops.sync();
break;
default:
return -EINVAL;
next prev parent reply other threads:[~2015-08-23 11:13 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-23 10:41 [RFC v6 00/25] Re-use nvram module Finn Thain
2015-08-23 10:41 ` [RFC v6 01/25] scsi/atari_scsi: Dont select CONFIG_NVRAM Finn Thain
2015-08-23 10:41 ` [RFC v6 02/25] m68k/atari: Move Atari-specific code out of drivers/char/nvram.c Finn Thain
2015-08-23 10:41 ` [RFC v6 03/25] m68k/atari: Replace nvram_{read, write}_byte with arch_nvram_ops Finn Thain
2015-10-14 11:19 ` [RFC v6 03/25] m68k/atari: Replace nvram_{read,write}_byte " Finn Thain
2015-08-23 10:41 ` [RFC v6 04/25] char/nvram: Re-order functions to remove forward declarations and #ifdefs Finn Thain
2015-08-23 10:41 ` [RFC v6 05/25] char/nvram: Adopt arch_nvram_ops Finn Thain
2015-08-23 10:41 ` [RFC v6 06/25] x86/thinkpad_acpi: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte() Finn Thain
2015-08-23 10:41 ` [RFC v6 07/25] char/nvram: Allow the set_checksum and initialize ioctls to be omitted Finn Thain
2015-08-23 10:41 ` [RFC v6 08/25] char/nvram: Implement NVRAM read/write methods Finn Thain
2015-08-23 10:41 ` [RFC v6 09/25] char/nvram: Use generic fixed_size_llseek() Finn Thain
2015-08-23 10:41 ` [RFC v6 10/25] m68k/atari: Implement arch_nvram_ops methods and enable CONFIG_HAVE_ARCH_NVRAM_OPS Finn Thain
2015-08-23 10:41 ` [RFC v6 11/25] char/nvram: Add "devname:nvram" module alias Finn Thain
2015-08-23 10:41 ` [RFC v6 12/25] powerpc: Cleanup nvram includes Finn Thain
2015-08-23 10:41 ` [RFC v6 13/25] powerpc: Add missing ppc_md.nvram_size for CHRP and PowerMac Finn Thain
2015-08-23 10:41 ` [RFC v6 14/25] powerpc: Implement arch_nvram_ops.get_size() and remove old nvram_* exports Finn Thain
2015-08-23 10:41 ` Finn Thain [this message]
2015-08-23 10:41 ` [RFC v6 16/25] powerpc, fbdev: Use NV_CMODE and NV_VMODE only when CONFIG_PPC32 and CONFIG_PPC_PMAC and CONFIG_NVRAM Finn Thain
2015-08-23 10:41 ` [RFC v6 17/25] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte() Finn Thain
2015-08-23 10:41 ` [RFC v6 18/25] nvram: Drop nvram_* symbol exports and prototypes Finn Thain
2015-08-23 10:41 ` [RFC v6 19/25] powerpc: Remove CONFIG_GENERIC_NVRAM and adopt CONFIG_HAVE_ARCH_NVRAM_OPS Finn Thain
2015-08-23 10:41 ` [RFC v6 20/25] char/generic_nvram: Remove as unused Finn Thain
2015-08-23 10:41 ` [RFC v6 21/25] powerpc: Adopt nvram module for PPC64 Finn Thain
2015-08-23 10:41 ` [RFC v6 22/25] m68k/mac: Adopt naming and calling conventions for PRAM routines Finn Thain
2015-08-23 10:41 ` [RFC v6 23/25] m68k/mac: Use macros for RTC accesses not magic numbers Finn Thain
2015-08-23 10:41 ` [RFC v6 24/25] m68k/mac: Fix PRAM accessors Finn Thain
2015-08-23 10:41 ` [RFC v6 25/25] m68k: Dispatch nvram_ops calls to Atari or Mac functions Finn Thain
2015-10-11 20:06 ` [RFC v6 00/25] Re-use nvram module Laurent Vivier
2015-10-12 2:32 ` 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=20150823104133.287719763@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).