From patchwork Mon Mar 1 00:14:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerone Young X-Patchwork-Id: 46518 X-Patchwork-Delegate: stefan.bader@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 09292B7CBD for ; Mon, 1 Mar 2010 11:15:10 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NltHo-0004IB-AZ; Mon, 01 Mar 2010 00:15:00 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1NltHl-0004Hm-Vj for kernel-team@lists.ubuntu.com; Mon, 01 Mar 2010 00:14:58 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1NltHl-00032Y-Ub for ; Mon, 01 Mar 2010 00:14:57 +0000 Received: from adsl-71-145-133-119.dsl.austtx.sbcglobal.net ([71.145.133.119] helo=[192.168.1.6]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1NltHl-0007EX-K8 for kernel-team@lists.ubuntu.com; Mon, 01 Mar 2010 00:14:57 +0000 Subject: [HARDY] [SRU] Add support for Broadcom Ethernet 5716 & 5716S From: Jerone Young To: Kernel team list Date: Sun, 28 Feb 2010 18:14:54 -0600 Message-ID: <1267402494.2316.20.camel@laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Impact: Many servers shipped last year have Broadcom Ethernet 5716 & 5716S cards. They currently are not functional with 8.04. https://bugs.launchpad.net/ubuntu/hardy/+source/linux/+bug/435185 Fix: Two patches attached to this email add PCI IDs to the driver. Patches based on upstream stable commits. Testcase: Ethernet works after patches are applied. Based on upstream commit, though modification made for 2.6.26: http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.27.y.git;a=commit;h=7bb0a04fcd610e5db59690332b2a46b6068c8bc3 Adding support for BCM5716 Signed-off-by: Jerone Young Based on upstream commit, though modification made for 2.6.26: http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.29.y.git;a=commit;h=1caacecb7cb2b72e798f06a32b5061075cf397fa Add support for BCM5716S Signed-off-by: Jerone Young diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 51b163a..49ebb50 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -89,6 +89,7 @@ typedef enum { BCM5709, BCM5709S, BCM5716, + BCM5716S, } board_t; /* indexed by board_t, above */ @@ -105,6 +106,7 @@ static struct { { "Broadcom NetXtreme II BCM5709 1000Base-T" }, { "Broadcom NetXtreme II BCM5709 1000Base-SX" }, { "Broadcom NetXtreme II BCM5716 1000Base-T" }, + { "Broadcom NetXtreme II BCM5716 1000Base-SX" }, }; static struct pci_device_id bnx2_pci_tbl[] = { @@ -128,6 +130,8 @@ static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = { PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5709S }, { PCI_VENDOR_ID_BROADCOM, 0x163b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 }, + { PCI_VENDOR_ID_BROADCOM, 0x163c, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 }, { 0, } }; Acked-by: Tim Gardner diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index e9cfb02..989d4b6 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -87,6 +87,7 @@ typedef enum { BCM5708S, BCM5709, BCM5709S, + BCM5716, } board_t; /* indexed by board_t, above */ @@ -102,9 +103,10 @@ static struct { { "Broadcom NetXtreme II BCM5708 1000Base-SX" }, { "Broadcom NetXtreme II BCM5709 1000Base-T" }, { "Broadcom NetXtreme II BCM5709 1000Base-SX" }, + { "Broadcom NetXtreme II BCM5716 1000Base-T" }, }; static struct pci_device_id bnx2_pci_tbl[] = { { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706, PCI_VENDOR_ID_HP, 0x3101, 0, 0, NC370T }, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706, @@ -123,6 +125,8 @@ static struct pci_device_id bnx2_pci_tbl[] = { PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5709 }, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5709S, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5709S }, + { PCI_VENDOR_ID_BROADCOM, 0x163b, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 }, { 0, } };