mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-01-23 18:35:11 +00:00
ee2ce29223
During bootstd scanning for bootdevs, if bootdev_hunt_drv() encounters a device not found error (e.g. ENOENT), let it return a successful status so that bootstd will continue scanning the next devices, not stopping prematurely. Background: During scanning for bootflows, it's possible for bootstd to encounter a faulty device controller. Also when the same u-boot is used for another variant of the same board, some device controller such as SATA might not exist. I've found this issue while converting the Marvell Sheevaplug board to use bootstd. This board has 2 variants, the original Sheevaplug has MMC and USB only, but the later variant comes with USB, MMC, and eSATA ports. We have been using the same u-boot (starting with CONFIG_IDE and later with DM CONFIG_SATA) for both variants. This worked well with the old envs-scripting booting scheme. Signed-off-by: Tony Dinh <mibodhi@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
166 lines
3.3 KiB
C
166 lines
3.3 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2000-2005, DENX Software Engineering
|
|
* Wolfgang Denk <wd@denx.de>
|
|
* Copyright (C) Procsys. All rights reserved.
|
|
* Mushtaq Khan <mushtaq_k@procsys.com>
|
|
* <mushtaqk_921@yahoo.co.in>
|
|
* Copyright (C) 2008 Freescale Semiconductor, Inc.
|
|
* Dave Liu <daveliu@freescale.com>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <ahci.h>
|
|
#include <blk.h>
|
|
#include <dm.h>
|
|
#include <part.h>
|
|
#include <sata.h>
|
|
#include <dm/device-internal.h>
|
|
#include <dm/uclass-internal.h>
|
|
|
|
#ifndef CONFIG_AHCI
|
|
struct blk_desc sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
|
|
#endif
|
|
|
|
int sata_reset(struct udevice *dev)
|
|
{
|
|
struct ahci_ops *ops = ahci_get_ops(dev);
|
|
|
|
if (!ops->reset)
|
|
return -ENOSYS;
|
|
|
|
return ops->reset(dev);
|
|
}
|
|
|
|
int sata_dm_port_status(struct udevice *dev, int port)
|
|
{
|
|
struct ahci_ops *ops = ahci_get_ops(dev);
|
|
|
|
if (!ops->port_status)
|
|
return -ENOSYS;
|
|
|
|
return ops->port_status(dev, port);
|
|
}
|
|
|
|
int sata_scan(struct udevice *dev)
|
|
{
|
|
struct ahci_ops *ops = ahci_get_ops(dev);
|
|
|
|
if (!ops->scan)
|
|
return -ENOSYS;
|
|
|
|
return ops->scan(dev);
|
|
}
|
|
|
|
int sata_rescan(bool verbose)
|
|
{
|
|
int ret;
|
|
struct udevice *dev;
|
|
|
|
if (verbose)
|
|
printf("Removing devices on SATA bus...\n");
|
|
|
|
blk_unbind_all(UCLASS_AHCI);
|
|
|
|
ret = uclass_find_first_device(UCLASS_AHCI, &dev);
|
|
if (ret || !dev) {
|
|
printf("Cannot find SATA device (err=%d)\n", ret);
|
|
return -ENOENT;
|
|
}
|
|
|
|
ret = device_remove(dev, DM_REMOVE_NORMAL);
|
|
if (ret) {
|
|
printf("Cannot remove SATA device '%s' (err=%d)\n", dev->name, ret);
|
|
return -ENOSYS;
|
|
}
|
|
|
|
if (verbose)
|
|
printf("Rescanning SATA bus for devices...\n");
|
|
|
|
ret = uclass_probe_all(UCLASS_AHCI);
|
|
|
|
if (ret == -ENODEV) {
|
|
if (verbose)
|
|
printf("No SATA block device found\n");
|
|
return 0;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
#ifndef CONFIG_AHCI
|
|
#ifdef CONFIG_PARTITIONS
|
|
struct blk_desc *sata_get_dev(int dev)
|
|
{
|
|
return (dev < CONFIG_SYS_SATA_MAX_DEVICE) ? &sata_dev_desc[dev] : NULL;
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
static unsigned long sata_bread(struct udevice *dev, lbaint_t start,
|
|
lbaint_t blkcnt, void *dst)
|
|
{
|
|
return -ENOSYS;
|
|
}
|
|
|
|
static unsigned long sata_bwrite(struct udevice *dev, lbaint_t start,
|
|
lbaint_t blkcnt, const void *buffer)
|
|
{
|
|
return -ENOSYS;
|
|
}
|
|
|
|
#ifndef CONFIG_AHCI
|
|
int __sata_initialize(void)
|
|
{
|
|
int rc, ret = -1;
|
|
int i;
|
|
|
|
for (i = 0; i < CONFIG_SYS_SATA_MAX_DEVICE; i++) {
|
|
memset(&sata_dev_desc[i], 0, sizeof(struct blk_desc));
|
|
sata_dev_desc[i].uclass_id = UCLASS_AHCI;
|
|
sata_dev_desc[i].devnum = i;
|
|
sata_dev_desc[i].part_type = PART_TYPE_UNKNOWN;
|
|
sata_dev_desc[i].type = DEV_TYPE_HARDDISK;
|
|
sata_dev_desc[i].lba = 0;
|
|
sata_dev_desc[i].blksz = 512;
|
|
sata_dev_desc[i].log2blksz = LOG2(sata_dev_desc[i].blksz);
|
|
rc = init_sata(i);
|
|
if (!rc) {
|
|
rc = scan_sata(i);
|
|
if (!rc && sata_dev_desc[i].lba > 0 &&
|
|
sata_dev_desc[i].blksz > 0) {
|
|
part_init(&sata_dev_desc[i]);
|
|
ret = i;
|
|
}
|
|
}
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
int sata_initialize(void) __attribute__((weak, alias("__sata_initialize")));
|
|
|
|
__weak int __sata_stop(void)
|
|
{
|
|
int i, err = 0;
|
|
|
|
for (i = 0; i < CONFIG_SYS_SATA_MAX_DEVICE; i++)
|
|
err |= reset_sata(i);
|
|
|
|
if (err)
|
|
printf("Could not reset some SATA devices\n");
|
|
|
|
return err;
|
|
}
|
|
int sata_stop(void) __attribute__((weak, alias("__sata_stop")));
|
|
#endif
|
|
|
|
static const struct blk_ops sata_blk_ops = {
|
|
.read = sata_bread,
|
|
.write = sata_bwrite,
|
|
};
|
|
|
|
U_BOOT_DRIVER(sata_blk) = {
|
|
.name = "sata_blk",
|
|
.id = UCLASS_BLK,
|
|
.ops = &sata_blk_ops,
|
|
};
|