Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-17 22:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

sata: fix reset_sata for dwc_ahsata

Browse source 
- fix crash when sata device is not initialized
- remove disable_sata_clock() since it is not clear which clock for which
  device should be disabled here
- call disable_sata_clock() for mx6 in preboot_os instead

Signed-off-by: Soeren Moch <smoch@web.de>
Acked-by: Nikita Kiryanov <nikita@compulab.co.il>
Tested-by: Nikita Kiryanov <nikita@compulab.co.il>
This commit is contained in:
Soeren Moch 2014-11-27 10:11:41 +01:00 • committed by Stefano Babic
parent f8bbd7f7b0
commit dd1c8f1b5f
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/imx-common/cpu.c
View file

@ -206,6 +206,9 @@ void arch_preboot_os(void)
{ {
#if defined(CONFIG_CMD_SATA) #if defined(CONFIG_CMD_SATA)
sata_stop(); sata_stop();
#if defined(CONFIG_MX6)
disable_sata_clock();
#endif
#endif #endif
#if defined(CONFIG_VIDEO_IPUV3) #if defined(CONFIG_VIDEO_IPUV3)
/* disable video before launching O/S */ /* disable video before launching O/S */

14
drivers/block/dwc_ahsata.c
View file

@ -594,22 +594,24 @@ int init_sata(int dev)
int reset_sata(int dev) int reset_sata(int dev)
{ {
struct ahci_probe_ent *probe_ent = 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 *host_mmio =
(struct sata_host_regs *)probe_ent->mmio_base;
if (dev < 0 || dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) { if (dev < 0 || dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) {
printf("The sata index %d is out of ranges\n\r", dev); printf("The sata index %d is out of ranges\n\r", dev);
return -1; return -1;
} }
probe_ent = (struct ahci_probe_ent *)sata_dev_desc[dev].priv;
if (NULL == probe_ent)
/* not initialized, so nothing to reset */
return 0;
host_mmio = (struct sata_host_regs *)probe_ent->mmio_base;
setbits_le32(&host_mmio->ghc, SATA_HOST_GHC_HR); setbits_le32(&host_mmio->ghc, SATA_HOST_GHC_HR);
while (readl(&host_mmio->ghc) & SATA_HOST_GHC_HR) while (readl(&host_mmio->ghc) & SATA_HOST_GHC_HR)
udelay(100); udelay(100);
disable_sata_clock();
return 0; return 0;
} }