From patchwork Wed Mar 2 13:36:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Dauchy X-Patchwork-Id: 85084 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 0F97D1007D4 for ; Thu, 3 Mar 2011 00:44:18 +1100 (EST) Received: from localhost ([127.0.0.1]:57656 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PumLf-0006XC-CD for incoming@patchwork.ozlabs.org; Wed, 02 Mar 2011 08:44:15 -0500 Received: from [140.186.70.92] (port=46272 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PumKT-0006FP-DI for qemu-devel@nongnu.org; Wed, 02 Mar 2011 08:43:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PumKS-0004n4-5m for qemu-devel@nongnu.org; Wed, 02 Mar 2011 08:43:01 -0500 Received: from mail-wy0-f173.google.com ([74.125.82.173]:55895) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PumKS-0004mv-1c for qemu-devel@nongnu.org; Wed, 02 Mar 2011 08:43:00 -0500 Received: by wyb29 with SMTP id 29so6084562wyb.4 for ; Wed, 02 Mar 2011 05:42:58 -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=Co38EaVI9/w33HyI9TbxmdmmU+1DGL7wYBRJ6wawlRc=; b=QpXk3QIA/cBCiLYWldEj3OZ2Hu+eqodf9TDNJwbtpDSGzyn0rHZ4TH4TyMwxG4NC4/ JyIeRmCXKWgqHD80ZELBRw2yO/0x/PjW5+0g6OFm7p5H7d+a6v3ffUZjLVAPNvsppFhl hdxQikC8tSVjBTUVBCbhqbas3/PKi3y5qSfkQ= 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=g4mrVlepPdiY12kU3MvMK6lt6PBsl9I9MMFfK5tVCOX64XGXNc0SVRppHwjvLldMSY ulDhAnz8kBXizpoTWDkteUj034Jmu/m3ZX4gJsXhExE9AhqEq3yf9lb0F0Zv6aJJH/x/ rWv03YC4NkOVHG0F1bLJRpXFq+5Q5il0/S4Ug= Received: by 10.216.18.76 with SMTP id k54mr646689wek.61.1299073378656; Wed, 02 Mar 2011 05:42:58 -0800 (PST) Received: from localhost.localdomain (hitchhiker.gandi.net [217.70.181.24]) by mx.google.com with ESMTPS id o19sm3083633wee.2.2011.03.02.05.42.57 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Mar 2011 05:42:57 -0800 (PST) From: William Dauchy To: qemu-devel@nongnu.org Date: Wed, 2 Mar 2011 14:36:26 +0100 Message-Id: <1299072986-11496-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.173 Cc: blauwirbel@gmail.com, 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. --- hw/pcnet.c | 27 ++++++++++++++------------- hw/rtl8139.c | 24 ++++++++++++------------ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index db52dc5..4e30e9c 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1557,19 +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 */ - - memcpy(s->prom, s->conf.macaddr.a, 6); - s->prom[12] = s->prom[13] = 0x00; - 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; @@ -1736,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); @@ -1744,5 +1734,16 @@ int pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info) add_boot_device_path(s->conf.bootindex, dev, "/ethernet-phy@0"); + /* Initialize the PROM */ + + memcpy(s->prom, s->conf.macaddr.a, 6); + s->prom[12] = s->prom[13] = 0x00; + 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..8356d5a 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,18 @@ 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);