printk_foo -> printk(BIOS_FOO, ...)
[coreboot.git] / src / southbridge / sis / sis966 / sis966_nic.c
index 632c5133ccee60e3bb6362d7c8f929e0cc5ba930..62017360e74861c3513b8d147447270ef2b527a9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the coreboot project.
  *
  * Copyright (C) 2004 Tyan Computer
  * Written by Yinghai Lu <yhlu@tyan.com> for Tyan Computer.
@@ -75,12 +75,12 @@ static void readApcMacAddr(void)
     outl(0x80001048,0xcf8);
     outl((inl(0xcfc) & 0xfffffffd),0xcfc ); // enable IO78/79h for APC Index/Data
 
-    printk_debug("MAC addr in APC = ");
+    printk(BIOS_DEBUG, "MAC addr in APC = ");
     for(i = 0x9 ; i <=0xe ; i++)
     {
-        printk_debug("%2.2x",readApcByte(i));
+        printk(BIOS_DEBUG, "%2.2x",readApcByte(i));
     }
-    printk_debug("\n");
+    printk(BIOS_DEBUG, "\n");
 
     /* Set APC Reload */
     writeApcByte(0x7,readApcByte(0x7)&0xf7);
@@ -93,9 +93,7 @@ static void readApcMacAddr(void)
 
 static void set_apc(struct device *dev)
 {
-    uint32_t tmp;
     uint16_t addr;
-    uint32_t idx;
     uint16_t i;
     uint8_t   bTmp;
 
@@ -139,20 +137,20 @@ static void set_apc(struct device *dev)
 #define LoopNum 200
 static  unsigned long ReadEEprom( struct device *dev,  uint32_t base,  uint32_t Reg)
 {
-    uint16_t   data;
+    uint32_t   data;
     uint32_t   i;
     uint32_t   ulValue;
 
 
     ulValue = (0x80 | (0x2 << 8) | (Reg << 10));  //BIT_7
 
-    writel( ulValue,base+0x3c);
+    write32(base+0x3c, ulValue);
 
     mdelay(10);
 
     for(i=0 ; i <= LoopNum; i++)
     {
-        ulValue=readl(base+0x3c);
+        ulValue=read32(base+0x3c);
 
         if(!(ulValue & 0x0080)) //BIT_7
             break;
@@ -164,8 +162,8 @@ static  unsigned long ReadEEprom( struct device *dev,  uint32_t base,  uint32_t
 
     if(i==LoopNum)   data=0x10000;
     else{
-       ulValue=readl(base+0x3c);
-       data = (uint16_t)((ulValue & 0xffff0000) >> 16);
+       ulValue=read32(base+0x3c);
+       data = ((ulValue & 0xffff0000) >> 16);
     }
 
     return data;
@@ -174,11 +172,9 @@ static  unsigned long ReadEEprom( struct device *dev,  uint32_t base,  uint32_t
 static int phy_read(uint32_t  base, unsigned phy_addr, unsigned phy_reg)
 {
     uint32_t   ulValue;
-    unsigned  loop = 0x100;
     uint32_t   Read_Cmd;
     uint16_t   usData;
 
-    uint16_t   tmp;
 
 
           Read_Cmd = ((phy_reg << 11) |
@@ -187,19 +183,16 @@ static int phy_read(uint32_t  base, unsigned phy_addr, unsigned phy_reg)
                       SMI_REQUEST);
 
            // SmiMgtInterface Reg is the SMI management interface register(offset 44h) of MAC
-          writel( Read_Cmd,base+0x44);
-          //outl( Read_Cmd,tmp+0x44);
+          write32(base+0x44, Read_Cmd);
 
            // Polling SMI_REQ bit to be deasserted indicated read command completed
            do
            {
               // Wait 20 usec before checking status
-              //StallAndWait(20);
                   mdelay(20);
-              ulValue = readl(base+0x44);
-              //ulValue = inl(tmp+0x44);
+              ulValue = read32(base+0x44);
            } while((ulValue & SMI_REQUEST) != 0);
-            //printk_debug("base %x cmd %lx ret val %lx\n", tmp,Read_Cmd,ulValue);
+            //printk(BIOS_DEBUG, "base %x cmd %lx ret val %lx\n", tmp,Read_Cmd,ulValue);
            usData=(ulValue>>16);
 
 
@@ -213,7 +206,6 @@ static int phy_read(uint32_t  base, unsigned phy_addr, unsigned phy_reg)
 static int phy_detect(uint32_t base,uint16_t *PhyAddr) //BOOL PHY_Detect()
 {
     int                      bFoundPhy = FALSE;
-    uint32_t           Read_Cmd;
     uint16_t           usData;
     int                       PhyAddress = 0;
 
@@ -235,7 +227,7 @@ static int phy_detect(uint32_t base,uint16_t *PhyAddr) //BOOL PHY_Detect()
 
        if(!bFoundPhy)
        {
-           printk_debug("PHY not found !!!! \n");
+           printk(BIOS_DEBUG, "PHY not found !!!! \n");
        }
 
        *PhyAddr=PhyAddress;
@@ -246,16 +238,10 @@ static int phy_detect(uint32_t base,uint16_t *PhyAddr) //BOOL PHY_Detect()
 
 static void nic_init(struct device *dev)
 {
-        uint32_t dword, old;
-        uint32_t mac_h, mac_l;
-        int eeprom_valid = 0;
         int val;
         uint16_t  PhyAddr;
-        struct southbridge_sis_sis966_config *conf;
-        static uint32_t nic_index = 0;
         uint32_t base;
         struct resource *res;
-        uint32_t reg;
 
 
         print_debug("NIC_INIT:---------->\n");
@@ -284,19 +270,19 @@ static void nic_init(struct device *dev)
 
        if(!res)
        {
-               printk_debug("NIC Cannot find resource..\r\n");
+               printk(BIOS_DEBUG, "NIC Cannot find resource..\r\n");
                return;
        }
        base = res->base;
-        printk_debug("NIC base address %lx\n",base);
+        printk(BIOS_DEBUG, "NIC base address %lx\n",base);
 
        if(!(val=phy_detect(base,&PhyAddr)))
        {
-              printk_debug("PHY detect fail !!!!\r\n");
+              printk(BIOS_DEBUG, "PHY detect fail !!!!\r\n");
                return;
        }
 
-        ulValue=readl(base + 0x38L);   //  check EEPROM existing
+        ulValue=read32(base + 0x38L);   //  check EEPROM existing
 
         if((ulValue & 0x0002))
         {
@@ -305,7 +291,7 @@ static void nic_init(struct device *dev)
 
           //   if that is valid we will use that
 
-                       printk_debug("EEPROM contents %x \n",ReadEEprom( dev,  base,  0LL));
+                       printk(BIOS_DEBUG, "EEPROM contents %x \n",ReadEEprom( dev,  base,  0LL));
                        for(i=0;i<3;i++) {
                                //status = smbus_read_byte(dev_eeprom, i);
                                ulValue=ReadEEprom( dev,  base,  i+3L);
@@ -316,10 +302,10 @@ static void nic_init(struct device *dev)
                        }
         }else{
                  // read MAC address from firmware
-                printk_debug("EEPROM invalid!!\nReg 0x38h=%.8lx \n",ulValue);
-                MacAddr[0]=readw(0xffffffc0); // mac address store at here
-                MacAddr[1]=readw(0xffffffc2);
-                MacAddr[2]=readw(0xffffffc4);
+                printk(BIOS_DEBUG, "EEPROM invalid!!\nReg 0x38h=%.8lx \n",ulValue);
+                MacAddr[0]=read16(0xffffffc0); // mac address store at here
+                MacAddr[1]=read16(0xffffffc2);
+                MacAddr[2]=read16(0xffffffc4);
         }
 
         set_apc(dev);
@@ -353,67 +339,6 @@ static void nic_init(struct device *dev)
 print_debug("NIC_INIT:<----------\n");
 return;
 
-#define RegStationMgtInf       0x44
-#define PHY_RGMII      0x10000000
-
-       writel(PHY_RGMII, base + RegStationMgtInf);
-       conf = dev->chip_info;
-
-       if(conf->mac_eeprom_smbus != 0) {
-//     read MAC address from EEPROM at first
-
-               struct device *dev_eeprom;
-               dev_eeprom = dev_find_slot_on_smbus(conf->mac_eeprom_smbus, conf->mac_eeprom_addr);
-
-               if(dev_eeprom) {
-               //      if that is valid we will use that
-                       unsigned char dat[6];
-                       int status;
-                       int i;
-                       for(i=0;i<6;i++) {
-                               status = smbus_read_byte(dev_eeprom, i);
-                               if(status < 0) break;
-                               dat[i] = status & 0xff;
-                       }
-                       if(status >= 0) {
-                               mac_l = 0;
-                               for(i=3;i>=0;i--) {
-                                       mac_l <<= 8;
-                                       mac_l += dat[i];
-                               }
-                               if(mac_l != 0xffffffff) {
-                                       mac_l += nic_index;
-                                       mac_h = 0;
-                                       for(i=5;i>=4;i--) {
-                                               mac_h <<= 8;
-                                               mac_h += dat[i];
-                                       }
-                                       eeprom_valid = 1;
-                               }
-                       }
-               }
-       }
-
-// if that is invalid we will read that from romstrap
-       if(!eeprom_valid) {
-               unsigned long mac_pos;
-               mac_pos = 0xffffffd0; // refer to romstrap.inc and romstrap.lds
-               mac_l = readl(mac_pos) + nic_index; // overflow?
-               mac_h = readl(mac_pos + 4);
-
-       }
-
-// set that into NIC MMIO
-#define NvRegMacAddrA  0xA8
-#define NvRegMacAddrB  0xAC
-       writel(mac_l, base + NvRegMacAddrA);
-       writel(mac_h, base + NvRegMacAddrB);
-
-       nic_index++;
-
-#if CONFIG_PCI_ROM_RUN == 1
-       pci_dev_init(dev);// it will init option rom
-#endif
 
 }
 
@@ -436,8 +361,9 @@ static struct device_operations nic_ops  = {
 //     .enable         = sis966_enable,
        .ops_pci        = &lops_pci,
 };
+
 static const struct pci_driver nic_driver __pci_driver = {
        .ops    = &nic_ops,
        .vendor = PCI_VENDOR_ID_SIS,
-       .device = PCI_DEVICE_ID_SIS_SIS966_NIC1,
+       .device = PCI_DEVICE_ID_SIS_SIS966_NIC,
 };