From owner-svn-src-all@FreeBSD.ORG Tue Nov 24 14:06:16 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1534A106566C; Tue, 24 Nov 2009 14:06:16 +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 0472A8FC16; Tue, 24 Nov 2009 14:06:16 +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 nAOE6FZu018860; Tue, 24 Nov 2009 14:06:15 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAOE6FdR018858; Tue, 24 Nov 2009 14:06:15 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <200911241406.nAOE6FdR018858@svn.freebsd.org> From: Alexander Motin Date: Tue, 24 Nov 2009 14:06:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199749 - head/sys/dev/ata X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2009 14:06:16 -0000 Author: mav Date: Tue Nov 24 14:06:15 2009 New Revision: 199749 URL: http://svn.freebsd.org/changeset/base/199749 Log: Use only lower byte of sectors_intr IDENTIFY word as sector count. This fixes SET_MULTI error during boot on devices supporting less then 16 sectors per interrupt. Modified: head/sys/dev/ata/ata-disk.c Modified: head/sys/dev/ata/ata-disk.c ============================================================================== --- head/sys/dev/ata/ata-disk.c Tue Nov 24 13:44:53 2009 (r199748) +++ head/sys/dev/ata/ata-disk.c Tue Nov 24 14:06:15 2009 (r199749) @@ -397,7 +397,7 @@ ad_init(device_t dev) /* use multiple sectors/interrupt if device supports it */ if (ad_version(atadev->param.version_major)) { - int secsperint = max(1, min(atadev->param.sectors_intr, 16)); + int secsperint = max(1, min(atadev->param.sectors_intr & 0xff, 16)); if (!ata_controlcmd(dev, ATA_SET_MULTI, 0, 0, secsperint)) atadev->max_iosize = secsperint * DEV_BSIZE;