powerpc/nvram: Move generic code for nvram and pstore

[linux.git] / arch / powerpc / include / asm / nvram.h

diff --git a/arch/powerpc/include/asm/nvram.h b/arch/powerpc/include/asm/nvram.h
index 9d1aafe607c7996b98d2309e74d73ffef432be3a..09a518bb7c03c681a776e708f78642446b4ecbb4 100644 (file)
--- a/arch/powerpc/include/asm/nvram.h
+++ b/arch/powerpc/include/asm/nvram.h
@@ -6,31 +6,46 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  */
-
 #ifndef _ASM_POWERPC_NVRAM_H
 #define _ASM_POWERPC_NVRAM_H
 
-/* Signatures for nvram partitions */
-#define NVRAM_SIG_SP   0x02    /* support processor */
-#define NVRAM_SIG_OF   0x50    /* open firmware config */
-#define NVRAM_SIG_FW   0x51    /* general firmware */
-#define NVRAM_SIG_HW   0x52    /* hardware (VPD) */
-#define NVRAM_SIG_FLIP 0x5a    /* Apple flip/flop header */
-#define NVRAM_SIG_APPL 0x5f    /* Apple "system" (???) */
-#define NVRAM_SIG_SYS  0x70    /* system env vars */
-#define NVRAM_SIG_CFG  0x71    /* config data */
-#define NVRAM_SIG_ELOG 0x72    /* error log */
-#define NVRAM_SIG_VEND 0x7e    /* vendor defined */
-#define NVRAM_SIG_FREE 0x7f    /* Free space */
-#define NVRAM_SIG_OS   0xa0    /* OS defined */
-#define NVRAM_SIG_PANIC        0xa1    /* Apple OSX "panic" */
-
-#ifdef __KERNEL__
-
+#include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/list.h>
+#include <uapi/asm/nvram.h>
+
+/*
+ * Set oops header version to distinguish between old and new format header.
+ * lnx,oops-log partition max size is 4000, header version > 4000 will
+ * help in identifying new header.
+ */
+#define OOPS_HDR_VERSION 5000
+
+struct err_log_info {
+       __be32 error_type;
+       __be32 seq_num;
+};
+
+struct nvram_os_partition {
+       const char *name;
+       int req_size;   /* desired size, in bytes */
+       int min_size;   /* minimum acceptable size (0 means req_size) */
+       long size;      /* size of data portion (excluding err_log_info) */
+       long index;     /* offset of data portion of partition */
+       bool os_partition; /* partition initialized by OS, not FW */
+};
+
+struct oops_log_info {
+       __be16 version;
+       __be16 report_length;
+       __be64 timestamp;
+} __attribute__((packed));
+
+extern struct nvram_os_partition oops_log_partition;
 
 #ifdef CONFIG_PPC_PSERIES
+extern struct nvram_os_partition rtas_log_partition;
+
 extern int nvram_write_error_log(char * buff, int length,
                                         unsigned int err_type, unsigned int err_seq);
 extern int nvram_read_error_log(char * buff, int length,
@@ -56,17 +71,6 @@ extern int nvram_remove_partition(const char *name, int sig,
 extern int nvram_get_partition_size(loff_t data_index);
 extern loff_t nvram_find_partition(const char *name, int sig, int *out_size);
 
-#endif /* __KERNEL__ */
-
-/* PowerMac specific nvram stuffs */
-
-enum {
-       pmac_nvram_OF,          /* Open Firmware partition */
-       pmac_nvram_XPRAM,       /* MacOS XPRAM partition */
-       pmac_nvram_NR           /* MacOS Name Registry partition */
-};
-
-#ifdef __KERNEL__
 /* Return partition offset in nvram */
 extern int     pmac_get_partition(int partition);
 
@@ -77,36 +81,27 @@ 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);
+
+/* Initialize NVRAM oops partition */
+extern void __init nvram_init_oops_partition(int rtas_partition_exists);
+
+/* Read a NVRAM partition */
+extern int nvram_read_partition(struct nvram_os_partition *part, char *buff,
+                               int length, unsigned int *err_type,
+                               unsigned int *error_log_cnt);
+
+/* Write to NVRAM OS partition */
+extern int nvram_write_os_partition(struct nvram_os_partition *part,
+                                   char *buff, int length,
+                                   unsigned int err_type,
+                                   unsigned int error_log_cnt);
+
 /* Determine NVRAM size */
 extern ssize_t nvram_get_size(void);
 
 /* Normal access to NVRAM */
 extern unsigned char nvram_read_byte(int i);
 extern void nvram_write_byte(unsigned char c, int i);
-#endif
-
-/* Some offsets in XPRAM */
-#define PMAC_XPRAM_MACHINE_LOC 0xe4
-#define PMAC_XPRAM_SOUND_VOLUME        0x08
-
-/* Machine location structure in PowerMac XPRAM */
-struct pmac_machine_location {
-       unsigned int    latitude;       /* 2+30 bit Fractional number */
-       unsigned int    longitude;      /* 2+30 bit Fractional number */
-       unsigned int    delta;          /* mix of GMT delta and DLS */
-};
-
-/*
- * /dev/nvram ioctls
- *
- * Note that PMAC_NVRAM_GET_OFFSET is still supported, but is
- * definitely obsolete. Do not use it if you can avoid it
- */
-
-#define OBSOLETE_PMAC_NVRAM_GET_OFFSET \
-                               _IOWR('p', 0x40, int)
-
-#define IOC_NVRAM_GET_OFFSET   _IOWR('p', 0x42, int)   /* Get NVRAM partition offset */
-#define IOC_NVRAM_SYNC         _IO('p', 0x43)          /* Sync NVRAM image */
-
 #endif /* _ASM_POWERPC_NVRAM_H */