[coreboot] r3644 - trunk/coreboot-v2/src/northbridge/via/cn700
svn at coreboot.org
svn at coreboot.org
Thu Oct 9 19:08:32 CEST 2008
Author: uwe
Date: 2008-10-09 19:08:32 +0200 (Thu, 09 Oct 2008)
New Revision: 3644
Modified:
trunk/coreboot-v2/src/northbridge/via/cn700/agp.c
trunk/coreboot-v2/src/northbridge/via/cn700/chip.h
trunk/coreboot-v2/src/northbridge/via/cn700/cn700.h
trunk/coreboot-v2/src/northbridge/via/cn700/northbridge.c
trunk/coreboot-v2/src/northbridge/via/cn700/raminit.c
trunk/coreboot-v2/src/northbridge/via/cn700/raminit.h
trunk/coreboot-v2/src/northbridge/via/cn700/vga.c
Log:
Indent-based + manual cleanups for CN700 (trivial). As this will be ported
to v3 sooner or later we cleanup _now_, so we don't have to do it twice.
- Whitespace, coding style improvements.
- Fix a few typos.
- Add a missing #endif in raminit.h.
- Drop an unused variable.
Signed-off-by: Uwe Hermann <uwe at hermann-uwe.de>
Acked-by: Uwe Hermann <uwe at hermann-uwe.de>
Modified: trunk/coreboot-v2/src/northbridge/via/cn700/agp.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cn700/agp.c 2008-10-09 16:05:16 UTC (rev 3643)
+++ trunk/coreboot-v2/src/northbridge/via/cn700/agp.c 2008-10-09 17:08:32 UTC (rev 3644)
@@ -32,24 +32,27 @@
static void agp_init(device_t dev)
{
u32 reg32;
-
- /* Some of this may not be necessary,
- * it should be handled by the OS */
+
+ /* Some of this may not be necessary (should be handled by the OS). */
printk_debug("Enabling AGP.\n");
-
- /* Allow R/W access to AGP registers */
+
+ /* Allow R/W access to AGP registers. */
pci_write_config8(dev, 0x4d, 0x15);
-
- /* Setup PCI latency timer */
+
+ /* Setup PCI latency timer. */
pci_write_config8(dev, 0xd, 0x8);
-
- /* Set to AGP 3.0 Mode, which should theoretically render the rest of
- * the registers set here pointless */
+
+ /*
+ * Set to AGP 3.0 Mode, which should theoretically render the rest of
+ * the registers set here pointless.
+ */
pci_write_config8(dev, 0x84, 0xb);
-
+
/* AGP Request Queue Size */
pci_write_config8(dev, 0x4a, 0x1f);
- /* AGP Hardware Support (default 0xc4)
+
+ /*
+ * AGP Hardware Support (default 0xc4)
* 7: AGP SBA Enable (1 to Enable)
* 6: AGP Enable
* 5: Reserved
@@ -57,25 +60,26 @@
* 3: AGP8X Mode Enable
* 2: AGP4X Mode Enable
* 1: AGP2X Mode Enable
- * 0: AGP1X Mode Enable */
+ * 0: AGP1X Mode Enable
+ */
pci_write_config8(dev, 0x4b, 0xc4);
-
+
/* Enable AGP Backdoor */
pci_write_config8(dev, 0xb5, 0x03);
-
- /* Set aperture to 32MB */
- /* TODO: Use config option, explain how it works */
+
+ /* Set aperture to 32 MB. */
+ /* TODO: Use config option, explain how it works. */
pci_write_config32(dev, 0x94, 0x00010f38);
- /* Set GART Table Base Address (31:12) */
+ /* Set GART Table Base Address (31:12). */
pci_write_config32(dev, 0x98, (0x1558 << 12));
- /* Set AGP Aperture Base */
+ /* Set AGP Aperture Base. */
pci_write_config32(dev, 0x10, 0xf8000008);
- /* Enable CPU/PMSTR GART Access */
+ /* Enable CPU/PMSTR GART Access. */
reg32 = pci_read_config8(dev, 0xbf);
reg32 |= 0x80;
pci_write_config8(dev, 0xbf, reg32);
-
+
/* Enable AGP Aperture. */
reg32 = pci_read_config32(dev, 0x94);
reg32 |= (3 << 7);
@@ -84,16 +88,17 @@
/* AGP Control */
pci_write_config8(dev, 0xbc, 0x21);
pci_write_config8(dev, 0xbd, 0xd2);
-
- /* AGP Pad, driving strength, and delay control */
- /* All this should be constant, seeing as the
- * VGA controller is onboard */
+
+ /*
+ * AGP Pad, driving strength, and delay control. All this should be
+ * constant, seeing as the VGA controller is onboard.
+ */
pci_write_config8(dev, 0x40, 0xc7);
pci_write_config8(dev, 0x41, 0xdb);
pci_write_config8(dev, 0x42, 0x10);
pci_write_config8(dev, 0x43, 0xdb);
pci_write_config8(dev, 0x44, 0x24);
-
+
/* AGPC CKG Control */
pci_write_config8(dev, 0xc0, 0x02);
pci_write_config8(dev, 0xc1, 0x02);
@@ -108,27 +113,30 @@
};
static const struct pci_driver agp_driver __pci_driver = {
- .ops = &agp_operations,
+ .ops = &agp_operations,
.vendor = PCI_VENDOR_ID_VIA,
.device = PCI_DEVICE_ID_VIA_CN700_AGP,
};
-/* This is the AGP 3.0 "bridge" @Bus 0 Device 1 Func 0. When using AGP 3.0, the
-config in this device takes presidence. We configure both just to be safe. */
+/*
+ * This is the AGP 3.0 "bridge" @Bus 0 Device 1 Func 0. When using AGP 3.0, the
+ * config in this device takes presidence. We configure both just to be safe.
+ */
static void agp_bridge_init(device_t dev)
{
- printk_debug("Setting up AGP Bridge device\n");
+ printk_debug("Setting up AGP bridge device\n");
+
pci_write_config16(dev, 0x4, 0x0007);
/* Secondary Bus Number */
pci_write_config8(dev, 0x19, 0x01);
/* Subordinate Bus Number */
pci_write_config8(dev, 0x1a, 0x01);
- /* IO Base */
+ /* I/O Base */
pci_write_config8(dev, 0x1c, 0xd0);
- /* IO Limit */
+ /* I/O Limit */
pci_write_config8(dev, 0x1d, 0xd0);
-
+
/* Memory Base */
pci_write_config16(dev, 0x20, 0xfb00);
/* Memory Limit */
@@ -159,7 +167,7 @@
};
static const struct pci_driver agp_bridge_driver __pci_driver = {
- .ops = &agp_bridge_operations,
+ .ops = &agp_bridge_operations,
.vendor = PCI_VENDOR_ID_VIA,
.device = PCI_DEVICE_ID_VIA_CN700_BRIDGE,
};
Modified: trunk/coreboot-v2/src/northbridge/via/cn700/chip.h
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cn700/chip.h 2008-10-09 16:05:16 UTC (rev 3643)
+++ trunk/coreboot-v2/src/northbridge/via/cn700/chip.h 2008-10-09 17:08:32 UTC (rev 3644)
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-struct northbridge_via_cn700_config
-{
+struct northbridge_via_cn700_config {
};
extern struct chip_operations northbridge_via_cn700_ops;
Modified: trunk/coreboot-v2/src/northbridge/via/cn700/cn700.h
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cn700/cn700.h 2008-10-09 16:05:16 UTC (rev 3643)
+++ trunk/coreboot-v2/src/northbridge/via/cn700/cn700.h 2008-10-09 17:08:32 UTC (rev 3644)
@@ -19,18 +19,20 @@
*/
#ifndef __ROMCC__
-static void cn700_noop(){}
+static void cn700_noop()
+{
+}
#endif
/* VGA stuff */
-#define SR_INDEX 0x3c4
-#define SR_DATA 0x3c5
-#define CRTM_INDEX 0x3b4
-#define CRTM_DATA 0x3b5
-#define CRTC_INDEX 0x3d4
-#define CRTC_DATA 0x3d5
+#define SR_INDEX 0x3c4
+#define SR_DATA 0x3c5
+#define CRTM_INDEX 0x3b4
+#define CRTM_DATA 0x3b5
+#define CRTC_INDEX 0x3d4
+#define CRTC_DATA 0x3d5
-/* Memory Controller Registers */
+/* Memory controller registers */
#define RANK0_END 0x40
#define RANK1_END 0x41
#define RANK2_END 0x42
@@ -45,7 +47,7 @@
#define CH_A_DQS_OUTPUT_DELAY 0x70
#define CH_A_MD_OUTPUT_DELAY 0x71
-/* RAM Init Commands */
+/* RAM init commands */
#define RAM_COMMAND_NORMAL 0x0
#define RAM_COMMAND_NOP 0x1
#define RAM_COMMAND_PRECHARGE 0x2
Modified: trunk/coreboot-v2/src/northbridge/via/cn700/northbridge.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cn700/northbridge.c 2008-10-09 16:05:16 UTC (rev 3643)
+++ trunk/coreboot-v2/src/northbridge/via/cn700/northbridge.c 2008-10-09 17:08:32 UTC (rev 3644)
@@ -38,17 +38,15 @@
{
device_t vlink_dev;
u16 reg16;
- u8 ranks;
- u8 pagec, paged, pagee, pagef;
- u8 shadowreg;
-
- /* Set up the vga framebuffer size */
+ u8 ranks, pagec, paged, pagee, pagef, shadowreg;
+
+ /* Set up the VGA framebuffer size. */
reg16 = (log2(CONFIG_VIDEO_MB) << 12) | (1 << 15);
pci_write_config16(dev, 0xa0, reg16);
-
- /* Set up VGA timers */
+
+ /* Set up VGA timers. */
pci_write_config8(dev, 0xa2, 0x44);
-
+
for (ranks = 0x4b; ranks >= 0x48; ranks--) {
if (pci_read_config8(dev, ranks)) {
ranks -= 0x48;
@@ -64,7 +62,7 @@
/* AGPCINT Misc. */
pci_write_config8(dev, 0xb8, 0x08);
- /* shadown ram */
+ /* Shadow RAM */
pagec = 0xff, paged = 0xff, pagee = 0xff, pagef = 0x30;
/* PAGE C, D, E are all read write enable */
pci_write_config8(dev, 0x80, pagec);
@@ -75,11 +73,13 @@
shadowreg |= pagef;
pci_write_config8(dev, 0x83, shadowreg);
/* vlink mirror */
- vlink_dev = dev_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_CN700_VLINK, 0);
+ vlink_dev = dev_find_device(PCI_VENDOR_ID_VIA,
+ PCI_DEVICE_ID_VIA_CN700_VLINK, 0);
if (vlink_dev) {
pci_write_config8(vlink_dev, 0x61, pagec);
pci_write_config8(vlink_dev, 0x62, paged);
pci_write_config8(vlink_dev, 0x64, pagee);
+
shadowreg = pci_read_config8(vlink_dev, 0x63);
shadowreg |= pagef;
pci_write_config8(vlink_dev, 0x63, shadowreg);
@@ -88,91 +88,93 @@
static const struct device_operations memctrl_operations = {
.read_resources = cn700_noop,
- .init = memctrl_init,
+ .init = memctrl_init,
};
static const struct pci_driver memctrl_driver __pci_driver = {
- .ops = &memctrl_operations,
+ .ops = &memctrl_operations,
.vendor = PCI_VENDOR_ID_VIA,
.device = PCI_DEVICE_ID_VIA_CN700_MEMCTRL,
};
static void pci_domain_read_resources(device_t dev)
{
- struct resource *resource;
+ struct resource *resource;
printk_spew("Entering cn700 pci_domain_read_resources.\n");
- /* Initialize the system wide io space constraints */
- resource = new_resource(dev, IOINDEX_SUBTRACTIVE(0,0));
- resource->limit = 0xffffUL;
- resource->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE |
- IORESOURCE_ASSIGNED;
+ /* Initialize the system wide I/O space constraints. */
+ resource = new_resource(dev, IOINDEX_SUBTRACTIVE(0, 0));
+ resource->limit = 0xffffUL;
+ resource->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE |
+ IORESOURCE_ASSIGNED;
- /* Initialize the system wide memory resources constraints */
- resource = new_resource(dev, IOINDEX_SUBTRACTIVE(1,0));
- resource->limit = 0xffffffffULL;
- resource->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
- IORESOURCE_ASSIGNED;
+ /* Initialize the system wide memory resources constraints. */
+ resource = new_resource(dev, IOINDEX_SUBTRACTIVE(1, 0));
+ resource->limit = 0xffffffffULL;
+ resource->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
+ IORESOURCE_ASSIGNED;
printk_spew("Leaving cn700 pci_domain_read_resources.\n");
}
static void ram_resource(device_t dev, unsigned long index,
- unsigned long basek, unsigned long sizek)
+ unsigned long basek, unsigned long sizek)
{
- struct resource *resource;
+ struct resource *resource;
- if (!sizek) {
- return;
- }
- resource = new_resource(dev, index);
- resource->base = ((resource_t)basek) << 10;
- resource->size = ((resource_t)sizek) << 10;
- resource->flags = IORESOURCE_MEM | IORESOURCE_CACHEABLE | \
- IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED;
+ if (!sizek)
+ return;
+
+ resource = new_resource(dev, index);
+ resource->base = ((resource_t) basek) << 10;
+ resource->size = ((resource_t) sizek) << 10;
+ resource->flags = IORESOURCE_MEM | IORESOURCE_CACHEABLE |
+ IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED;
}
static void tolm_test(void *gp, struct device *dev, struct resource *new)
{
struct resource **best_p = gp;
struct resource *best;
+
best = *best_p;
- if (!best || (best->base > new->base)) {
+ if (!best || (best->base > new->base))
best = new;
- }
*best_p = best;
}
static u32 find_pci_tolm(struct bus *bus)
{
- print_debug("Entering find_pci_tolm\n");
struct resource *min;
u32 tolm;
+
+ print_debug("Entering find_pci_tolm\n");
+
min = 0;
- search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM, tolm_test, &min);
+ search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM,
+ tolm_test, &min);
tolm = 0xffffffffUL;
- if (min && tolm > min->base) {
+ if (min && tolm > min->base)
tolm = min->base;
- }
+
print_debug("Leaving find_pci_tolm\n");
+
return tolm;
}
static void pci_domain_set_resources(device_t dev)
{
- /*
- * the order is important to find the correct ram size.
- */
- static const u8 ramregs[] = {0x43, 0x42, 0x41, 0x40};
+ /* The order is important to find the correct RAM size. */
+ static const u8 ramregs[] = { 0x43, 0x42, 0x41, 0x40 };
device_t mc_dev;
- u32 pci_tolm;
+ u32 pci_tolm;
printk_spew("Entering cn700 pci_domain_set_resources.\n");
- pci_tolm = find_pci_tolm(&dev->link[0]);
- mc_dev = dev_find_device(PCI_VENDOR_ID_VIA,
- PCI_DEVICE_ID_VIA_CN700_MEMCTRL, 0);
+ pci_tolm = find_pci_tolm(&dev->link[0]);
+ mc_dev = dev_find_device(PCI_VENDOR_ID_VIA,
+ PCI_DEVICE_ID_VIA_CN700_MEMCTRL, 0);
if (mc_dev) {
unsigned long tomk, tolmk;
@@ -180,30 +182,30 @@
int i, idx;
/*
- * once the register value is not zero, the ramsize is
- * this register's value multiply 64 * 1024 * 1024
+ * Once the register value is not zero, the RAM size is
+ * this register's value multiply 64 * 1024 * 1024.
*/
- for(rambits = 0, i = 0; i < ARRAY_SIZE(ramregs); i++) {
- unsigned char reg;
+ for (rambits = 0, i = 0; i < ARRAY_SIZE(ramregs); i++) {
rambits = pci_read_config8(mc_dev, ramregs[i]);
if (rambits != 0)
break;
}
-
+
tomk = rambits * 64 * 1024;
printk_spew("tomk is 0x%x\n", tomk);
- /* Compute the Top Of Low Memory, in Kb */
+ /* Compute the Top Of Low Memory (TOLM), in Kb. */
tolmk = pci_tolm >> 10;
if (tolmk >= tomk) {
/* The PCI hole does does not overlap the memory. */
tolmk = tomk;
}
- /* Report the memory regions */
+ /* Report the memory regions. */
idx = 10;
/* TODO: Hole needed? */
- ram_resource(dev, idx++, 0, 640); /* first 640k */
- /* Leave a hole for vga, 0xa0000 - 0xc0000 */
- ram_resource(dev, idx++, 768, (tolmk - 768 - CONFIG_VIDEO_MB * 1024));
+ ram_resource(dev, idx++, 0, 640); /* First 640k */
+ /* Leave a hole for VGA, 0xa0000 - 0xc0000 */
+ ram_resource(dev, idx++, 768,
+ (tolmk - 768 - CONFIG_VIDEO_MB * 1024));
}
assign_resources(&dev->link[0]);
}
@@ -212,21 +214,21 @@
{
printk_debug("Entering cn700 pci_domain_scan_bus.\n");
- max = pci_scan_bus(&dev->link[0], PCI_DEVFN(0, 0), 0xff, max);
- return max;
+ max = pci_scan_bus(&dev->link[0], PCI_DEVFN(0, 0), 0xff, max);
+ return max;
}
static const struct device_operations pci_domain_ops = {
- .read_resources = pci_domain_read_resources,
- .set_resources = pci_domain_set_resources,
- .enable_resources = enable_childrens_resources,
- .init = 0,
- .scan_bus = pci_domain_scan_bus,
-};
+ .read_resources = pci_domain_read_resources,
+ .set_resources = pci_domain_set_resources,
+ .enable_resources = enable_childrens_resources,
+ .init = 0,
+ .scan_bus = pci_domain_scan_bus,
+};
static void cpu_bus_init(device_t dev)
{
- initialize_cpus(&dev->link[0]);
+ initialize_cpus(&dev->link[0]);
}
static void cpu_bus_noop(device_t dev)
@@ -234,25 +236,24 @@
}
static const struct device_operations cpu_bus_ops = {
- .read_resources = cpu_bus_noop,
- .set_resources = cpu_bus_noop,
- .enable_resources = cpu_bus_noop,
- .init = cpu_bus_init,
- .scan_bus = 0,
+ .read_resources = cpu_bus_noop,
+ .set_resources = cpu_bus_noop,
+ .enable_resources = cpu_bus_noop,
+ .init = cpu_bus_init,
+ .scan_bus = 0,
};
static void enable_dev(struct device *dev)
{
printk_spew("In cn700 enable_dev for device %s.\n", dev_path(dev));
- /* Set the operations if it is a special bus type */
- if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
- dev->ops = &pci_domain_ops;
+ /* Set the operations if it is a special bus type. */
+ if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {
+ dev->ops = &pci_domain_ops;
pci_set_method(dev);
- }
- else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
- dev->ops = &cpu_bus_ops;
- }
+ } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) {
+ dev->ops = &cpu_bus_ops;
+ }
}
struct chip_operations northbridge_via_cn700_ops = {
Modified: trunk/coreboot-v2/src/northbridge/via/cn700/raminit.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cn700/raminit.c 2008-10-09 16:05:16 UTC (rev 3643)
+++ trunk/coreboot-v2/src/northbridge/via/cn700/raminit.c 2008-10-09 17:08:32 UTC (rev 3644)
@@ -25,7 +25,7 @@
#include <delay.h>
#include "cn700.h"
-//#define DEBUG_RAM_SETUP 1
+// #define DEBUG_RAM_SETUP 1
#ifdef DEBUG_RAM_SETUP
#define PRINT_DEBUG_MEM(x) print_debug(x)
@@ -60,16 +60,16 @@
}
/**
- * Configure the bus between the cpu and the northbridge. This might be able to
+ * Configure the bus between the CPU and the northbridge. This might be able to
* be moved to post-ram code in the future. For the most part, these registers
* should not be messed around with. These are too complex to explain short of
* copying the datasheets into the comments, but most of these values are from
* the BIOS Porting Guide, so they should work on any board. If they don't,
* try the values from your factory BIOS.
*
- * TODO: Changing the DRAM frequency doesn't work (hard lockup)
+ * TODO: Changing the DRAM frequency doesn't work (hard lockup).
*
- * @param dev The northbridge's CPU Host Interface (D0F2)
+ * @param dev The northbridge's CPU Host Interface (D0F2).
*/
static void c7_cpu_setup(device_t dev)
{
@@ -87,13 +87,15 @@
/* Write Policy */
pci_write_config8(dev, 0x56, 0x01);
/* Miscellaneous Control */
- /* DRAM Operating Frequency (Bits 7:5)
- * 000 : 100MHz 001 : 133MHz
- * 010 : 166MHz 011 : 200MHz
- * 100 : 266MHz 101 : 333MHz
- * 110/111 : Reserved */
+ /*
+ * DRAM Operating Frequency (bits 7:5)
+ * 000 : 100MHz 001 : 133MHz
+ * 010 : 166MHz 011 : 200MHz
+ * 100 : 266MHz 101 : 333MHz
+ * 110/111 : Reserved
+ */
/* CPU Miscellaneous Control */
- pci_write_config8(dev, 0x59, 0x44);
+ pci_write_config8(dev, 0x59, 0x44);
/* Write Policy */
pci_write_config8(dev, 0x5d, 0xb2);
/* Bandwidth Timer */
@@ -112,8 +114,8 @@
/* Read Line Burst DRDY# Timing Control */
pci_write_config8(dev, 0x66, 0xff);
pci_write_config8(dev, 0x67, 0x30);
-
- /* Host Bus IO Circuit (See datasheet) */
+
+ /* Host Bus I/O Circuit (see datasheet) */
/* Host Address Pullup/down Driving */
pci_write_config8(dev, 0x70, 0x11);
pci_write_config8(dev, 0x71, 0x11);
@@ -133,7 +135,7 @@
pci_write_config8(dev, 0x79, 0xaa);
/* Address Strobe Input Delay Control */
pci_write_config8(dev, 0x7a, 0x24);
- // Address CKG Rising/Falling Time Control
+ /* Address CKG Rising/Falling Time Control */
pci_write_config8(dev, 0x7b, 0xaa);
/* Address CKG Clock Rising/Falling Time Control */
pci_write_config8(dev, 0x7c, 0x00);
@@ -148,10 +150,10 @@
}
/**
- * Set up dram size according to spd data. Eventually, DRAM timings should be
+ * Set up DRAM size according to SPD data. Eventually, DRAM timings should be
* done in a similar manner.
*
- * @param ctrl The northbridge devices and spd addresses.
+ * @param ctrl The northbridge devices and SPD addresses.
*/
static void sdram_set_size(const struct mem_controller *ctrl)
{
@@ -159,37 +161,37 @@
ranks = spd_read_byte(ctrl->channel0[0], SPD_NUM_DIMM_BANKS);
ranks = (ranks & 0x07) + 1;
- density = spd_read_byte(ctrl->channel0[0], SPD_DENSITY_OF_EACH_ROW_ON_MODULE);
- switch (density)
- {
- case 0x80:
- result = 0x08; /* 512MB / 64MB = 0x08 */
- break;
- case 0x40:
- result = 0x04;
- break;
- case 0x20:
- result = 0x02;
- break;
- case 0x10:
- result = 0xff; /* 16GB */
- break;
- case 0x08:
- result = 0xff; /* 8GB */
- break;
- case 0x04:
- result = 0xff; /* 4GB */
- break;
- case 0x02:
- result = 0x20; /* 2GB */
- break;
- case 0x01:
- result = 0x10; /* 1GB */
- break;
+ density = spd_read_byte(ctrl->channel0[0],
+ SPD_DENSITY_OF_EACH_ROW_ON_MODULE);
+ switch (density) {
+ case 0x80:
+ result = 0x08; /* 512MB / 64MB = 0x08 */
+ break;
+ case 0x40:
+ result = 0x04;
+ break;
+ case 0x20:
+ result = 0x02;
+ break;
+ case 0x10:
+ result = 0xff; /* 16GB */
+ break;
+ case 0x08:
+ result = 0xff; /* 8GB */
+ break;
+ case 0x04:
+ result = 0xff; /* 4GB */
+ break;
+ case 0x02:
+ result = 0x20; /* 2GB */
+ break;
+ case 0x01:
+ result = 0x10; /* 1GB */
+ break;
}
if (result == 0xff)
- die("dram module size too big, not supported by cn700\r\n");
+ die("DRAM module size too big, not supported by CN700\r\n");
pci_write_config8(ctrl->d0f3, 0x40, result);
pci_write_config8(ctrl->d0f3, 0x48, 0x00);
@@ -197,7 +199,7 @@
pci_write_config8(ctrl->d0f3, 0x41, result * ranks);
pci_write_config8(ctrl->d0f3, 0x49, result);
}
- /* size mirror */
+ /* Size mirror */
pci_write_config8(ctrl->d0f7, 0xe5, (result * ranks) << 2);
pci_write_config8(ctrl->d0f7, 0x57, (result * ranks) << 2);
/* Low Top Address */
@@ -207,55 +209,53 @@
/* Physical-Virtual Mapping */
if (ranks == 2)
- pci_write_config8(ctrl->d0f3, 0x54, 1 << 7 | 0 << 4 | 1 << 3 | 1 << 0);
+ pci_write_config8(ctrl->d0f3, 0x54,
+ 1 << 7 | 0 << 4 | 1 << 3 | 1 << 0);
if (ranks == 1)
pci_write_config8(ctrl->d0f3, 0x54, 1 << 7 | 0 << 4);
pci_write_config8(ctrl->d0f3, 0x55, 0x00);
- /* virtual rank interleave, disable */
+ /* Virtual rank interleave, disable */
pci_write_config32(ctrl->d0f3, 0x58, 0x00);
/* MA Map Type */
result = spd_read_byte(ctrl->channel0[0], SPD_NUM_BANKS_PER_SDRAM);
if (result == 8) {
col = spd_read_byte(ctrl->channel0[0], SPD_NUM_COLUMNS);
- switch (col)
- {
- case 10:
- pci_write_config8(ctrl->d0f3, 0x50, 0xa0);
- break;
- case 11:
- pci_write_config8(ctrl->d0f3, 0x50, 0xc0);
- break;
- case 12:
- pci_write_config8(ctrl->d0f3, 0x50, 0xe0);
- break;
+ switch (col) {
+ case 10:
+ pci_write_config8(ctrl->d0f3, 0x50, 0xa0);
+ break;
+ case 11:
+ pci_write_config8(ctrl->d0f3, 0x50, 0xc0);
+ break;
+ case 12:
+ pci_write_config8(ctrl->d0f3, 0x50, 0xe0);
+ break;
}
- }
- else if (result == 4) {
+ } else if (result == 4) {
col = spd_read_byte(ctrl->channel0[0], SPD_NUM_COLUMNS);
- switch (col)
- {
- case 9:
- pci_write_config8(ctrl->d0f3, 0x50, 0x00);
- break;
- case 10:
- pci_write_config8(ctrl->d0f3, 0x50, 0x20);
- break;
- case 11:
- pci_write_config8(ctrl->d0f3, 0x50, 0x40);
- break;
- case 12:
- pci_write_config8(ctrl->d0f3, 0x50, 0x60);
- break;
+ switch (col) {
+ case 9:
+ pci_write_config8(ctrl->d0f3, 0x50, 0x00);
+ break;
+ case 10:
+ pci_write_config8(ctrl->d0f3, 0x50, 0x20);
+ break;
+ case 11:
+ pci_write_config8(ctrl->d0f3, 0x50, 0x40);
+ break;
+ case 12:
+ pci_write_config8(ctrl->d0f3, 0x50, 0x60);
+ break;
}
}
pci_write_config8(ctrl->d0f3, 0x51, 0x00);
}
/**
- * Set up various ram and other control registers statically. Some of these may
- * not be needed, other should be done with spd info, but that's a project for
- * the future
+ * Set up various RAM and other control registers statically. Some of these may
+ * not be needed, other should be done with SPD info, but that's a project for
+ * the future.
*/
static void sdram_set_registers(const struct mem_controller *ctrl)
{
@@ -265,48 +265,49 @@
pci_write_config8(ctrl->d0f3, 0x61, 0xe0);
/* Set CAS=4 */
pci_write_config8(ctrl->d0f3, 0x62, 0xfa);
- /* dram timing-3 */
+ /* DRAM timing-3 */
pci_write_config8(ctrl->d0f3, 0x63, 0xca);
- /* dram timing-4 */
+ /* DRAM timing-4 */
pci_write_config8(ctrl->d0f3, 0x64, 0xcc);
/* DIMM command / Address Selection */
pci_write_config8(ctrl->d0f3, 0x67, 0x00);
/* Disable cross bank/multi page mode */
pci_write_config8(ctrl->d0f3, 0x69, 0x00);
- /* disable refresh now */
+ /* Disable refresh now */
pci_write_config8(ctrl->d0f3, 0x6a, 0x00);
- /* frequency 100MHZ */
+ /* Frequency 100 MHz */
pci_write_config8(ctrl->d0f3, 0x90, 0x00);
pci_write_config8(ctrl->d0f2, 0x57, 0x18);
- /* Allow manual dll reset */
+ /* Allow manual DLL reset */
pci_write_config8(ctrl->d0f3, 0x6b, 0x10);
/* Bank/Rank Interleave Address Select */
pci_write_config8(ctrl->d0f3, 0x52, 0x33);
pci_write_config8(ctrl->d0f3, 0x53, 0x3f);
-
- /* Set to DDR2 sdram, BL=8 (0xc8, 0xc0 for bl=4) */
+
+ /* Set to DDR2 SDRAM, BL=8 (0xc8, 0xc0 for bl=4) */
pci_write_config8(ctrl->d0f3, 0x6c, 0xc8);
/* DRAM Bus Turn-Around Setting */
pci_write_config8(ctrl->d0f3, 0x60, 0x03);
/* DRAM Arbitration Control */
pci_write_config8(ctrl->d0f3, 0x66, 0x80);
- /* DQS Tuning: testing on a couple different boards has shown this is
+ /*
+ * DQS Tuning: testing on a couple different boards has shown this is
* static, or close enough that it can be. Which is good, because the
- * tuning function used too many registers
+ * tuning function used too many registers.
*/
- /* DQS Output Delay for CHannel A */
+ /* DQS Output Delay for Channel A */
pci_write_config8(ctrl->d0f3, 0x70, 0x00);
/* MD Output Delay for Channel A */
pci_write_config8(ctrl->d0f3, 0x71, 0x01);
pci_write_config8(ctrl->d0f3, 0x73, 0x01);
- /* dram arbitration timer */
+ /* DRAM arbitration timer */
pci_write_config8(ctrl->d0f3, 0x65, 0xd9);
- /* dram signal timing control */
+ /* DRAM signal timing control */
pci_write_config8(ctrl->d0f3, 0x74, 0x01);
pci_write_config8(ctrl->d0f3, 0x75, 0x01);
pci_write_config8(ctrl->d0f3, 0x76, 0x06);
@@ -316,7 +317,7 @@
pci_write_config8(ctrl->d0f3, 0x7a, 0x00);
pci_write_config8(ctrl->d0f3, 0x7b, 0x10);
- /* dram clocking control */
+ /* DRAM clocking control */
pci_write_config8(ctrl->d0f3, 0x91, 0x01);
/* CS/CKE Clock Phase Control */
pci_write_config8(ctrl->d0f3, 0x92, 0x02);
@@ -325,18 +326,18 @@
/* DCLKO Feedback Mode Output Control */
pci_write_config8(ctrl->d0f3, 0x94, 0x00);
pci_write_config8(ctrl->d0f3, 0x9d, 0x0f);
-
+
/* SDRAM ODT Control */
pci_write_config8(ctrl->d0f3, 0xda, 0x80);
/* Channel A DQ/DQS CKG Output Delay Control */
pci_write_config8(ctrl->d0f3, 0xdc, 0x54);
/* Channel A DQ/DQS CKG Output Delay Control */
pci_write_config8(ctrl->d0f3, 0xdd, 0x55);
- /* odt lookup table */
+ /* ODT lookup table */
pci_write_config8(ctrl->d0f3, 0xd8, 0x01);
pci_write_config8(ctrl->d0f3, 0xd9, 0x0a);
- /* ddr sdram control */
+ /* DDR SDRAM control */
pci_write_config8(ctrl->d0f3, 0x6d, 0xc0);
pci_write_config8(ctrl->d0f3, 0x6f, 0x41);
@@ -344,7 +345,7 @@
pci_write_config8(ctrl->d0f3, 0xd0, 0xaa);
/* Compensation Control */
- pci_write_config8(ctrl->d0f3, 0xd3, 0x01); /*enable auto compensation*/
+ pci_write_config8(ctrl->d0f3, 0xd3, 0x01); /* Enable autocompensation */
/* ODT (some are set with driving select above) */
pci_write_config8(ctrl->d0f3, 0xd4, 0x80);
pci_write_config8(ctrl->d0f3, 0xd5, 0x8a);
@@ -362,8 +363,8 @@
pci_write_config8(ctrl->d0f3, 0xee, 0x00);
/* DQS CKG Input Delay Control */
pci_write_config8(ctrl->d0f3, 0xef, 0x10);
-
- /* dram duty control */
+
+ /* DRAM duty control */
pci_write_config8(ctrl->d0f3, 0xed, 0x10);
/* SMM and APIC decoding, we do not use SMM */
@@ -372,23 +373,23 @@
/* SMM and APIC decoding mirror */
pci_write_config8(ctrl->d0f7, 0xe6, reg);
- /* dram module configuration */
+ /* DRAM module configuration */
pci_write_config8(ctrl->d0f3, 0x6e, 0x89);
}
static void sdram_set_post(const struct mem_controller *ctrl)
{
device_t dev = ctrl->d0f3;
+
/* Enable multipage mode. */
pci_write_config8(dev, 0x69, 0x03);
/* Enable refresh. */
pci_write_config8(dev, 0x6a, 0x32);
- // vga device
- pci_write_config16(dev, 0xa0, (1 <<15));
+ /* VGA device. */
+ pci_write_config16(dev, 0xa0, (1 << 15));
pci_write_config16(dev, 0xa4, 0x0010);
-
}
static void sdram_enable(device_t dev, unsigned long rank_address)
@@ -410,33 +411,35 @@
/* 3. Mode register set. */
PRINT_DEBUG_MEM("RAM Enable 4: Mode register set\r\n");
do_ram_command(dev, RAM_COMMAND_MRS);
- read32(rank_address + 0x120000);// EMRS DLL Enable
- read32(rank_address + 0x800); // MRS DLL Reset
-
+ read32(rank_address + 0x120000); /* EMRS DLL Enable */
+ read32(rank_address + 0x800); /* MRS DLL Reset */
+
/* 4. Precharge all again. */
PRINT_DEBUG_MEM("RAM Enable 2: Precharge all\r\n");
do_ram_command(dev, RAM_COMMAND_PRECHARGE);
read32(rank_address + 0x0);
-
+
/* 5. Perform 8 refresh cycles. Wait tRC each time. */
PRINT_DEBUG_MEM("RAM Enable 3: CBR\r\n");
do_ram_command(dev, RAM_COMMAND_CBR);
- for(i = 0; i < 8; i++) {
+ for (i = 0; i < 8; i++) {
read32(rank_address + 0x20);
udelay(100);
}
/* 6. Mode register set. */
PRINT_DEBUG_MEM("RAM Enable 4: Mode register set\r\n");
- //safe value for now, BL=8, WR=5, CAS=4
- /* (E)MRS values are from the BPG. No direct explanation is given, but
+ /* Safe value for now, BL=8, WR=5, CAS=4 */
+ /*
+ * (E)MRS values are from the BPG. No direct explanation is given, but
* they should somehow conform to the JEDEC DDR2 SDRAM Specification
- * (JESD79-2C). */
+ * (JESD79-2C).
+ */
do_ram_command(dev, RAM_COMMAND_MRS);
- read32(rank_address + 0x002258); // MRS command
- read32(rank_address + 0x121c20); // EMRS OCD Default
- read32(rank_address + 0x120020); // EMRS OCD Calibration Mode Exit
-
+ read32(rank_address + 0x002258); /* MRS command */
+ read32(rank_address + 0x121c20); /* EMRS OCD Default */
+ read32(rank_address + 0x120020); /* EMRS OCD Calibration Mode Exit */
+
/* 8. Normal operation */
PRINT_DEBUG_MEM("RAM Enable 5: Normal operation\r\n");
do_ram_command(dev, RAM_COMMAND_NORMAL);
@@ -444,7 +447,7 @@
}
/*
- * Support one dimm with up to 2 ranks
+ * Support one DIMM with up to 2 ranks.
*/
static void ddr_ram_setup(const struct mem_controller *ctrl)
{
@@ -456,7 +459,7 @@
sdram_enable(ctrl->d0f3, 0);
reg = pci_read_config8(ctrl->d0f3, 0x41);
if (reg != 0)
- sdram_enable(ctrl->d0f3, pci_read_config8(ctrl->d0f3, 0x40) << 26);
+ sdram_enable(ctrl->d0f3,
+ pci_read_config8(ctrl->d0f3, 0x40) << 26);
sdram_set_post(ctrl);
}
-
Modified: trunk/coreboot-v2/src/northbridge/via/cn700/raminit.h
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cn700/raminit.h 2008-10-09 16:05:16 UTC (rev 3643)
+++ trunk/coreboot-v2/src/northbridge/via/cn700/raminit.h 2008-10-09 17:08:32 UTC (rev 3644)
@@ -21,9 +21,11 @@
#ifndef RAMINIT_H
#define RAMINIT_H
-#define DIMM_SOCKETS 1 //Only one works, for now.
+#define DIMM_SOCKETS 1 /* Only one works, for now. */
struct mem_controller {
device_t d0f0, d0f2, d0f3, d0f4, d0f7, d1f0;
u8 channel0[DIMM_SOCKETS];
};
+
+#endif
Modified: trunk/coreboot-v2/src/northbridge/via/cn700/vga.c
===================================================================
--- trunk/coreboot-v2/src/northbridge/via/cn700/vga.c 2008-10-09 16:05:16 UTC (rev 3643)
+++ trunk/coreboot-v2/src/northbridge/via/cn700/vga.c 2008-10-09 17:08:32 UTC (rev 3644)
@@ -18,8 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/* Note: Some of the VGA control registers are located on the memory controller.
- Registers are set both in raminit.c and northbridge.c */
+/*
+ * Note: Some of the VGA control registers are located on the memory
+ * controller. Registers are set both in raminit.c and northbridge.c.
+ */
#include <console/console.h>
#include <arch/io.h>
@@ -37,75 +39,74 @@
void write_protect_vgabios(void)
{
-//Don't bother for now
+ /* Don't bother for now. */
}
static void vga_init(device_t dev)
{
u8 reg8;
- print_debug("Copying BOCHS Bios to 0xf000\n");
- /* Copy BOCHS BIOS from 4G-ROM_SIZE-64k (in flash) to 0xf0000 (in RAM)
- * This is for compatibility with the VGA ROM's BIOS callbacks */
+ print_debug("Copying BOCHS BIOS to 0xf000\n");
+ /*
+ * Copy BOCHS BIOS from 4G-ROM_SIZE-64k (in flash) to 0xf0000 (in RAM)
+ * This is for compatibility with the VGA ROM's BIOS callbacks.
+ */
memcpy(0xf0000, (0xffffffff - ROM_SIZE - 0xffff), 0x10000);
printk_debug("Initializing VGA\n");
-
- /* Set memory rate to 200MHz */
+
+ /* Set memory rate to 200 MHz. */
outb(0x3d, CRTM_INDEX);
reg8 = inb(CRTM_DATA);
reg8 &= 0x0f;
reg8 |= (0x1 << 4);
outb(0x3d, CRTM_INDEX);
outb(reg8, CRTM_DATA);
-
- /* Set framebuffer size */
+
+ /* Set framebuffer size. */
reg8 = (CONFIG_VIDEO_MB / 4);
outb(0x39, SR_INDEX);
outb(reg8, SR_DATA);
-
-
+
pci_write_config8(dev, 0x04, 0x07);
pci_write_config8(dev, 0x0d, 0x20);
- pci_write_config32(dev,0x10, 0xf4000008);
- pci_write_config32(dev,0x14, 0xfb000000);
-
-
+ pci_write_config32(dev, 0x10, 0xf4000008);
+ pci_write_config32(dev, 0x14, 0xfb000000);
+
printk_debug("INSTALL REAL-MODE IDT\n");
setup_realmode_idt();
printk_debug("DO THE VGA BIOS\n");
do_vgabios();
- /* VGA seems to work without this, but crash & burn with it */
- //printk_debug("Enable VGA console\n");
- //vga_enable_console();
+ /* VGA seems to work without this, but crash & burn with it. */
+ // printk_debug("Enable VGA console\n");
+ // vga_enable_console();
/* It's not clear if these need to be programmed before or after
- * the VGA bios runs. Try both, clean up later */
- /* Set memory rate to 200MHz */
+ * the VGA BIOS runs. Try both, clean up later. */
+ /* Set memory rate to 200 MHz (again). */
outb(0x3d, CRTM_INDEX);
reg8 = inb(CRTM_DATA);
reg8 &= 0x0f;
reg8 |= (0x1 << 4);
outb(0x3d, CRTM_INDEX);
outb(reg8, CRTM_DATA);
-
- /* Set framebuffer size (again) */
+
+ /* Set framebuffer size (again). */
reg8 = (CONFIG_VIDEO_MB / 4);
outb(0x39, SR_INDEX);
outb(reg8, SR_DATA);
- /* Clear the BOCHs Bios out of memory, so it doesn't confuse linux */
+ /* Clear the BOCHS BIOS out of memory, so it doesn't confuse Linux. */
memset(0xf0000, 0, 0x10000);
}
static void vga_read_resources(device_t dev)
{
dev->rom_address = 0xfff80000;
- dev->on_mainboard=1;
+ dev->on_mainboard = 1;
pci_dev_read_resources(dev);
}
-
static const struct device_operations vga_operations = {
.read_resources = vga_read_resources,
.set_resources = pci_dev_set_resources,
@@ -115,7 +116,7 @@
};
static const struct pci_driver vga_driver __pci_driver = {
- .ops = &vga_operations,
+ .ops = &vga_operations,
.vendor = PCI_VENDOR_ID_VIA,
.device = PCI_DEVICE_ID_VIA_CN700_VGA,
};
More information about the coreboot
mailing list