From owner-svn-src-all@FreeBSD.ORG  Mon Feb 23 22:13:05 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 EDE0D1065672;
	Mon, 23 Feb 2009 22:13:05 +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 D9DB28FC12;
	Mon, 23 Feb 2009 22:13:05 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1NMD5dr041007;
	Mon, 23 Feb 2009 22:13:05 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1NMD5fn041006;
	Mon, 23 Feb 2009 22:13:05 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200902232213.n1NMD5fn041006@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 23 Feb 2009 22:13:05 +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: r188958 - head/sys/dev/ata/chipsets
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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Feb 2009 22:13:08 -0000

Author: mav
Date: Mon Feb 23 22:13:05 2009
New Revision: 188958
URL: http://svn.freebsd.org/changeset/base/188958

Log:
  Fix non-AHCI channels detection on combined JMicron controllers,
  broken by r188694.

Modified:
  head/sys/dev/ata/chipsets/ata-jmicron.c

Modified: head/sys/dev/ata/chipsets/ata-jmicron.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-jmicron.c	Mon Feb 23 21:19:18 2009	(r188957)
+++ head/sys/dev/ata/chipsets/ata-jmicron.c	Mon Feb 23 22:13:05 2009	(r188958)
@@ -132,6 +132,8 @@ ata_jmicron_chipinit(device_t dev)
 
 	/* set the number of HW channels */ 
 	ctlr->channels = ctlr->chip->cfg1 + ctlr->chip->cfg2;
+	ctlr->ichannels |= ((0xffffffffU >> (32 - ctlr->chip->cfg2))
+	    << ctlr->chip->cfg1);
     }
     return 0;
 }