use new pci config setup

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1319 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Greg Watson 2003-12-17 17:51:35 +00:00
parent 5965169dad
commit 1b362c4980
4 changed files with 152 additions and 137 deletions

View File

@ -1,2 +1,4 @@
config chip.h #config chip.h
object w83c553f.o #object w83c553f.o
driver w83c553f.o
driver w83c553f_ide.o

View File

@ -27,75 +27,30 @@
* Enabling function 1 (IDE controller of the chip. * Enabling function 1 (IDE controller of the chip.
*/ */
#ifndef CONFIG_ISA_IO
#define CONFIG_ISA_IO 0xFE000000
#endif
#include <arch/io.h> #include <arch/io.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ids.h>
#include <device/chip.h> #include <device/chip.h>
#include <console/console.h> #include <console/console.h>
#include "w83c553f.h" #include "w83c553f.h"
#include "chip.h"
#ifndef CONFIG_ISA_MEM
#define CONFIG_ISA_MEM 0xFD000000
#endif
#ifndef CONFIG_ISA_IO
#define CONFIG_ISA_IO 0xFE000000
#endif
#ifndef CONFIG_IDE_MAXBUS
#define CONFIG_IDE_MAXBUS 2
#endif
#ifndef CONFIG_IDE_MAXDEVICE
#define CONFIG_IDE_MAXDEVICE (CONFIG_IDE_MAXBUS*2)
#endif
uint32_t ide_bus_offset[CONFIG_IDE_MAXBUS];
void initialise_pic(void); void initialise_pic(void);
void initialise_dma(void); void initialise_dma(void);
extern struct pci_ops pci_direct_ppc; static void
w83c553_init(struct device *dev)
#if 0
void southbridge_early_init(void)
{ {
unsigned char reg8; unsigned char reg8;
printk_info("Configure W83C553F\n");
#ifdef SANDPOINT
/* /*
* Set ISA memory space * Set ISA memory space NOT SURE ABOUT THIS???
*/
pci_direct_ppc.read_byte(0, 0x58, W83C553F_IPADCR, &reg8);
/* 16 MB ISA memory space */
reg8 |= (W83C553F_IPADCR_IPATOM4 | W83C553F_IPADCR_IPATOM5 | W83C553F_IPADCR_IPATOM6 | W83C553F_IPADCR_IPATOM7);
reg8 &= ~W83C553F_IPADCR_MBE512;
pci_direct_ppc.write_byte(0, 0x58, W83C553F_IPADCR, &reg8);
}
#endif
void w83c553_init(void)
{
struct device *dev;
unsigned char reg8;
unsigned short reg16;
unsigned int reg32;
dev = dev_find_device(W83C553F_VID, W83C553F_DID, 0);
if (dev == 0)
{
printk_info("Error: Cannot find W83C553F controller on any PCI bus\n");
return;
}
printk_info("Found W83C553F controller\n");
/* always enabled */
#if 0
reg16 = pci_read_config16(dev, PCI_COMMAND);
reg16 |= PCI_COMMAND_MASTER | PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
pci_write_config16(dev, PCI_COMMAND, reg16);
#endif
/*
* Set ISA memory space
*/ */
reg8 = pci_read_config8(dev, W83C553F_IPADCR); reg8 = pci_read_config8(dev, W83C553F_IPADCR);
/* 16 MB ISA memory space */ /* 16 MB ISA memory space */
@ -111,7 +66,6 @@ void w83c553_init(void)
reg8 &= ~W83C553F_CSCR_BIOSWP; reg8 &= ~W83C553F_CSCR_BIOSWP;
pci_write_config8(dev, W83C553F_CSCR, reg8); pci_write_config8(dev, W83C553F_CSCR, reg8);
/* /*
* Enable Port 92 * Enable Port 92
*/ */
@ -121,64 +75,8 @@ void w83c553_init(void)
/* /*
* Route IDE interrupts to IRQ 14 & 15 on 8259. * Route IDE interrupts to IRQ 14 & 15 on 8259.
*/ */
pci_write_config8(dev, W83C553F_IDEIRCR, 0xef); pci_write_config8(dev, W83C553F_IDEIRCR, 0x90);
pci_write_config16(dev, W83C553F_PCIIRCR, 0x0000); pci_write_config16(dev, W83C553F_PCIIRCR, 0xABEF);
/*
* Read IDE bus offsets from function 1 device.
* We must unmask the LSB indicating that it is an IO address.
*/
dev = dev_find_device(W83C553F_VID, W83C553F_IDE, 0);
if (dev == 0)
{
printk_info("Error: Cannot find W83C553F function 1 device\n");
return;
}
/*
* Enable native mode on IDE ports and set base address.
*/
reg8 = W83C553F_PIR_P1NL | W83C553F_PIR_P0NL;
pci_write_config8(dev, W83C553F_PIR, reg8);
pci_write_config32(dev, PCI_BASE_ADDRESS_0, 0xffffffff);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_0);
pci_write_config32(dev, PCI_BASE_ADDRESS_0, 0x1f0);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_0);
pci_write_config32(dev, PCI_BASE_ADDRESS_1, 0xffffffff);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_1);
pci_write_config32(dev, PCI_BASE_ADDRESS_1, 0x3f6);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_1);
pci_write_config32(dev, PCI_BASE_ADDRESS_2, 0xffffffff);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_2);
pci_write_config32(dev, PCI_BASE_ADDRESS_2, 0x170);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_2);
pci_write_config32(dev, PCI_BASE_ADDRESS_3, 0xffffffff);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_3);
pci_write_config32(dev, PCI_BASE_ADDRESS_3, 0x376);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_3);
/*
* Set read-ahead duration to 0xff
* Enable P0 and P1
*/
reg32 = 0x00ff0000 | W83C553F_IDECSR_P1EN | W83C553F_IDECSR_P0EN;
pci_write_config32(dev, W83C553F_IDECSR, reg32);
ide_bus_offset[0] = pci_read_config32(dev, PCI_BASE_ADDRESS_0);
printk_debug("ide bus offset = 0x%x\n", ide_bus_offset[0]);
ide_bus_offset[0] &= ~1;
#if CONFIG_IDE_MAXBUS > 1
ide_bus_offset[1] = pci_read_config32(dev, PCI_BASE_ADDRESS_2);
ide_bus_offset[1] &= ~1;
#endif
/*
* Enable function 1, IDE -> busmastering and IO space access
*/
reg16 = pci_read_config16(dev, PCI_COMMAND);
reg16 |= PCI_COMMAND_MASTER | PCI_COMMAND_IO;
pci_write_config16(dev, PCI_COMMAND, reg16);
reg16 = pci_read_config16(dev, PCI_COMMAND);
/* /*
* Initialise ISA interrupt controller * Initialise ISA interrupt controller
@ -189,6 +87,7 @@ void w83c553_init(void)
* Initialise DMA controller * Initialise DMA controller
*/ */
initialise_dma(); initialise_dma();
#endif
printk_info("W83C553F configuration complete\n"); printk_info("W83C553F configuration complete\n");
} }
@ -286,23 +185,17 @@ void initialise_dma(void)
outw(W83C553F_DMA2 + W83C553F_DMA2_CS, 0x0000); outw(W83C553F_DMA2 + W83C553F_DMA2_CS, 0x0000);
} }
void southbridge_init(struct chip *chip, enum chip_pass pass) struct device_operations w83c553_ops = {
{ .read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
struct southbridge_winbond_w83c553_config *conf = (struct southbridge_winbond_w83c553_config *)chip->chip_info; .enable_resources = pci_dev_enable_resources,
.init = w83c553_init,
switch (pass) { .scan_bus = 0,
case CONF_PASS_POST_PCI: };
w83c553_init();
break; struct pci_driver w83c553f_pci_driver __pci_driver = {
/* w83c553f */
default: .ops = &w83c553_ops,
/* nothing yet */ .device = PCI_DEVICE_ID_WINBOND_83C553,
break; .vendor = PCI_VENDOR_ID_WINBOND,
}
}
struct chip_control southbridge_winbond_w83c553_control = {
enable: southbridge_init,
name: "Winbond W83C553"
}; };

