From owner-freebsd-stable@FreeBSD.ORG  Thu Jun  1 22:23:40 2006
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
X-Original-To: freebsd-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 B9FBD16A6DA
	for <freebsd-stable@freebsd.org>; Thu,  1 Jun 2006 22:23:40 +0000 (UTC)
	(envelope-from jfvogel@gmail.com)
Received: from wx-out-0102.google.com (wx-out-0102.google.com [66.249.82.196])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4690D43D48
	for <freebsd-stable@freebsd.org>; Thu,  1 Jun 2006 22:23:40 +0000 (GMT)
	(envelope-from jfvogel@gmail.com)
Received: by wx-out-0102.google.com with SMTP id i31so276025wxd
	for <freebsd-stable@freebsd.org>; Thu, 01 Jun 2006 15:23:39 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com;
	h=received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition;
	b=Xt21eFbPDXCm/OxREGRtbwfLc6X+eyQAYfmEEW8t55brUd13seHM/SJN8cS3uDL8HCBfeSPN36ORsGoZfr6d3d3fiVJtbxWqKJHq7dEIgXDhhdYuZjcH4o25zrjSddtgBTv4fQXw2G2CWnRYx98DMj1fAMYbjRDJW/6rx/Xg4xg=
Received: by 10.70.29.17 with SMTP id c17mr1412335wxc;
	Thu, 01 Jun 2006 15:23:39 -0700 (PDT)
Received: by 10.70.77.18 with HTTP; Thu, 1 Jun 2006 15:23:39 -0700 (PDT)
Message-ID: <2a41acea0606011523k462c8fedw3678558024d72191@mail.gmail.com>
Date: Thu, 1 Jun 2006 15:23:39 -0700
From: "Jack Vogel" <jfvogel@gmail.com>
To: freebsd-stable@freebsd.org, "Scott Long" <scottl@samsco.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Cc: 
Subject: diffs to add newer Intel ATA and ICHSMB IDs
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jun 2006 22:23:46 -0000

I occasionally run into issues that newer PCI device IDs are
not yet supported, these in particular are on a new box
I am working on. Can someone see that these changes
get integrated please :)

Cheers,

Jack

--- dev/ata/ata-chipset.orig.c  Fri Jun  2 05:39:18 2006
+++ dev/ata/ata-chipset.c       Fri Jun  2 05:38:34 2006
@@ -1595,6 +1595,8 @@
      { ATA_I82801GB_R1, 0, AHCI, 0x00, ATA_SA300, "ICH7" },
      { ATA_I82801GB_M,  0, AHCI, 0x00, ATA_SA300, "ICH7" },
      { ATA_I82801GB_AH, 0, AHCI, 0x00, ATA_SA300, "ICH7" },
+     { ATA_I631xESB,    0,    0, 0x00, ATA_UDMA5, "631xESB" },
+     { ATA_I631xESB_S1, 0, AHCI, 0x00, ATA_SA300, "631xESB" },
      { ATA_I31244,      0,    0, 0x00, ATA_SA150, "31244" },
      { 0, 0, 0, 0, 0, 0}};
     char buffer[64];
--- dev/ata/ata-pci.orig.h      Fri Jun  2 05:30:03 2006
+++ dev/ata/ata-pci.h   Fri Jun  2 05:30:47 2006
@@ -148,6 +148,8 @@
 #define ATA_I82801FB_S1         0x26518086
 #define ATA_I82801FB_R1         0x26528086
 #define ATA_I82801FB_M          0x26538086
+#define ATA_I631xESB_S1         0x26808086
+#define ATA_I631xESB            0x269e8086
 #define ATA_I82801GB            0x27df8086
 #define ATA_I82801GB_S1         0x27c08086
 #define ATA_I82801GB_R1         0x27c38086
--- dev/ichsmb/ichsmb_pci.orig.c        Fri Jun  2 05:17:21 2006
+++ dev/ichsmb/ichsmb_pci.c     Fri Jun  2 05:20:04 2006
@@ -74,6 +74,7 @@
 #define ID_82801DC                     0x24C38086
 #define ID_82801EB                     0x24D38086
 #define ID_6300ESB                     0x25a48086
+#define ID_631xESB                     0x269b8086

 #define PCIS_SERIALBUS_SMBUS_PROGIF    0x00

@@ -145,6 +146,9 @@
                break;
        case ID_6300ESB:
                device_set_desc(dev, "Intel 6300ESB (ICH) SMBus controller");
+               break;
+       case ID_631xESB:
+               device_set_desc(dev, "Intel 631xESB (ESB2) SMBus controller");
                break;
        default:
                if (pci_get_class(dev) == PCIC_SERIALBUS