Attached patch fixes at least one issue ;) During the PCI BAR sizing must be the

D1F0 bridge without activated I/O and MEM resources, otherwise it will hang
 whole PCI bus.

 U-boot is also disabling the IO/MEM decode when sizing the BARs, dont know why
 does we not.

 Second small change just changes a bit which controls the PSTATECTL logic.

 Third change deals with the integrated VGA, which needs to be enabled early,
 so the VGA_EN is set along the bridges, and PCI K8 resource maps are set
 correctly. Finally the CPU accessible framebuffer is now disabled as it is not
 needed.

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3587 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Rudolf Marek 2008-09-19 22:58:59 +00:00
parent c4128cfbec
commit 0b0771d180
3 changed files with 22 additions and 13 deletions

View File

@ -24,8 +24,8 @@
static void bridge_enable(struct device *dev)
{
u8 tmp;
print_debug("B188 device dump\n");
/* VIA recommends this, sorry no known info. */
writeback(dev, 0x40, 0x91);
@ -44,6 +44,12 @@ static void bridge_enable(struct device *dev)
writeback(dev, 0x3e, 0x16);
dump_south(dev);
/* disable I/O and memory decode, or it freezes PCI bus during BAR sizing */
tmp = pci_read_config8(dev, PCI_COMMAND);
tmp &= ~0x3;
pci_write_config8(dev, PCI_COMMAND, tmp);
}
static const struct device_operations bridge_ops = {

View File

@ -63,6 +63,15 @@ static void dram_enable(struct device *dev)
/* The Address Next to the Last Valid DRAM Address */
pci_write_config16(dev, 0x88, (msr.lo >> 24) | reg);
}
static void dram_enable_k8m890(struct device *dev)
{
dram_enable(dev);
/* enable VGA, so the bridges gets VGA_EN and resources are set */
pci_write_config8(dev, 0xa1, 0x80);
}
static struct resource *resmax;
@ -113,17 +122,11 @@ static void dram_init_fb(struct device *dev)
printk_debug("VIA FB proposed base: %llx\n", proposed_base);
/* enable UMA but no FB */
/* Step 1: enable UMA but no FB */
pci_write_config8(dev, 0xa1, 0x80);
/* 27:21 goes to 7:1, 0 is enable CPU access */
tmp = (proposed_base >> 20) | 0x1;
pci_write_config8(dev, 0xa0, tmp);
/* 31:28 goes to 3:0 */
tmp = ((proposed_base >> 28) & 0xf);
tmp = ((log2(K8M890_FBSIZEMB) - 2) << 4);
tmp |= 0x80;
/* Step 2: enough is just the FB size, the CPU accessible address is not needed */
tmp = ((log2(K8M890_FBSIZEMB) - 2) << 4) | 0x80;
pci_write_config8(dev, 0xa1, tmp);
/* TODO K8 needs some UMA fine tuning too maybe call some generic routine here? */
@ -141,7 +144,7 @@ static const struct device_operations dram_ops_m = {
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.enable = dram_enable,
.enable = dram_enable_k8m890,
.init = dram_init_fb,
.ops_pci = 0,
};

View File

@ -105,8 +105,8 @@ static void host_ctrl_enable_k8m890(struct device *dev) {
/* Arbitration control */
pci_write_config8(dev, 0xa5, 0x3c);
/* Arbitration control 2 */
pci_write_config8(dev, 0xa6, 0x82);
/* Arbitration control 2, Enable C2NOW delay to PSTATECTL */
pci_write_config8(dev, 0xa6, 0x83);
}