View File

@ -21,6 +21,9 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _W83C553_H
#define _W83C553_H
/* winbond access routines and defines*/ /* winbond access routines and defines*/
/* from the winbond data sheet - /* from the winbond data sheet -
@ -192,4 +195,6 @@
#define W83C553F_DMA2_CM 0xDC #define W83C553F_DMA2_CM 0xDC
#define W83C553F_DMA2_RWAMB 0xDE #define W83C553F_DMA2_RWAMB 0xDE
void initialise_w83c553f(void); extern struct device_operations w83c553_ops;
#endif /* _W83C553_H */

View File

@ -0,0 +1,115 @@
/*
* (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Andreas Heppel <aheppel@sysgo.de>
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
/*
* Enable IDE controller of the W83C553F chip.
*/
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include "w83c553f.h"
#ifndef CONFIG_IDE_MAXBUS
#define CONFIG_IDE_MAXBUS 2
#endif
#ifndef CONFIG_IDE_MAXDEVICE
#define CONFIG_IDE_MAXDEVICE (CONFIG_IDE_MAXBUS*2)
#endif
uint32_t ide_bus_offset[CONFIG_IDE_MAXBUS];
static void
w83c553_ide_init(struct device *dev)
{
unsigned char reg8;
unsigned short reg16;
unsigned int reg32;
printk_info("Configure W83C553F IDE\n");
#if 0
/*
* Enable native mode on IDE ports and set base address.
*/
reg8 = W83C553F_PIR_P1NL | W83C553F_PIR_P0NL;
pci_write_config8(dev, W83C553F_PIR, reg8);
pci_write_config32(dev, PCI_BASE_ADDRESS_0, 0xffffffff);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_0);
pci_write_config32(dev, PCI_BASE_ADDRESS_0, 0x1f0);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_0);
pci_write_config32(dev, PCI_BASE_ADDRESS_1, 0xffffffff);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_1);
pci_write_config32(dev, PCI_BASE_ADDRESS_1, 0x3f6);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_1);
pci_write_config32(dev, PCI_BASE_ADDRESS_2, 0xffffffff);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_2);
pci_write_config32(dev, PCI_BASE_ADDRESS_2, 0x170);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_2);
pci_write_config32(dev, PCI_BASE_ADDRESS_3, 0xffffffff);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_3);
pci_write_config32(dev, PCI_BASE_ADDRESS_3, 0x376);
reg32 = pci_read_config32(dev, PCI_BASE_ADDRESS_3);
/*
* Set read-ahead duration to 0xff
* Enable P0 and P1
*/
reg32 = 0x00ff0000 | W83C553F_IDECSR_P1EN | W83C553F_IDECSR_P0EN;
pci_write_config32(dev, W83C553F_IDECSR, reg32);
ide_bus_offset[0] = pci_read_config32(dev, PCI_BASE_ADDRESS_0);
printk_debug("ide bus offset = 0x%x\n", ide_bus_offset[0]);
ide_bus_offset[0] &= ~1;
#if CONFIG_IDE_MAXBUS > 1
ide_bus_offset[1] = pci_read_config32(dev, PCI_BASE_ADDRESS_2);
ide_bus_offset[1] &= ~1;
#endif
/*
* Enable function 1, IDE -> busmastering and IO space access
*/
reg16 = pci_read_config16(dev, PCI_COMMAND);
reg16 |= PCI_COMMAND_MASTER | PCI_COMMAND_IO;
pci_write_config16(dev, PCI_COMMAND, reg16);
#endif
printk_info("IDE configuration complete\n");
}
struct device_operations w83c553_ide_ops = {
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.init = w83c553_ide_init,
.scan_bus = 0,
};
struct pci_driver w83c553f_ide_pci_driver __pci_driver = {
/* w83c553f_ide */
.ops = &w83c553_ide_ops,
.device = PCI_DEVICE_ID_WINBOND_82C105,
.vendor = PCI_VENDOR_ID_WINBOND,
};