[coreboot-gerrit] New patch to review for coreboot: Drop southbridge intel/i82801cx

Stefan Reinauer (stefan.reinauer@coreboot.org) gerrit at coreboot.org
Thu Oct 29 02:18:24 CET 2015


Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12237

-gerrit

commit e173b0e84c1bef8d95242b40acce082be9dbead4
Author: Stefan Reinauer <stefan.reinauer at coreboot.org>
Date:   Wed Oct 28 18:01:22 2015 -0700

    Drop southbridge intel/i82801cx
    
    All boards using this southbridge have been removed from
    the tree already.
    
    Change-Id: I08269931d845d1f57b34174238bcce245ad77894
    Signed-off-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
---
 src/southbridge/intel/i82801cx/Kconfig       |   4 -
 src/southbridge/intel/i82801cx/Makefile.inc  |  12 --
 src/southbridge/intel/i82801cx/ac97.c        |  41 -----
 src/southbridge/intel/i82801cx/early_smbus.c | 134 ---------------
 src/southbridge/intel/i82801cx/i82801cx.c    |  53 ------
 src/southbridge/intel/i82801cx/i82801cx.h    |  74 --------
 src/southbridge/intel/i82801cx/ide.c         |  48 ------
 src/southbridge/intel/i82801cx/lpc.c         | 241 ---------------------------
 src/southbridge/intel/i82801cx/nic.c         |  21 ---
 src/southbridge/intel/i82801cx/pci.c         |  29 ----
 src/southbridge/intel/i82801cx/reset.c       |   9 -
 src/southbridge/intel/i82801cx/smbus.c       |  83 ---------
 src/southbridge/intel/i82801cx/usb.c         |  48 ------
 13 files changed, 797 deletions(-)

