[coreboot-gerrit] New patch to review for coreboot: b70a849 AGESA fam15: Drop code that was commented out
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Tue Jul 22 19:14:40 CEST 2014
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6331
-gerrit
commit b70a8490616a3837faff7f5b1c9cc158961fa737
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Tue Jul 15 16:19:08 2014 +0300
AGESA fam15: Drop code that was commented out
Only references to bus_rd890, bus_sp5100 and bus_sr5650 were
in code sections that had been commented out.
Change-Id: If5552c409ce948c494345f49dbaad790b398bff8
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/mainboard/amd/dinar/get_bus_conf.c | 16 +------------
src/mainboard/amd/dinar/mptable.c | 13 -----------
src/mainboard/supermicro/h8qgi/get_bus_conf.c | 33 +--------------------------
src/mainboard/supermicro/h8qgi/mptable.c | 13 -----------
src/mainboard/supermicro/h8scm/get_bus_conf.c | 33 +--------------------------
src/mainboard/supermicro/h8scm/mptable.c | 13 -----------
src/mainboard/tyan/s8226/get_bus_conf.c | 31 +------------------------
src/mainboard/tyan/s8226/mptable.c | 12 ----------
8 files changed, 4 insertions(+), 160 deletions(-)
diff --git a/src/mainboard/amd/dinar/get_bus_conf.c b/src/mainboard/amd/dinar/get_bus_conf.c
index fdf4b67..3104b73 100644
--- a/src/mainboard/amd/dinar/get_bus_conf.c
+++ b/src/mainboard/amd/dinar/get_bus_conf.c
@@ -31,7 +31,6 @@
* and acpi_tables busnum is default.
*/
u8 bus_sb700[2];
-u8 bus_rd890[14];
/*
* Here you only need to set value in pci1234 for HT-IO that could be installed or not
@@ -51,7 +50,6 @@ u32 hcdnx[] = {
};
u32 sbdn_sb700;
-u32 sbdn_rd890;
void get_bus_conf(void)
{
@@ -65,13 +63,9 @@ void get_bus_conf(void)
for (i = 0; i < ARRAY_SIZE(bus_sb700); i++) {
bus_sb700[i] = 0;
}
- for (i = 0; i < ARRAY_SIZE(bus_rd890); i++) {
- bus_rd890[i] = 0;
- }
- bus_rd890[0] = (pci1234x[0] >> 16) & 0xff;
- bus_sb700[0] = bus_rd890[0];
+ bus_sb700[0] = (pci1234x[0] >> 16) & 0xff;
/* sb700 */
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(sbdn_sb700 + 0x14, 4));
@@ -82,13 +76,5 @@ void get_bus_conf(void)
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
- /* rd890 */
- for (i = 1; i < ARRAY_SIZE(bus_rd890); i++) {
- dev = dev_find_slot(bus_rd890[0], PCI_DEVFN(sbdn_rd890 + i, 0));
- if (dev) {
- bus_rd890[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
- }
- }
-
printk(BIOS_DEBUG, "Mainboard - Get_bus_conf.c - get_bus_conf - End.\n");
}
diff --git a/src/mainboard/amd/dinar/mptable.c b/src/mainboard/amd/dinar/mptable.c
index 671cd37..398ee86 100644
--- a/src/mainboard/amd/dinar/mptable.c
+++ b/src/mainboard/amd/dinar/mptable.c
@@ -28,9 +28,7 @@
#include <cpu/x86/lapic.h>
#include <cpu/amd/amdfam15.h>
-extern u8 bus_rd890[14];
extern u8 bus_sb700[2];
-extern u32 sbdn_rd890;
extern u32 sbdn_sb700;
@@ -130,17 +128,6 @@ static void *smp_write_config_table(void *v)
/* SATA */
PCI_INT(0x0, 0x11, 0x0, 0x16); //6, INTG
- /* on board NIC & Slot PCIE. */
- /* configuration B doesnt need dev 5,6,7 */
- /*
- * PCI_INT(bus_rd890[0x5], 0x0, 0x0, 0x11);
- * PCI_INT(bus_rd890[0x6], 0x0, 0x0, 0x12);
- * PCI_INT(bus_rd890[0x7], 0x0, 0x0, 0x13);
- */
-
- //smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0, (((13)<<2)|(0)), apicid_rd890, 28); /* dev d */
- //smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, bus_rd890[13], (((0)<<2)|(1)), apicid_rd890, 0); /* card behind dev13 */
-
/* PCI slots */
/* PCI_SLOT 0. */
PCI_INT(bus_sb700[1], 0x5, 0x0, 0x14);
diff --git a/src/mainboard/supermicro/h8qgi/get_bus_conf.c b/src/mainboard/supermicro/h8qgi/get_bus_conf.c
index f604e21..549334e 100644
--- a/src/mainboard/supermicro/h8qgi/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8qgi/get_bus_conf.c
@@ -31,11 +31,6 @@
* and acpi_tables busnum is default.
*/
u8 bus_sp5100[2];
-u8 bus_sr5650[14];
-
-
-
-u32 sbdn_sr5650;
u32 sbdn_sp5100;
void get_bus_conf(void)
@@ -48,13 +43,8 @@ void get_bus_conf(void)
for (i = 0; i < ARRAY_SIZE(bus_sp5100); i++) {
bus_sp5100[i] = 0;
}
- for (i = 0; i < ARRAY_SIZE(bus_sr5650); i++) {
- bus_sr5650[i] = 0;
- }
-
- bus_sr5650[0] = 0;
- bus_sp5100[0] = bus_sr5650[0];
+ bus_sp5100[0] = 0;
/* sp5100 */
dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, 4));
@@ -62,25 +52,4 @@ void get_bus_conf(void)
if (dev) {
bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
-
- /* sr5650 */
- for (i = 1; i < ARRAY_SIZE(bus_sr5650); i++) {
- dev = dev_find_slot(bus_sr5650[0], PCI_DEVFN(sbdn_sr5650 + i, 0));
- if (dev) {
- bus_sr5650[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
- }
- }
-
-/*
- for (i = 0; i < 4; i++) {
- dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, i));
- if (dev) {
- bus_sp5100[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
- }
- }
-*/
-
-
- /* I/O APICs: APIC ID Version State Address */
-
}
diff --git a/src/mainboard/supermicro/h8qgi/mptable.c b/src/mainboard/supermicro/h8qgi/mptable.c
index 8a248cc..754ed54 100644
--- a/src/mainboard/supermicro/h8qgi/mptable.c
+++ b/src/mainboard/supermicro/h8qgi/mptable.c
@@ -28,9 +28,7 @@
#include <cpu/x86/lapic.h>
#include <cpu/amd/amdfam10_sysconf.h>
-extern u8 bus_sr5650[14];
extern u8 bus_sp5100[2];
-extern u32 sbdn_sr5650;
extern u32 sbdn_sp5100;
static void *smp_write_config_table(void *v)
@@ -144,17 +142,6 @@ static void *smp_write_config_table(void *v)
/* SATA */
PCI_INT(0x0, 0x11, 0x0, 0x16); //6, INTG
- /* on board NIC & Slot PCIE. */
- /* configuration B doesnt need dev 5,6,7 */
- /*
- * PCI_INT(bus_sr5650[0x5], 0x0, 0x0, 0x11);
- * PCI_INT(bus_sr5650[0x6], 0x0, 0x0, 0x12);
- * PCI_INT(bus_sr5650[0x7], 0x0, 0x0, 0x13);
- */
-
- //smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0, (((13)<<2)|(0)), apicid_sr5650, 28); /* dev d */
- //smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, bus_sr5650[13], (((0)<<2)|(1)), apicid_sr5650, 0); /* card behind dev13 */
-
/* PCI slots */
/* PCI_SLOT 0. */
PCI_INT(bus_sp5100[1], 0x5, 0x0, 0x14);
diff --git a/src/mainboard/supermicro/h8scm/get_bus_conf.c b/src/mainboard/supermicro/h8scm/get_bus_conf.c
index 3cae35a..28c4bf7 100644
--- a/src/mainboard/supermicro/h8scm/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8scm/get_bus_conf.c
@@ -31,11 +31,6 @@
* and acpi_tables busnum is default.
*/
u8 bus_sp5100[2];
-u8 bus_sr5650[14];
-
-
-
-u32 sbdn_sr5650;
u32 sbdn_sp5100;
void get_bus_conf(void)
@@ -48,13 +43,8 @@ void get_bus_conf(void)
for (i = 0; i < 0; i++) {
bus_sp5100[i] = 0;
}
- for (i = 0; i < ARRAY_SIZE(bus_sr5650); i++) {
- bus_sr5650[i] = 0;
- }
-
- bus_sr5650[0] = 0;
- bus_sp5100[0] = bus_sr5650[0];
+ bus_sp5100[0] = 0;
/* sp5100 */
dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, 4));
@@ -62,25 +52,4 @@ void get_bus_conf(void)
if (dev) {
bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
-
- /* sr5650 */
- for (i = 1; i < ARRAY_SIZE(bus_sr5650); i++) {
- dev = dev_find_slot(bus_sr5650[0], PCI_DEVFN(sbdn_sr5650 + i, 0));
- if (dev) {
- bus_sr5650[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
- }
- }
-
-/*
- for (i = 0; i < 4; i++) {
- dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, i));
- if (dev) {
- bus_sp5100[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
- }
- }
-*/
-
-
- /* I/O APICs: APIC ID Version State Address */
-
}
diff --git a/src/mainboard/supermicro/h8scm/mptable.c b/src/mainboard/supermicro/h8scm/mptable.c
index 8a248cc..754ed54 100644
--- a/src/mainboard/supermicro/h8scm/mptable.c
+++ b/src/mainboard/supermicro/h8scm/mptable.c
@@ -28,9 +28,7 @@
#include <cpu/x86/lapic.h>
#include <cpu/amd/amdfam10_sysconf.h>
-extern u8 bus_sr5650[14];
extern u8 bus_sp5100[2];
-extern u32 sbdn_sr5650;
extern u32 sbdn_sp5100;
static void *smp_write_config_table(void *v)
@@ -144,17 +142,6 @@ static void *smp_write_config_table(void *v)
/* SATA */
PCI_INT(0x0, 0x11, 0x0, 0x16); //6, INTG
- /* on board NIC & Slot PCIE. */
- /* configuration B doesnt need dev 5,6,7 */
- /*
- * PCI_INT(bus_sr5650[0x5], 0x0, 0x0, 0x11);
- * PCI_INT(bus_sr5650[0x6], 0x0, 0x0, 0x12);
- * PCI_INT(bus_sr5650[0x7], 0x0, 0x0, 0x13);
- */
-
- //smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0, (((13)<<2)|(0)), apicid_sr5650, 28); /* dev d */
- //smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, bus_sr5650[13], (((0)<<2)|(1)), apicid_sr5650, 0); /* card behind dev13 */
-
/* PCI slots */
/* PCI_SLOT 0. */
PCI_INT(bus_sp5100[1], 0x5, 0x0, 0x14);
diff --git a/src/mainboard/tyan/s8226/get_bus_conf.c b/src/mainboard/tyan/s8226/get_bus_conf.c
index 3cbe59c..7a6876b 100644
--- a/src/mainboard/tyan/s8226/get_bus_conf.c
+++ b/src/mainboard/tyan/s8226/get_bus_conf.c
@@ -30,11 +30,6 @@
* and acpi_tables busnum is default.
*/
u8 bus_sp5100[2];
-u8 bus_sr5650[14];
-
-
-
-u32 sbdn_sr5650;
u32 sbdn_sp5100;
void get_bus_conf(void);
@@ -49,13 +44,8 @@ void get_bus_conf(void)
for (i = 0; i < 0; i++) {
bus_sp5100[i] = 0;
}
- for (i = 0; i < ARRAY_SIZE(bus_sr5650); i++) {
- bus_sr5650[i] = 0;
- }
-
- bus_sr5650[0] = 0;
- bus_sp5100[0] = bus_sr5650[0];
+ bus_sp5100[0] = 0;
/* sp5100 */
dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, 4));
@@ -63,23 +53,4 @@ void get_bus_conf(void)
if (dev) {
bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
-
- /* sr5650 */
- for (i = 1; i < ARRAY_SIZE(bus_sr5650); i++) {
- dev = dev_find_slot(bus_sr5650[0], PCI_DEVFN(sbdn_sr5650 + i, 0));
- if (dev) {
- bus_sr5650[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
- }
- }
-
-/*
- for (i = 0; i < 4; i++) {
- dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, i));
- if (dev) {
- bus_sp5100[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
- }
- }
-*/
-
-
}
diff --git a/src/mainboard/tyan/s8226/mptable.c b/src/mainboard/tyan/s8226/mptable.c
index 8a248cc..6a12f2b 100644
--- a/src/mainboard/tyan/s8226/mptable.c
+++ b/src/mainboard/tyan/s8226/mptable.c
@@ -28,7 +28,6 @@
#include <cpu/x86/lapic.h>
#include <cpu/amd/amdfam10_sysconf.h>
-extern u8 bus_sr5650[14];
extern u8 bus_sp5100[2];
extern u32 sbdn_sr5650;
extern u32 sbdn_sp5100;
@@ -144,17 +143,6 @@ static void *smp_write_config_table(void *v)
/* SATA */
PCI_INT(0x0, 0x11, 0x0, 0x16); //6, INTG
- /* on board NIC & Slot PCIE. */
- /* configuration B doesnt need dev 5,6,7 */
- /*
- * PCI_INT(bus_sr5650[0x5], 0x0, 0x0, 0x11);
- * PCI_INT(bus_sr5650[0x6], 0x0, 0x0, 0x12);
- * PCI_INT(bus_sr5650[0x7], 0x0, 0x0, 0x13);
- */
-
- //smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0, (((13)<<2)|(0)), apicid_sr5650, 28); /* dev d */
- //smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, bus_sr5650[13], (((0)<<2)|(1)), apicid_sr5650, 0); /* card behind dev13 */
-
/* PCI slots */
/* PCI_SLOT 0. */
PCI_INT(bus_sp5100[1], 0x5, 0x0, 0x14);
More information about the coreboot-gerrit
mailing list