From owner-svn-src-stable-8@FreeBSD.ORG Tue Nov 17 14:49:35 2009 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C88EC106566C; Tue, 17 Nov 2009 14:49:35 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9C6F98FC14; Tue, 17 Nov 2009 14:49:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAHEnZMY013984; Tue, 17 Nov 2009 14:49:35 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAHEnZDl013979; Tue, 17 Nov 2009 14:49:35 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <200911171449.nAHEnZDl013979@svn.freebsd.org> From: Alexander Motin Date: Tue, 17 Nov 2009 14:49:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199385 - in stable/8/sys: cam/ata dev/ahci dev/siis X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2009 14:49:35 -0000 Author: mav Date: Tue Nov 17 14:49:35 2009 New Revision: 199385 URL: http://svn.freebsd.org/changeset/base/199385 Log: MFC r198322: Report real max_target = 15. SIM doesn't need to know that target 15 is PMP. It is XPT business. Modified: stable/8/sys/cam/ata/ata_xpt.c stable/8/sys/dev/ahci/ahci.c stable/8/sys/dev/siis/siis.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/cam/ata/ata_xpt.c ============================================================================== --- stable/8/sys/cam/ata/ata_xpt.c Tue Nov 17 14:47:40 2009 (r199384) +++ stable/8/sys/cam/ata/ata_xpt.c Tue Nov 17 14:49:35 2009 (r199385) @@ -1212,7 +1212,8 @@ ata_scan_bus(struct cam_periph *periph, take_next: /* Take next device. Wrap from 15 (PM) to 0. */ scan_info->counter = (scan_info->counter + 1 ) & 0x0f; - if (scan_info->counter >= scan_info->cpi->max_target+1) { + if (scan_info->counter > scan_info->cpi->max_target - + ((scan_info->cpi->hba_inquiry & PI_SATAPM) ? 1 : 0)) { xpt_free_ccb(work_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; Modified: stable/8/sys/dev/ahci/ahci.c ============================================================================== --- stable/8/sys/dev/ahci/ahci.c Tue Nov 17 14:47:40 2009 (r199384) +++ stable/8/sys/dev/ahci/ahci.c Tue Nov 17 14:49:35 2009 (r199385) @@ -1924,7 +1924,7 @@ ahciaction(struct cam_sim *sim, union cc cpi->hba_misc = PIM_SEQSCAN; cpi->hba_eng_cnt = 0; if (ch->caps & AHCI_CAP_SPM) - cpi->max_target = 14; + cpi->max_target = 15; else cpi->max_target = 0; cpi->max_lun = 0; Modified: stable/8/sys/dev/siis/siis.c ============================================================================== --- stable/8/sys/dev/siis/siis.c Tue Nov 17 14:47:40 2009 (r199384) +++ stable/8/sys/dev/siis/siis.c Tue Nov 17 14:49:35 2009 (r199385) @@ -1564,7 +1564,7 @@ siisaction(struct cam_sim *sim, union cc cpi->target_sprt = 0; cpi->hba_misc = PIM_SEQSCAN; cpi->hba_eng_cnt = 0; - cpi->max_target = 14; + cpi->max_target = 15; cpi->max_lun = 0; cpi->initiator_id = 0; cpi->bus_id = cam_sim_bus(sim);