GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

southbridge/nvidia: Remove commented code

Browse source 
Change-Id: Ice4a5cae1a289852895012bb55035707b54cefb5
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/16899
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Elyes HAOUAS 2016-10-05 22:17:30 +02:00 committed by Martin Roth
parent 571fb1fb44
commit 49a7c37de9
9 changed files with 1 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/southbridge/nvidia/ck804/early_setup.c
View file

@ -300,10 +300,6 @@ static void ck804_early_setup(void)
setup_ss_table(CK804B_ANACTRL_IO_BASE + 0xc0, CK804B_ANACTRL_IO_BASE + 0xc4, CK804B_ANACTRL_IO_BASE + 0xc8, cpu_ss_tbl, 64); setup_ss_table(CK804B_ANACTRL_IO_BASE + 0xc0, CK804B_ANACTRL_IO_BASE + 0xc4, CK804B_ANACTRL_IO_BASE + 0xc8, cpu_ss_tbl, 64);
#endif #endif
#if 0
dump_io_resources(ANACTRL_IO_BASE);
dump_io_resources(SYSCTRL_IO_BASE);
#endif
} }
static int ck804_early_setup_x(void) static int ck804_early_setup_x(void)

6
src/southbridge/nvidia/ck804/lpc.c
View file

@ -136,12 +136,6 @@ static void lpc_init(device_t dev)
printk(BIOS_DEBUG, "Throttling CPU %2d.%1.1d percent.\n", printk(BIOS_DEBUG, "Throttling CPU %2d.%1.1d percent.\n",
(on * 12) + (on >> 1), (on & 1) * 5); (on * 12) + (on >> 1), (on & 1) * 5);
} }
#if 0
/* Enable Port 92 fast reset (default is enabled). */
byte = pci_read_config8(dev, 0xe8);
byte |= ~(1 << 3);
pci_write_config8(dev, 0xe8, byte);
#endif
/* Set up NMI on errors. */ /* Set up NMI on errors. */
byte = inb(0x70); /* RTC70 */ byte = inb(0x70); /* RTC70 */

9
src/southbridge/nvidia/ck804/pci.c
View file

@ -33,18 +33,9 @@ static void pci_init(struct device *dev)
dword |= (1 << 30); /* Clear possible errors */ dword |= (1 << 30); /* Clear possible errors */
pci_write_config32(dev, 0x04, dword); pci_write_config32(dev, 0x04, dword);
#if 0
word = pci_read_config16(dev, 0x48);
word |= (1 << 0); /* MRL2MRM */
word |= (1 << 2); /* MR2MRM */
pci_write_config16(dev, 0x48, word);
#endif
#if 1
dword = pci_read_config32(dev, 0x4c); dword = pci_read_config32(dev, 0x4c);
dword |= 0x00440000; /* TABORT_SER_ENABLE Park Last Enable. */ dword |= 0x00440000; /* TABORT_SER_ENABLE Park Last Enable. */
pci_write_config32(dev, 0x4c, dword); pci_write_config32(dev, 0x4c, dword);
#endif
pci_domain_dev = dev->bus->dev; pci_domain_dev = dev->bus->dev;
while (pci_domain_dev) { while (pci_domain_dev) {

35
src/southbridge/nvidia/ck804/sata.c
View file

@ -51,13 +51,6 @@ static void sata_com_reset(struct device *dev, unsigned reset)
*(base + 8) = dword; *(base + 8) = dword;
*(base + 0x48) = dword; *(base + 0x48) = dword;
#if 0
udelay(1000);
dword &= ~(0xf);
*(base + 8) = dword;
*(base + 0x48) = dword;
#endif
if (reset) if (reset)
return; return;
@ -109,17 +102,6 @@ static void sata_init(struct device *dev)
dword |= (1 << 1); dword |= (1 << 1);
printk(BIOS_DEBUG, "SATA P\n"); printk(BIOS_DEBUG, "SATA P\n");
} }
#if 0
/* Write back */
dword |= (1 << 12);
dword |= (1 << 14);
#endif
#if 0
/* ADMA */
dword |= (1 << 16);
dword |= (1 << 17);
#endif
#if 1 #if 1
/* DO NOT relay OK and PAGE_FRNDLY_DTXFR_CNT. */ /* DO NOT relay OK and PAGE_FRNDLY_DTXFR_CNT. */
@ -128,23 +110,6 @@ static void sata_init(struct device *dev)
#endif #endif
pci_write_config32(dev, 0x50, dword); pci_write_config32(dev, 0x50, dword);
#if 0
/* SLUMBER_DURING_D3 */
dword = pci_read_config32(dev, 0x7c);
dword &= ~(1 << 4);
pci_write_config32(dev, 0x7c, dword);
dword = pci_read_config32(dev, 0xd0);
dword &= ~(0xff << 24);
dword |= (0x68 << 24);
pci_write_config32(dev, 0xd0, dword);
dword = pci_read_config32(dev, 0xe0);
dword &= ~(0xff << 24);
dword |= (0x68 << 24);
pci_write_config32(dev, 0xe0, dword);
#endif
dword = pci_read_config32(dev, 0xf8); dword = pci_read_config32(dev, 0xf8);
dword |= 2; dword |= 2;
pci_write_config32(dev, 0xf8, dword); pci_write_config32(dev, 0xf8, dword);

