From owner-freebsd-stable@FreeBSD.ORG Sun Jan 8 07:38:02 2006 Return-Path: X-Original-To: stable@freebsd.org Delivered-To: freebsd-stable@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 22BAD16A41F for ; Sun, 8 Jan 2006 07:38:02 +0000 (GMT) (envelope-from solskogen@carebears.mine.nu) Received: from smartmail.hjemme.no (mail.hjemme.no [62.97.193.11]) by mx1.FreeBSD.org (Postfix) with ESMTP id 781BE43D5C for ; Sun, 8 Jan 2006 07:37:56 +0000 (GMT) (envelope-from solskogen@carebears.mine.nu) Received: from carebears.mine.nu (151.85-200-10.bkkb.no [85.200.10.151]) by smartmail.hjemme.no (8.13.3/8.13.3) with ESMTP id k087a8lD011119 for ; Sun, 8 Jan 2006 08:36:08 +0100 Received: from localhost (unknown [127.0.0.1]) by carebears.mine.nu (Postfix) with ESMTP id A865511204F for ; Sun, 8 Jan 2006 08:37:58 +0100 (CET) Received: from carebears.mine.nu ([127.0.0.1]) by localhost (tenderheart.carebears.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 44342-07 for ; Sun, 8 Jan 2006 08:37:41 +0100 (CET) Received: from carebears.mine.nu (localhost [127.0.0.1]) by carebears.mine.nu (Postfix) with ESMTP id 6CC58111E04 for ; Sun, 8 Jan 2006 08:37:41 +0100 (CET) Received: from 62.97.242.158 (SquirrelMail authenticated user solskogen) by carebears.mine.nu with HTTP; Sun, 8 Jan 2006 08:37:41 +0100 (CET) Message-ID: <1489.62.97.242.158.1136705861.squirrel@carebears.mine.nu> Date: Sun, 8 Jan 2006 08:37:41 +0100 (CET) From: "Christer Solskogen" To: stable@freebsd.org User-Agent: SquirrelMail/1.4.6 [CVS] MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-Virus-Scanned: by amavis at tenderheart.carebears.net Cc: Subject: (no subject) X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jan 2006 07:38:02 -0000 Hi! I got myself a mainboard with the ICH7 chipset. This chipset is supported in FreeBSD, but on my board it had a problem. It found only 2 of my four disks (ad0 and ad2) I tried updating to 6.0-stable (from 6.0-release) but the problem resist. I found a patch at bsdforums that did indeed work. Could anyone review this, and commit it, please? Taken from http://www.bsdforums.org/forums/showthread.php?threadid=37304 --- ata-chipset.c Thu Oct 13 10:07:46 2005 +++ ata-chipset-ich7.c Sun Dec 11 23:25:48 2005 @@ -1845,10 +1845,13 @@ struct ata_channel *ch = device_get_softc(dev); int mask, timeout; - /* ICH6 has 4 SATA ports as master/slave on 2 channels so deal with pairs */ + /* ICH6/7 has 4 SATA ports as master/slave on 2 channels so deal with pairs */ if (ctlr->chip->chipid == ATA_I82801FB_S1 || ctlr->chip->chipid == ATA_I82801FB_R1 || - ctlr->chip->chipid == ATA_I82801FB_M) { + ctlr->chip->chipid == ATA_I82801FB_M || + ctlr->chip->chipid == ATA_I82801GB_S1 || + ctlr->chip->chipid == ATA_I82801GB_R1 || + ctlr->chip->chipid == ATA_I82801GB_M) { mask = (0x0005 << ch->unit); } else { -- cso