From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MFbbh-00033W-EQ for qemu-devel@nongnu.org; Sat, 13 Jun 2009 18:21:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MFbbd-000330-VY for qemu-devel@nongnu.org; Sat, 13 Jun 2009 18:21:49 -0400 Received: from [199.232.76.173] (port=35857 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MFbbd-00032x-M1 for qemu-devel@nongnu.org; Sat, 13 Jun 2009 18:21:45 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:45570) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MFbbd-0005vh-Df for qemu-devel@nongnu.org; Sat, 13 Jun 2009 18:21:45 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e9.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n5DM9Hxc008542 for ; Sat, 13 Jun 2009 18:09:17 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n5DMLicI242594 for ; Sat, 13 Jun 2009 18:21:44 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n5DMLhYX023505 for ; Sat, 13 Jun 2009 18:21:44 -0400 Message-ID: <4A342676.6030900@us.ibm.com> Date: Sat, 13 Jun 2009 17:21:42 -0500 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] Fix e1000 emulation for FreeBSD 8.0-current References: <20090607192912.GA16996@triton.kn-bremen.de> In-Reply-To: <20090607192912.GA16996@triton.kn-bremen.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juergen Lock Cc: qemu-devel@nongnu.org Juergen Lock wrote: > FreeBSD 8.0-current svn rev >= 190872 changed the way initial > MAC addresses are read in the em(4) driver, it now reads them from > E1000_RA instead of from the EEPROM. See e1000_read_mac_addr_generic() > in sys/dev/e1000/if_em.c: > http://svn.freebsd.org/viewvc/base/head/sys/dev/e1000/e1000_nvm.c?view=markup&pathrev=190872 > http://svn.freebsd.org/viewvc/base?view=revision&revision=190872 > Needs a Signed-off-by. > diff --git a/hw/e1000.c b/hw/e1000.c > index 2665792..5d614bd 100644 > --- a/hw/e1000.c > +++ b/hw/e1000.c > @@ -1102,6 +1102,16 @@ static void pci_e1000_init(PCIDevice *pci_dev) > memmove(d->phy_reg, phy_reg_init, sizeof phy_reg_init); > memset(d->mac_reg, 0, sizeof d->mac_reg); > memmove(d->mac_reg, mac_reg_init, sizeof mac_reg_init); > + /* > + * FreeBSD 8.0-current svn rev >= 190872 expects the mac address here, > + * see e1000_read_mac_addr_generic() in sys/dev/e1000/if_em.c: > + * http://svn.freebsd.org/viewvc/base/head/sys/dev/e1000/e1000_nvm.c?view=markup&pathrev=190872 > + * http://svn.freebsd.org/viewvc/base?view=revision&revision=190872 > + */ > + d->mac_reg[RA] = (macaddr[3]<<24) | (macaddr[2]<<16) | > + (macaddr[1]<<8) | macaddr[0]; > + d->mac_reg[RA+1] = (macaddr[5]<<8) | macaddr[4]; > + > d->rxbuf_min_shift = 1; > memset(&d->tx, 0, sizeof d->tx); > > > > > -- Regards, Anthony Liguori