Re: [PATCH v5] bootstd: sata: Add bootstd support for ahci sata

2023-10-23 Thread Tony Dinh 
On Mon, Oct 23, 2023 at 12:08 PM Tom Rini  wrote:
>
> On Wed, 11 Oct 2023 13:26:42 -0700, Tony Dinh wrote:
>
> > Add ahci sata bootdev and corresponding hunting function.
> >
> >
>
> I know this is recent but given their importance, applied to u-boot/master,
> thanks!
>
> --
> Tom
>

Thanks Tom!

All the best,
Tony

Re: [PATCH v5] bootstd: sata: Add bootstd support for ahci sata

2023-10-23 Thread Tom Rini 
On Wed, 11 Oct 2023 13:26:42 -0700, Tony Dinh wrote:

> Add ahci sata bootdev and corresponding hunting function.
> 
> 

I know this is recent but given their importance, applied to u-boot/master,
thanks!

-- 
Tom

Re: [PATCH v5] bootstd: sata: Add bootstd support for ahci sata

2023-10-16 Thread Stefan Roese 

On 10/11/23 22:26, Tony Dinh wrote:

Add ahci sata bootdev and corresponding hunting function.

Signed-off-by: Tony Dinh 


Reviewed-by: Stefan Roese 

Thanks,
Stefan


---

Changes in v5:
- In bootmeth_script script_boot(), it's unnecessary to check for ret so
remove it. While we're here, also initialize ret in declaration.

Changes in v4:
- Revise logic in bootmeth_script() to set devtype to sata for non-scsi
SATA device
- Rewrite sata_rescan() logic to properly remove all devices before probing
- Add description to sata_rescan() header

Changes in v3:
- Correct drivers/ata/Makefile to compile sata_bootdev only if
ahci sata is enabled.

Changes in v2:
- set devtype to sata in bootmeth_script for non-scsi SATA device.

  boot/bootmeth_script.c | 16 +++---
  drivers/ata/Makefile   |  2 +-
  drivers/ata/sata.c | 32 
  drivers/ata/sata_bootdev.c | 62 ++
  include/sata.h |  6 
  5 files changed, 113 insertions(+), 5 deletions(-)
  create mode 100644 drivers/ata/sata_bootdev.c

diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c
index 345114dabf..06340e43d2 100644
--- a/boot/bootmeth_script.c
+++ b/boot/bootmeth_script.c
@@ -188,12 +188,20 @@ static int script_boot(struct udevice *dev, struct 
bootflow *bflow)
  {
struct blk_desc *desc = dev_get_uclass_plat(bflow->blk);
ulong addr;
-   int ret;
+   int ret = 0;
  
-	if (desc->uclass_id == UCLASS_USB)

+   if (desc->uclass_id == UCLASS_USB) {
ret = env_set("devtype", "usb");
-   else
-   ret = env_set("devtype", blk_get_devtype(bflow->blk));
+   } else {
+   /* If the uclass is AHCI, but the driver is ATA
+* (not scsi), set devtype to sata
+*/
+   if (IS_ENABLED(CONFIG_SATA) &&
+   desc->uclass_id == UCLASS_AHCI)
+   ret = env_set("devtype", "sata");
+   else
+   ret = env_set("devtype", blk_get_devtype(bflow->blk));
+   }
if (!ret)
ret = env_set_hex("devnum", desc->devnum);
if (!ret)
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 6e30180b8b..0b6f91098a 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_SCSI_AHCI) += ahci.o
  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_SATA) += sata.o 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..f126b84e05 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,36 @@ int sata_scan(struct udevice *dev)
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, );
+   if (ret || !dev) {
+   printf("Cannot find SATA device (err=%d)\n", ret);
+   return -ENOSYS;
+   }
+
+   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);
+
+   return ret;
+}
+
  #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" },
+   { }
+};
+

Re: [PATCH v5] bootstd: sata: Add bootstd support for ahci sata

