Hi Simon,
On Tue, Sep 5, 2023 at 9:00 PM Tony Dinh wrote:
>
> Add ahci sata bootdev and corresponding hunting function.
>
> Signed-off-by: Tony Dinh
> ---
>
> drivers/ata/Makefile | 1 +
> drivers/ata/sata.c | 25 +++
> drivers/ata/sata_bootdev.c | 62 ++
> include/sata.h | 1 +
> 4 files changed, 89 insertions(+)
> create mode 100644 drivers/ata/sata_bootdev.c
>
> diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
> index 6e30180b8b..c1b51b5444 100644
> --- a/drivers/ata/Makefile
> +++ b/drivers/ata/Makefile
> @@ -11,6 +11,7 @@ obj-$(CONFIG_DWC_AHSATA) += dwc_ahsata.o
> obj-$(CONFIG_FSL_SATA) += fsl_sata.o
> obj-$(CONFIG_LIBATA) += libata.o
> obj-$(CONFIG_SATA) += sata.o
> +obj-$(CONFIG_BOOTSTD) += sata_bootdev.o
> obj-$(CONFIG_SATA_CEVA) += sata_ceva.o
> obj-$(CONFIG_SATA_MV) += sata_mv.o
> obj-$(CONFIG_SATA_SIL) += sata_sil.o
> diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
> index ce3e9b5a40..9da7218564 100644
> --- a/drivers/ata/sata.c
> +++ b/drivers/ata/sata.c
> @@ -15,6 +15,8 @@
> #include
> #include
> #include
> +#include
> +#include
>
> #ifndef CONFIG_AHCI
> struct blk_desc sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
> @@ -50,6 +52,29 @@ int sata_scan(struct udevice *dev)
> return ops->scan(dev);
> }
>
> +int sata_rescan(bool verbose)
> +{
> + struct udevice *dev;
> + int devnum = 0;
> + int ret;
> +
> + /* Find and probing the SATA controller */
> + ret = uclass_get_device(UCLASS_AHCI, devnum, &dev);
> +
> + /* Sanity check */
> + if (ret)
> + ret = uclass_find_first_device(UCLASS_AHCI, &dev);
> + if (ret) {
> + printf("Cannot probe SATA device %d (err=%d)\n", devnum, ret);
> + return -ENOSYS;
> + }
> + if (!dev) {
> + printf("No SATA device found!\n");
> + return -ENOSYS;
> + }
> + return 0;
> +}
> +
> #ifndef CONFIG_AHCI
> #ifdef CONFIG_PARTITIONS
> struct blk_desc *sata_get_dev(int dev)
> diff --git a/drivers/ata/sata_bootdev.c b/drivers/ata/sata_bootdev.c
> new file mode 100644
> index 00..f638493ce0
> --- /dev/null
> +++ b/drivers/ata/sata_bootdev.c
> @@ -0,0 +1,62 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Bootdev for sata
> + *
> + * Copyright 2023 Tony Dinh
> + */
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +static int sata_bootdev_bind(struct udevice *dev)
> +{
> + struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev);
> +
> + ucp->prio = BOOTDEVP_4_SCAN_FAST;
> +
> + return 0;
> +}
> +
> +static int sata_bootdev_hunt(struct bootdev_hunter *info, bool show)
> +{
> + int ret;
> +
> + if (IS_ENABLED(CONFIG_PCI)) {
> + ret = pci_init();
> + if (ret)
> + return ret;
> + }
> +
> + ret = sata_rescan(true);
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +
> +struct bootdev_ops sata_bootdev_ops = {
> +};
> +
> +static const struct udevice_id sata_bootdev_ids[] = {
> + { .compatible = "u-boot,bootdev-sata" },
> + { }
> +};
> +
> +U_BOOT_DRIVER(sata_bootdev) = {
> + .name = "sata_bootdev",
> + .id = UCLASS_BOOTDEV,
> + .ops= &sata_bootdev_ops,
> + .bind = sata_bootdev_bind,
> + .of_match = sata_bootdev_ids,
> +};
> +
> +BOOTDEV_HUNTER(sata_bootdev_hunter) = {
> + .prio = BOOTDEVP_4_SCAN_FAST,
> + .uclass = UCLASS_AHCI,
> + .hunt = sata_bootdev_hunt,
> + .drv= DM_DRIVER_REF(sata_bootdev),
> +};
> diff --git a/include/sata.h b/include/sata.h
> index d89f7a8a29..0495744bad 100644
> --- a/include/sata.h
> +++ b/include/sata.h
> @@ -20,5 +20,6 @@ extern struct blk_desc sata_dev_desc[];
>
> int sata_probe(int devnum);
> int sata_remove(int devnum);
> +int sata_rescan(bool verbose);
>
> #endif
> --
> 2.39.2
>
This will need a followup patch. It's about how the distro boot
devtype is currently set to "ahci" after the bootflow scanning,
instead of "sata". For example,
load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${uImage}
The non-scsi hdd device it must be identified as sata, like below,
load sata ${devnum}:${distro_bootpart} ${kernel_addr_r} ${uImage}
All the best,
Tony
