yhlu's pnp patch

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1518 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 127 insertions, 27 deletions

diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 4f5fd989ee..0096fcd3dd 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -16,13 +16,73 @@
 #include "chip.h"
 #include "w83627hf.h"
 
-static void init(device_t dev)
+//BY LYH
+
+void pnp_enter_ext_func_mode(device_t dev) {
+        outb(0x87, dev->path.u.pnp.port);
+        outb(0x87, dev->path.u.pnp.port);
+}
+void pnp_exit_ext_func_mode(device_t dev) {
+        outb(0xaa, dev->path.u.pnp.port);
+}
+
+void pnp_write_hwm(unsigned long port_base, uint8_t reg, uint8_t value)
+{
+        outb(reg, port_base+5);
+        outb(value, port_base+6);
+}
+
+uint8_t pnp_read_hwm(unsigned long port_base, uint8_t reg)
+{
+        outb(reg, port_base + 5);
+        return inb(port_base + 6);
+}       
+
+static void enable_hwm_smbus(device_t dev) {
+	uint8_t reg, value;
+	reg = 0x2b;
+	value = pnp_read_config(dev, reg);
+	value &= 0x3f;
+	pnp_write_config(dev, reg, value);
+}
+
+static void init_hwm(unsigned long base)
+{
+	uint8_t  reg, value;
+	int i;
+
+	unsigned  hwm_reg_values[] = {
+//	       reg                mask             data
+              0x40     ,       0xff    ,       0x81,  //  ; Start Hardware Monitoring for WIN627
+              0x48     ,       0xC8    ,       0x48,  //  ; Program SIO SMBus BAR to 90h>>1
+              0x4A     ,       0x21    ,       0x21,  //  ; Program T2 SMBus BAR to 92h>>1 &
+                                                     //  ; Program T3 SMBus BAR to 94h>>1
+              0x4E     ,       0x80    ,       0x00,  
+              0x43     ,       0x00    ,       0xFF,
+              0x44     ,       0x00    ,       0x3F,
+              0x4C     ,       0xBF    ,       0x18,
+              0x4D     ,       0xFF    ,       0x80   //  ; Turn Off Beep
+                                                                            
+	};
+
+	for(i = 0; i<  sizeof(hwm_reg_values)/sizeof(hwm_reg_values[0]); i+=3 ) { 
+		reg = hwm_reg_values[i];	
+	 	value = pnp_read_hwm(base, reg);		
+		value &= 0xff & hwm_reg_values[i+1];
+		value |= 0xff & hwm_reg_values[i+2];
+#if 0
+		printk_debug("base = 0x%04x, reg = 0x%02x, value = 0x%02x\r\n", base,reg,value);
+#endif
+		pnp_write_hwm(base,reg, value);
+	}
+}
+
+//END
+
+static void w83627hf_init(device_t dev)
 {
 	struct superio_winbond_w83627hf_config *conf;
 	struct resource *res0, *res1;
-	/* Wishlist handle well known programming interfaces more
-	 * generically.
-	 */
 	if (!dev->enable) {
 		return;
 	}
@@ -41,15 +101,61 @@ static void init(device_t dev)
 		res1 = get_resource(dev, PNP_IDX_IO1);
 		init_pc_keyboard(res0->base, res1->base, &conf->keyboard);
 		break;
+//BY LYH
+        case W83627HF_HWM:
+                res0 = get_resource(dev, PNP_IDX_IO0);
+                init_hwm(res0->base);
+                break;
+//END
+	}
+}
+
+void w83627hf_pnp_set_resources(device_t dev)
+{
+        
+        pnp_enter_ext_func_mode(dev);  //BY LYH
+
+	pnp_set_resources(dev);
+                
+        pnp_exit_ext_func_mode(dev);  //BY LYH
+        
+}       
+        
+void w83627hf_pnp_enable_resources(device_t dev)
+{       
+        pnp_enter_ext_func_mode(dev);  //BY LYH
+	
+	pnp_enable_resources(dev);               
+
+	if(dev->path.u.pnp.device == W83627HF_HWM) {
+		//set the pin 91,92 as I2C bus
+		printk_debug("w83627hf hwm smbus enabled\r\n");
+		enable_hwm_smbus(dev);
 	}
+
+        pnp_exit_ext_func_mode(dev);  //BY LYH
+
+}
+
+void w83627hf_pnp_enable(device_t dev)
+{
+
+        if (!dev->enable) {
+                pnp_enter_ext_func_mode(dev);   // BY LYH
+
+                pnp_set_logical_device(dev);
+                pnp_set_enable(dev, 0);
+
+                pnp_exit_ext_func_mode(dev);  //BY LYH
+        }
 }
 
 static struct device_operations ops = {
 	.read_resources   = pnp_read_resources,
-	.set_resources    = pnp_set_resources,
-	.enable_resources = pnp_enable_resources,
-	.enable           = pnp_enable,
-	.init             = init,
+	.set_resources    = w83627hf_pnp_set_resources,
+	.enable_resources = w83627hf_pnp_enable_resources,
+	.enable           = w83627hf_pnp_enable,
+	.init             = w83627hf_init,
 };
 
 static struct pnp_info pnp_dev_info[] = {
@@ -61,8 +167,8 @@ static struct pnp_info pnp_dev_info[] = {
         { &ops, W83627HF_KBC,  PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, },
         { &ops, W83627HF_CIR, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
         { &ops, W83627HF_GAME_MIDI_GPIO1, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7ff, 0 }, {0x7fe, 4} },
-        // { W83627HF_GPIO2,},
-        // { W83627HF_GPIO3,},
+        { &ops, W83627HF_GPIO2,},
+        { &ops, W83627HF_GPIO3,},
         { &ops, W83627HF_ACPI, PNP_IRQ0,  },
         { &ops, W83627HF_HWM,  PNP_IO0 | PNP_IRQ0, { 0xff8, 0 } },
 };
@@ -72,24 +178,8 @@ static void enumerate(struct chip *chip)
 	pnp_enumerate(chip, sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), 
 		&pnp_ops, pnp_dev_info);
 }
