From owner-p4-projects@FreeBSD.ORG Tue Nov 10 21:00:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4338C1065679; Tue, 10 Nov 2009 21:00:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 080411065672 for ; Tue, 10 Nov 2009 21:00:53 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA24F8FC1B for ; Tue, 10 Nov 2009 21:00:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAL0qSG040923 for ; Tue, 10 Nov 2009 21:00:52 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nAAL0q5j040921 for perforce@freebsd.org; Tue, 10 Nov 2009 21:00:52 GMT (envelope-from mav@freebsd.org) Date: Tue, 10 Nov 2009 21:00:52 GMT Message-Id: <200911102100.nAAL0q5j040921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 170447 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Nov 2009 21:00:53 -0000 http://p4web.freebsd.org/chv.cgi?CH=170447 Change 170447 by mav@mav_mavbook on 2009/11/10 21:00:23 Make ADA honor XPT mind about queueing support. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#42 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#30 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#124 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#42 (text+ko) ==== @@ -626,7 +626,7 @@ if (cgd->ident_data.support.command2 & ATA_SUPPORT_FLUSHCACHE) softc->flags |= ADA_FLAG_CAN_FLUSHCACHE; if (cgd->ident_data.satacapabilities & ATA_SUPPORT_NCQ && - cgd->ident_data.queue >= 31) + cgd->inq_flags & SID_CmdQue) softc->flags |= ADA_FLAG_CAN_NCQ; softc->state = ADA_STATE_NORMAL; @@ -706,11 +706,6 @@ dp->secsize, dp->heads, dp->secs_per_track, dp->cylinders); xpt_announce_periph(periph, announce_buf); - if (softc->flags & ADA_FLAG_CAN_NCQ) { - printf("%s%d: Native Command Queueing enabled\n", - periph->periph_name, periph->unit_number); - } - /* * Add async callbacks for bus reset and * bus device reset calls. I don't bother ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#30 (text+ko) ==== @@ -307,7 +307,7 @@ struct scsi_inquiry_data inq_data; struct ata_params ident_data; u_int8_t serial_num[252]; - u_int8_t reserved; + u_int8_t inq_flags; u_int8_t serial_num_len; }; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#124 (text+ko) ==== @@ -2671,6 +2671,7 @@ cgd->protocol = dev->protocol; cgd->inq_data = dev->inq_data; cgd->ident_data = dev->ident_data; + cgd->inq_flags = dev->inq_flags; cgd->ccb_h.status = CAM_REQ_CMP; cgd->serial_num_len = dev->serial_num_len; if ((dev->serial_num_len > 0)