Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-26 20:37:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

ide: Move ide_init() entirely within ide_probe()

Browse source 
Now that ide_probe() is the only caller of ide_init(), move all the code
into the probe function, so it is easier to refactor it.

Move ide_dev_desc[] into ide_probe() to, since it is the only user.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-04-25 10:54:45 -06:00 • committed by Tom Rini
parent db89e72302
commit 708404c9e9
1 changed files with 38 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
drivers/block/ide.c
View file

@ -39,8 +39,6 @@ ulong ide_bus_offset[CONFIG_SYS_IDE_MAXBUS] = {
#define ATA_CURR_BASE(dev) (CONFIG_SYS_ATA_BASE_ADDR + \ #define ATA_CURR_BASE(dev) (CONFIG_SYS_ATA_BASE_ADDR + \
ide_bus_offset[IDE_BUS(dev)]) ide_bus_offset[IDE_BUS(dev)])
struct blk_desc ide_dev_desc[CONFIG_SYS_IDE_MAXDEVICE];
#define IDE_TIME_OUT 2000 /* 2 sec timeout */ #define IDE_TIME_OUT 2000 /* 2 sec timeout */
#define ATAPI_TIME_OUT 7000 /* 7 sec timeout (5 sec seems to work...) */ #define ATAPI_TIME_OUT 7000 /* 7 sec timeout (5 sec seems to work...) */
@ -719,44 +717,6 @@ static int ide_init_one(int bus)
return 0; return 0;
} }
static void ide_init(void)
{
bool bus_ok[CONFIG_SYS_IDE_MAXBUS];
int i, bus;
schedule();
/* ATAPI Drives seems to need a proper IDE Reset */
ide_reset();
/*
* Wait for IDE to get ready.
* According to spec, this can take up to 31 seconds!
*/
for (bus = 0; bus < CONFIG_SYS_IDE_MAXBUS; ++bus) {
bus_ok[bus] = !ide_init_one(bus);
schedule();
}
putc('\n');
for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; ++i) {
ide_dev_desc[i].type = DEV_TYPE_UNKNOWN;
ide_dev_desc[i].uclass_id = UCLASS_IDE;
ide_dev_desc[i].devnum = i;
ide_dev_desc[i].part_type = PART_TYPE_UNKNOWN;
ide_dev_desc[i].blksz = 0;
ide_dev_desc[i].log2blksz =
LOG2_INVALID(typeof(ide_dev_desc[i].log2blksz));
ide_dev_desc[i].lba = 0;
if (!bus_ok[IDE_BUS(i)])
continue;
ide_ident(&ide_dev_desc[i]);
dev_print(&ide_dev_desc[i]);
}
schedule();
}
static void ide_output_data(int dev, const ulong *sect_buf, int words) static void ide_output_data(int dev, const ulong *sect_buf, int words)
{ {
uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG); uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG);
@ -1041,9 +1001,41 @@ BOOTDEV_HUNTER(ide_bootdev_hunter) = {
static int ide_probe(struct udevice *udev) static int ide_probe(struct udevice *udev)
{ {
int i; struct blk_desc ide_dev_desc[CONFIG_SYS_IDE_MAXDEVICE];
bool bus_ok[CONFIG_SYS_IDE_MAXBUS];
int i, bus;
ide_init(); schedule();
/* ATAPI Drives seems to need a proper IDE Reset */
ide_reset();
/*
* Wait for IDE to get ready.
* According to spec, this can take up to 31 seconds!
*/
for (bus = 0; bus < CONFIG_SYS_IDE_MAXBUS; ++bus) {
bus_ok[bus] = !ide_init_one(bus);
schedule();
}
putc('\n');
for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; ++i) {
ide_dev_desc[i].type = DEV_TYPE_UNKNOWN;
ide_dev_desc[i].uclass_id = UCLASS_IDE;
ide_dev_desc[i].devnum = i;
ide_dev_desc[i].part_type = PART_TYPE_UNKNOWN;
ide_dev_desc[i].blksz = 0;
ide_dev_desc[i].log2blksz =
LOG2_INVALID(typeof(ide_dev_desc[i].log2blksz));
ide_dev_desc[i].lba = 0;
if (!bus_ok[IDE_BUS(i)])
continue;
ide_ident(&ide_dev_desc[i]);
dev_print(&ide_dev_desc[i]);
}
schedule();
for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; i++) { for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; i++) {
if (ide_dev_desc[i].type != DEV_TYPE_UNKNOWN) { if (ide_dev_desc[i].type != DEV_TYPE_UNKNOWN) {
@ -1075,10 +1067,6 @@ static int ide_probe(struct udevice *udev)
if (ret) if (ret)
return ret; return ret;
ret = bootdev_setup_for_dev(udev, "ide_bootdev");
if (ret)
return log_msg_ret("bootdev", ret);
/* fill in device vendor/product/rev strings */ /* fill in device vendor/product/rev strings */
desc = dev_get_uclass_plat(blk_dev); desc = dev_get_uclass_plat(blk_dev);
strlcpy(desc->vendor, ide_dev_desc[desc->devnum].vendor, strlcpy(desc->vendor, ide_dev_desc[desc->devnum].vendor,
@ -1089,6 +1077,10 @@ static int ide_probe(struct udevice *udev)
strlcpy(desc->revision, strlcpy(desc->revision,
ide_dev_desc[desc->devnum].revision, ide_dev_desc[desc->devnum].revision,
BLK_REV_SIZE); BLK_REV_SIZE);
ret = bootdev_setup_for_dev(udev, "ide_bootdev");
if (ret)
return log_msg_ret("bootdev", ret);
} }
} }