amdfam10 boards: Drop array bus_rs780
Values in the array are not used anywhere. Change-Id: I608b8c2e21bc515c56a27982815c1da43f3bb976 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/30637 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
@ -23,7 +23,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb800[6];
|
u8 bus_sb800[6];
|
||||||
u32 apicid_sb800;
|
u32 apicid_sb800;
|
||||||
|
|
||||||
@ -63,15 +62,8 @@ void get_bus_conf(void)
|
|||||||
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
|
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
|
||||||
|
|
||||||
memset(bus_sb800, 0, sizeof(bus_sb800));
|
memset(bus_sb800, 0, sizeof(bus_sb800));
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
|
||||||
bus_sb800[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
|
bus_sb800[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
|
|
||||||
/* sb800 */
|
/* sb800 */
|
||||||
dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -86,16 +78,6 @@ void get_bus_conf(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
if(255 != bus_rs780[i]) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb800[6];
|
u8 bus_sb800[6];
|
||||||
u32 apicid_sb800;
|
u32 apicid_sb800;
|
||||||
|
|
||||||
@ -64,13 +63,7 @@ void get_bus_conf(void)
|
|||||||
|
|
||||||
memset(bus_sb800, 0, sizeof(bus_sb800));
|
memset(bus_sb800, 0, sizeof(bus_sb800));
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
bus_sb800[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
|
||||||
bus_sb800[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
/* sb800 */
|
/* sb800 */
|
||||||
dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -85,16 +78,6 @@ void get_bus_conf(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
if(255 != bus_rs780[i]) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb700[2];
|
u8 bus_sb700[2];
|
||||||
u32 apicid_sb700;
|
u32 apicid_sb700;
|
||||||
|
|
||||||
@ -65,12 +64,8 @@ void get_bus_conf(void)
|
|||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
bus_sb700[i] = 0;
|
bus_sb700[i] = 0;
|
||||||
}
|
}
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
bus_sb700[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
bus_sb700[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
/* sb700 */
|
/* sb700 */
|
||||||
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -78,14 +73,6 @@ void get_bus_conf(void)
|
|||||||
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb700[2];
|
u8 bus_sb700[2];
|
||||||
u32 apicid_sb700;
|
u32 apicid_sb700;
|
||||||
|
|
||||||
@ -65,12 +64,8 @@ void get_bus_conf(void)
|
|||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
bus_sb700[i] = 0;
|
bus_sb700[i] = 0;
|
||||||
}
|
}
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
bus_sb700[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
bus_sb700[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
/* sb700 */
|
/* sb700 */
|
||||||
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -78,14 +73,6 @@ void get_bus_conf(void)
|
|||||||
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb700[2];
|
u8 bus_sb700[2];
|
||||||
u32 apicid_sb700;
|
u32 apicid_sb700;
|
||||||
|
|
||||||
@ -65,12 +64,8 @@ void get_bus_conf(void)
|
|||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
bus_sb700[i] = 0;
|
bus_sb700[i] = 0;
|
||||||
}
|
}
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
bus_sb700[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
bus_sb700[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
/* sb700 */
|
/* sb700 */
|
||||||
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -78,14 +73,6 @@ void get_bus_conf(void)
|
|||||||
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb700[2];
|
u8 bus_sb700[2];
|
||||||
u32 apicid_sb700;
|
u32 apicid_sb700;
|
||||||
|
|
||||||
@ -65,12 +64,8 @@ void get_bus_conf(void)
|
|||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
bus_sb700[i] = 0;
|
bus_sb700[i] = 0;
|
||||||
}
|
}
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
bus_sb700[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
bus_sb700[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
/* sb700 */
|
/* sb700 */
|
||||||
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -78,14 +73,6 @@ void get_bus_conf(void)
|
|||||||
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb800[6];
|
u8 bus_sb800[6];
|
||||||
u32 apicid_sb800;
|
u32 apicid_sb800;
|
||||||
|
|
||||||
@ -64,14 +63,7 @@ void get_bus_conf(void)
|
|||||||
|
|
||||||
memset(bus_sb800, 0, sizeof(bus_sb800));
|
memset(bus_sb800, 0, sizeof(bus_sb800));
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
bus_sb800[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
|
||||||
bus_sb800[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
|
|
||||||
/* sb800 */
|
/* sb800 */
|
||||||
dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -86,16 +78,6 @@ void get_bus_conf(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
if(255 != bus_rs780[i]) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb800[6];
|
u8 bus_sb800[6];
|
||||||
u32 apicid_sb800;
|
u32 apicid_sb800;
|
||||||
|
|
||||||
@ -64,14 +63,7 @@ void get_bus_conf(void)
|
|||||||
|
|
||||||
memset(bus_sb800, 0, sizeof(bus_sb800));
|
memset(bus_sb800, 0, sizeof(bus_sb800));
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
bus_sb800[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
|
||||||
bus_sb800[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
|
|
||||||
/* sb800 */
|
/* sb800 */
|
||||||
dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -86,16 +78,6 @@ void get_bus_conf(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
if(255 != bus_rs780[i]) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb700[2];
|
u8 bus_sb700[2];
|
||||||
u32 apicid_sb700;
|
u32 apicid_sb700;
|
||||||
|
|
||||||
@ -65,12 +64,8 @@ void get_bus_conf(void)
|
|||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
bus_sb700[i] = 0;
|
bus_sb700[i] = 0;
|
||||||
}
|
}
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
bus_sb700[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
bus_sb700[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
/* sb700 */
|
/* sb700 */
|
||||||
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -78,14 +73,6 @@ void get_bus_conf(void)
|
|||||||
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb700[2];
|
u8 bus_sb700[2];
|
||||||
u32 apicid_sb700;
|
u32 apicid_sb700;
|
||||||
|
|
||||||
@ -65,12 +64,8 @@ void get_bus_conf(void)
|
|||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
bus_sb700[i] = 0;
|
bus_sb700[i] = 0;
|
||||||
}
|
}
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
bus_sb700[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
bus_sb700[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
/* sb700 */
|
/* sb700 */
|
||||||
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -78,14 +73,6 @@ void get_bus_conf(void)
|
|||||||
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb700[2];
|
u8 bus_sb700[2];
|
||||||
u32 apicid_sb700;
|
u32 apicid_sb700;
|
||||||
|
|
||||||
@ -65,12 +64,8 @@ void get_bus_conf(void)
|
|||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
bus_sb700[i] = 0;
|
bus_sb700[i] = 0;
|
||||||
}
|
}
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
bus_sb700[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
bus_sb700[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
/* sb700 */
|
/* sb700 */
|
||||||
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -78,14 +73,6 @@ void get_bus_conf(void)
|
|||||||
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb700[2];
|
u8 bus_sb700[2];
|
||||||
u32 apicid_sb700;
|
u32 apicid_sb700;
|
||||||
|
|
||||||
@ -65,12 +64,8 @@ void get_bus_conf(void)
|
|||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
bus_sb700[i] = 0;
|
bus_sb700[i] = 0;
|
||||||
}
|
}
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
bus_sb700[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
bus_sb700[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
/* sb700 */
|
/* sb700 */
|
||||||
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -78,14 +73,6 @@ void get_bus_conf(void)
|
|||||||
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
static u8 bus_rs780[11];
|
|
||||||
u8 bus_sb700[2];
|
u8 bus_sb700[2];
|
||||||
u32 apicid_sb700;
|
u32 apicid_sb700;
|
||||||
|
|
||||||
@ -65,12 +64,8 @@ void get_bus_conf(void)
|
|||||||
for (i = 0; i < 2; i++) {
|
for (i = 0; i < 2; i++) {
|
||||||
bus_sb700[i] = 0;
|
bus_sb700[i] = 0;
|
||||||
}
|
}
|
||||||
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
bus_rs780[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
bus_rs780[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
bus_sb700[0] = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
bus_sb700[0] = bus_rs780[0];
|
|
||||||
|
|
||||||
/* sb700 */
|
/* sb700 */
|
||||||
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
|
||||||
@ -78,14 +73,6 @@ void get_bus_conf(void)
|
|||||||
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* rs780 */
|
|
||||||
for (i = 1; i < ARRAY_SIZE(bus_rs780); i++) {
|
|
||||||
dev = dev_find_slot(bus_rs780[0], PCI_DEVFN(sysconf.sbdn + i, 0));
|
|
||||||
if (dev) {
|
|
||||||
bus_rs780[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
/* I/O APICs: APIC ID Version State Address */
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
||||||
apicid_base = get_apicid_base(1);
|
apicid_base = get_apicid_base(1);
|
||||||
|
Reference in New Issue
Block a user