rpms/kernel-xen-2.6/devel linux-2.6-net-e1000e.patch, NONE, 1.1.2.1 kernel-2.6.21.7-i686-xen.config, 1.2, 1.2.2.1 kernel-2.6.21.7-x86_64-xen.config, 1.2, 1.2.2.1 kernel.spec, 1.2, 1.2.2.1
Eduardo Habkost (ehabkost)
fedora-extras-commits at redhat.com
Tue Nov 13 17:47:12 UTC 2007
- Previous message (by thread): rpms/deskbar-applet/devel .cvsignore, 1.28, 1.29 deskbar-applet.spec, 1.55, 1.56 sources, 1.28, 1.29
- Next message (by thread): rpms/dblatex/devel COPYING-docbook-xsl, NONE, 1.1 dblatex-0.2.7-external-which.patch, NONE, 1.1 dblatex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ehabkost
Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12517
Modified Files:
Tag: private-ehabkost-e1000e-bz360691
kernel-2.6.21.7-i686-xen.config
kernel-2.6.21.7-x86_64-xen.config kernel.spec
Added Files:
Tag: private-ehabkost-e1000e-bz360691
linux-2.6-net-e1000e.patch
Log Message:
Adding e1000e driver (bz#360691)
linux-2.6-net-e1000e.patch:
--- NEW FILE linux-2.6-net-e1000e.patch ---
From: Andy Gospodarek <gospo at redhat.com>
Subject: [RHEL5.1 PATCH] e1000e: initial support for e1000e netdriver
Date: Thu, 9 Aug 2007 14:28:38 -0400
Bugzilla: 240086
Message-Id: <20070809182837.GE1096 at gospo.rdu.redhat.com>
Changelog: [net] e1000e: initial support for e1000e netdriver
This patch adds support for the new e1000e gigabit driver. It is a
re-designed e1000 driver that only has new hardware support.
This will resolve BZ 240086.
---
Kconfig | 23
Makefile | 1
e1000e/82571.c | 1348 +++++++++++++++
e1000e/Makefile | 37
e1000e/defines.h | 737 ++++++++
e1000e/e1000.h | 518 +++++
e1000e/e1000_compat.h | 22
e1000e/es2lan.c | 1227 +++++++++++++
e1000e/ethtool.c | 1763 +++++++++++++++++++
e1000e/hw.h | 862 +++++++++
e1000e/ich8lan.c | 2220 +++++++++++++++++++++++++
e1000e/lib.c | 2464 +++++++++++++++++++++++++++
e1000e/netdev.c | 4408 ++++++++++++++++++++++++++++++++++++++++++++++++++
e1000e/param.c | 382 ++++
e1000e/phy.c | 1771 ++++++++++++++++++++
15 files changed, 17783 insertions(+)
Index: linux-2.6.21.i686/drivers/net/e1000e/e1000.h
===================================================================
--- /dev/null
+++ linux-2.6.21.i686/drivers/net/e1000e/e1000.h
@@ -0,0 +1,518 @@
+/*******************************************************************************
+
+ Intel PRO/1000 Linux driver
+ Copyright(c) 1999 - 2007 Intel Corporation.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms and conditions of the GNU General Public License,
+ version 2, as published by the Free Software Foundation.
+
+ This program is distributed in the hope it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ more details.
+
+ You should have received a copy of the GNU General Public License along with
+ this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+
+ The full GNU General Public License is included in this distribution in
+ the file called "COPYING".
+
+ Contact Information:
+ Linux NICS <linux.nics at intel.com>
+ e1000-devel Mailing List <e1000-devel at lists.sourceforge.net>
+ Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+
+*******************************************************************************/
+
+/* Linux PRO/1000 Ethernet Driver main header file */
+
+#ifndef _E1000_H_
+#define _E1000_H_
+
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+
+#include "e1000_compat.h"
+#include "hw.h"
+
+struct e1000_info;
+
+#define ndev_printk(level, netdev, format, arg...) \
+ printk(level "%s: %s: " format, (netdev)->dev.parent->bus_id, \
+ (netdev)->name, ## arg)
+
+#ifdef DEBUG
+#define ndev_dbg(netdev, format, arg...) \
+ ndev_printk(KERN_DEBUG , netdev, format, ## arg)
+#else
+#define ndev_dbg(netdev, format, arg...) do { (void)(netdev); } while (0)
+#endif
+
+#define ndev_err(netdev, format, arg...) \
+ ndev_printk(KERN_ERR , netdev, format, ## arg)
+#define ndev_info(netdev, format, arg...) \
+ ndev_printk(KERN_INFO , netdev, format, ## arg)
+#define ndev_warn(netdev, format, arg...) \
+ ndev_printk(KERN_WARNING , netdev, format, ## arg)
+#define ndev_notice(netdev, format, arg...) \
+ ndev_printk(KERN_NOTICE , netdev, format, ## arg)
+
+
+/* TX/RX descriptor defines */
+#define E1000_DEFAULT_TXD 256
+#define E1000_MAX_TXD 4096
+#define E1000_MIN_TXD 80
+
+#define E1000_DEFAULT_RXD 256
+#define E1000_MAX_RXD 4096
+#define E1000_MIN_RXD 80
+
+/* Early Receive defines */
+#define E1000_ERT_2048 0x100
+
+#define E1000_FC_PAUSE_TIME 0x0680 /* 858 usec */
+
+/* How many Tx Descriptors do we need to call netif_wake_queue ? */
+/* How many Rx Buffers do we bundle into one write to the hardware ? */
+#define E1000_RX_BUFFER_WRITE 16 /* Must be power of 2 */
+
+#define AUTO_ALL_MODES 0
+#define E1000_EEPROM_APME 0x0400
+
+#define E1000_MNG_VLAN_NONE (-1)
+
+/* Number of packet split data buffers (not including the header buffer) */
+#define PS_PAGE_BUFFERS (MAX_PS_BUFFERS - 1)
+
+enum e1000_boards {
+ board_82571,
+ board_82572,
+ board_82573,
+ board_80003es2lan,
+ board_ich8lan,
+ board_ich9lan,
+};
+
+struct e1000_queue_stats {
+ u64 packets;
+ u64 bytes;
+};
+
+struct e1000_ps_page {
+ struct page *page;
+ u64 dma; /* must be u64 - written to hw */
+};
+
+/*
+ * wrappers around a pointer to a socket buffer,
+ * so a DMA handle can be stored along with the buffer
+ */
+struct e1000_buffer {
+ dma_addr_t dma;
+ struct sk_buff *skb;
+ union {
+ /* TX */
+ struct {
+ unsigned long time_stamp;
+ u16 length;
+ u16 next_to_watch;
+ };
+ /* RX */
+ struct page *page;
+ };
+
+};
+
+struct e1000_ring {
+ void *desc; /* pointer to ring memory */
+ dma_addr_t dma; /* phys address of ring */
+ unsigned int size; /* length of ring in bytes */
+ unsigned int count; /* number of desc. in ring */
+
+ u16 next_to_use;
+ u16 next_to_clean;
+
+ u16 head;
+ u16 tail;
+
+ /* array of buffer information structs */
+ struct e1000_buffer *buffer_info;
+
+ union {
+ /* for TX */
+ struct {
+ bool last_tx_tso; /* used to mark tso desc. */
+ };
+ /* for RX */
+ struct {
+ /* arrays of page information for packet split */
+ struct e1000_ps_page *ps_pages;
+ struct sk_buff *rx_skb_top;
+ };
+ };
+
+ struct e1000_queue_stats stats;
+};
+
[...17492 lines suppressed...]
+
+ ret_val = e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
+
+ return 0;
+}
+
+/**
+ * e1000_cfg_kmrn_1000_80003es2lan - Apply "quirks" for gigabit operation
+ * @hw: pointer to the HW structure
+ *
+ * Configure the KMRN interface by applying last minute quirks for
+ * gigabit operation.
+ **/
+static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw)
+{
+ s32 ret_val;
+ u16 reg_data;
+ u32 tipg;
+
+ reg_data = E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT;
+ ret_val = e1000_write_kmrn_reg(hw,
+ E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
+ reg_data);
+ if (ret_val)
+ return ret_val;
+
+ /* Configure Transmit Inter-Packet Gap */
+ tipg = er32(TIPG);
+ tipg &= ~E1000_TIPG_IPGT_MASK;
+ tipg |= DEFAULT_TIPG_IPGT_1000_80003ES2LAN;
+ ew32(TIPG, tipg);
+
+ ret_val = e1e_rphy(hw, GG82563_PHY_KMRN_MODE_CTRL, ®_data);
+ if (ret_val)
+ return ret_val;
+
+ reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
+ ret_val = e1e_wphy(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
+
+ return ret_val;
+}
+
+/**
+ * e1000_clear_hw_cntrs_80003es2lan - Clear device specific hardware counters
+ * @hw: pointer to the HW structure
+ *
+ * Clears the hardware counters by reading the counter registers.
+ **/
+static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw)
+{
+ u32 temp;
+
+ e1000_clear_hw_cntrs_base(hw);
+
+ temp = er32(PRC64);
+ temp = er32(PRC127);
+ temp = er32(PRC255);
+ temp = er32(PRC511);
+ temp = er32(PRC1023);
+ temp = er32(PRC1522);
+ temp = er32(PTC64);
+ temp = er32(PTC127);
+ temp = er32(PTC255);
+ temp = er32(PTC511);
+ temp = er32(PTC1023);
+ temp = er32(PTC1522);
+
+ temp = er32(ALGNERRC);
+ temp = er32(RXERRC);
+ temp = er32(TNCRS);
+ temp = er32(CEXTERR);
+ temp = er32(TSCTC);
+ temp = er32(TSCTFC);
+
+ temp = er32(MGTPRC);
+ temp = er32(MGTPDC);
+ temp = er32(MGTPTC);
+
+ temp = er32(IAC);
+ temp = er32(ICRXOC);
+
+ temp = er32(ICRXPTC);
+ temp = er32(ICRXATC);
+ temp = er32(ICTXPTC);
+ temp = er32(ICTXATC);
+ temp = er32(ICTXQEC);
+ temp = er32(ICTXQMTC);
+ temp = er32(ICRXDMTC);
+}
+
+static struct e1000_mac_operations es2_mac_ops = {
+ .mng_mode_enab = E1000_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT,
+ /* check_for_link dependent on media type */
+ .cleanup_led = e1000_cleanup_led_generic,
+ .clear_hw_cntrs = e1000_clear_hw_cntrs_80003es2lan,
+ .get_bus_info = e1000_get_bus_info_pcie,
+ .get_link_up_info = e1000_get_link_up_info_80003es2lan,
+ .led_on = e1000_led_on_generic,
+ .led_off = e1000_led_off_generic,
+ .mc_addr_list_update = e1000_mc_addr_list_update_generic,
+ .reset_hw = e1000_reset_hw_80003es2lan,
+ .init_hw = e1000_init_hw_80003es2lan,
+ .setup_link = e1000_setup_link,
+ /* setup_physical_interface dependent on media type */
+};
+
+static struct e1000_phy_operations es2_phy_ops = {
+ .acquire_phy = e1000_acquire_phy_80003es2lan,
+ .check_reset_block = e1000_check_reset_block_generic,
+ .commit_phy = e1000_phy_sw_reset,
+ .force_speed_duplex = e1000_phy_force_speed_duplex_80003es2lan,
+ .get_cfg_done = e1000_get_cfg_done_80003es2lan,
+ .get_cable_length = e1000_get_cable_length_80003es2lan,
+ .get_phy_info = e1000_get_phy_info_m88,
+ .read_phy_reg = e1000_read_phy_reg_gg82563_80003es2lan,
+ .release_phy = e1000_release_phy_80003es2lan,
+ .reset_phy = e1000_phy_hw_reset_generic,
+ .set_d0_lplu_state = NULL,
+ .set_d3_lplu_state = e1000_set_d3_lplu_state,
+ .write_phy_reg = e1000_write_phy_reg_gg82563_80003es2lan,
+};
+
+static struct e1000_nvm_operations es2_nvm_ops = {
+ .acquire_nvm = e1000_acquire_nvm_80003es2lan,
+ .read_nvm = e1000_read_nvm_eerd,
+ .release_nvm = e1000_release_nvm_80003es2lan,
+ .update_nvm = e1000_update_nvm_checksum_generic,
+ .valid_led_default = e1000_valid_led_default,
+ .validate_nvm = e1000_validate_nvm_checksum_generic,
+ .write_nvm = e1000_write_nvm_80003es2lan,
+};
+
+struct e1000_info e1000_es2_info = {
+ .mac = e1000_80003es2lan,
+ .flags = FLAG_HAS_HW_VLAN_FILTER
+ | FLAG_HAS_JUMBO_FRAMES
+ | FLAG_HAS_STATS_PTC_PRC
+ | FLAG_HAS_WOL
+ | FLAG_APME_IN_CTRL3
+ | FLAG_RX_CSUM_ENABLED
+ | FLAG_HAS_CTRLEXT_ON_LOAD
+ | FLAG_HAS_STATS_ICR_ICT
+ | FLAG_RX_NEEDS_RESTART /* errata */
+ | FLAG_TARC_SET_BIT_ZERO /* errata */
+ | FLAG_APME_CHECK_PORT_B
+ | FLAG_DISABLE_FC_PAUSE_TIME /* errata */
+ | FLAG_TIPG_MEDIUM_FOR_80003ESLAN,
+ .pba = 38,
+ .get_invariants = e1000_get_invariants_80003es2lan,
+ .mac_ops = &es2_mac_ops,
+ .phy_ops = &es2_phy_ops,
+ .nvm_ops = &es2_nvm_ops,
+};
+
Index: linux-2.6.21.i686/drivers/net/Kconfig
===================================================================
--- linux-2.6.21.i686.orig/drivers/net/Kconfig
+++ linux-2.6.21.i686/drivers/net/Kconfig
@@ -1989,6 +1989,29 @@ config E1000_DISABLE_PACKET_SPLIT
If in doubt, say N.
+config E1000E
+ tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
+ depends on PCI
+ ---help---
+ This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
+ ethernet family of adapters. For PCI or PCI-X e1000 adapters,
+ use the regular e1000 driver For more information on how to
+ identify your adapter, go to the Adapter & Driver ID Guide at:
+
+ <http://support.intel.com/support/network/adapter/pro100/21397.htm>
+
+ For general information and support, go to the Intel support
+ website at:
+
+ <http://support.intel.com>
+
+ More specific information on configuring the driver is in
+ <file:Documentation/networking/e1000e.txt>.
+
+ To compile this driver as a module, choose M here and read
+ <file:Documentation/networking/net-modules.txt>. The module
+ will be called e1000e.
+
source "drivers/net/ixp2000/Kconfig"
config MYRI_SBUS
Index: linux-2.6.21.i686/drivers/net/Makefile
===================================================================
--- linux-2.6.21.i686.orig/drivers/net/Makefile
+++ linux-2.6.21.i686/drivers/net/Makefile
@@ -3,6 +3,7 @@
#
obj-$(CONFIG_E1000) += e1000/
+obj-$(CONFIG_E1000E) += e1000e/
obj-$(CONFIG_IBM_EMAC) += ibm_emac/
obj-$(CONFIG_IXGB) += ixgb/
obj-$(CONFIG_CHELSIO_T1) += chelsio/
Index: kernel-2.6.21.7-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21.7-i686-xen.config,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- kernel-2.6.21.7-i686-xen.config 29 Oct 2007 17:29:06 -0000 1.2
+++ kernel-2.6.21.7-i686-xen.config 13 Nov 2007 17:46:13 -0000 1.2.2.1
@@ -1443,6 +1443,7 @@
# CONFIG_ACENIC_OMIT_TIGON_I is not set
CONFIG_DL2K=m
CONFIG_E1000=m
+CONFIG_E1000E=m
CONFIG_E1000_NAPI=y
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
CONFIG_NS83820=m
Index: kernel-2.6.21.7-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21.7-x86_64-xen.config,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- kernel-2.6.21.7-x86_64-xen.config 29 Oct 2007 17:29:06 -0000 1.2
+++ kernel-2.6.21.7-x86_64-xen.config 13 Nov 2007 17:46:13 -0000 1.2.2.1
@@ -1348,6 +1348,7 @@
# CONFIG_ACENIC_OMIT_TIGON_I is not set
CONFIG_DL2K=m
CONFIG_E1000=m
+CONFIG_E1000E=m
CONFIG_E1000_NAPI=y
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
CONFIG_NS83820=m
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- kernel.spec 29 Oct 2007 17:29:06 -0000 1.2
+++ kernel.spec 13 Nov 2007 17:46:13 -0000 1.2.2.1
@@ -798,6 +798,7 @@
# NIC driver fixes
Patch1300: linux-2.6-net-e1000-no-msi-warning.patch
+Patch1301: linux-2.6-net-e1000e.patch
# Filesystem stuff.
# Squashfs
@@ -1492,6 +1493,8 @@
# NIC driver fixes
# Don't print warnings about MSI failures on e1000
%patch1300 -p1
+# Include e1000e driver (bug #360691)
+%patch1301 -p1
# Filesystem patches.
# Squashfs
@@ -2286,6 +2289,9 @@
# Checkout F-8/ and commit there.
#
%changelog
+* Tue Nov 13 2007 Eduardo Habkost <ehabkost at redhat.com>
+- Add e1000e driver (bug #360691)
+
* Mon Oct 22 2007 Dave Jones <davej at redhat.com>
- 2.6.23-git17
- Previous message (by thread): rpms/deskbar-applet/devel .cvsignore, 1.28, 1.29 deskbar-applet.spec, 1.55, 1.56 sources, 1.28, 1.29
- Next message (by thread): rpms/dblatex/devel COPYING-docbook-xsl, NONE, 1.1 dblatex-0.2.7-external-which.patch, NONE, 1.1 dblatex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list