From owner-p4-projects@FreeBSD.ORG Tue Jul 7 20:33:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67F221065672; Tue, 7 Jul 2009 20:33:02 +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 27986106566C for ; Tue, 7 Jul 2009 20:33:02 +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 EFD428FC14 for ; Tue, 7 Jul 2009 20:33:01 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n67KX1oj004743 for ; Tue, 7 Jul 2009 20:33:01 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n67KX19j004741 for perforce@freebsd.org; Tue, 7 Jul 2009 20:33:01 GMT (envelope-from mav@freebsd.org) Date: Tue, 7 Jul 2009 20:33:01 GMT Message-Id: <200907072033.n67KX19j004741@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 Cc: Subject: PERFORCE change 165787 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jul 2009 20:33:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=165787 Change 165787 by mav@mav_mavbook on 2009/07/07 20:32:27 Add cpi.maxio support to ahci and atapicam modules. Teach ada driver to use it. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#18 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#44 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#17 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#18 (text+ko) ==== @@ -632,6 +632,7 @@ char announce_buf[80]; struct disk_params *dp; caddr_t match; + u_int maxio; cgd = (struct ccb_getdev *)arg; if (periph == NULL) { @@ -684,6 +685,7 @@ softc->quirks = ADA_Q_NONE; /* Check if the SIM does not want queued commands */ + bzero(&cpi, sizeof(cpi)); xpt_setup_ccb(&cpi.ccb_h, periph->path, /*priority*/1); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); @@ -704,10 +706,16 @@ softc->disk->d_dump = adadump; softc->disk->d_name = "ada"; softc->disk->d_drv1 = periph; + maxio = cpi.maxio; /* Honor max I/O size of SIM */ + if (maxio == 0) + maxio = DFLTPHYS; /* traditional default */ + else if (maxio > MAXPHYS) + maxio = MAXPHYS; /* for safety */ if (cgd->ident_data.support.command2 & ATA_SUPPORT_ADDRESS48) - softc->disk->d_maxsize = min(MAXPHYS, 65535 * 512); + maxio = min(maxio, 65535 * 512); else /* 28bit ATA command limit */ - softc->disk->d_maxsize = min(MAXPHYS, 255 * 512); + maxio = min(maxio, 255 * 512); + softc->disk->d_maxsize = maxio; softc->disk->d_unit = periph->unit_number; softc->disk->d_flags = 0; if (softc->flags & ADA_FLAG_CAN_FLUSHCACHE) ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#44 (text+ko) ==== @@ -1837,6 +1837,7 @@ cpi->transport_version = 2; cpi->protocol = PROTO_ATA; cpi->protocol_version = SCSI_REV_2; + cpi->maxio = MAXPHYS; cpi->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); break; ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#17 (text+ko) ==== @@ -418,6 +418,8 @@ break; } } + cpi->maxio = softc->ata_ch->dma.max_iosize ? + softc->ata_ch->dma.max_iosize : DFLTPHYS; ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); return;