From patchwork Sun Mar 6 21:27:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Dauchy X-Patchwork-Id: 85602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AA977B7100 for ; Mon, 7 Mar 2011 10:07:19 +1100 (EST) Received: from localhost ([127.0.0.1]:54463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PwM3T-0000Tt-Bi for incoming@patchwork.ozlabs.org; Sun, 06 Mar 2011 17:03:59 -0500 Received: from [140.186.70.92] (port=54604 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PwM0e-0006mh-Ck for qemu-devel@nongnu.org; Sun, 06 Mar 2011 17:01:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PwLaJ-0007BC-EH for qemu-devel@nongnu.org; Sun, 06 Mar 2011 16:33:52 -0500 Received: from mail-ww0-f41.google.com ([74.125.82.41]:44789) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PwLaJ-0007B3-12 for qemu-devel@nongnu.org; Sun, 06 Mar 2011 16:33:51 -0500 Received: by wwb29 with SMTP id 29so2003364wwb.4 for ; Sun, 06 Mar 2011 13:33:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=YBcdp8EPa26TsZChoAU7RzKHXWpa+ETYfeevQX3SH6E=; b=C+CZW4e9ideer3UrEaaHCoOgxAV65yl4AOH+sg6LCsdGLYK+v7frPgjRLQbc5mhjQB 7rS/in05j7OfPMwApl9P+rRs5Ug5qfMHkXUUwQoWfwDOBbrYZR0FFTM2U5vPrdm1wtcC d8YmtnMY4vQUIrZVHGJMJ3AJoW1AKgfNnzuao= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=C3YF3g8AVmoXTECypjt5kzMZ7e2nxudLuC8e+oUIwf7XrXHYrd1yVCJ4uz87uYvzc7 CkSCd7P2CmM3pOWr6e7d9v36crhezUVwCrovZ+dme7v6FoBcq/mygaXb0rW25WNYu9w0 aatI9+n4LQXkeyhrKfbGJtGaKIQ7rY74Jy+pA= Received: by 10.216.174.69 with SMTP id w47mr1722599wel.41.1299447226787; Sun, 06 Mar 2011 13:33:46 -0800 (PST) Received: from localhost.localdomain (hitchhiker.gandi.net [217.70.181.24]) by mx.google.com with ESMTPS id h39sm932406wes.5.2011.03.06.13.33.45 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 06 Mar 2011 13:33:45 -0800 (PST) From: William Dauchy To: blauwirbel@gmail.com Date: Sun, 6 Mar 2011 22:27:18 +0100 Message-Id: <1299446838-8689-1-git-send-email-wdauchy@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.41 Cc: qemu-devel@nongnu.org, William Dauchy Subject: [Qemu-devel] [PATCH] moving eeprom initialization X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The initialization should not be only on reset but also when initializing the device. It resolves a bug when hot plugging a pci network device: the mac address was always null. Signed-off-by: William Dauchy Signed-off-by: Wen Congyang --- hw/pcnet.c | 59 +++++++++++++++++++++++++++++---------------------------- hw/rtl8139.c | 23 ++++++++++----------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 6dfdcc4..d3d5661 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1557,35 +1557,6 @@ uint32_t pcnet_bcr_readw(PCNetState *s, uint32_t rap) void pcnet_h_reset(void *opaque) { PCNetState *s = opaque; - int i; - uint16_t checksum; - - /* Initialize the PROM */ - - /* - Datasheet: http://pdfdata.datasheetsite.com/web/24528/AM79C970A.pdf - page 95 - */ - memcpy(s->prom, s->conf.macaddr.a, 6); - /* Reserved Location: must be 00h */ - s->prom[6] = s->prom[7] = 0x00; - /* Reserved Location: must be 00h */ - s->prom[8] = 0x00; - /* Hardware ID: must be 11h if compatibility to AMD drivers is desired */ - s->prom[9] = 0x11; - /* User programmable space, init with 0 */ - s->prom[10] = s->prom[11] = 0x00; - /* LSByte of two-byte checksum, which is the sum of bytes 00h-0Bh - and bytes 0Eh and 0Fh, must therefore be initialized with 0! */ - s->prom[12] = s->prom[13] = 0x00; - /* Must be ASCII W (57h) if compatibility to AMD - driver software is desired */ - s->prom[14] = s->prom[15] = 0x57; - - for (i = 0,checksum = 0; i < 16; i++) - checksum += s->prom[i]; - *(uint16_t *)&s->prom[12] = cpu_to_le16(checksum); - s->bcr[BCR_MSRDA] = 0x0005; s->bcr[BCR_MSWRA] = 0x0005; @@ -1752,6 +1723,9 @@ void pcnet_common_cleanup(PCNetState *d) int pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info) { + int i; + uint16_t checksum; + s->poll_timer = qemu_new_timer(vm_clock, pcnet_poll_timer, s); qemu_macaddr_default_if_unset(&s->conf.macaddr); @@ -1760,5 +1734,32 @@ int pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info) add_boot_device_path(s->conf.bootindex, dev, "/ethernet-phy@0"); + /* Initialize the PROM */ + + /* + Datasheet: http://pdfdata.datasheetsite.com/web/24528/AM79C970A.pdf + page 95 + */ + memcpy(s->prom, s->conf.macaddr.a, 6); + /* Reserved Location: must be 00h */ + s->prom[6] = s->prom[7] = 0x00; + /* Reserved Location: must be 00h */ + s->prom[8] = 0x00; + /* Hardware ID: must be 11h if compatibility to AMD drivers is desired */ + s->prom[9] = 0x11; + /* User programmable space, init with 0 */ + s->prom[10] = s->prom[11] = 0x00; + /* LSByte of two-byte checksum, which is the sum of bytes 00h-0Bh + and bytes 0Eh and 0Fh, must therefore be initialized with 0! */ + s->prom[12] = s->prom[13] = 0x00; + /* Must be ASCII W (57h) if compatibility to AMD + driver software is desired */ + s->prom[14] = s->prom[15] = 0x57; + + for (i = 0, checksum = 0; i < 16; i++) { + checksum += s->prom[i]; + } + *(uint16_t *)&s->prom[12] = cpu_to_le16(checksum); + return 0; } diff --git a/hw/rtl8139.c b/hw/rtl8139.c index a22530c..7a87522 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -1189,18 +1189,6 @@ static void rtl8139_reset(DeviceState *d) rtl8139_update_irq(s); - /* prepare eeprom */ - s->eeprom.contents[0] = 0x8129; -#if 1 - // PCI vendor and device ID should be mirrored here - s->eeprom.contents[1] = PCI_VENDOR_ID_REALTEK; - s->eeprom.contents[2] = PCI_DEVICE_ID_REALTEK_8139; -#endif - - s->eeprom.contents[7] = s->conf.macaddr.a[0] | s->conf.macaddr.a[1] << 8; - s->eeprom.contents[8] = s->conf.macaddr.a[2] | s->conf.macaddr.a[3] << 8; - s->eeprom.contents[9] = s->conf.macaddr.a[4] | s->conf.macaddr.a[5] << 8; - /* mark all status registers as owned by host */ for (i = 0; i < 4; ++i) { @@ -3392,6 +3380,17 @@ static int pci_rtl8139_init(PCIDevice *dev) qemu_macaddr_default_if_unset(&s->conf.macaddr); + /* prepare eeprom */ + s->eeprom.contents[0] = 0x8129; +#if 1 + /* PCI vendor and device ID should be mirrored here */ + s->eeprom.contents[1] = PCI_VENDOR_ID_REALTEK; + s->eeprom.contents[2] = PCI_DEVICE_ID_REALTEK_8139; +#endif + s->eeprom.contents[7] = s->conf.macaddr.a[0] | s->conf.macaddr.a[1] << 8; + s->eeprom.contents[8] = s->conf.macaddr.a[2] | s->conf.macaddr.a[3] << 8; + s->eeprom.contents[9] = s->conf.macaddr.a[4] | s->conf.macaddr.a[5] << 8; + s->nic = qemu_new_nic(&net_rtl8139_info, &s->conf, dev->qdev.info->name, dev->qdev.id, s); qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a);