From owner-p4-projects@FreeBSD.ORG Thu Oct 29 16:17:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7FFB1065697; Thu, 29 Oct 2009 16:17:47 +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 7C4801065696 for ; Thu, 29 Oct 2009 16:17:47 +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 512F58FC22 for ; Thu, 29 Oct 2009 16:17:47 +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 n9TGHlvX099826 for ; Thu, 29 Oct 2009 16:17:47 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n9TGHlDq099824 for perforce@freebsd.org; Thu, 29 Oct 2009 16:17:47 GMT (envelope-from mav@freebsd.org) Date: Thu, 29 Oct 2009 16:17:47 GMT Message-Id: <200910291617.n9TGHlDq099824@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 169929 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: Thu, 29 Oct 2009 16:17:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=169929 Change 169929 by mav@mav_mavtest on 2009/10/29 16:17:35 Report PIO size during boot. Tune style. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#110 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#110 (text+ko) ==== @@ -1076,30 +1076,35 @@ speed = cpi.base_transfer_speed; freq = 0; if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SPI) { - struct ccb_trans_settings_spi *spi; + struct ccb_trans_settings_spi *spi = + &cts.xport_specific.spi; - spi = &cts.xport_specific.spi; if ((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) != 0 && spi->sync_offset != 0) { freq = scsi_calc_syncsrate(spi->sync_period); speed = freq; } - if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0) speed *= (0x01 << spi->bus_width); } if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_FC) { - struct ccb_trans_settings_fc *fc = &cts.xport_specific.fc; + struct ccb_trans_settings_fc *fc = + &cts.xport_specific.fc; + if (fc->valid & CTS_FC_VALID_SPEED) speed = fc->bitrate; } if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SAS) { - struct ccb_trans_settings_sas *sas = &cts.xport_specific.sas; + struct ccb_trans_settings_sas *sas = + &cts.xport_specific.sas; + if (sas->valid & CTS_SAS_VALID_SPEED) speed = sas->bitrate; } if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SATA) { - struct ccb_trans_settings_sata *sata = &cts.xport_specific.sata; + struct ccb_trans_settings_sata *sata = + &cts.xport_specific.sata; + if (sata->valid & CTS_SATA_VALID_SPEED) speed = sata->bitrate; } @@ -1147,7 +1152,20 @@ if (fc->valid & CTS_FC_VALID_PORT) printf(" PortID 0x%x", fc->port); } + if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_ATA) { + struct ccb_trans_settings_ata *ata = + &cts.xport_specific.ata; + if (ata->valid & CTS_ATA_VALID_BYTECOUNT) + printf(" (PIO size %dbytes)", ata->bytecount); + } + if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SATA) { + struct ccb_trans_settings_sata *sata = + &cts.xport_specific.sata; + + if (sata->valid & CTS_SATA_VALID_BYTECOUNT) + printf(" (PIO size %dbytes)", sata->bytecount); + } if (path->device->inq_flags & SID_CmdQue || path->device->flags & CAM_DEV_TAG_AFTER_COUNT) { printf("\n%s%d: Command Queueing enabled",