mirror of
https://github.com/smaeul/u-boot.git
synced 2025-10-25 01:58:13 +01:00
aa6ab905b2
Commit d97dc8a0 separated the non-command code into its own file which caused variable sata_curr_device can not be set to a correct value. Before commit d97dc8a0, variable sata_curr_device can be set correctly in sata_initialize(). After commit d97dc8a0, sata_initialize() is moved out to its own file. Accordingly, variable sata_curr_device is removed from sata_initialize() too. This caused sata_curr_device never gets a chance to be set properly which prevent other commands from being executed. This patch sets variable sata_curr_device properly. Fixes: d97dc8a0 (dm: sata: Separate the non-command code into its own file) Signed-off-by: Tang Yuantian <yuantian.tang@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
118 lines
2.7 KiB
C
118 lines
2.7 KiB
C
/*
|
|
* 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>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <sata.h>
|
|
|
|
struct blk_desc sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
|
|
|
|
#ifdef CONFIG_PARTITIONS
|
|
struct blk_desc *sata_get_dev(int dev)
|
|
{
|
|
return (dev < CONFIG_SYS_SATA_MAX_DEVICE) ? &sata_dev_desc[dev] : NULL;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_BLK
|
|
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;
|
|
}
|
|
#else
|
|
static unsigned long sata_bread(struct blk_desc *block_dev, lbaint_t start,
|
|
lbaint_t blkcnt, void *dst)
|
|
{
|
|
return sata_read(block_dev->devnum, start, blkcnt, dst);
|
|
}
|
|
|
|
static unsigned long sata_bwrite(struct blk_desc *block_dev, lbaint_t start,
|
|
lbaint_t blkcnt, const void *buffer)
|
|
{
|
|
return sata_write(block_dev->devnum, start, blkcnt, buffer);
|
|
}
|
|
#endif
|
|
|
|
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].if_type = IF_TYPE_SATA;
|
|
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);
|
|
#ifndef CONFIG_BLK
|
|
sata_dev_desc[i].block_read = sata_bread;
|
|
sata_dev_desc[i].block_write = sata_bwrite;
|
|
#endif
|
|
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")));
|
|
|
|
#ifdef CONFIG_BLK
|
|
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,
|
|
};
|
|
#else
|
|
U_BOOT_LEGACY_BLK(sata) = {
|
|
.if_typename = "sata",
|
|
.if_type = IF_TYPE_SATA,
|
|
.max_devs = CONFIG_SYS_SATA_MAX_DEVICE,
|
|
.desc = sata_dev_desc,
|
|
};
|
|
#endif
|