Author: mav
Date: Tue Jun 12 08:10:14 2012
New Revision: 236948
URL: http://svn.freebsd.org/changeset/base/236948
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/8/sys/dev/ahci/ahci.c
stable/8/sys/dev/ata/ata-all.c
stable/8/sys/dev/mvs/mvs.c
stable/8/sys/dev/siis/siis.c
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/dev/ahci/ahci.c
==============================================================================
--- stable/8/sys/dev/ahci/ahci.c Tue Jun 12 08:08:33 2012
(r236947)
+++ stable/8/sys/dev/ahci/ahci.c Tue Jun 12 08:10:14 2012
(r236948)
@@ -2963,7 +2963,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/8/sys/dev/ata/ata-all.c
==============================================================================
--- stable/8/sys/dev/ata/ata-all.c Tue Jun 12 08:08:33 2012
(r236947)
+++ stable/8/sys/dev/ata/ata-all.c Tue Jun 12 08:10:14 2012
(r236948)
@@ -1873,7 +1873,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;
cpi->ccb_h.status = CAM_REQ_CMP;
Modified: stable/8/sys/dev/mvs/mvs.c
==============================================================================
--- stable/8/sys/dev/mvs/mvs.c Tue Jun 12 08:08:33 2012 (r236947)
+++ stable/8/sys/dev/mvs/mvs.c Tue Jun 12 08:10:14 2012 (r236948)
@@ -2383,7 +2383,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;
cpi->ccb_h.status = CAM_REQ_CMP;
Modified: stable/8/sys/dev/siis/siis.c
==============================================================================
--- stable/8/sys/dev/siis/siis.c Tue Jun 12 08:08:33 2012
(r236947)
+++ stable/8/sys/dev/siis/siis.c Tue Jun 12 08:10:14 2012
(r236948)
@@ -1964,7 +1964,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->ccb_h.status = CAM_REQ_CMP;
cpi->maxio = MAXPHYS;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