2023-10-11 Thread Simon Glass 
On Wed, 11 Oct 2023 at 13:27, Tony Dinh  wrote:
>
> Add ahci sata bootdev and corresponding hunting function.
>
> Signed-off-by: Tony Dinh 
> ---
>
> Changes in v5:
> - In bootmeth_script script_boot(), it's unnecessary to check for ret so
> remove it. While we're here, also initialize ret in declaration.
>
> Changes in v4:
> - Revise logic in bootmeth_script() to set devtype to sata for non-scsi
> SATA device
> - Rewrite sata_rescan() logic to properly remove all devices before probing
> - Add description to sata_rescan() header
>
> Changes in v3:
> - Correct drivers/ata/Makefile to compile sata_bootdev only if
> ahci sata is enabled.
>
> Changes in v2:
> - set devtype to sata in bootmeth_script for non-scsi SATA device.
>
>  boot/bootmeth_script.c | 16 +++---
>  drivers/ata/Makefile   |  2 +-
>  drivers/ata/sata.c | 32 
>  drivers/ata/sata_bootdev.c | 62 ++
>  include/sata.h |  6 
>  5 files changed, 113 insertions(+), 5 deletions(-)
>  create mode 100644 drivers/ata/sata_bootdev.c

Reviewed-by: Simon Glass

[PATCH v5] bootstd: sata: Add bootstd support for ahci sata

2023-10-11 Thread Tony Dinh 
Add ahci sata bootdev and corresponding hunting function.

Signed-off-by: Tony Dinh 
---

Changes in v5:
- In bootmeth_script script_boot(), it's unnecessary to check for ret so
remove it. While we're here, also initialize ret in declaration.

Changes in v4:
- Revise logic in bootmeth_script() to set devtype to sata for non-scsi
SATA device
- Rewrite sata_rescan() logic to properly remove all devices before probing
- Add description to sata_rescan() header

Changes in v3:
- Correct drivers/ata/Makefile to compile sata_bootdev only if
ahci sata is enabled.

Changes in v2:
- set devtype to sata in bootmeth_script for non-scsi SATA device.

 boot/bootmeth_script.c | 16 +++---
 drivers/ata/Makefile   |  2 +-
 drivers/ata/sata.c | 32 
 drivers/ata/sata_bootdev.c | 62 ++
 include/sata.h |  6 
 5 files changed, 113 insertions(+), 5 deletions(-)
 create mode 100644 drivers/ata/sata_bootdev.c

diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c
index 345114dabf..06340e43d2 100644
--- a/boot/bootmeth_script.c
+++ b/boot/bootmeth_script.c
@@ -188,12 +188,20 @@ static int script_boot(struct udevice *dev, struct 
bootflow *bflow)
 {
struct blk_desc *desc = dev_get_uclass_plat(bflow->blk);
ulong addr;
-   int ret;
+   int ret = 0;
 
-   if (desc->uclass_id == UCLASS_USB)
+   if (desc->uclass_id == UCLASS_USB) {
ret = env_set("devtype", "usb");
-   else
-   ret = env_set("devtype", blk_get_devtype(bflow->blk));
+   } else {
+   /* If the uclass is AHCI, but the driver is ATA
+* (not scsi), set devtype to sata
+*/
+   if (IS_ENABLED(CONFIG_SATA) &&
+   desc->uclass_id == UCLASS_AHCI)
+   ret = env_set("devtype", "sata");
+   else
+   ret = env_set("devtype", blk_get_devtype(bflow->blk));
+   }
if (!ret)
ret = env_set_hex("devnum", desc->devnum);
if (!ret)
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 6e30180b8b..0b6f91098a 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_SCSI_AHCI) += ahci.o
 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_SATA) += sata.o 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..f126b84e05 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,36 @@ int sata_scan(struct udevice *dev)
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, );
+   if (ret || !dev) {
+   printf("Cannot find SATA device (err=%d)\n", ret);
+   return -ENOSYS;
+   }
+
+   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);
+
+   return ret;
+}
+
 #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,