diff --git a/src/southbridge/intel/i82801cx/Kconfig b/src/southbridge/intel/i82801cx/Kconfig
deleted file mode 100644
index 3e01cb8..0000000
--- a/src/southbridge/intel/i82801cx/Kconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-config SOUTHBRIDGE_INTEL_I82801CX
-	bool
-	select IOAPIC
-	select HAVE_HARD_RESET
diff --git a/src/southbridge/intel/i82801cx/Makefile.inc b/src/southbridge/intel/i82801cx/Makefile.inc
deleted file mode 100644
index ab95982..0000000
--- a/src/southbridge/intel/i82801cx/Makefile.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_I82801CX),y)
-
-ramstage-y += i82801cx.c
-ramstage-y += usb.c
-ramstage-y += lpc.c
-ramstage-y += ide.c
-ramstage-y += ac97.c
-#ramstage-y += nic.c
-ramstage-y += pci.c
-ramstage-y += reset.c
-
-endif
diff --git a/src/southbridge/intel/i82801cx/ac97.c b/src/southbridge/intel/i82801cx/ac97.c
deleted file mode 100644
index 5de44fc..0000000
--- a/src/southbridge/intel/i82801cx/ac97.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * (C) 2003 Linux Networx
- */
-#include <console/console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include "i82801cx.h"
-
-
-static struct device_operations ac97audio_ops  = {
-	.read_resources   = pci_dev_read_resources,
-	.set_resources    = pci_dev_set_resources,
-	.enable_resources = pci_dev_enable_resources,
-	.enable           = i82801cx_enable,
-	.init             = 0,
-	.scan_bus         = 0,
-};
-
-static const struct pci_driver ac97audio_driver __pci_driver = {
-	.ops    = &ac97audio_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801CA_AC97_AUDIO,
-};
-
-
-static struct device_operations ac97modem_ops  = {
-	.read_resources   = pci_dev_read_resources,
-	.set_resources    = pci_dev_set_resources,
-	.enable_resources = pci_dev_enable_resources,
-	.enable           = i82801cx_enable,
-	.init             = 0,
-	.scan_bus         = 0,
-};
-
-static const struct pci_driver ac97modem_driver __pci_driver = {
-	.ops    = &ac97modem_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801CA_AC97_MODEM,
-};
diff --git a/src/southbridge/intel/i82801cx/early_smbus.c b/src/southbridge/intel/i82801cx/early_smbus.c
deleted file mode 100644
index 5be6353..0000000
--- a/src/southbridge/intel/i82801cx/early_smbus.c
+++ /dev/null
@@ -1,134 +0,0 @@
-#include <device/pci_ids.h>
-#include "i82801cx.h"
-
-static void enable_smbus(void)
-{
-	device_t dev = PCI_DEV(0x0, 0x1f, 0x3);
-
-	printk(BIOS_DEBUG, "SMBus controller enabled\n");
-	/* set smbus iobase */
-	pci_write_config32(dev, SMB_BASE, SMBUS_IO_BASE | PCI_BASE_ADDRESS_SPACE_IO);
-	/* Set smbus enable */
-	pci_write_config8(dev, HOSTC, HST_EN);
-	/* Set smbus iospace enable */
-	pci_write_config16(dev, PCI_COMMAND, PCI_COMMAND_IO);
-	/* Disable interrupt generation */
-	outb(0, SMBUS_IO_BASE + SMBHSTCTL);
-	/* clear any lingering errors, so the transaction will run */
-	outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT);
-}
-
-
-static inline void smbus_delay(void)
-{
-	outb(0x80, 0x80);
-}
-
-// See http://www.coreboot.org/pipermail/linuxbios/2004-September/009077.html
-// for a description of this function.
-static int smbus_wait_until_active(void)
-{
-	unsigned long loops;
-	loops = SMBUS_TIMEOUT;
-	do {
-		unsigned char val;
-		smbus_delay();
-		val = inb(SMBUS_IO_BASE + SMBHSTSTAT);
-		if ((val & 1)) {
-			break;
-		}
-	} while (--loops);
-	return loops ? 0 : -4;
-}
-
-static int smbus_wait_until_ready(void)
-{
-	unsigned long loops;
-	loops = SMBUS_TIMEOUT;
-	do {
-		unsigned char val;
-		smbus_delay();
-		val = inb(SMBUS_IO_BASE + SMBHSTSTAT);
-		// !HOST_BUSY?
-		if ((val & 1) == 0) {
-			break;
-		}
-		if(loops == (SMBUS_TIMEOUT / 2)) {
-			// Clear status flags
-			outb(inb(SMBUS_IO_BASE + SMBHSTSTAT),
-				SMBUS_IO_BASE + SMBHSTSTAT);
-		}
-	} while(--loops);
-	return loops?0:-2;
-}
-
-static int smbus_wait_until_done(void)
-{
-	unsigned long loops;
-	loops = SMBUS_TIMEOUT;
-	do {
-		unsigned char val;
-		smbus_delay();
-
-		val = inb(SMBUS_IO_BASE + SMBHSTSTAT);
-		// !HOST_BUSY?
-		if ( (val & 1) == 0) {
-			break;
-		}
-		// BYTE_DONE or SUCCESS or error?
-		if ((val & ~((1<<6)|(1<<0)) ) != 0 ) {
-			break;
-		}
-	} while(--loops);
-	return loops?0:-3;
-}
-
-static int smbus_read_byte(unsigned device, unsigned address)
-{
-	unsigned char global_control_register;
-	unsigned char global_status_register;
-	unsigned char byte;
-
-	if (smbus_wait_until_ready() < 0) {
-		return -2;
-	}
-
-	/* setup transaction */
-	/* disable interrupts */
-	outb(inb(SMBUS_IO_BASE + SMBHSTCTL) & 0xfe, SMBUS_IO_BASE + SMBHSTCTL);
-	/* set to read from the specified device  */
-	outb(((device & 0x7f) << 1) | 1, SMBUS_IO_BASE + SMBXMITADD);
-	/* set the command/address... */
-	outb(address & 0xFF, SMBUS_IO_BASE + SMBHSTCMD);
-	/* set up for a byte data read */
-	outb((inb(SMBUS_IO_BASE + SMBHSTCTL) & 0xe3) | (0x2<<2), SMBUS_IO_BASE + SMBHSTCTL);
-
-	/* clear any lingering errors, so the transaction will run */
-	outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT);
-
-	/* clear the data byte...*/
-	outb(0, SMBUS_IO_BASE + SMBHSTDAT0);
-
-	/* start a byte read, with interrupts disabled */
-	outb((inb(SMBUS_IO_BASE + SMBHSTCTL) | 0x40), SMBUS_IO_BASE + SMBHSTCTL);
-	/* poll for it to start */
-	if (smbus_wait_until_active() < 0) {
-		return -4;
-	}
-
-	/* poll for transaction completion */
-	if (smbus_wait_until_done() < 0) {
-		return -3;
-	}
-
-	global_status_register = inb(SMBUS_IO_BASE + SMBHSTSTAT) & ~(1<<6); /* Ignore the In Use Status... */
-
-	/* read results of transaction */
-	byte = inb(SMBUS_IO_BASE + SMBHSTDAT0);
-
-	// SUCCESS?
-	if (global_status_register != 2) {
-		return -1;
-	}
-	return byte;
-}
diff --git a/src/southbridge/intel/i82801cx/i82801cx.c b/src/southbridge/intel/i82801cx/i82801cx.c
deleted file mode 100644
index 685c931..0000000
--- a/src/southbridge/intel/i82801cx/i82801cx.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <console/console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <assert.h>
-#include "i82801cx.h"
-
-void i82801cx_enable(device_t dev)
-{
-	unsigned int index = 0;
-	uint8_t bHasDisableBit = 0;
-	uint16_t cur_disable_mask, new_disable_mask;
-
-//	all 82801ca devices are in bus 0
-	unsigned int devfn = PCI_DEVFN(0x1f, 0); // lpc
-	device_t lpc_dev = dev_find_slot(0, devfn); // 0
-	if (!lpc_dev)
-		return;
-
-	// Calculate disable bit position for specified device:function
-	// NOTE: For ICH-3, only the following devices can be disabled:
-	//		 D31:F1, D31:F3, D31:F5, D31:F6,
-	//		 D29:F0, D29:F1, D29:F2
-
-    if (PCI_SLOT(dev->path.pci.devfn) == 31) {
-    	index = PCI_FUNC(dev->path.pci.devfn);
-
-		if ((index == 1) || (index == 3) || (index == 5) || (index == 6))
-			bHasDisableBit = 1;
-
-    } else if (PCI_SLOT(dev->path.pci.devfn) == 29) {
-    	index = 8 + PCI_FUNC(dev->path.pci.devfn);
-
-		if (PCI_FUNC(dev->path.pci.devfn) < 3)
-			bHasDisableBit = 1;
-    }
-
-	if (bHasDisableBit) {
-		cur_disable_mask = pci_read_config16(lpc_dev, FUNC_DIS);
-		new_disable_mask = cur_disable_mask & ~(1<<index); 		// enable it
-		if (!dev->enabled) {
-			new_disable_mask |= (1<<index);  // disable it
-		}
-		if (new_disable_mask != cur_disable_mask) {
-			pci_write_config16(lpc_dev, FUNC_DIS, new_disable_mask);
-		}
-	}
-}
-
-struct chip_operations southbridge_intel_i82801cx_ops = {
-	CHIP_NAME("Intel ICH3 (82801Cx) Series Southbridge")
-	.enable_dev = i82801cx_enable,
-};
diff --git a/src/southbridge/intel/i82801cx/i82801cx.h b/src/southbridge/intel/i82801cx/i82801cx.h
deleted file mode 100644
index f196fa3..0000000
--- a/src/southbridge/intel/i82801cx/i82801cx.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef I82801CX_H
-#define I82801CX_H
-
-#if !defined(__PRE_RAM__)
-#include <device/device.h>
-void i82801cx_enable(device_t dev);
-#endif
-
-
-#define PCI_DMA_CFG     0x90
-#define SERIRQ_CNTL     0x64
-#define GEN_CNTL        0xd0
-#define GEN_STS         0xd4
-#define RTC_CONF        0xd8
-#define GEN_PMCON_3     0xa4
-
-#define PMBASE          0x40
-#define ACPI_CNTL       0x44
-#define BIOS_CNTL       0x4E
-#define GPIO_BASE       0x58
-#define GPIO_CNTL       0x5C
-#define PIRQA_ROUT      0x60
-#define PIRQE_ROUT      0x68
-#define COM_DEC         0xE0
-#define LPC_EN          0xE6
-#define FUNC_DIS        0xF2
-
-// GEN_PMCON_3 bits
-#define RTC_BATTERY_DEAD		(1<<2)
-#define RTC_POWER_FAILED		(1<<1)
-#define SLEEP_AFTER_POWER_FAIL	(1<<0)
-
-/* IDE controller: */
-
-// PCI Configuration Space (D31:F1)
-#define IDE_TIM_PRI		0x40		// IDE timings, primary
-#define IDE_TIM_SEC		0x42		// IDE timings, secondary
-
-
-// IDE_TIM bits
-#define IDE_DECODE_ENABLE	(1<<15)
-
-/* SMBus: */
-
-// PCI Configuration Space (D31:F3)
-#define SMB_BASE	0x20
-#define HOSTC		0x40
-
-// HOSTC bits
-#define I2C_EN		(1<<2)
-#define SMB_SMI_EN	(1<<1)
-#define HST_EN		(1<<0)
-
-#define SMBUS_IO_BASE 0x1000
-
-// I/O registers (relative to SMBUS_IO_BASE)
-#define SMBHSTSTAT		0
-#define SMBHSTCTL		2
-#define SMBHSTCMD		3
-#define SMBXMITADD		4
-#define SMBHSTDAT0		5
-#define SMBHSTDAT1		6
-#define SMBBLKDAT		7
-#define SMBTRNSADD		9
-#define SMBSLVDATA		10
-#define SMLINK_PIN_CTL	14
-#define SMBUS_PIN_CTL	15
-
-/* Between 1-10 seconds, We should never timeout normally
- * Longer than this is just painful when a timeout condition occurs.
- */
-#define SMBUS_TIMEOUT (100*1000)
-
-#endif /* I82801CX_H */
diff --git a/src/southbridge/intel/i82801cx/ide.c b/src/southbridge/intel/i82801cx/ide.c
deleted file mode 100644
index 74c442c..0000000
--- a/src/southbridge/intel/i82801cx/ide.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <console/console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include "i82801cx.h"
-
-
-static void ide_init(struct device *dev)
-{
-	/* Enable ide devices so the linux ide driver will work */
-	uint16_t ideTimingConfig;
-	int enable_primary = 1;
-	int enable_secondary = 1;
-
-	ideTimingConfig = pci_read_config16(dev, IDE_TIM_PRI);
-	ideTimingConfig &= ~IDE_DECODE_ENABLE;
-	if (enable_primary) {
-		/* Enable first ide interface */
-		ideTimingConfig |= IDE_DECODE_ENABLE;
-		printk(BIOS_DEBUG, "IDE0 ");
-	}
-	pci_write_config16(dev, IDE_TIM_PRI, ideTimingConfig);
-
-    ideTimingConfig = pci_read_config16(dev, IDE_TIM_SEC);
-    ideTimingConfig &= ~IDE_DECODE_ENABLE;
-    if (enable_secondary) {
-		/* Enable secondary ide interface */
-        ideTimingConfig |= IDE_DECODE_ENABLE;
-        printk(BIOS_DEBUG, "IDE1 ");
-	}
-    pci_write_config16(dev, IDE_TIM_SEC, ideTimingConfig);
-}
-
-static struct device_operations ide_ops  = {
-	.read_resources   = pci_dev_read_resources,
-	.set_resources    = pci_dev_set_resources,
-	.enable_resources = pci_dev_enable_resources,
-	.init             = ide_init,
-	.scan_bus         = 0,
-	.enable           = i82801cx_enable,
-};
-
-static const struct pci_driver ide_driver __pci_driver = {
-	.ops    = &ide_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801CA_IDE,
-};
diff --git a/src/southbridge/intel/i82801cx/lpc.c b/src/southbridge/intel/i82801cx/lpc.c
deleted file mode 100644
index a348c95..0000000
--- a/src/southbridge/intel/i82801cx/lpc.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * (C) 2003 Linux Networx, SuSE Linux AG
- * (C) 2004 Tyan Computer
- * (c) 2005 Digital Design Corporation
- */
-#include <console/console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <pc80/mc146818rtc.h>
-#include <pc80/isa-dma.h>
-#include <arch/io.h>
-#include <arch/ioapic.h>
-#include "i82801cx.h"
-
-#define NMI_OFF 0
-
-#ifndef CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL
-#define CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL MAINBOARD_POWER_ON
-#endif
-
-#define MAINBOARD_POWER_OFF 0
-#define MAINBOARD_POWER_ON  1
-
-
-/**
- * Set miscellanous static southbridge features.
- *
- * @param dev PCI device with I/O APIC control registers
- */
-static void i82801cx_enable_ioapic(struct device *dev)
-{
-	u32 reg32;
-
-	reg32 = pci_read_config32(dev, GEN_CNTL);
-	reg32 |= (1 << 13);	/* Coprocessor error enable (COPR_ERR_EN) */
-	reg32 |= (3 << 7);	/* IOAPIC enable (APIC_EN) */
-	reg32 |= (1 << 2);	/* DMA collection buffer enable (DCB_EN) */
-	reg32 |= (1 << 1);	/* Delayed transaction enable (DTE) */
-	pci_write_config32(dev, GEN_CNTL, reg32);
-	printk(BIOS_DEBUG, "IOAPIC Southbridge enabled %x\n", reg32);
-
-	set_ioapic_id(VIO_APIC_VADDR, 0x02);
-
-	/*
-	 * Select Boot Configuration register (0x03) and
-	 * use Processor System Bus (0x01) to deliver interrupts.
-	 */
-	io_apic_write(VIO_APIC_VADDR, 0x03, 0x01);
-}
-
-// This is how interrupts are received from the Super I/O chip
-static void i82801cx_enable_serial_irqs( struct device *dev)
-{
-	// Recognize serial IRQs, continuous mode, frame size 21, 4 clock start frame pulse width
-    pci_write_config8(dev, SERIRQ_CNTL, (1 << 7)|(1 << 6)|((21 - 17) << 2)|(0<< 0));
-}
-
-/**
- * Route all DMA channels to either PCI or LPC.
- *
- * @param dev TODO
- * @param mask Identifies whether each channel should be used for PCI DMA
- *             (bit = 0) or LPC DMA (bit = 1). The LSb controls channel 0.
- *             Channel 4 is not used (reserved).
- */
-static void i82801cx_lpc_route_dma( struct device *dev, uint8_t mask)
-{
-    uint16_t dmaConfig;
-    int channelIndex;
-
-    dmaConfig = pci_read_config16(dev, PCI_DMA_CFG);
-    dmaConfig &= 0x300;				// Preserve reserved bits
-    for(channelIndex = 0; channelIndex < 8; channelIndex++) {
-    	if (channelIndex == 4)
-        	continue;		// Register doesn't support channel 4
-        dmaConfig |= ((mask & (1 << channelIndex))? 3:1) << (channelIndex*2);
-    }
-    pci_write_config16(dev, PCI_DMA_CFG, dmaConfig);
-}
-
-static void i82801cx_rtc_init(struct device *dev)
-{
-    uint32_t dword;
-    int rtc_failed;
-	int pwr_on = CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL;
-    uint8_t pmcon3 = pci_read_config8(dev, GEN_PMCON_3);
-
-    rtc_failed = pmcon3 & RTC_BATTERY_DEAD;
-    if (rtc_failed) {
-    	// Clear the RTC_BATTERY_DEAD bit, but preserve
-        // the RTC_POWER_FAILED, G3 state, and reserved bits
-		// NOTE: RTC_BATTERY_DEAD and RTC_POWER_FAILED are "write-1-clear" bits
-        pmcon3 &= ~RTC_POWER_FAILED;
-    }
-
-    get_option(&pwr_on, "power_on_after_fail");
-	pmcon3 &= ~SLEEP_AFTER_POWER_FAIL;
-	if (!pwr_on) {
-		pmcon3 |= SLEEP_AFTER_POWER_FAIL;
-	}
-	pci_write_config8(dev, GEN_PMCON_3, pmcon3);
-	printk(BIOS_INFO, "set power %s after power fail\n",
-				 pwr_on ? "on" : "off");
-
-    // See if the Safe Mode jumper is set
-    dword = pci_read_config32(dev, GEN_STS);
-    rtc_failed |= dword & (1 << 2);
-
-    cmos_init(rtc_failed);
-}
-
-
-static void i82801cx_1f0_misc(struct device *dev)
-{
-	// Prevent LPC disabling, enable parity errors, and SERR# (System Error)
-    pci_write_config16(dev, PCI_COMMAND, 0x014f);
-
-    // Set ACPI base address to 0x1100 (I/O space)
-    pci_write_config32(dev, PMBASE, 0x00001101);
-
-    // Enable ACPI I/O and power management
-    pci_write_config8(dev, ACPI_CNTL, 0x10);
-
-    // Set GPIO base address to 0x1180 (I/O space)
-    pci_write_config32(dev, GPIO_BASE, 0x00001181);
-
-    // Enable GPIO
-    pci_write_config8(dev, GPIO_CNTL, 0x10);
-
-    // Route PIRQA to IRQ11, PIRQB to IRQ3, PIRQC to IRQ5, PIRQD to IRQ10
-    pci_write_config32(dev, PIRQA_ROUT, 0x0A05030B);
-
-    // Route PIRQE to IRQ7. Leave PIRQF - PIRQH unrouted.
-    pci_write_config8(dev, PIRQE_ROUT, 0x07);
-
-    // Enable access to the upper 128 byte bank of CMOS RAM
-    pci_write_config8(dev, RTC_CONF, 0x04);
-
-    // Decode 0x3F8-0x3FF (COM1) for COMA port,
-	//		  0x2F8-0x2FF (COM2) for COMB
-    pci_write_config8(dev, COM_DEC, 0x10);
-
-	// LPT decode defaults to 0x378-0x37F and 0x778-0x77F
-	// Floppy decode defaults to 0x3F0-0x3F5, 0x3F7
-
-    // Enable COMA, COMB, LPT, floppy;
-	// disable microcontroller, Super I/O, sound, gameport
-    pci_write_config16(dev, LPC_EN, 0x000F);
-}
-
-static void lpc_init(struct device *dev)
-{
-	uint8_t byte;
-	int pwr_on=-1;
-	int nmi_option;
-
-	/* IO APIC initialization */
-	i82801cx_enable_ioapic(dev);
-
-	i82801cx_enable_serial_irqs(dev);
-
-	/* power after power fail */
-	        /* FIXME this doesn't work! */
-        /* Which state do we want to goto after g3 (power restored)?
-         * 0 == S0 Full On
-         * 1 == S5 Soft Off
-         */
-    byte = pci_read_config8(dev, GEN_PMCON_3);
-    if (pwr_on)
-    	byte &= ~1;		// Return to S0 (boot) after power is re-applied
-    else
-    	byte |= 1;		// Return to S5
-    pci_write_config8(dev, GEN_PMCON_3, byte);
-    printk(BIOS_INFO, "set power %s after power fail\n", pwr_on?"on":"off");
-
-    /* Set up NMI on errors */
-    byte = inb(0x61);
-    byte &= ~(1 << 3); /* IOCHK# NMI Enable */
-    byte &= ~(1 << 2); /* PCI SERR# Enable */
-    outb(byte, 0x61);
-    byte = inb(0x70);
-    nmi_option = NMI_OFF;
-    get_option(&nmi_option, "nmi");
-    if (nmi_option) {
-        byte &= ~(1 << 7); /* set NMI */
-        outb(byte, 0x70);
-    }
-
-	/* Initialize the real time clock */
-	i82801cx_rtc_init(dev);
-
-	i82801cx_lpc_route_dma(dev, 0xff);
-
-	/* Initialize isa dma */
-	isa_dma_init();
-
-	i82801cx_1f0_misc(dev);
-}
-
-static void i82801cx_lpc_read_resources(device_t dev)
-{
-	struct resource *res;
-
-	/* Get the normal PCI resources of this device. */
-	pci_dev_read_resources(dev);
-
-	/* Add an extra subtractive resource for both memory and I/O. */
-	res = new_resource(dev, IOINDEX_SUBTRACTIVE(0, 0));
-	res->base = 0;
-	res->size = 0x1000;
-	res->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE |
-		     IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
-
-	res = new_resource(dev, IOINDEX_SUBTRACTIVE(1, 0));
-	res->base = 0xff800000;
-	res->size = 0x00800000; /* 8 MB for flash */
-	res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
-		     IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
-
-	res = new_resource(dev, 3); /* IOAPIC */
-	res->base = IO_APIC_ADDR;
-	res->size = 0x00001000;
-	res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
-}
-
-static struct device_operations lpc_ops  = {
-	.read_resources   = i82801cx_lpc_read_resources,
-	.set_resources    = pci_dev_set_resources,
-	.enable_resources = pci_dev_enable_resources,
-	.init             = lpc_init,
-	.scan_bus         = scan_lpc_bus,
-	.enable           = 0,
-};
-
-static const struct pci_driver lpc_driver __pci_driver = {
-	.ops    = &lpc_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801CA_LPC,
-};
diff --git a/src/southbridge/intel/i82801cx/nic.c b/src/southbridge/intel/i82801cx/nic.c
deleted file mode 100644
index 00ce038..0000000
--- a/src/southbridge/intel/i82801cx/nic.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <console/console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include "i82801cx.h"
-
-
-static struct device_operations nic_ops  = {
-	.read_resources   = pci_dev_read_resources,
-	.set_resources    = pci_dev_set_resources,
-	.enable_resources = pci_dev_enable_resources,
-	.init             = 0,
-	.scan_bus         = 0,
-};
-
-static const struct pci_driver nic_driver __pci_driver = {
-	.ops    = &nic_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801CA_LAN,
-};
diff --git a/src/southbridge/intel/i82801cx/pci.c b/src/southbridge/intel/i82801cx/pci.c
deleted file mode 100644
index 1ebe8c7..0000000
--- a/src/southbridge/intel/i82801cx/pci.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <console/console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include "i82801cx.h"
-
-static void pci_init(struct device *dev)
-{
-	// NOTE: the original (v1) 'CA code set these in the bridge register (0x3E-3F)
-	/* Enable pci error detecting */
-	uint32_t dword = pci_read_config32(dev, PCI_COMMAND);
-	dword |= (PCI_COMMAND_SERR | PCI_COMMAND_PARITY);
-	pci_write_config32(dev, PCI_COMMAND, dword);
-}
-
-static struct device_operations pci_ops  = {
-	.read_resources   = pci_bus_read_resources,
-	.set_resources    = pci_dev_set_resources,
-	.enable_resources = pci_bus_enable_resources,
-	.init             = pci_init,
-	.scan_bus         = pci_scan_bridge,
-};
-
-static const struct pci_driver pci_driver __pci_driver = {
-	.ops    = &pci_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801CA_PCI,
-};
diff --git a/src/southbridge/intel/i82801cx/reset.c b/src/southbridge/intel/i82801cx/reset.c
deleted file mode 100644
index 6883ff0..0000000
--- a/src/southbridge/intel/i82801cx/reset.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <arch/io.h>
-#include <reset.h>
-
-void hard_reset(void)
-{
-        /* Try rebooting through port 0xcf9 */
-        // Hard reset without power cycle
-        outb((0 <<3)|(1<<2)|(1<<1), 0xcf9);
-}
diff --git a/src/southbridge/intel/i82801cx/smbus.c b/src/southbridge/intel/i82801cx/smbus.c
deleted file mode 100644
index 324f82f..0000000
--- a/src/southbridge/intel/i82801cx/smbus.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include <smbus.h>
-#include <pci.h>
-#include <arch/io.h>
-#include "i82801cx.h"
-
-#define PM_BUS 0
-#define PM_DEVFN PCI_DEVFN(0x1f,3)
-
-void smbus_enable(void)
-{
-	/* iobase addr */
-	pcibios_write_config_dword(PM_BUS, PM_DEVFN, SMB_BASE,
-							   SMBUS_IO_BASE | PCI_BASE_ADDRESS_SPACE_IO);
-	/* smbus enable */
-	pcibios_write_config_byte(PM_BUS, PM_DEVFN, HOSTC, HST_EN);
-	/* iospace enable */
-	pcibios_write_config_word(PM_BUS, PM_DEVFN, PCI_COMMAND, PCI_COMMAND_IO);
-
-    /* Disable interrupt generation */
-    outb(0, SMBUS_IO_BASE + SMBHSTCTL);
-}
-
-static void smbus_wait_until_ready(void)
-{
-	// Loop while HOST_BUSY
-	while((inb(SMBUS_IO_BASE + SMBHSTSTAT) & 1) == 1) {
-		/* nop */
-	}
-}
-
-static void smbus_wait_until_done(void)
-{
-	unsigned char byte;
-
-	// Loop while HOST_BUSY
-	do {
-		byte = inb(SMBUS_IO_BASE + SMBHSTSTAT);
-	}
-	while((byte &1) == 1);
-
-	// Wait for SUCCESS or error or BYTE_DONE
-	while( (byte & ~1) == 0) {
-		byte = inb(SMBUS_IO_BASE + SMBHSTSTAT);
-	}
-}
-
-int smbus_read_byte(unsigned device, unsigned address, unsigned char *result)
-{
-	unsigned char host_status_register;
-	unsigned char byte;
-
-	smbus_wait_until_ready();
-
-	/* setup transaction */
-	/* disable interrupts */
-	outb(inb(SMBUS_IO_BASE + SMBHSTCTL) & (~1), SMBUS_IO_BASE + SMBHSTCTL);
-	/* set to read from the specified device  */
-	outb(((device & 0x7f) << 1) | 1, SMBUS_IO_BASE + SMBHSTADD);
-	/* set the command/address... */
-	outb(address & 0xFF, SMBUS_IO_BASE + SMBHSTCMD);
-	/* set up for a byte data read */
-	outb((inb(SMBUS_IO_BASE + SMBHSTCTL) & 0xE3) | (0x2 << 2), SMBUS_IO_BASE + SMBHSTCTL);
-
-	/* clear any lingering errors, so the transaction will run */
-	outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT);
-
-	/* clear the data byte...*/
-	outb(0, SMBUS_IO_BASE + SMBHSTDAT0);
-
-	/* start the command */
-	outb((inb(SMBUS_IO_BASE + SMBHSTCTL) | 0x40), SMBUS_IO_BASE + SMBHSTCTL);
-
-	/* poll for transaction completion */
-	smbus_wait_until_done();
-
-	host_status_register = inb(SMBUS_IO_BASE + SMBHSTSTAT);
-
-	/* read results of transaction */
-	byte = inb(SMBUS_IO_BASE + SMBHSTDAT0);
-
-	*result = byte;
-	return host_status_register != 0x02;		// return true if !SUCCESS
-}
diff --git a/src/southbridge/intel/i82801cx/usb.c b/src/southbridge/intel/i82801cx/usb.c
deleted file mode 100644
index 5a8e86f..0000000
--- a/src/southbridge/intel/i82801cx/usb.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <console/console.h>
-#include <device/device.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include "i82801cx.h"
-
-static void usb_init(struct device *dev)
-{
-
-#if 0
-	uint32_t cmd;
-	printk(BIOS_DEBUG, "USB: Setting up controller.. ");
-	cmd = pci_read_config32(dev, PCI_COMMAND);
-	pci_write_config32(dev, PCI_COMMAND,
-		cmd | PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
-		PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE);
-
-
-	printk(BIOS_DEBUG, "done.\n");
-#endif
-
-}
-
-static struct device_operations usb_ops  = {
-	.read_resources   = pci_dev_read_resources,
-	.set_resources    = pci_dev_set_resources,
-	.enable_resources = pci_dev_enable_resources,
-	.init             = usb_init,
-	.scan_bus         = 0,
-	.enable           = i82801cx_enable,
-};
-
-static const struct pci_driver usb_driver_1 __pci_driver = {
-	.ops    = &usb_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801CA_USB1,
-};
-static const struct pci_driver usb_driver_2 __pci_driver = {
-        .ops    = &usb_ops,
-        .vendor = PCI_VENDOR_ID_INTEL,
-        .device = PCI_DEVICE_ID_INTEL_82801CA_USB2,
-};
-static const struct pci_driver usb_driver_3 __pci_driver = {
-        .ops    = &usb_ops,
-        .vendor = PCI_VENDOR_ID_INTEL,
-        .device = PCI_DEVICE_ID_INTEL_82801CA_USB3,
-};



More information about the coreboot-gerrit mailing list