Author: mav
Date: Tue Jun 12 08:08:33 2012
New Revision: 236947
URL: http://svn.freebsd.org/changeset/base/236947
Log:
MFC r236847:
Partially revert r236666:
Return PROTO_ATA protocol in response to XPT_PATH_INQ.
smartmontools uses it to identify ATA devices and I don't know any other
place now where it is important. It could probably use XPT_GDEV_TYPE
instead for more accurate protocol information, but let it live for now.
Modified:
stable/9/sys/dev/ahci/ahci.c
stable/9/sys/dev/ata/ata-all.c
stable/9/sys/dev/mvs/mvs.c
stable/9/sys/dev/siis/siis.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/ahci/ahci.c
==============================================================================
--- stable/9/sys/dev/ahci/ahci.c Tue Jun 12 07:53:39 2012
(r236946)
+++ stable/9/sys/dev/ahci/ahci.c Tue Jun 12 08:08:33 2012
(r236947)
@@ -2967,7 +2967,7 @@ ahciaction(struct cam_sim *sim, union cc
cpi->unit_number = cam_sim_unit(sim);
cpi->transport = XPORT_SATA;
cpi->transport_version = XPORT_VERSION_UNSPECIFIED;
- cpi->protocol = PROTO_UNSPECIFIED;
+ cpi->protocol = PROTO_ATA;
cpi->protocol_version = PROTO_VERSION_UNSPECIFIED;
cpi->maxio = MAXPHYS;
/* ATI SB600 can't handle 256 sectors with FPDMA (NCQ). */
Modified: stable/9/sys/dev/ata/ata-all.c
==============================================================================
--- stable/9/sys/dev/ata/ata-all.c Tue Jun 12 07:53:39 2012
(r236946)
+++ stable/9/sys/dev/ata/ata-all.c Tue Jun 12 08:08:33 2012
(r236947)
@@ -1875,7 +1875,7 @@ ataaction(struct cam_sim *sim, union ccb
else
cpi->transport = XPORT_ATA;
cpi->transport_version = XPORT_VERSION_UNSPECIFIED;
- cpi->protocol = PROTO_UNSPECIFIED;
+ cpi->protocol = PROTO_ATA;
cpi->protocol_version = PROTO_VERSION_UNSPECIFIED;
cpi->maxio = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
if (device_get_devclass(device_get_parent(parent)) ==
Modified: stable/9/sys/dev/mvs/mvs.c
==============================================================================
--- stable/9/sys/dev/mvs/mvs.c Tue Jun 12 07:53:39 2012 (r236946)
+++ stable/9/sys/dev/mvs/mvs.c Tue Jun 12 08:08:33 2012 (r236947)
@@ -2385,7 +2385,7 @@ mvsaction(struct cam_sim *sim, union ccb
cpi->unit_number = cam_sim_unit(sim);
cpi->transport = XPORT_SATA;
cpi->transport_version = XPORT_VERSION_UNSPECIFIED;
- cpi->protocol = PROTO_UNSPECIFIED;
+ cpi->protocol = PROTO_ATA;
cpi->protocol_version = PROTO_VERSION_UNSPECIFIED;
cpi->maxio = MAXPHYS;
if ((ch->quirks & MVS_Q_SOC) == 0) {
Modified: stable/9/sys/dev/siis/siis.c
==============================================================================
--- stable/9/sys/dev/siis/siis.c Tue Jun 12 07:53:39 2012
(r236946)
+++ stable/9/sys/dev/siis/siis.c Tue Jun 12 08:08:33 2012
(r236947)
@@ -1960,7 +1960,7 @@ siisaction(struct cam_sim *sim, union cc
cpi->unit_number = cam_sim_unit(sim);
cpi->transport = XPORT_SATA;
cpi->transport_version = XPORT_VERSION_UNSPECIFIED;
- cpi->protocol = PROTO_UNSPECIFIED;
+ cpi->protocol = PROTO_ATA;
cpi->protocol_version = PROTO_VERSION_UNSPECIFIED;
cpi->maxio = MAXPHYS;
cpi->hba_vendor = pci_get_vendor(parent);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
