GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trying to get it right... 

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1340 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Greg Watson 2004-01-21 23:50:56 +00:00
parent 8a1678fb90
commit 8af609f2fe
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/pc80/ide/ide.c
View File

@ -29,8 +29,14 @@
#include <pc80/ide.h> #include <pc80/ide.h>
#include <arch/io.h> #include <arch/io.h>
#ifndef CONFIG_IDE_MAXBUS
#define CONFIG_IDE_MAXBUS 2
#endif
struct controller controller; struct controller controller;
struct harddisk_info harddisk_info[NUM_HD]; struct harddisk_info harddisk_info[NUM_HD];
extern uint32_t ide_base[CONFIG_IDE_MAXBUS];
static int await_ide(int (*done)(struct controller *ctrl), static int await_ide(int (*done)(struct controller *ctrl),
struct controller *ctrl, unsigned long timeout) struct controller *ctrl, unsigned long timeout)
@ -226,12 +232,16 @@ static inline int ide_read_sector_lba48(
return pio_data_in(info->ctrl, &cmd, buffer, IDE_SECTOR_SIZE); return pio_data_in(info->ctrl, &cmd, buffer, IDE_SECTOR_SIZE);
} }
int ide_read_sector(int driveno, void * buf, unsigned int sector, int ide_read(int driveno, unsigned int sector, void *buf)
int byte_offset, int n_bytes)
{ {
struct harddisk_info *info = &harddisk_info[driveno]; struct harddisk_info *info;
int result; int result;
if (driveno > NUM_HD-1)
return -1;
info = &harddisk_info[driveno];
/* Report the buffer is empty */ /* Report the buffer is empty */
if (sector > info->sectors) { if (sector > info->sectors) {
return -1; return -1;
@ -251,7 +261,7 @@ int ide_read_sector(int driveno, void * buf, unsigned int sector,
return result; return result;
} }
static int init_drive(struct harddisk_info *info, struct controller *ctrl, int slave, int basedrive) static int init_drive(struct harddisk_info *info, struct controller *ctrl, int slave, int drive)
{ {
uint16_t* drive_info; uint16_t* drive_info;
struct ide_pio_command cmd; struct ide_pio_command cmd;
@ -267,9 +277,9 @@ static int init_drive(struct harddisk_info *info, struct controller *ctrl, int s
info->drive_exists = 0; info->drive_exists = 0;
info->slave_absent = 0; info->slave_absent = 0;
info->slave = slave?IDE_DH_SLAVE: IDE_DH_MASTER; info->slave = slave?IDE_DH_SLAVE: IDE_DH_MASTER;
info->basedrive = basedrive; info->basedrive = drive & 1;
printk_info("Testing for disk %d\n", info->basedrive); printk_info("Testing for disk %d\n", drive);
/* Select the drive that we are testing */ /* Select the drive that we are testing */
outb(IDE_DH_DEFAULT | IDE_DH_HEAD(0) | IDE_DH_CHS | info->slave, outb(IDE_DH_DEFAULT | IDE_DH_HEAD(0) | IDE_DH_CHS | info->slave,
@ -296,7 +306,7 @@ static int init_drive(struct harddisk_info *info, struct controller *ctrl, int s
} }
} }
printk_info("Probing for disk %d\n", info->basedrive); printk_info("Probing for disk %d\n", drive);
memset(&cmd, 0, sizeof(cmd)); memset(&cmd, 0, sizeof(cmd));
cmd.device = IDE_DH_DEFAULT | IDE_DH_HEAD(0) | IDE_DH_CHS | info->slave; cmd.device = IDE_DH_DEFAULT | IDE_DH_HEAD(0) | IDE_DH_CHS | info->slave;
@ -404,8 +414,9 @@ static int init_drive(struct harddisk_info *info, struct controller *ctrl, int s
return 0; return 0;
} }
static int init_controller(struct controller *ctrl, int basedrive) static int init_controller(struct controller *ctrl, int num)
{ {
int drive;
struct harddisk_info *info; struct harddisk_info *info;
/* Put the drives ide channel in a know state and wait /* Put the drives ide channel in a know state and wait
@ -454,15 +465,16 @@ static int init_controller(struct controller *ctrl, int basedrive)
*/ */
/* Now initialize the individual drives */ /* Now initialize the individual drives */
info = &harddisk_info[basedrive]; drive = num * 2; /* 2 drives per controller */
init_drive(info, ctrl, 0, basedrive & 1); info = &harddisk_info[drive];
init_drive(info, ctrl, 0, drive);
/* at the moment this only works for the first drive */ /* at the moment this only works for the first drive */
#if 0 #if 0
if (info->drive_exists && !info->slave_absent) { if (info->drive_exists && !info->slave_absent) {
basedrive++; drive++;
info++; info++;
init_drive(info, ctrl, 1, basedrive & 1); init_drive(info, ctrl, 1, drive);
} }
#endif #endif
@ -477,36 +489,26 @@ int ide_init(void)
/* Intialize the harddisk_info structures */ /* Intialize the harddisk_info structures */
memset(harddisk_info, 0, sizeof(harddisk_info)); memset(harddisk_info, 0, sizeof(harddisk_info));
for(index = 0; index < 1; index++) { for(index = 0; index < CONFIG_IDE_MAXBUS; index++) {
#if 0
/* IDE normal pci mode */ /* IDE normal pci mode */
unsigned cmd_reg, ctrl_reg;
uint32_t cmd_base, ctrl_base; uint32_t cmd_base, ctrl_base;
if (index < 2) { cmd_base = ide_base[index];
cmd_reg = PCI_BASE_ADDRESS_0; ctrl_base = cmd_base + IDE_REG_EXTENDED_OFFSET;
ctrl_reg = PCI_BASE_ADDRESS_1; controller.cmd_base = (cmd_base & ~3);
} else { controller.ctrl_base = (ctrl_base & ~3);
cmd_reg = PCI_BASE_ADDRESS_2;
ctrl_reg = PCI_BASE_ADDRESS_3;
}
pcibios_read_config_dword(0, 0, cmd_reg, &cmd_base);
pcibios_read_config_dword(0, 0, ctrl_reg, &ctrl_base);
controller.cmd_base = cmd_base & ~3;
controller.ctrl_base = ctrl_base & ~3;
#endif
uint16_t base;
base = (index < 1)?IDE_BASE0:IDE_BASE1;
controller.cmd_base = base;
controller.ctrl_base = base + IDE_REG_EXTENDED_OFFSET;
printk_info("init_controller %d at (%x, %x)\n", index, controller.cmd_base, controller.ctrl_base); printk_info("init_controller %d at (%x, %x)\n", index, controller.cmd_base, controller.ctrl_base);
if (init_controller(&controller, index << 1) < 0) { if (init_controller(&controller, index) < 0) {
/* nothing behind the controller */ /* nothing behind the controller */
continue; continue;
} }
drives++; drives++;
/*
* break here to avoid lengthy timeout probing for
* disks on second controller
*/
break;
} }
return drives > 0 ? 0 : -1; return drives > 0 ? 0 : -1;