printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / southbridge / nvidia / ck804 / ck804_sata.c

diff --git a/src/southbridge/nvidia/ck804/ck804_sata.c b/src/southbridge/nvidia/ck804/ck804_sata.c
index 33ec3d66e12a5920b58612f9eddc54a3a8bcfd36..8eed906ce847684fe5de7e8a9918ef6c03e17fca 100644 (file)
--- a/src/southbridge/nvidia/ck804/ck804_sata.c
+++ b/src/southbridge/nvidia/ck804/ck804_sata.c
@@ -2,6 +2,7 @@
  * Copyright 2004 Tyan Computer
  *  by yhlu@tyan.com
  */
+
 #include <console/console.h>
 #include <device/device.h>
 #include <delay.h>
@@ -10,7 +11,11 @@
 #include <device/pci_ops.h>
 #include "ck804.h"
 
+#ifndef CK804_SATA_RESET_FOR_ATAPI
+#define CK804_SATA_RESET_FOR_ATAPI 0
+#endif
 
+#if CK804_SATA_RESET_FOR_ATAPI
 static void sata_com_reset(struct device *dev, unsigned reset)
 // reset = 1 : reset
 // reset = 0 : clear
@@ -21,14 +26,14 @@ static void sata_com_reset(struct device *dev, unsigned reset)
 
        base = (uint32_t *) pci_read_config32(dev, 0x24);
 
-       printk_debug("base = %08x\r\n", base);
+       printk(BIOS_DEBUG, "base = %08lx\n", base);
 
