| ata-sata.c (241402) | ata-sata.c (249083) |
|---|---|
| 1/*- 2 * Copyright (c) 1998 - 2008 S��ren Schmidt <sos@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1998 - 2008 S��ren Schmidt <sos@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/dev/ata/ata-sata.c 241402 2012-10-10 17:51:23Z mav $"); | 28__FBSDID("$FreeBSD: head/sys/dev/ata/ata-sata.c 249083 2013-04-04 07:12:24Z mav $"); |
| 29 30#include "opt_ata.h" 31#include <sys/param.h> 32#include <sys/systm.h> 33#include <sys/kernel.h> 34#include <sys/ata.h> 35#include <sys/bus.h> 36#include <sys/endian.h> --- 115 unchanged lines hidden (view full) --- 152 153int 154ata_sata_phy_reset(device_t dev, int port, int quick) 155{ 156 struct ata_channel *ch = device_get_softc(dev); 157 int loop, retry, sata_rev; 158 uint32_t val, val1; 159 | 29 30#include "opt_ata.h" 31#include <sys/param.h> 32#include <sys/systm.h> 33#include <sys/kernel.h> 34#include <sys/ata.h> 35#include <sys/bus.h> 36#include <sys/endian.h> --- 115 unchanged lines hidden (view full) --- 152 153int 154ata_sata_phy_reset(device_t dev, int port, int quick) 155{ 156 struct ata_channel *ch = device_get_softc(dev); 157 int loop, retry, sata_rev; 158 uint32_t val, val1; 159 |
| 160#ifdef ATA_CAM | |
| 161 sata_rev = ch->user[port < 0 ? 0 : port].revision; 162 if (sata_rev > 0) 163 quick = 0; | 160 sata_rev = ch->user[port < 0 ? 0 : port].revision; 161 if (sata_rev > 0) 162 quick = 0; |
| 164#else 165 sata_rev = 0; 166#endif | |
| 167 168 if (quick) { 169 if (ata_sata_scr_read(ch, port, ATA_SCONTROL, &val)) 170 return (0); 171 if ((val & ATA_SC_DET_MASK) == ATA_SC_DET_IDLE) { 172 ata_sata_scr_write(ch, port, ATA_SCONTROL, 173 ATA_SC_DET_IDLE | ((ch->pm_level > 0) ? 0 : 174 ATA_SC_IPM_DIS_PARTIAL | ATA_SC_IPM_DIS_SLUMBER)); --- 198 unchanged lines hidden --- | 163 164 if (quick) { 165 if (ata_sata_scr_read(ch, port, ATA_SCONTROL, &val)) 166 return (0); 167 if ((val & ATA_SC_DET_MASK) == ATA_SC_DET_IDLE) { 168 ata_sata_scr_write(ch, port, ATA_SCONTROL, 169 ATA_SC_DET_IDLE | ((ch->pm_level > 0) ? 0 : 170 ATA_SC_IPM_DIS_PARTIAL | ATA_SC_IPM_DIS_SLUMBER)); --- 198 unchanged lines hidden --- |