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

southbridge/broadcom: Remove spaces before/after parenthesis 

Change-Id: Ic43b5ddaa395658ab7c34cdd004516884a20b005
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/25875
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Elyes HAOUAS 2018-04-26 19:30:55 +02:00 committed by Patrick Georgi
parent f98a5d6a32
commit f46810171a
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/southbridge/broadcom/bcm5785/bcm5785.c
View File

@ -29,14 +29,14 @@ void bcm5785_enable(device_t dev)
/* See if we are on the behind the pcix bridge */ /* See if we are on the behind the pcix bridge */
bus_dev = dev->bus->dev; bus_dev = dev->bus->dev;
if ((bus_dev->vendor == PCI_VENDOR_ID_SERVERWORKS) && if ((bus_dev->vendor == PCI_VENDOR_ID_SERVERWORKS) &&
(bus_dev->device == 0x0036 )) // device under PCI-X Bridge (bus_dev->device == 0x0036)) // device under PCI-X Bridge
{ {
unsigned devfn; unsigned devfn;
devfn = bus_dev->path.pci.devfn + (1 << 3); devfn = bus_dev->path.pci.devfn + (1 << 3);
sb_pci_main_dev = dev_find_slot(bus_dev->bus->secondary, devfn); sb_pci_main_dev = dev_find_slot(bus_dev->bus->secondary, devfn);
// index = ((dev->path.pci.devfn & ~7) >> 3) + 8; // index = ((dev->path.pci.devfn & ~7) >> 3) + 8;
} else if ((bus_dev->vendor == PCI_VENDOR_ID_SERVERWORKS) && } else if ((bus_dev->vendor == PCI_VENDOR_ID_SERVERWORKS) &&
(bus_dev->device == 0x0104)) // device under PCI Bridge( under PCI-X ) (bus_dev->device == 0x0104)) // device under PCI Bridge (under PCI-X)
{ {
unsigned devfn; unsigned devfn;
devfn = bus_dev->bus->dev->path.pci.devfn + (1 << 3); devfn = bus_dev->bus->dev->path.pci.devfn + (1 << 3);
@ -46,7 +46,7 @@ void bcm5785_enable(device_t dev)
else { // same bus else { // same bus
unsigned devfn; unsigned devfn;
devfn = (dev->path.pci.devfn) & ~7; devfn = (dev->path.pci.devfn) & ~7;
if ( dev->vendor == PCI_VENDOR_ID_SERVERWORKS ) { if (dev->vendor == PCI_VENDOR_ID_SERVERWORKS) {
if (dev->device == 0x0036) //PCI-X Bridge if (dev->device == 0x0036) //PCI-X Bridge
{ devfn += (1<<3); } { devfn += (1<<3); }
else if (dev->device == 0x0223) // USB else if (dev->device == 0x0223) // USB

8
src/southbridge/broadcom/bcm5785/sata.c
View File

@ -42,13 +42,13 @@ static void sata_init(struct device *dev)
write32(mmio_base + 0x10f0, 0x40000001); write32(mmio_base + 0x10f0, 0x40000001);
write32(mmio_base + 0x8c, 0x00ff2007); write32(mmio_base + 0x8c, 0x00ff2007);
mdelay( 10 ); mdelay(10);
write32(mmio_base + 0x8c, 0x78592009); write32(mmio_base + 0x8c, 0x78592009);
mdelay( 10 ); mdelay(10);
write32(mmio_base + 0x8c, 0x00082004); write32(mmio_base + 0x8c, 0x00082004);
mdelay( 10 ); mdelay(10);
write32(mmio_base + 0x8c, 0x00002004); write32(mmio_base + 0x8c, 0x00002004);
mdelay( 10 ); mdelay(10);
//init PHY //init PHY

4
src/southbridge/broadcom/bcm5785/sb_pci_main.c
View File

@ -43,9 +43,9 @@ static void sb_init(device_t dev)
if (nmi_option) { if (nmi_option) {
byte &= ~(1 << 7); /* set NMI */ byte &= ~(1 << 7); /* set NMI */
} else { } else {
byte |= ( 1 << 7); // Can not mask NMI from PCI-E and NMI_NOW byte |= (1 << 7); // Can not mask NMI from PCI-E and NMI_NOW
} }
if ( byte != byte_old) { if (byte != byte_old) {
outb(byte, 0x70); outb(byte, 0x70);
} }

4
src/southbridge/broadcom/bcm5785/smbus.h
View File

@ -66,10 +66,10 @@ static int smbus_wait_until_done(unsigned smbus_io_base)
val = inb(smbus_io_base + SMBHSTSTAT); val = inb(smbus_io_base + SMBHSTSTAT);
val &= 0x1f; // mask off reserved bits val &= 0x1f; // mask off reserved bits
if ( val & 0x1c) { if (val & 0x1c) {
return -5; // error return -5; // error
} }
if ( val == 0x02) { if (val == 0x02) {
outb(val, smbus_io_base + SMBHSTSTAT); // clear status outb(val, smbus_io_base + SMBHSTSTAT); // clear status
return 0; // return 0; //
} }