From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RV9pd-000449-F6 for qemu-devel@nongnu.org; Mon, 28 Nov 2011 17:37:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RV9pc-0004pg-0f for qemu-devel@nongnu.org; Mon, 28 Nov 2011 17:37:49 -0500 Received: from e35.co.us.ibm.com ([32.97.110.153]:46948) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RV9pb-0004ll-PS for qemu-devel@nongnu.org; Mon, 28 Nov 2011 17:37:47 -0500 Received: from /spool/local by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 28 Nov 2011 15:37:26 -0700 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pASMb9Gc093446 for ; Mon, 28 Nov 2011 15:37:10 -0700 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pASMb1fd026060 for ; Mon, 28 Nov 2011 15:37:03 -0700 Message-ID: <4ED40D06.1030104@us.ibm.com> Date: Mon, 28 Nov 2011 16:36:54 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1322083230-853-1-git-send-email-sw@weilnetz.de> In-Reply-To: <1322083230-853-1-git-send-email-sw@weilnetz.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1.0 (resend)] eepro100: Fix alignment requirement for statistical counters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: qemu-devel@nongnu.org, "Michael S. Tsirkin" On 11/23/2011 03:20 PM, Stefan Weil wrote: > According to Intel's Open Source Software Developer Manual, > the dump counters address must be Dword aligned. > > The new code enforces this alignment, so s->statsaddr may now > be used with stw_le_pci_dma() and stl_le_pci_dma(). > > Signed-off-by: Stefan Weil Applied. Thanks. Regards, Anthony Liguori > --- > hw/eepro100.c | 10 +++++++++- > 1 files changed, 9 insertions(+), 1 deletions(-) > > diff --git a/hw/eepro100.c b/hw/eepro100.c > index 7d59e71..29ec5b4 100644 > --- a/hw/eepro100.c > +++ b/hw/eepro100.c > @@ -976,7 +976,15 @@ static void eepro100_cu_command(EEPRO100State * s, uint8_t val) > case CU_STATSADDR: > /* Load dump counters address. */ > s->statsaddr = e100_read_reg4(s, SCBPointer); > - TRACE(OTHER, logout("val=0x%02x (status address)\n", val)); > + TRACE(OTHER, logout("val=0x%02x (dump counters address)\n", val)); > + if (s->statsaddr& 3) { > + /* Memory must be Dword aligned. */ > + logout("unaligned dump counters address\n"); > + /* Handling of misaligned addresses is undefined. > + * Here we align the address by ignoring the lower bits. */ > + /* TODO: Test unaligned dump counter address on real hardware. */ > + s->statsaddr&= ~3; > + } > break; > case CU_SHOWSTATS: > /* Dump statistical counters. */