43
src/southbridge/nvidia/ck804/smbus.h
View file

@ -34,25 +34,6 @@ static inline void smbus_delay(void)
outb(0x80, 0x80); outb(0x80, 0x80);
} }
#if 0
/* Not needed, upon write to PRTCL, the status will be auto-cleared. */
static int smbus_wait_until_ready(unsigned smbus_io_base)
{
unsigned long loops;
loops = SMBUS_TIMEOUT;
do {
unsigned char val;
smbus_delay();
val = inb(smbus_io_base + SMBHSTSTAT);
val &= 0x1f;
if (val == 0)
return 0;
outb(val, smbus_io_base + SMBHSTSTAT);
} while (--loops);
return -2;
}
#endif
static int smbus_wait_until_done(unsigned smbus_io_base) static int smbus_wait_until_done(unsigned smbus_io_base)
{ {
unsigned long loops; unsigned long loops;
@ -72,12 +53,6 @@ static int do_smbus_recv_byte(unsigned smbus_io_base, unsigned device)
{ {
unsigned char global_status_register, byte; unsigned char global_status_register, byte;
#if 0
/* Not needed, upon write to PRTCL, the status will be auto-cleared. */
if (smbus_wait_until_ready(smbus_io_base) < 0)
return -2;
#endif
/* Set the device I'm talking to. */ /* Set the device I'm talking to. */
outb(((device & 0x7f) << 1) | 1, smbus_io_base + SMBXMITADD); outb(((device & 0x7f) << 1) | 1, smbus_io_base + SMBXMITADD);
smbus_delay(); smbus_delay();
@ -112,12 +87,6 @@ static int do_smbus_send_byte(unsigned smbus_io_base, unsigned device,
{ {
unsigned global_status_register; unsigned global_status_register;
#if 0
/* Not needed, upon write to PRTCL, the status will be auto-cleared. */
if (smbus_wait_until_ready(smbus_io_base) < 0)
return -2;
#endif
outb(val, smbus_io_base + SMBHSTDAT0); outb(val, smbus_io_base + SMBHSTDAT0);
smbus_delay(); smbus_delay();
@ -151,12 +120,6 @@ static int do_smbus_read_byte(unsigned smbus_io_base, unsigned device,
{ {
unsigned char global_status_register, byte; unsigned char global_status_register, byte;
#if 0
/* Not needed, upon write to PRTCL, the status will be auto-cleared. */
if (smbus_wait_until_ready(smbus_io_base) < 0)
return -2;
#endif
/* Set the device I'm talking to. */ /* Set the device I'm talking to. */
outb(((device & 0x7f) << 1) | 1, smbus_io_base + SMBXMITADD); outb(((device & 0x7f) << 1) | 1, smbus_io_base + SMBXMITADD);
smbus_delay(); smbus_delay();
@ -191,12 +154,6 @@ static int do_smbus_write_byte(unsigned smbus_io_base, unsigned device,
{ {
unsigned global_status_register; unsigned global_status_register;
#if 0
/* Not needed, upon write to PRTCL, the status will be auto-cleared. */
if (smbus_wait_until_ready(smbus_io_base) < 0)
return -2;
#endif
outb(val, smbus_io_base + SMBHSTDAT0); outb(val, smbus_io_base + SMBHSTDAT0);
smbus_delay(); smbus_delay();

7
src/southbridge/nvidia/mcp55/bootblock.c
View file

@ -28,13 +28,8 @@ static void mcp55_enable_rom(void)
pci_devfn_t addr; pci_devfn_t addr;
/* Enable 4MB ROM access at 0xFFC00000 - 0xFFFFFFFF. */ /* Enable 4MB ROM access at 0xFFC00000 - 0xFFFFFFFF. */
#if 0
/* Default MCP55 LPC single */
addr = pci_locate_device(PCI_ID(0x10de, 0x0367), 0);
#else
// addr = pci_locate_device(PCI_ID(0x10de, 0x0360), 0);
addr = PCI_DEV(0, (MCP55_DEVN_BASE + 1), 0); addr = PCI_DEV(0, (MCP55_DEVN_BASE + 1), 0);
#endif
/* Set the 15MB enable bits. */ /* Set the 15MB enable bits. */
byte = pci_read_config8(addr, 0x88); byte = pci_read_config8(addr, 0x88);

19
src/southbridge/nvidia/mcp55/early_setup_car.c
View file

@ -253,7 +253,6 @@ static void mcp55_early_setup(unsigned mcp55_num, unsigned *busn,
#if CONFIG_MCP55_USE_AZA #if CONFIG_MCP55_USE_AZA
RES_PCI_IO, PCI_ADDR(0, 6, 1, 0x40), 0x00000000, 0xCB8410DE, RES_PCI_IO, PCI_ADDR(0, 6, 1, 0x40), 0x00000000, 0xCB8410DE,
// RES_PCI_IO, PCI_ADDR(0, 1, 1, 0xE4), ~(1 << 14), (1 << 14),
#endif #endif
#ifdef MCP55_MB_SETUP #ifdef MCP55_MB_SETUP
@ -326,22 +325,6 @@ static void mcp55_early_setup(unsigned mcp55_num, unsigned *busn,
PCI_DEV(busn[j], devn[j], 0), io_base[j]); PCI_DEV(busn[j], devn[j], 0), io_base[j]);
} }
#if 0
for (j = 0; j < mcp55_num; j++) {
// PCI-E (XSPLL) SS table 0x40, x044, 0x48
// SATA (SPPLL) SS table 0xb0, 0xb4, 0xb8
// CPU (PPLL) SS table 0xc0, 0xc4, 0xc8
setup_ss_table(io_base[j] + ANACTRL_IO_BASE + 0x40,
io_base[j] + ANACTRL_IO_BASE + 0x44,
io_base[j] + ANACTRL_IO_BASE + 0x48, pcie_ss_tbl, 64);
setup_ss_table(io_base[j] + ANACTRL_IO_BASE + 0xb0,
io_base[j] + ANACTRL_IO_BASE + 0xb4,
io_base[j] + ANACTRL_IO_BASE + 0xb8, sata_ss_tbl, 64);
setup_ss_table(io_base[j] + ANACTRL_IO_BASE + 0xc0,
io_base[j] + ANACTRL_IO_BASE + 0xc4,
io_base[j] + ANACTRL_IO_BASE + 0xc8, cpu_ss_tbl, 64);
}
#endif
} }
#ifndef HT_CHAIN_NUM_MAX #ifndef HT_CHAIN_NUM_MAX
@ -405,7 +388,5 @@ out:
mcp55_early_clear_port(mcp55_num, busn, devn, io_base); mcp55_early_clear_port(mcp55_num, busn, devn, io_base);
// set_ht_link_mcp55(HT_CHAIN_NUM_MAX);
return 0; return 0;
} }

14
src/southbridge/nvidia/mcp55/lpc.c
View file

@ -91,11 +91,6 @@ static void lpc_init(device_t dev)
lpc_common_init(dev, 1); lpc_common_init(dev, 1);
#if 0
/* Posted memory write enable. */
byte = pci_read_config8(dev, 0x46);
pci_write_config8(dev, 0x46, byte | (1 << 0));
#endif
/* power after power fail */ /* power after power fail */
#if 1 #if 1
@ -122,13 +117,6 @@ static void lpc_init(device_t dev)
(on * 12) + (on >> 1), (on & 1) * 5); (on * 12) + (on >> 1), (on & 1) * 5);
} }
#if 0
/* Enable Port 92 fast reset (default is enabled). */
byte = pci_read_config8(dev, 0xe8);
byte |= ~(1 << 3);
pci_write_config8(dev, 0xe8, byte);
#endif
/* Enable error reporting. */ /* Enable error reporting. */
/* Set up sync flood detected. */ /* Set up sync flood detected. */
byte = pci_read_config8(dev, 0x47); byte = pci_read_config8(dev, 0x47);
@ -258,7 +246,6 @@ static struct device_operations lpc_ops = {
.enable_resources = mcp55_lpc_enable_resources, .enable_resources = mcp55_lpc_enable_resources,
.init = lpc_init, .init = lpc_init,
.scan_bus = scan_lpc_bus, .scan_bus = scan_lpc_bus,
// .enable = mcp55_enable,
.ops_pci = &mcp55_pci_ops, .ops_pci = &mcp55_pci_ops,
}; };
static const unsigned short lpc_ids[] = { static const unsigned short lpc_ids[] = {
@ -295,7 +282,6 @@ static struct device_operations lpc_slave_ops = {
.write_acpi_tables = acpi_write_hpet, .write_acpi_tables = acpi_write_hpet,
#endif #endif
.init = lpc_slave_init, .init = lpc_slave_init,
// .enable = mcp55_enable,
.ops_pci = &mcp55_pci_ops, .ops_pci = &mcp55_pci_ops,
}; };

11
src/southbridge/nvidia/mcp55/mcp55.c
View file

@ -68,9 +68,7 @@ void mcp55_enable(device_t dev)
if (dev->device == 0x0000) { if (dev->device == 0x0000) {
vendorid = pci_read_config32(dev, PCI_VENDOR_ID); vendorid = pci_read_config32(dev, PCI_VENDOR_ID);
deviceid = (vendorid >> 16) & 0xffff; deviceid = (vendorid >> 16) & 0xffff;
// vendorid &= 0xffff;
} else { } else {
// vendorid = dev->vendor;
deviceid = dev->device; deviceid = dev->device;
} }
@ -200,15 +198,6 @@ void mcp55_enable(device_t dev)
| (1 << 11) | (1 << 10) | (1 << 9)); | (1 << 11) | (1 << 10) | (1 << 9));
pci_write_config32(sm_dev, 0xe8, final_reg); /* Enable all at first. */ pci_write_config32(sm_dev, 0xe8, final_reg); /* Enable all at first. */
#if 0
reg_old = reg = pci_read_config32(sm_dev, 0xe4);
// reg |= (1 << 0);
reg &= ~(0x3f << 4);
if (reg != reg_old) {
printk(BIOS_DEBUG, "mcp55.c pcie enabled\n");
pci_write_config32(sm_dev, 0xe4, reg);
}
#endif
} }
if (!dev->enabled) { if (!dev->enabled) {