Deleted Added
sdiff udiff text old ( 166248 ) new ( 186352 )
full compact
ixp425_mem.c (166248) ixp425_mem.c (186352)
1/* $NetBSD: ixp425_mem.c,v 1.2 2005/12/11 12:16:51 christos Exp $ */
2
3/*
4 * Copyright (c) 2003 Wasabi Systems, Inc.
5 * All rights reserved.
6 *
7 * Written by Steve C. Woodford for Wasabi Systems, Inc.
8 *

--- 22 unchanged lines hidden (view full) ---

31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 * POSSIBILITY OF SUCH DAMAGE.
36 */
37
38#include <sys/cdefs.h>
1/* $NetBSD: ixp425_mem.c,v 1.2 2005/12/11 12:16:51 christos Exp $ */
2
3/*
4 * Copyright (c) 2003 Wasabi Systems, Inc.
5 * All rights reserved.
6 *
7 * Written by Steve C. Woodford for Wasabi Systems, Inc.
8 *

--- 22 unchanged lines hidden (view full) ---

31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 * POSSIBILITY OF SUCH DAMAGE.
36 */
37
38#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/ixp425_mem.c 166248 2007-01-26 01:37:32Z kevlo $");
39__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/ixp425_mem.c 186352 2008-12-20 03:26:09Z sam $");
40
41#include <sys/param.h>
42#include <sys/systm.h>
43
44#include <arm/xscale/ixp425/ixp425reg.h>
45#include <arm/xscale/ixp425/ixp425var.h>
46
47static uint32_t sdram_64bit[] = {

--- 9 unchanged lines hidden (view full) ---

57 0x04000000, /* 64M: Four 8M x 16 chips */
58 0x04000000, /* 64M: Two 16M x 16 chips */
59 0x08000000, /* 128M: Four 16M x 16 chips */
60 0x08000000, /* 128M: Two 32M x 16 chips */
61 0x10000000, /* 256M: Four 32M x 16 chips */
62 0, 0
63};
64
40
41#include <sys/param.h>
42#include <sys/systm.h>
43
44#include <arm/xscale/ixp425/ixp425reg.h>
45#include <arm/xscale/ixp425/ixp425var.h>
46
47static uint32_t sdram_64bit[] = {

--- 9 unchanged lines hidden (view full) ---

57 0x04000000, /* 64M: Four 8M x 16 chips */
58 0x04000000, /* 64M: Two 16M x 16 chips */
59 0x08000000, /* 128M: Four 16M x 16 chips */
60 0x08000000, /* 128M: Two 32M x 16 chips */
61 0x10000000, /* 256M: Four 32M x 16 chips */
62 0, 0
63};
64
65#define MCU_REG_READ(x) (*(volatile uint32_t *)(IXP425_MCU_VBASE + (x)))
66
67uint32_t
68ixp425_sdram_size(void)
69{
65uint32_t
66ixp425_sdram_size(void)
67{
68#define MCU_REG_READ(x) (*(volatile uint32_t *)(IXP425_MCU_VBASE + (x)))
70 uint32_t size, sdr_config;
71
72 sdr_config = MCU_REG_READ(MCU_SDR_CONFIG);
73
74 if (sdr_config & MCU_SDR_CONFIG_64MBIT)
75 size = sdram_64bit[MCU_SDR_CONFIG_MCONF(sdr_config)];
76 else
77 size = sdram_other[MCU_SDR_CONFIG_MCONF(sdr_config)];
78
79 if (size == 0) {
80 printf("** SDR_CONFIG retuns unknown value, using 32M\n");
81 size = 32 * 1024 * 1024;
82 }
83
84 return (size);
69 uint32_t size, sdr_config;
70
71 sdr_config = MCU_REG_READ(MCU_SDR_CONFIG);
72
73 if (sdr_config & MCU_SDR_CONFIG_64MBIT)
74 size = sdram_64bit[MCU_SDR_CONFIG_MCONF(sdr_config)];
75 else
76 size = sdram_other[MCU_SDR_CONFIG_MCONF(sdr_config)];
77
78 if (size == 0) {
79 printf("** SDR_CONFIG retuns unknown value, using 32M\n");
80 size = 32 * 1024 * 1024;
81 }
82
83 return (size);
84#undef MCU_REG_READ
85}
85}
86
87uint32_t
88ixp435_ddram_size(void)
89{
90#define MCU_REG_READ(x) (*(volatile uint32_t *)(IXP425_MCU_VBASE + (x)))
91 uint32_t sbr0;
92
93 /*
94 * Table 198, page 516 shows DDR-I/II SDRAM bank sizes
95 * for SBR0 and SBR1. The manual states both banks must
96 * be programmed to be the same size. We just assume
97 * it's done right and calculate 2x for the memory size.
98 */
99 sbr0 = MCU_REG_READ(MCU_DDR_SBR0);
100 return 2 * 16*(sbr0 & 0x7f) * 1024 * 1024;
101#undef MCU_REG_READ
102}