Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35e95e63 authored by Olaf Hering's avatar Olaf Hering Committed by Paul Mackerras
Browse files

[PATCH] ppc32: nvram driver for chrp 



This implements a nvram acccess method, similar to
arch/ppc64/kernel/pSeries_nvram.c tested on CHRP B50.

Signed-off-by: default avatarOlaf Hering <olh@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 8b150478

arch/powerpc/platforms/chrp/Makefile

+1 −0
Original line number Original line Diff line number Diff line 
obj-y				+= setup.o time.o pegasos_eth.o

obj-y				+= setup.o time.o pegasos_eth.o

obj-$(CONFIG_PCI)		+= pci.o

obj-$(CONFIG_PCI)		+= pci.o

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_NVRAM)		+= nvram.o

arch/powerpc/platforms/chrp/chrp.h

0 → 100644
+12 −0
Original line number Original line Diff line number Diff line 
/*

 * Declarations of CHRP platform-specific things.

 */



extern void chrp_nvram_init(void);

extern void chrp_get_rtc_time(struct rtc_time *);

extern int chrp_set_rtc_time(struct rtc_time *);

extern void chrp_calibrate_decr(void);

extern long chrp_time_init(void);



extern void chrp_find_bridges(void);

extern void chrp_event_scan(void);

arch/powerpc/platforms/chrp/nvram.c

0 → 100644
+84 −0
Original line number Original line Diff line number Diff line 
/*

 *  c 2001 PPC 64 Team, IBM Corp

 *

 *      This program is free software; you can redistribute it and/or

 *      modify it under the terms of the GNU General Public License

 *      as published by the Free Software Foundation; either version

 *      2 of the License, or (at your option) any later version.

 *

 * /dev/nvram driver for PPC

 *

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <asm/uaccess.h>

#include <asm/prom.h>

#include <asm/machdep.h>

#include "chrp.h"



static unsigned int nvram_size;

static unsigned char nvram_buf[4];

static DEFINE_SPINLOCK(nvram_lock);



static unsigned char chrp_nvram_read(int addr)

{

	unsigned long done, flags;

	unsigned char ret;



	if (addr >= nvram_size) {

		printk(KERN_DEBUG "%s: read addr %d > nvram_size %u\n",

		       current->comm, addr, nvram_size);

		return 0xff;

	}

	spin_lock_irqsave(&nvram_lock, flags);

	if ((call_rtas("nvram-fetch", 3, 2, &done, addr, __pa(nvram_buf), 1) != 0) || 1 != done)

		ret = 0xff;

	else

		ret = nvram_buf[0];

	spin_unlock_irqrestore(&nvram_lock, flags);



	return ret;

}



static void chrp_nvram_write(int addr, unsigned char val)

{

	unsigned long done, flags;



	if (addr >= nvram_size) {

		printk(KERN_DEBUG "%s: write addr %d > nvram_size %u\n",

		       current->comm, addr, nvram_size);

		return;

	}

	spin_lock_irqsave(&nvram_lock, flags);

	nvram_buf[0] = val;

	if ((call_rtas("nvram-store", 3, 2, &done, addr, __pa(nvram_buf), 1) != 0) || 1 != done)

		printk(KERN_DEBUG "rtas IO error storing 0x%02x at %d", val, addr);

	spin_unlock_irqrestore(&nvram_lock, flags);

}



void __init chrp_nvram_init(void)

{

	struct device_node *nvram;

	unsigned int *nbytes_p, proplen;



	nvram = of_find_node_by_type(NULL, "nvram");

	if (nvram == NULL)

		return;



	nbytes_p = (unsigned int *)get_property(nvram, "#bytes", &proplen);

	if (nbytes_p == NULL || proplen != sizeof(unsigned int))

		return;



	nvram_size = *nbytes_p;



	printk(KERN_INFO "CHRP nvram contains %u bytes\n", nvram_size);

	of_node_put(nvram);



	ppc_md.nvram_read_val = chrp_nvram_read;

	ppc_md.nvram_write_val = chrp_nvram_write;



	return;

}

arch/powerpc/platforms/chrp/setup.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -55,13 +55,8 @@ 
#include <asm/rtas.h>

#include <asm/rtas.h>

#include <asm/xmon.h>

#include <asm/xmon.h>





void chrp_get_rtc_time(struct rtc_time *);

#include "chrp.h"

int chrp_set_rtc_time(struct rtc_time *);

void chrp_calibrate_decr(void);

long chrp_time_init(void);





void chrp_find_bridges(void);

void chrp_event_scan(void);

void rtas_indicator_progress(char *, unsigned short);

void rtas_indicator_progress(char *, unsigned short);

void btext_progress(char *, unsigned short);

void btext_progress(char *, unsigned short);
@@ -469,6 +464,10 @@ void __init chrp_init_IRQ(void) 
void __init

void __init

chrp_init2(void)

chrp_init2(void)

{

{

#ifdef CONFIG_NVRAM

	chrp_nvram_init();

#endif



	request_region(0x20,0x20,"pic1");

	request_region(0x20,0x20,"pic1");

	request_region(0xa0,0x20,"pic2");

	request_region(0xa0,0x20,"pic2");

	request_region(0x00,0x20,"dma1");

	request_region(0x00,0x20,"dma1");

arch/ppc/platforms/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,9 @@ obj-$(CONFIG_PPC_PMAC) += pmac_pic.o pmac_setup.o pmac_time.o \ 
					pmac_low_i2c.o pmac_cache.o

					pmac_low_i2c.o pmac_cache.o

obj-$(CONFIG_PPC_CHRP)		+= chrp_setup.o chrp_time.o chrp_pci.o \

obj-$(CONFIG_PPC_CHRP)		+= chrp_setup.o chrp_time.o chrp_pci.o \

					chrp_pegasos_eth.o

					chrp_pegasos_eth.o

ifeq ($(CONFIG_PPC_CHRP),y)

obj-$(CONFIG_NVRAM)		+= chrp_nvram.o

endif

obj-$(CONFIG_PPC_PREP)		+= prep_pci.o prep_setup.o

obj-$(CONFIG_PPC_PREP)		+= prep_pci.o prep_setup.o

ifeq ($(CONFIG_PPC_PMAC),y)

ifeq ($(CONFIG_PPC_PMAC),y)

obj-$(CONFIG_NVRAM)		+= pmac_nvram.o

obj-$(CONFIG_NVRAM)		+= pmac_nvram.o