From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrSN0-00046F-IQ for qemu-devel@nongnu.org; Mon, 02 Jun 2014 09:33:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WrSMs-0001jH-RK for qemu-devel@nongnu.org; Mon, 02 Jun 2014 09:33:46 -0400 Received: from mail-qa0-x229.google.com ([2607:f8b0:400d:c00::229]:46538) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WrSMs-0001jC-MN for qemu-devel@nongnu.org; Mon, 02 Jun 2014 09:33:38 -0400 Received: by mail-qa0-f41.google.com with SMTP id dc16so2658306qab.14 for ; Mon, 02 Jun 2014 06:33:38 -0700 (PDT) From: "Gabriel L. Somlo" Date: Mon, 2 Jun 2014 09:33:29 -0400 Message-Id: <1401716009-7005-4-git-send-email-somlo@cmu.edu> In-Reply-To: <1401716009-7005-1-git-send-email-somlo@cmu.edu> References: <1401716009-7005-1-git-send-email-somlo@cmu.edu> Subject: [Qemu-devel] [PATCH v4 3/3] e1000: remove broken support for 82573L List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.crosthwaite@xilinx.com, romain@dolbeau.org, mst@redhat.com, agraf@suse.de, stefanha@redhat.com, pbonzini@redhat.com, afaerber@suse.de Currently, e1000 support is based on the manual for the 8254xx model series. 82573x models are documented in a separate manual (see http://www.intel.com/content/dam/www/public/us/en/documents/manuals/pcie-gbe-controllers-open-source-manual.pdf) and the 82573L device ID no longer works correctly on either Linux (3.14.*) or Windows 7. This patch removes stale code claiming to support 82573L, cleaning up the code base for the remaining 8254xx model series. Signed-off-by: Gabriel Somlo Reviewed-by: Michael S. Tsirkin Reviewed-by: Peter Crosthwaite Reviewed-by: Stefan Hajnoczi --- hw/net/e1000.c | 18 ------------------ tests/e1000-test.c | 1 - 2 files changed, 19 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 1c51be8..47e0775 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -70,8 +70,6 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL); /* * HW models: * E1000_DEV_ID_82540EM works with Windows, Linux, and OS X <= 10.8 - * E1000_DEV_ID_82573L OK with windoze and Linux 2.6.22, - * appears to perform better than 82540EM, but breaks with Linux 2.6.18 * E1000_DEV_ID_82544GC_COPPER appears to work; not well tested * E1000_DEV_ID_82545EM_COPPER works with Linux and OS X >= 10.6 * Others never tested @@ -144,7 +142,6 @@ typedef struct E1000State_st { typedef struct E1000BaseClass { PCIDeviceClass parent_class; uint16_t phy_id2; - bool is_8257xx; } E1000BaseClass; #define TYPE_E1000_BASE "e1000-base" @@ -271,15 +268,9 @@ static void set_interrupt_cause(E1000State *s, int index, uint32_t val) { PCIDevice *d = PCI_DEVICE(s); - E1000BaseClass *edc = E1000_DEVICE_GET_CLASS(d); uint32_t pending_ints; uint32_t mit_delay; - if (val && edc->is_8257xx) { - /* hack only for 8257xx models */ - val |= E1000_ICR_INT_ASSERTED; - } - s->mac_reg[ICR] = val; /* @@ -1581,7 +1572,6 @@ typedef struct E1000Info { uint16_t device_id; uint8_t revision; uint16_t phy_id2; - bool is_8257xx; } E1000Info; static void e1000_class_init(ObjectClass *klass, void *data) @@ -1598,7 +1588,6 @@ static void e1000_class_init(ObjectClass *klass, void *data) k->device_id = info->device_id; k->revision = info->revision; e->phy_id2 = info->phy_id2; - e->is_8257xx = info->is_8257xx; k->class_id = PCI_CLASS_NETWORK_ETHERNET; set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); dc->desc = "Intel Gigabit Ethernet"; @@ -1634,13 +1623,6 @@ static const E1000Info e1000_devices[] = { .revision = 0x03, .phy_id2 = E1000_PHY_ID2_8254xx_DEFAULT, }, - { - .name = "e1000-82573l", - .device_id = E1000_DEV_ID_82573L, - .revision = 0x03, - .phy_id2 = E1000_PHY_ID2_82573x, - .is_8257xx = true, - }, }; static const TypeInfo e1000_default_info = { diff --git a/tests/e1000-test.c b/tests/e1000-test.c index 53c41f8..81f164d 100644 --- a/tests/e1000-test.c +++ b/tests/e1000-test.c @@ -33,7 +33,6 @@ static const char *models[] = { "e1000-82540em", "e1000-82544gc", "e1000-82545em", - "e1000-82573l", }; int main(int argc, char **argv) -- 1.9.3