-static void sio_enable(struct chip *chip, enum chip_pass pass)
-{
-
-        struct superio_winbond_w83627hf_config *conf = (struct superio_winbond_w83627hf_config *)chip->chip_info;
-
-        switch (pass) {
-        case CONF_PASS_PRE_CONSOLE:
-                init_pc_keyboard(0x60, 0x64, &conf->keyboard);
-                break;
-        default:
-                /* nothing yet */
-                break;
-        }
-}
-
 
 struct chip_control superio_winbond_w83627hf_control = {
-	.enable	   = sio_enable,
 	.enumerate = enumerate,
 	.name      = "Winbond w83627hf"
 };
diff --git a/src/superio/winbond/w83627hf/w83627hf_early_serial.c b/src/superio/winbond/w83627hf/w83627hf_early_serial.c
index 158d18af42..b1c7db4bed 100644
--- a/src/superio/winbond/w83627hf/w83627hf_early_serial.c
+++ b/src/superio/winbond/w83627hf/w83627hf_early_serial.c
@@ -1,11 +1,21 @@
 #include <arch/romcc_io.h>
 #include "w83627hf.h"
 
-
+static inline void pnp_enter_ext_func_mode(device_t dev) {
+	unsigned port = dev>>8;
+        outb(0x87, port);
+        outb(0x87, port);
+}
+static void pnp_exit_ext_func_mode(device_t dev) {
+	unsigned port = dev>>8;
+        outb(0xaa, port);
+}
 static void w83627hf_enable_serial(device_t dev, unsigned iobase)
 {
+	pnp_enter_ext_func_mode(dev);
 	pnp_set_logical_device(dev);
 	pnp_set_enable(dev, 0);
 	pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
 	pnp_set_enable(dev, 1);
+	pnp_exit_ext_func_mode(dev);
 }