<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25872">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/southbridge/sis/sis966/nic.c: Improve code formatting<br><br>Change-Id: If4f3d3ed43fca1bff52ea99cc3eab29beb4e2a08<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/southbridge/sis/sis966/nic.c<br>1 file changed, 71 insertions(+), 73 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/25872/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/southbridge/sis/sis966/nic.c b/src/southbridge/sis/sis966/nic.c</span><br><span>index 448514b..ce5804c 100644</span><br><span>--- a/src/southbridge/sis/sis966/nic.c</span><br><span>+++ b/src/southbridge/sis/sis966/nic.c</span><br><span>@@ -30,36 +30,36 @@</span><br><span> #include "sis966.h"</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-u8 SiS_SiS191_init[6][3]={</span><br><span style="color: hsl(0, 100%, 40%);">-{0x04, 0xFF, 0x07},</span><br><span style="color: hsl(0, 100%, 40%);">-{0x2C, 0xFF, 0x39},</span><br><span style="color: hsl(0, 100%, 40%);">-{0x2D, 0xFF, 0x10},</span><br><span style="color: hsl(0, 100%, 40%);">-{0x2E, 0xFF, 0x91},</span><br><span style="color: hsl(0, 100%, 40%);">-{0x2F, 0xFF, 0x01},</span><br><span style="color: hsl(0, 100%, 40%);">-{0x00, 0x00, 0x00} //End of table</span><br><span style="color: hsl(120, 100%, 40%);">+u8 SiS_SiS191_init[6][3]={</span><br><span style="color: hsl(120, 100%, 40%);">+ {0x04, 0xFF, 0x07},</span><br><span style="color: hsl(120, 100%, 40%);">+ {0x2C, 0xFF, 0x39},</span><br><span style="color: hsl(120, 100%, 40%);">+ {0x2D, 0xFF, 0x10},</span><br><span style="color: hsl(120, 100%, 40%);">+ {0x2E, 0xFF, 0x91},</span><br><span style="color: hsl(120, 100%, 40%);">+ {0x2F, 0xFF, 0x01},</span><br><span style="color: hsl(120, 100%, 40%);">+ {0x00, 0x00, 0x00} //End of table</span><br><span> };</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define StatusReg 0x1</span><br><span style="color: hsl(120, 100%, 40%);">+#define StatusReg 0x1</span><br><span> #define SMI_READ 0x0</span><br><span> #define SMI_REQUEST 0x10</span><br><span style="color: hsl(0, 100%, 40%);">-#define TRUE 1</span><br><span style="color: hsl(0, 100%, 40%);">-#define FALSE 0</span><br><span style="color: hsl(120, 100%, 40%);">+#define TRUE 1</span><br><span style="color: hsl(120, 100%, 40%);">+#define FALSE 0</span><br><span> </span><br><span> u16 MacAddr[3];</span><br><span> </span><br><span> </span><br><span> static void writeApcByte(int addr, u8 value)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- outb(addr,0x78);</span><br><span style="color: hsl(0, 100%, 40%);">- outb(value,0x79);</span><br><span style="color: hsl(120, 100%, 40%);">+ outb(addr, 0x78);</span><br><span style="color: hsl(120, 100%, 40%);">+ outb(value, 0x79);</span><br><span> }</span><br><span> </span><br><span> static u8 readApcByte(int addr)</span><br><span> {</span><br><span> u8 value;</span><br><span style="color: hsl(0, 100%, 40%);">- outb(addr,0x78);</span><br><span style="color: hsl(0, 100%, 40%);">- value=inb(0x79);</span><br><span style="color: hsl(120, 100%, 40%);">+ outb(addr, 0x78);</span><br><span style="color: hsl(120, 100%, 40%);">+ value = inb(0x79);</span><br><span> return(value);</span><br><span> }</span><br><span> </span><br><span>@@ -69,52 +69,52 @@</span><br><span> </span><br><span> // enable APC in south bridge sis966 D2F0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- outl(0x80001048,0xcf8);</span><br><span style="color: hsl(0, 100%, 40%);">- outl((inl(0xcfc) & 0xfffffffd),0xcfc ); // enable IO78/79h for APC Index/Data</span><br><span style="color: hsl(120, 100%, 40%);">+ outl(0x80001048, 0xcf8);</span><br><span style="color: hsl(120, 100%, 40%);">+ outl((inl(0xcfc) & 0xfffffffd), 0xcfc ); // enable IO78/79h for APC Index/Data</span><br><span> </span><br><span> printk(BIOS_DEBUG, "MAC addr in APC = ");</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0x9; i <=0xe; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0x9; i <= 0xe; i++) {</span><br><span> printk(BIOS_DEBUG, "%2.2x",readApcByte(i));</span><br><span> }</span><br><span> printk(BIOS_DEBUG, "\n");</span><br><span> </span><br><span> /* Set APC Reload */</span><br><span style="color: hsl(0, 100%, 40%);">- writeApcByte(0x7,readApcByte(0x7)&0xf7);</span><br><span style="color: hsl(0, 100%, 40%);">- writeApcByte(0x7,readApcByte(0x7)|0x0a);</span><br><span style="color: hsl(120, 100%, 40%);">+ writeApcByte(0x7, readApcByte(0x7) & 0xf7);</span><br><span style="color: hsl(120, 100%, 40%);">+ writeApcByte(0x7, readApcByte(0x7) | 0x0a);</span><br><span> </span><br><span> /* disable APC in south bridge */</span><br><span style="color: hsl(0, 100%, 40%);">- outl(0x80001048,0xcf8);</span><br><span style="color: hsl(0, 100%, 40%);">- outl(inl(0xcfc)&0xffffffbf,0xcfc);</span><br><span style="color: hsl(120, 100%, 40%);">+ outl(0x80001048, 0xcf8);</span><br><span style="color: hsl(120, 100%, 40%);">+ outl(inl(0xcfc) & 0xffffffbf, 0xcfc);</span><br><span> }</span><br><span> </span><br><span> static void set_apc(struct device *dev)</span><br><span> {</span><br><span> u16 addr;</span><br><span> u16 i;</span><br><span style="color: hsl(0, 100%, 40%);">- u8 bTmp;</span><br><span style="color: hsl(120, 100%, 40%);">+ u8 bTmp;</span><br><span> </span><br><span> /* enable APC in south bridge sis966 D2F0 */</span><br><span style="color: hsl(0, 100%, 40%);">- outl(0x80001048,0xcf8);</span><br><span style="color: hsl(0, 100%, 40%);">- outl((inl(0xcfc) & 0xfffffffd),0xcfc ); // enable IO78/79h for APC Index/Data</span><br><span style="color: hsl(120, 100%, 40%);">+ outl(0x80001048, 0xcf8);</span><br><span style="color: hsl(120, 100%, 40%);">+ outl((inl(0xcfc) & 0xfffffffd), 0xcfc ); // enable IO78/79h for APC Index/Data</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i <3; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- addr=0x9+2*i;</span><br><span style="color: hsl(0, 100%, 40%);">- writeApcByte(addr,(u8)(MacAddr[i]&0xFF));</span><br><span style="color: hsl(0, 100%, 40%);">- writeApcByte(addr+1L,(u8)((MacAddr[i]>>8)&0xFF));</span><br><span style="color: hsl(0, 100%, 40%);">- // printf("%x - ",readMacAddrByte(0x59+i));</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 3; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ addr=0x9 + 2*i;</span><br><span style="color: hsl(120, 100%, 40%);">+ writeApcByte(addr, (u8)(MacAddr[i] & 0xFF));</span><br><span style="color: hsl(120, 100%, 40%);">+ writeApcByte(addr+1L, (u8)((MacAddr[i] >> 8) & 0xFF));</span><br><span style="color: hsl(120, 100%, 40%);">+ // printf("%x - ",readMacAddrByte(0x59 + i));</span><br><span> }</span><br><span> </span><br><span> /* Set APC Reload */</span><br><span style="color: hsl(0, 100%, 40%);">- writeApcByte(0x7,readApcByte(0x7)&0xf7);</span><br><span style="color: hsl(0, 100%, 40%);">- writeApcByte(0x7,readApcByte(0x7)|0x0a);</span><br><span style="color: hsl(120, 100%, 40%);">+ writeApcByte(0x7, readApcByte(0x7) & 0xf7);</span><br><span style="color: hsl(120, 100%, 40%);">+ writeApcByte(0x7, readApcByte(0x7) | 0x0a);</span><br><span> </span><br><span> /* disable APC in south bridge */</span><br><span style="color: hsl(0, 100%, 40%);">- outl(0x80001048,0xcf8);</span><br><span style="color: hsl(0, 100%, 40%);">- outl(inl(0xcfc)&0xffffffbf,0xcfc);</span><br><span style="color: hsl(120, 100%, 40%);">+ outl(0x80001048, 0xcf8);</span><br><span style="color: hsl(120, 100%, 40%);">+ outl(inl(0xcfc) & 0xffffffbf, 0xcfc);</span><br><span> </span><br><span> // CFG reg0x73 bit=1, tell driver MAC Address load to APC</span><br><span> bTmp = pci_read_config8(dev, 0x73);</span><br><span style="color: hsl(0, 100%, 40%);">- bTmp|=0x1;</span><br><span style="color: hsl(120, 100%, 40%);">+ bTmp |= 0x1;</span><br><span> pci_write_config8(dev, 0x73, bTmp);</span><br><span> }</span><br><span> </span><br><span>@@ -127,13 +127,13 @@</span><br><span> * @return Contents of EEPROM word (Reg).</span><br><span> */</span><br><span> #define LoopNum 200</span><br><span style="color: hsl(0, 100%, 40%);">-static unsigned long ReadEEprom( struct device *dev, u8 *base, u32 Reg)</span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned long ReadEEprom(struct device *dev, u8 *base, u32 Reg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- u32 data;</span><br><span style="color: hsl(0, 100%, 40%);">- u32 i;</span><br><span style="color: hsl(0, 100%, 40%);">- u32 ulValue;</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 data;</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 i;</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 ulValue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ulValue = (0x80 | (0x2 << 8) | (Reg << 10)); //BIT_7</span><br><span style="color: hsl(120, 100%, 40%);">+ ulValue = (0x80 | (0x2 << 8) | (Reg << 10)); //BIT_7</span><br><span> </span><br><span> write32(base + 0x3c, ulValue);</span><br><span> </span><br><span>@@ -150,7 +150,8 @@</span><br><span> </span><br><span> mdelay(50);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (i==LoopNum) data=0x10000;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (i == LoopNum)</span><br><span style="color: hsl(120, 100%, 40%);">+ data = 0x10000;</span><br><span> else {</span><br><span> ulValue=read32(base + 0x3c);</span><br><span> data = ((ulValue & 0xffff0000) >> 16);</span><br><span>@@ -161,9 +162,9 @@</span><br><span> </span><br><span> static int phy_read(u8 *base, unsigned phy_addr, unsigned phy_reg)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- u32 ulValue;</span><br><span style="color: hsl(0, 100%, 40%);">- u32 Read_Cmd;</span><br><span style="color: hsl(0, 100%, 40%);">- u16 usData;</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 ulValue;</span><br><span style="color: hsl(120, 100%, 40%);">+ u32 Read_Cmd;</span><br><span style="color: hsl(120, 100%, 40%);">+ u16 usData;</span><br><span> </span><br><span> Read_Cmd = ((phy_reg << 11) |</span><br><span> (phy_addr << 6) |</span><br><span>@@ -180,7 +181,7 @@</span><br><span> ulValue = read32(base + 0x44);</span><br><span> } while ((ulValue & SMI_REQUEST) != 0);</span><br><span> //printk(BIOS_DEBUG, "base %x cmd %lx ret val %lx\n", tmp,Read_Cmd,ulValue);</span><br><span style="color: hsl(0, 100%, 40%);">- usData=(ulValue>>16);</span><br><span style="color: hsl(120, 100%, 40%);">+ usData = (ulValue >> 16);</span><br><span> </span><br><span> return usData;</span><br><span> }</span><br><span>@@ -189,28 +190,26 @@</span><br><span> // If there exist a valid PHY then return TRUE, else return FALSE</span><br><span> static int phy_detect(u8 *base,u16 *PhyAddr) //BOOL PHY_Detect()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int bFoundPhy = FALSE;</span><br><span style="color: hsl(0, 100%, 40%);">- u16 usData;</span><br><span style="color: hsl(0, 100%, 40%);">- int PhyAddress = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ int bFoundPhy = FALSE;</span><br><span style="color: hsl(120, 100%, 40%);">+ u16 usData;</span><br><span style="color: hsl(120, 100%, 40%);">+ int PhyAddress = 0;</span><br><span> </span><br><span> </span><br><span> // Scan all PHY address(0 ~ 31) to find a valid PHY</span><br><span> for (PhyAddress = 0; PhyAddress < 32; PhyAddress++) {</span><br><span style="color: hsl(0, 100%, 40%);">- usData=phy_read(base,PhyAddress,StatusReg); // Status register is a PHY's register(offset 01h)</span><br><span style="color: hsl(120, 100%, 40%);">+ usData = phy_read(base,PhyAddress,StatusReg); // Status register is a PHY's register(offset 01h)</span><br><span> </span><br><span> // Found a valid PHY</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if ((usData != 0x0) && (usData != 0xffff)) {</span><br><span> bFoundPhy = TRUE;</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!bFoundPhy) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bFoundPhy)</span><br><span> printk(BIOS_DEBUG, "PHY not found !!!!\n");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- *PhyAddr=PhyAddress;</span><br><span style="color: hsl(120, 100%, 40%);">+ *PhyAddr = PhyAddress;</span><br><span> </span><br><span> return bFoundPhy;</span><br><span> }</span><br><span>@@ -227,8 +226,8 @@</span><br><span> </span><br><span> //-------------- enable NIC (SiS19x) -------------------------</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- u8 temp8;</span><br><span style="color: hsl(0, 100%, 40%);">- int i=0;</span><br><span style="color: hsl(120, 100%, 40%);">+ u8 temp8;</span><br><span style="color: hsl(120, 100%, 40%);">+ int i = 0;</span><br><span> while (SiS_SiS191_init[i][0] != 0) {</span><br><span> temp8 = pci_read_config8(dev, SiS_SiS191_init[i][0]);</span><br><span> temp8 &= SiS_SiS191_init[i][1];</span><br><span>@@ -240,7 +239,7 @@</span><br><span> //-----------------------------------------------------------</span><br><span> </span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned long i;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned long i;</span><br><span> unsigned long ulValue;</span><br><span> </span><br><span> res = find_resource(dev, 0x10);</span><br><span>@@ -252,34 +251,35 @@</span><br><span> base = res2mmio(res, 0, 0);</span><br><span> printk(BIOS_DEBUG, "NIC base address %p\n",base);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!(val=phy_detect(base,&PhyAddr))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(val = phy_detect(base, &PhyAddr))) {</span><br><span> printk(BIOS_DEBUG, "PHY detect fail !!!!\n");</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ulValue=read32(base + 0x38L); // check EEPROM existing</span><br><span style="color: hsl(120, 100%, 40%);">+ ulValue = read32(base + 0x38L); // check EEPROM existing</span><br><span> </span><br><span> if ((ulValue & 0x0002)) {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- // read MAC address from EEPROM at first</span><br><span style="color: hsl(120, 100%, 40%);">+ // read MAC address from EEPROM at first</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- // if that is valid we will use that</span><br><span style="color: hsl(120, 100%, 40%);">+ // if that is valid we will use that</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_DEBUG, "EEPROM contents %lx\n",ReadEEprom( dev, base, 0LL));</span><br><span style="color: hsl(0, 100%, 40%);">- for (i=0;i<3;i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_DEBUG, "EEPROM contents %lx\n",ReadEEprom(dev, base, 0LL));</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 3; i++) {</span><br><span> //status = smbus_read_byte(dev_eeprom, i);</span><br><span style="color: hsl(0, 100%, 40%);">- ulValue=ReadEEprom( dev, base, i+3L);</span><br><span style="color: hsl(0, 100%, 40%);">- if (ulValue ==0x10000) break; // error</span><br><span style="color: hsl(120, 100%, 40%);">+ ulValue = ReadEEprom(dev, base, i+3L);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ulValue == 0x10000)</span><br><span style="color: hsl(120, 100%, 40%);">+ break; // error</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- MacAddr[i] =ulValue & 0xFFFF;</span><br><span style="color: hsl(120, 100%, 40%);">+ MacAddr[i] = ulValue & 0xFFFF;</span><br><span> </span><br><span> }</span><br><span> } else {</span><br><span> // read MAC address from firmware</span><br><span> printk(BIOS_DEBUG, "EEPROM invalid!!\nReg 0x38h=%.8lx\n",ulValue);</span><br><span style="color: hsl(0, 100%, 40%);">- MacAddr[0]=read16((u16 *)0xffffffc0); // mac address store at here</span><br><span style="color: hsl(0, 100%, 40%);">- MacAddr[1]=read16((u16 *)0xffffffc2);</span><br><span style="color: hsl(0, 100%, 40%);">- MacAddr[2]=read16((u16 *)0xffffffc4);</span><br><span style="color: hsl(120, 100%, 40%);">+ MacAddr[0] = read16((u16 *)0xffffffc0); // mac address store at here</span><br><span style="color: hsl(120, 100%, 40%);">+ MacAddr[1] = read16((u16 *)0xffffffc2);</span><br><span style="color: hsl(120, 100%, 40%);">+ MacAddr[2] = read16((u16 *)0xffffffc4);</span><br><span> }</span><br><span> </span><br><span> set_apc(dev);</span><br><span>@@ -293,15 +293,14 @@</span><br><span> printk(BIOS_DEBUG, "****** NIC PCI config ******");</span><br><span> printk(BIOS_DEBUG, "\n 03020100 07060504 0B0A0908 0F0E0D0C");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (i=0;i<0xff;i+=4) {</span><br><span style="color: hsl(0, 100%, 40%);">- if ((i%16)==0)</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i=0; i< 0xff; i+=4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((i%16) == 0)</span><br><span> printk(BIOS_DEBUG, "\n%02x: ", i);</span><br><span style="color: hsl(0, 100%, 40%);">- printk(BIOS_DEBUG, "%08x ", pci_read_config32(dev,i));</span><br><span style="color: hsl(120, 100%, 40%);">+ printk(BIOS_DEBUG, "%08x ", pci_read_config32(dev, i));</span><br><span> }</span><br><span> printk(BIOS_DEBUG, "\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #endif</span><br><span> </span><br><span> }</span><br><span>@@ -309,7 +308,6 @@</span><br><span> printk(BIOS_DEBUG, "NIC_INIT:<----------\n");</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> }</span><br><span> </span><br><span> static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span>@@ -322,7 +320,7 @@</span><br><span> .set_subsystem = lpci_set_subsystem,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct device_operations nic_ops = {</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device_operations nic_ops = {</span><br><span> .read_resources = pci_dev_read_resources,</span><br><span> .set_resources = pci_dev_set_resources,</span><br><span> .enable_resources = pci_dev_enable_resources,</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25872">change 25872</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/25872"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If4f3d3ed43fca1bff52ea99cc3eab29beb4e2a08 </div>
<div style="display:none"> Gerrit-Change-Number: 25872 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>