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: [PATCH v7 22/26] powerpc: Remove pmac_xpram_{read,write} functions
Date: Sun, 01 Nov 2015 21:42:24 +1100 [thread overview]
Message-ID: <20151101104207.781688728@telegraphics.com.au> (raw)
In-Reply-To: 20151101104202.301856132@telegraphics.com.au
[-- Attachment #1: powerpc-remove-pmac_xpram_read-write --]
[-- Type: text/plain, Size: 6914 bytes --]
The arch_nvram_ops methods provide a uniform API for drivers and ioctls.
This API is used to replace older APIs like the nvram_{read,write}_byte()
exports and the pmac_xpram_{read,write} functions.
The latter API is removed in this patch. The addition of the
get_partition() method to struct nvram_ops makes that possible.
pmac_xpram_read() becomes unused once pmac_time_init() is converted
to use arch_nvram_ops. pmac_xpram_write() was already unused.
drivers/char/nvram.c also benefits with the removal of the CONFIG_PPC_PMAC
macro from that file.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
arch/powerpc/include/asm/nvram.h | 4 ----
arch/powerpc/kernel/nvram_64.c | 3 +++
arch/powerpc/kernel/setup_32.c | 3 +++
arch/powerpc/platforms/powermac/nvram.c | 28 +++-------------------------
arch/powerpc/platforms/powermac/time.c | 17 +++++++++++++----
drivers/char/nvram.c | 6 ++----
include/linux/nvram.h | 1 +
7 files changed, 25 insertions(+), 37 deletions(-)
Index: linux/arch/powerpc/include/asm/nvram.h
===================================================================
--- linux.orig/arch/powerpc/include/asm/nvram.h 2015-11-01 21:41:42.000000000 +1100
+++ linux/arch/powerpc/include/asm/nvram.h 2015-11-01 21:41:53.000000000 +1100
@@ -74,10 +74,6 @@ extern loff_t nvram_find_partition(const
/* Return partition offset in nvram */
extern int pmac_get_partition(int partition);
-/* Direct access to XPRAM on PowerMacs */
-extern u8 pmac_xpram_read(int xpaddr);
-extern void pmac_xpram_write(int xpaddr, u8 data);
-
/* 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-11-01 21:41:48.000000000 +1100
+++ linux/arch/powerpc/kernel/setup_32.c 2015-11-01 21:41:53.000000000 +1100
@@ -208,6 +208,9 @@ const struct nvram_ops arch_nvram_ops =
.write_byte = ppc_nvram_write_byte,
.get_size = ppc_nvram_get_size,
.sync = ppc_nvram_sync,
+#ifdef CONFIG_PPC_PMAC
+ .get_partition = pmac_get_partition,
+#endif
};
EXPORT_SYMBOL(arch_nvram_ops);
Index: linux/arch/powerpc/platforms/powermac/nvram.c
===================================================================
--- linux.orig/arch/powerpc/platforms/powermac/nvram.c 2015-11-01 21:41:39.000000000 +1100
+++ linux/arch/powerpc/platforms/powermac/nvram.c 2015-11-01 21:41:53.000000000 +1100
@@ -629,29 +629,7 @@ bail:
int pmac_get_partition(int partition)
{
- return nvram_partitions[partition];
+ if (machine_is(powermac))
+ return nvram_partitions[partition];
+ return -1;
}
-
-u8 pmac_xpram_read(int xpaddr)
-{
- int offset = pmac_get_partition(pmac_nvram_XPRAM);
-
- if (offset < 0 || xpaddr < 0 || xpaddr > 0x100)
- return 0xff;
-
- return ppc_md.nvram_read_val(xpaddr + offset);
-}
-
-void pmac_xpram_write(int xpaddr, u8 data)
-{
- int offset = pmac_get_partition(pmac_nvram_XPRAM);
-
- if (offset < 0 || xpaddr < 0 || xpaddr > 0x100)
- return;
-
- ppc_md.nvram_write_val(xpaddr + offset, data);
-}
-
-EXPORT_SYMBOL(pmac_get_partition);
-EXPORT_SYMBOL(pmac_xpram_read);
-EXPORT_SYMBOL(pmac_xpram_write);
Index: linux/drivers/char/nvram.c
===================================================================
--- linux.orig/drivers/char/nvram.c 2015-11-01 21:41:51.000000000 +1100
+++ linux/drivers/char/nvram.c 2015-11-01 21:41:53.000000000 +1100
@@ -332,8 +332,7 @@ static long nvram_misc_ioctl(struct file
/* fall through */
case IOC_NVRAM_GET_OFFSET:
ret = -EINVAL;
-#ifdef CONFIG_PPC_PMAC
- if (machine_is(powermac)) {
+ if (arch_nvram_ops.get_partition != NULL) {
int part, offset;
if (copy_from_user(&part, (void __user *)arg,
@@ -341,7 +340,7 @@ static long nvram_misc_ioctl(struct file
return -EFAULT;
if (part < pmac_nvram_OF || part > pmac_nvram_NR)
return -EINVAL;
- offset = pmac_get_partition(part);
+ offset = arch_nvram_ops.get_partition(part);
if (offset < 0)
return -EINVAL;
if (copy_to_user((void __user *)arg,
@@ -349,7 +348,6 @@ static long nvram_misc_ioctl(struct file
return -EFAULT;
ret = 0;
}
-#endif
break;
case IOC_NVRAM_SYNC:
if (arch_nvram_ops.sync != NULL) {
Index: linux/include/linux/nvram.h
===================================================================
--- linux.orig/include/linux/nvram.h 2015-11-01 21:41:47.000000000 +1100
+++ linux/include/linux/nvram.h 2015-11-01 21:41:53.000000000 +1100
@@ -11,6 +11,7 @@ struct nvram_ops {
ssize_t (*get_size)(void);
#ifdef CONFIG_PPC
long (*sync)(void);
+ int (*get_partition)(int);
#else
long (*set_checksum)(void);
long (*initialize)(void);
Index: linux/arch/powerpc/platforms/powermac/time.c
===================================================================
--- linux.orig/arch/powerpc/platforms/powermac/time.c 2015-11-01 21:41:51.000000000 +1100
+++ linux/arch/powerpc/platforms/powermac/time.c 2015-11-01 21:41:53.000000000 +1100
@@ -23,6 +23,7 @@
#include <linux/interrupt.h>
#include <linux/hardirq.h>
#include <linux/rtc.h>
+#include <linux/nvram.h>
#include <asm/sections.h>
#include <asm/prom.h>
@@ -70,13 +71,21 @@ long __init pmac_time_init(void)
s32 delta = 0;
#if defined(CONFIG_NVRAM) && defined(CONFIG_PPC32)
int dst;
+ int offset = arch_nvram_ops.get_partition(pmac_nvram_XPRAM);
- delta = ((s32)pmac_xpram_read(PMAC_XPRAM_MACHINE_LOC + 0x9)) << 16;
- delta |= ((s32)pmac_xpram_read(PMAC_XPRAM_MACHINE_LOC + 0xa)) << 8;
- delta |= pmac_xpram_read(PMAC_XPRAM_MACHINE_LOC + 0xb);
+ if (offset < 0)
+ return 0;
+
+ delta = arch_nvram_ops.read_byte(offset + PMAC_XPRAM_MACHINE_LOC + 9);
+ delta <<= 8;
+ delta |= arch_nvram_ops.read_byte(offset + PMAC_XPRAM_MACHINE_LOC + 10);
+ delta <<= 8;
+ delta |= arch_nvram_ops.read_byte(offset + PMAC_XPRAM_MACHINE_LOC + 11);
+
if (delta & 0x00800000UL)
delta |= 0xFF000000UL;
- dst = ((pmac_xpram_read(PMAC_XPRAM_MACHINE_LOC + 0x8) & 0x80) != 0);
+ dst = arch_nvram_ops.read_byte(offset + PMAC_XPRAM_MACHINE_LOC + 8);
+ dst &= 0x80;
printk("GMT Delta read from XPRAM: %d minutes, DST: %s\n", delta/60,
dst ? "on" : "off");
#endif
Index: linux/arch/powerpc/kernel/nvram_64.c
===================================================================
--- linux.orig/arch/powerpc/kernel/nvram_64.c 2015-11-01 21:41:51.000000000 +1100
+++ linux/arch/powerpc/kernel/nvram_64.c 2015-11-01 21:41:53.000000000 +1100
@@ -1109,6 +1109,9 @@ const struct nvram_ops arch_nvram_ops =
.write = ppc_nvram_write,
.get_size = ppc_nvram_get_size,
.sync = ppc_nvram_sync,
+#ifdef CONFIG_PPC_PMAC
+ .get_partition = pmac_get_partition,
+#endif
};
EXPORT_SYMBOL(arch_nvram_ops);
next prev parent reply other threads:[~2015-11-01 10:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-01 10:42 [PATCH v7 00/26] Re-use nvram module Finn Thain
2015-11-01 10:42 ` [PATCH v7 01/26] scsi/atari_scsi: Dont select CONFIG_NVRAM Finn Thain
2015-11-01 10:42 ` [PATCH v7 02/26] m68k/atari: Move Atari-specific code out of drivers/char/nvram.c Finn Thain
2015-11-01 10:42 ` [PATCH v7 03/26] m68k/atari: Replace nvram_{read, write}_byte with arch_nvram_ops Finn Thain
2015-11-01 10:42 ` [PATCH v7 04/26] char/nvram: Re-order functions to remove forward declarations and #ifdefs Finn Thain
2015-11-01 10:42 ` [PATCH v7 05/26] char/nvram: Adopt arch_nvram_ops Finn Thain
2015-11-01 10:42 ` [PATCH v7 06/26] x86/thinkpad_acpi: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte() Finn Thain
2015-11-01 10:42 ` [PATCH v7 07/26] char/nvram: Allow the set_checksum and initialize ioctls to be omitted Finn Thain
2015-11-01 10:42 ` [PATCH v7 08/26] char/nvram: Implement NVRAM read/write methods Finn Thain
2015-11-01 10:42 ` [PATCH v7 09/26] char/nvram: Use generic fixed_size_llseek() Finn Thain
2015-11-01 10:42 ` [PATCH v7 10/26] m68k/atari: Implement arch_nvram_ops methods and enable CONFIG_HAVE_ARCH_NVRAM_OPS Finn Thain
2015-11-01 10:42 ` [PATCH v7 11/26] char/nvram: Add "devname:nvram" module alias Finn Thain
2015-11-01 10:42 ` [PATCH v7 12/26] powerpc: Cleanup nvram includes Finn Thain
2015-11-01 10:42 ` [PATCH v7 13/26] powerpc: Add missing ppc_md.nvram_size for CHRP and PowerMac Finn Thain
2015-11-01 10:42 ` [PATCH v7 14/26] powerpc: Implement arch_nvram_ops.get_size() and remove old nvram_* exports Finn Thain
2015-11-01 10:42 ` [PATCH v7 15/26] powerpc: Implement nvram sync ioctl Finn Thain
2015-11-01 10:42 ` [PATCH v7 16/26] powerpc, fbdev: Use NV_CMODE and NV_VMODE only when CONFIG_PPC32 and CONFIG_PPC_PMAC and CONFIG_NVRAM Finn Thain
2015-11-01 10:42 ` [PATCH v7 17/26] powerpc, fbdev: Use arch_nvram_ops methods instead of nvram_read_byte() and nvram_write_byte() Finn Thain
2015-11-01 10:42 ` [PATCH v7 18/26] nvram: Drop nvram_* symbol exports and prototypes Finn Thain
2015-11-01 10:42 ` [PATCH v7 19/26] powerpc: Remove CONFIG_GENERIC_NVRAM and adopt CONFIG_HAVE_ARCH_NVRAM_OPS Finn Thain
2015-11-01 10:42 ` [PATCH v7 20/26] char/generic_nvram: Remove as unused Finn Thain
2015-11-01 10:42 ` [PATCH v7 21/26] powerpc: Adopt nvram module for PPC64 Finn Thain
2015-11-01 10:42 ` Finn Thain [this message]
2015-11-01 10:42 ` [PATCH v7 23/26] m68k/mac: Adopt naming and calling conventions for PRAM routines Finn Thain
2015-11-01 10:42 ` [PATCH v7 24/26] m68k/mac: Use macros for RTC accesses not magic numbers Finn Thain
2015-11-01 10:42 ` [PATCH v7 25/26] m68k/mac: Fix PRAM accessors Finn Thain
2015-11-01 10:42 ` [PATCH v7 26/26] m68k: Dispatch nvram_ops calls to Atari or Mac functions 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=20151101104207.781688728@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