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>

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>
Nikita Kiryanov · Stefano Babic
1 parent 8d29cef588
Showing 9 changed files with 57 additions and 0 deletions Side-by-side Diff
arch/arm/cpu/armv7/omap-common/sata.c
drivers/block/ata_piix.c
drivers/block/dwc_ahsata.c
drivers/block/fsl_sata.c
drivers/block/pata_bfin.c
drivers/block/sata_dwc.c
drivers/block/sata_sil.c
drivers/block/sata_sil3114.c
include/sata.h
@@ -74,6 +74,11 @@
 	return ret;
 }
  
+int reset_sata(int dev)
+{
+	return 0;
+}
+
 /* On OMAP platforms SATA provides the SCSI subsystem */
 void scsi_init(void)
 {
@@ -192,6 +192,11 @@
 	return 0;
 }
  
+int reset_sata(int dev)
+{
+	return 0;
+}
+
 static inline u8 sata_inb(unsigned long ioaddr)
 {
 	return inb(ioaddr);
@@ -592,6 +592,27 @@
 	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]);
@@ -255,6 +255,11 @@
 	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);
@@ -1009,6 +1009,11 @@
 	return res;
 }
  
+int reset_sata(int dev)
+{
+	return 0;
+}
+
 /* Read up to 255 sectors
  *
  * Returns sectors read
@@ -423,6 +423,11 @@
 	return rc;
 }
  
+int reset_sata(int dev)
+{
+	return 0;
+}
+
 static u8 ata_check_altstatus(struct ata_port *ap)
 {
 	u8 val = 0;
@@ -571,6 +571,11 @@
 	return 0;
 }
  
+int reset_sata(int dev)
+{
+	return 0;
+}
+
 /*
  * SATA interface between low level driver and command layer
  */
@@ -702,6 +702,11 @@
 	return res;
 }
  
+int reset_sata(int dev)
+{
+	return 0;
+}
+
 /* Check if device is connected to port */
 int sata_bus_probe (int portno)
 {
@@ -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);
...	...	@@ -74,6 +74,11 @@
74	74	return ret;
75	75	}
76	76
	77	+int reset_sata(int dev)
	78	+{
	79	+ return 0;
	80	+}
	81	+
77	82	/* On OMAP platforms SATA provides the SCSI subsystem */
78	83	void scsi_init(void)
79	84	{
...	...	@@ -192,6 +192,11 @@
192	192	return 0;
193	193	}
194	194
	195	+int reset_sata(int dev)
	196	+{
	197	+ return 0;
	198	+}
	199	+
195	200	static inline u8 sata_inb(unsigned long ioaddr)
196	201	{
197	202	return inb(ioaddr);
...	...	@@ -592,6 +592,27 @@
592	592	return 0;
593	593	}
594	594
	595	+int reset_sata(int dev)
	596	+{
	597	+ struct ahci_probe_ent *probe_ent =
	598	+ (struct ahci_probe_ent *)sata_dev_desc[dev].priv;
	599	+ struct sata_host_regs *host_mmio =
	600	+ (struct sata_host_regs *)probe_ent->mmio_base;
	601	+
	602	+ if (dev < 0 \|\| dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) {
	603	+ printf("The sata index %d is out of ranges\n\r", dev);
	604	+ return -1;
	605	+ }
	606	+
	607	+ setbits_le32(&host_mmio->ghc, SATA_HOST_GHC_HR);
	608	+ while (readl(&host_mmio->ghc) & SATA_HOST_GHC_HR)
	609	+ udelay(100);
	610	+
	611	+ disable_sata_clock();
	612	+
	613	+ return 0;
	614	+}
	615	+
595	616	static void dwc_ahsata_print_info(int dev)
596	617	{
597	618	block_dev_desc_t *pdev = &(sata_dev_desc[dev]);
...	...	@@ -255,6 +255,11 @@
255	255	return 0;
256	256	}
257	257
	258	+int reset_sata(int dev)
	259	+{
	260	+ return 0;
	261	+}
	262	+
258	263	static void fsl_sata_dump_regs(fsl_sata_reg_t __iomem *reg)
259	264	{
260	265	printf("\n\rSATA: %08x\n\r", (u32)reg);
...	...	@@ -1009,6 +1009,11 @@
1009	1009	return res;
1010	1010	}
1011	1011
	1012	+int reset_sata(int dev)
	1013	+{
	1014	+ return 0;
	1015	+}
	1016	+
1012	1017	/* Read up to 255 sectors
1013	1018	*
1014	1019	* Returns sectors read
...	...	@@ -423,6 +423,11 @@
423	423	return rc;
424	424	}
425	425
	426	+int reset_sata(int dev)
	427	+{
	428	+ return 0;
	429	+}
	430	+
426	431	static u8 ata_check_altstatus(struct ata_port *ap)
427	432	{
428	433	u8 val = 0;
...	...	@@ -571,6 +571,11 @@
571	571	return 0;
572	572	}
573	573
	574	+int reset_sata(int dev)
	575	+{
	576	+ return 0;
	577	+}
	578	+
574	579	/*
575	580	* SATA interface between low level driver and command layer
576	581	*/
...	...	@@ -702,6 +702,11 @@
702	702	return res;
703	703	}
704	704
	705	+int reset_sata(int dev)
	706	+{
	707	+ return 0;
	708	+}
	709	+
705	710	/* Check if device is connected to port */
706	711	int sata_bus_probe (int portno)
707	712	{
...	...	@@ -3,6 +3,7 @@
3	3	#include <part.h>
4	4
5	5	int init_sata(int dev);
	6	+int reset_sata(int dev);
6	7	int scan_sata(int dev);
7	8	ulong sata_read(int dev, ulong blknr, lbaint_t blkcnt, void *buffer);
8	9	ulong sata_write(int dev, ulong blknr, lbaint_t blkcnt, const void *buffer);