From: Finn Thain <fthain@telegraphics.com.au>
To: <linux-kernel@vger.kernel.org>, <linux-m68k@vger.kernel.org>,
<linuxppc-dev@lists.ozlabs.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH v7 10/26] m68k/atari: Implement arch_nvram_ops methods and enable CONFIG_HAVE_ARCH_NVRAM_OPS
Date: Sun, 01 Nov 2015 21:42:12 +1100 [thread overview]
Message-ID: <20151101104204.791647606@telegraphics.com.au> (raw)
In-Reply-To: 20151101104202.301856132@telegraphics.com.au
[-- Attachment #1: atari-hook-up-misc-device --]
[-- Type: text/plain, Size: 3537 bytes --]
Atari RTC NVRAM has a checksum so implement the remaining arch_nvram_ops
methods for the set_checksum and initialize ioctls. Enable
CONFIG_HAVE_ARCH_NVRAM_OPS.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
This re-enables the nvram module for Atari.
Changes since v3:
- Use bool (and select) instead of def_bool in the definition of the
HAVE_ARCH_NVRAM_OPS Kconfig symbol, as requested by Geert.
---
arch/m68k/Kconfig | 3 +++
arch/m68k/Kconfig.machine | 1 +
arch/m68k/atari/nvram.c | 24 ++++++++++++++++++++++++
drivers/char/Kconfig | 2 +-
4 files changed, 29 insertions(+), 1 deletion(-)
Index: linux/arch/m68k/atari/nvram.c
===================================================================
--- linux.orig/arch/m68k/atari/nvram.c 2015-11-01 21:41:27.000000000 +1100
+++ linux/arch/m68k/atari/nvram.c 2015-11-01 21:41:36.000000000 +1100
@@ -73,6 +73,26 @@ static void __nvram_set_checksum(void)
__nvram_write_byte(sum, ATARI_CKS_LOC + 1);
}
+static long nvram_set_checksum(void)
+{
+ spin_lock_irq(&rtc_lock);
+ __nvram_set_checksum();
+ spin_unlock_irq(&rtc_lock);
+ return 0;
+}
+
+static long nvram_initialize(void)
+{
+ loff_t i;
+
+ spin_lock_irq(&rtc_lock);
+ for (i = 0; i < NVRAM_BYTES; ++i)
+ __nvram_write_byte(0, i);
+ __nvram_set_checksum();
+ spin_unlock_irq(&rtc_lock);
+ return 0;
+}
+
static ssize_t nvram_read(char *buf, size_t count, loff_t *ppos)
{
char *p = buf;
@@ -119,6 +139,8 @@ static ssize_t nvram_write(char *buf, si
static ssize_t nvram_get_size(void)
{
+ if (!MACH_IS_ATARI)
+ return -ENODEV;
return NVRAM_BYTES;
}
@@ -126,6 +148,8 @@ const struct nvram_ops arch_nvram_ops =
.read = nvram_read,
.write = nvram_write,
.get_size = nvram_get_size,
+ .set_checksum = nvram_set_checksum,
+ .initialize = nvram_initialize,
};
EXPORT_SYMBOL(arch_nvram_ops);
Index: linux/drivers/char/Kconfig
===================================================================
--- linux.orig/drivers/char/Kconfig 2015-11-01 21:41:24.000000000 +1100
+++ linux/drivers/char/Kconfig 2015-11-01 21:41:36.000000000 +1100
@@ -247,7 +247,7 @@ source "drivers/char/hw_random/Kconfig"
config NVRAM
tristate "/dev/nvram support"
- depends on X86 || (ARM && RTC_DRV_CMOS) || GENERIC_NVRAM
+ depends on X86 || (ARM && RTC_DRV_CMOS) || GENERIC_NVRAM || HAVE_ARCH_NVRAM_OPS
---help---
If you say Y here and create a character special file /dev/nvram
with major number 10 and minor number 144 using mknod ("man mknod"),
Index: linux/arch/m68k/Kconfig
===================================================================
--- linux.orig/arch/m68k/Kconfig 2015-11-01 21:41:24.000000000 +1100
+++ linux/arch/m68k/Kconfig 2015-11-01 21:41:36.000000000 +1100
@@ -71,6 +71,9 @@ config PGTABLE_LEVELS
default 2 if SUN3 || COLDFIRE
default 3
+config HAVE_ARCH_NVRAM_OPS
+ bool
+
source "init/Kconfig"
source "kernel/Kconfig.freezer"
Index: linux/arch/m68k/Kconfig.machine
===================================================================
--- linux.orig/arch/m68k/Kconfig.machine 2015-11-01 21:41:24.000000000 +1100
+++ linux/arch/m68k/Kconfig.machine 2015-11-01 21:41:36.000000000 +1100
@@ -15,6 +15,7 @@ config ATARI
bool "Atari support"
depends on MMU
select MMU_MOTOROLA if MMU
+ select HAVE_ARCH_NVRAM_OPS
help
This option enables support for the 68000-based Atari series of
computers (including the TT, Falcon and Medusa). If you plan to use
next prev parent reply other threads:[~2015-11-01 10:52 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 ` Finn Thain [this message]
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 ` [PATCH v7 22/26] powerpc: Remove pmac_xpram_{read,write} functions Finn Thain
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=20151101104204.791647606@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=arnd@arndb.de \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.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).