arm: mvebu : sata_mv should probe all ports
While a board could have multiple SATA ports, some of the ports might not have a disk attached to them. So while probing for disks, sata_mv_probe() should continue probing all ports, and skip one with no disk attached. Tests with: - Seagate Goflex Net (Marvell Kirkwood 88F6281) out-of-tree u-boot. - Zyxel NSA325 (Marvell Kirkwood 88F6282 out-of-tree u-boot. Observation: If a board has 2 or more SATA ports, and there is only one disk attached to one of the ports, sata_mv_probe() does not return a successful probe status. And if only one disk is attached to the 2nd port (i.e. port 1), it is not probed at all. Patch Description: Let sata_mv_probe() continues probing all ports, even if there is error in probing a given port, and then return a successful status if there is at least one port was probed successfully. Signed-off-by: Tony Dinh <mibodhi@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
@@ -1068,6 +1068,7 @@ static int sata_mv_probe(struct udevice *dev)
|
||||
int nr_ports;
|
||||
int ret;
|
||||
int i;
|
||||
int status = -ENODEV; /* If the probe fails to detected any SATA port */
|
||||
|
||||
/* Get number of ports of this SATA controller */
|
||||
nr_ports = min(fdtdec_get_int(blob, node, "nr-ports", -1),
|
||||
@@ -1078,7 +1079,7 @@ static int sata_mv_probe(struct udevice *dev)
|
||||
IF_TYPE_SATA, -1, 512, 0, &blk);
|
||||
if (ret) {
|
||||
debug("Can't create device\n");
|
||||
return ret;
|
||||
continue;
|
||||
}
|
||||
|
||||
priv = dev_get_plat(blk);
|
||||
@@ -1088,18 +1089,23 @@ static int sata_mv_probe(struct udevice *dev)
|
||||
ret = sata_mv_init_sata(blk, i);
|
||||
if (ret) {
|
||||
debug("%s: Failed to init bus\n", __func__);
|
||||
return ret;
|
||||
continue;
|
||||
}
|
||||
|
||||
/* Scan SATA port */
|
||||
ret = sata_mv_scan_sata(blk, i);
|
||||
if (ret) {
|
||||
debug("%s: Failed to scan bus\n", __func__);
|
||||
return ret;
|
||||
continue;
|
||||
}
|
||||
|
||||
/* If we got here, the current SATA port was probed
|
||||
* successfully, so set the probe status to successful.
|
||||
*/
|
||||
status = 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return status;
|
||||
}
|
||||
|
||||
static int sata_mv_scan(struct udevice *dev)
|
||||
|
||||
Reference in New Issue
Block a user