sata: implement reset_sata for dwc_ahsata

Add reset_sata() to the sata driver interface and implement it
for dwc_ahsata. This function cleans up after sata_init(), and
therefore accepts a device number like sata_init() does.
A dummy implementation is provided for the rest of the drivers.

Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefano Babic <sbabic@denx.de>

diff --git a/arch/arm/cpu/armv7/omap-common/sata.c b/arch/arm/cpu/armv7/omap-common/sata.c
index 3b4dd3f5d77d22157a425bf7a06ec1ed637eb320..a24baa133778639dd565a36b9c4f00664230af45 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/sata.c
+++ b/arch/arm/cpu/armv7/omap-common/sata.c
@@ -74,6 +74,11 @@ int init_sata(int dev)
        return ret;
 }
 
+int reset_sata(int dev)
+{
+       return 0;
+}
+
 /* On OMAP platforms SATA provides the SCSI subsystem */
 void scsi_init(void)
 {

diff --git a/drivers/block/ata_piix.c b/drivers/block/ata_piix.c
index 5cf91ade8d2cb343a42898306d951b9e4d913155..30426842cc40e31be5e0a2ef3e8dac931463eef9 100644 (file)
--- a/drivers/block/ata_piix.c
+++ b/drivers/block/ata_piix.c
@@ -192,6 +192,11 @@ int init_sata(int dev)
        return 0;
 }
 
+int reset_sata(int dev)
+{
+       return 0;
+}
+
 static inline u8 sata_inb(unsigned long ioaddr)
 {
        return inb(ioaddr);

diff --git a/drivers/block/dwc_ahsata.c b/drivers/block/dwc_ahsata.c
index c68fd2f256541403a97f840599353dbadf7ec6df..9a2b547af2d3f0bf80d2ee0a6c0f88ddae061904 100644 (file)
--- a/drivers/block/dwc_ahsata.c
+++ b/drivers/block/dwc_ahsata.c
@@ -592,6 +592,27 @@ int init_sata(int dev)
        return 0;
 }
 
+int reset_sata(int dev)
+{
+       struct ahci_probe_ent *probe_ent =
+                       (struct ahci_probe_ent *)sata_dev_desc[dev].priv;
+       struct sata_host_regs *host_mmio =
+                       (struct sata_host_regs *)probe_ent->mmio_base;
+
+       if (dev < 0 || dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) {
+               printf("The sata index %d is out of ranges\n\r", dev);
+               return -1;
+       }
+
+       setbits_le32(&host_mmio->ghc, SATA_HOST_GHC_HR);
+       while (readl(&host_mmio->ghc) & SATA_HOST_GHC_HR)
+               udelay(100);
+
+       disable_sata_clock();
+
+       return 0;
+}
+
 static void dwc_ahsata_print_info(int dev)
 {
        block_dev_desc_t *pdev = &(sata_dev_desc[dev]);

diff --git a/drivers/block/fsl_sata.c b/drivers/block/fsl_sata.c
index ebd626178d098ce2beb4a00221997dc585feb10a..71d7cec7bdd2256877105555b9e4904b1438cc93 100644 (file)
--- a/drivers/block/fsl_sata.c
+++ b/drivers/block/fsl_sata.c
@@ -255,6 +255,11 @@ int init_sata(int dev)
        return 0;
 }
 
+int reset_sata(int dev)
+{
+       return 0;
+}
+
 static void fsl_sata_dump_regs(fsl_sata_reg_t __iomem *reg)
 {
        printf("\n\rSATA:           %08x\n\r", (u32)reg);

diff --git a/drivers/block/pata_bfin.c b/drivers/block/pata_bfin.c
index b7fd1cd634486639647bec5c9988001ca17993c1..c2673bd05dc6873eb9fa891eaeceb97460d83986 100644 (file)
--- a/drivers/block/pata_bfin.c
+++ b/drivers/block/pata_bfin.c
@@ -1009,6 +1009,11 @@ int init_sata(int dev)
        return res;
 }
 
+int reset_sata(int dev)
+{
+       return 0;
+}
+
 /* Read up to 255 sectors
  *
  * Returns sectors read

diff --git a/drivers/block/sata_dwc.c b/drivers/block/sata_dwc.c
index efca5eaba424478490fdf5382255f689e84261b1..9e8b067cdc890ca77f653173455ab3006501ccca 100644 (file)
--- a/drivers/block/sata_dwc.c
+++ b/drivers/block/sata_dwc.c
@@ -423,6 +423,11 @@ int init_sata(int dev)
        return rc;
 }
 
+int reset_sata(int dev)
+{
+       return 0;
+}
+
 static u8 ata_check_altstatus(struct ata_port *ap)
 {
        u8 val = 0;

diff --git a/drivers/block/sata_sil.c b/drivers/block/sata_sil.c
index 1f510cd265c0b42657fc74b28253965bea1c3de0..ea7d76a1670bb50996b54648d182e08a921670e8 100644 (file)
--- a/drivers/block/sata_sil.c
+++ b/drivers/block/sata_sil.c
@@ -571,6 +571,11 @@ int init_sata(int dev)
        return 0;
 }
 
+int reset_sata(int dev)
+{
+       return 0;
+}
+
 /*
  * SATA interface between low level driver and command layer
  */

diff --git a/drivers/block/sata_sil3114.c b/drivers/block/sata_sil3114.c
index 3aa6fc9839e95eda30f372bfe2cceac60c1ad6a9..61ffb66a7711db09f72b37cf3dc76001e409a333 100644 (file)
--- a/drivers/block/sata_sil3114.c
+++ b/drivers/block/sata_sil3114.c
@@ -702,6 +702,11 @@ int init_sata (int dev)
        return res;
 }
 
+int reset_sata(int dev)
+{
+       return 0;
+}
+
 /* Check if device is connected to port */
 int sata_bus_probe (int portno)
 {

diff --git a/include/sata.h b/include/sata.h
index 38f4b4acf6ca4e6f0e4804778674c39c42ac5c65..c2bbe1a9936db68967348dfd43be91c09dc7a004 100644 (file)
--- a/include/sata.h
+++ b/include/sata.h
@@ -3,6 +3,7 @@
 #include <part.h>
 
 int init_sata(int dev);
+int reset_sata(int dev);
 int scan_sata(int dev);
 ulong sata_read(int dev, ulong blknr, lbaint_t blkcnt, void *buffer);
 ulong sata_write(int dev, ulong blknr, lbaint_t blkcnt, const void *buffer);