-       if(reset) {
-               *(base + 4) = 0xffffffff;
-               *(base + 0x44) = 0xffffffff;
+       if (reset) {
+               *(base + 4) = 0xffffffff;
+               *(base + 0x44) = 0xffffffff;
        }
 
-       dword = *(base +8);
+       dword = *(base + 8);
        dword &= ~(0xf);
        dword |= reset;
 
@@ -42,87 +47,90 @@ static void sata_com_reset(struct device *dev, unsigned reset)
        *(base + 0x48) = dword;
 #endif
 
-       if(reset) return;
+       if (reset)
+               return;
 
-       dword = *(base+ 0);
-       printk_debug("*(base+0)=%08x\r\n",dword);
-       if(dword == 0x113) {
-               loop = 200000;// 2
+       dword = *(base + 0);
+       printk(BIOS_DEBUG, "*(base+0)=%08x\r\n", dword);
+       if (dword == 0x113) {
+               loop = 200000;  // 2
                do {
-                       dword = *(base + 4);
-                       if((dword & 0x10000)!=0) break;
+                       dword = *(base + 4);
+                       if ((dword & 0x10000) != 0)
+                               break;
                        udelay(10);
-               } while (--loop>0);
-               printk_debug("loop=%d, *(base+4)=%08x\r\n",loop,  dword);
+               } while (--loop > 0);
+               printk(BIOS_DEBUG, "loop=%d, *(base+4)=%08x\r\n", loop, dword);
        }
 
-       dword = *(base+ 0x40);
-       printk_debug("*(base+0x40)=%08x\r\n",dword);
-       if(dword == 0x113) {
-               loop = 200000;//2
-               do {
-                       dword = *(base + 0x44);
-                       if((dword & 0x10000)!=0) break;
+       dword = *(base + 0x40);
+       printk(BIOS_DEBUG, "*(base+0x40)=%08x\r\n", dword);
+       if (dword == 0x113) {
+               loop = 200000;  //2
+               do {
+                       dword = *(base + 0x44);
+                       if ((dword & 0x10000) != 0)
+                               break;
                        udelay(10);
-               } while (--loop>0);
-               printk_debug("loop=%d, *(base+0x44)=%08x\r\n",loop,  dword);
+               } while (--loop > 0);
+               printk(BIOS_DEBUG, "loop=%d, *(base+0x44)=%08x\r\n", loop, dword);
        }
 }
+#endif
 
 static void sata_init(struct device *dev)
 {
-
        uint32_t dword;
-
        struct southbridge_nvidia_ck804_config *conf;
+
        conf = dev->chip_info;
 
        dword = pci_read_config32(dev, 0x50);
-       /* Ensure prefetch is disabled */
+       /* Ensure prefetch is disabled. */
        dword &= ~((1 << 15) | (1 << 13));
        if (conf->sata1_enable) {
-               /* Enable secondary SATA interface */
-               dword |= (1<<0);
-               printk_debug("SATA S \t");
+               /* Enable secondary SATA interface. */
+               dword |= (1 << 0);
+               printk(BIOS_DEBUG, "SATA S \t");
        }
        if (conf->sata0_enable) {
-               /* Enable primary SATA interface */
-               dword |= (1<<1);
-               printk_debug("SATA P \n");
+               /* Enable primary SATA interface. */
+               dword |= (1 << 1);
+               printk(BIOS_DEBUG, "SATA P \n");
        }
 #if 0
-//     write back
-       dword |= (1<<12);
-       dword |= (1<<14);
+       /* Write back */
+       dword |= (1 << 12);
+       dword |= (1 << 14);
 #endif
 
 #if 0
-//     ADMA
-       dword |= (1<<16);
-       dword |= (1<<17);
+       /* ADMA */
+       dword |= (1 << 16);
+       dword |= (1 << 17);
 #endif
 
 #if 1
-//DO NOT relay OK and PAGE_FRNDLY_DTXFR_CNT.
-       dword &= ~(0x1f<<24);
-       dword |= (0x15<<24);
+       /* DO NOT relay OK and PAGE_FRNDLY_DTXFR_CNT. */
+       dword &= ~(0x1f << 24);
+       dword |= (0x15 << 24);
 #endif
        pci_write_config32(dev, 0x50, dword);
 
 #if 0
-//SLUMBER_DURING_D3.
+       /* SLUMBER_DURING_D3 */
        dword = pci_read_config32(dev, 0x7c);
-       dword &=  ~(1<<4);
+       dword &= ~(1 << 4);
        pci_write_config32(dev, 0x7c, dword);
 
        dword = pci_read_config32(dev, 0xd0);
-       dword &=  ~(0xff<<24);
-       dword |= (0x68<<24);
+       dword &= ~(0xff << 24);
+       dword |= (0x68 << 24);
        pci_write_config32(dev, 0xd0, dword);
 
        dword = pci_read_config32(dev, 0xe0);
-       dword &=  ~(0xff<<24);
-       dword |= (0x68<<24);
+       dword &= ~(0xff << 24);
+       dword |= (0x68 << 24);
        pci_write_config32(dev, 0xe0, dword);
 #endif
 
@@ -130,13 +138,13 @@ static void sata_init(struct device *dev)
        dword |= 2;
        pci_write_config32(dev, 0xf8, dword);
 
-#if 0
+#if CK804_SATA_RESET_FOR_ATAPI
        dword = pci_read_config32(dev, 0xac);
-       dword &= ~((1<<13)|(1<<14));
-       dword |= (1<<13)|(0<<14);
+       dword &= ~((1 << 13) | (1 << 14));
+       dword |= (1 << 13) | (0 << 14);
        pci_write_config32(dev, 0xac, dword);
 
-       sata_com_reset(dev, 1); // for discover some s-atapi device
+       sata_com_reset(dev, 1); /* For discover some s-atapi device. */
 #endif
 
 }
@@ -144,17 +152,18 @@ static void sata_init(struct device *dev)
 static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
 {
        pci_write_config32(dev, 0x40,
-               ((device & 0xffff) << 16) | (vendor & 0xffff));
+                          ((device & 0xffff) << 16) | (vendor & 0xffff));
 }
+
 static struct pci_operations lops_pci = {
        .set_subsystem = lpci_set_subsystem,
 };
 
-static struct device_operations sata_ops  = {
+static struct device_operations sata_ops = {
        .read_resources   = pci_dev_read_resources,
        .set_resources    = pci_dev_set_resources,
        .enable_resources = pci_dev_enable_resources,
-//     .enable           = ck804_enable,
+       // .enable        = ck804_enable,
        .init             = sata_init,
        .scan_bus         = 0,
        .ops_pci          = &lops_pci,