From patchwork Tue Aug 11 21:14:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Reimar_D=C3=B6ffinger?= X-Patchwork-Id: 31165 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 bilbo.ozlabs.org (Postfix) with ESMTPS id C9698B6F1E for ; Wed, 12 Aug 2009 07:18:45 +1000 (EST) Received: from localhost ([127.0.0.1]:40100 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mayjy-00047y-IZ for incoming@patchwork.ozlabs.org; Tue, 11 Aug 2009 17:18:42 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MaygT-0003NS-2m for qemu-devel@nongnu.org; Tue, 11 Aug 2009 17:15:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MaygO-0003Lf-3Q for qemu-devel@nongnu.org; Tue, 11 Aug 2009 17:15:04 -0400 Received: from [199.232.76.173] (port=33561 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MaygN-0003LY-VC for qemu-devel@nongnu.org; Tue, 11 Aug 2009 17:15:00 -0400 Received: from mail.gmx.net ([213.165.64.20]:35074) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1MaygN-0001qn-Gi for qemu-devel@nongnu.org; Tue, 11 Aug 2009 17:14:59 -0400 Received: (qmail invoked by alias); 11 Aug 2009 21:14:57 -0000 Received: from p5B1340BE.dip.t-dialin.net (EHLO localhost) [91.19.64.190] by mail.gmx.net (mp006) with SMTP; 11 Aug 2009 23:14:57 +0200 X-Authenticated: #11956158 X-Provags-ID: V01U2FsdGVkX19j58pPJIhjP+AiG6+PHgu7aJP4G3huK3mdzrWwzl a1pUCvEtHf6wNX Date: Tue, 11 Aug 2009 23:14:56 +0200 From: Reimar =?iso-8859-1?Q?D=F6ffinger?= To: qemu-devel@nongnu.org Message-ID: <20090811211456.GC10500@1und1.de> References: <4A81D3F1.1040300@codemonkey.ws> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4A81D3F1.1040300@codemonkey.ws> X-Mailer: git-send-email 1.6.4 User-Agent: Mutt/1.5.20 (2009-06-14) X-Y-GMX-Trusted: 0 X-FuHaFi: 0.53 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 2/5] Hack to make sure that drivers like AppleIntel8255x will not meddle with the RU/CU state when the ACK the interrupt with a 16 bit write. 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 This patch ensures that a driver will not accidentally/incorrectly change the RU/CU state with a write. This is incomplete and a bit ugly, but good enough for these drivers. The reason this is an issue is that the drivers ACK interrupts with a 16 bit write to the status word, with the lower bits having a value of 0. Signed-off-by: Reimar Döffinger --- hw/eepro100.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index bf5d920..f619d36 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1249,7 +1249,11 @@ static void eepro100_write1(EEPRO100State * s, uint32_t addr, uint8_t val) static void eepro100_write2(EEPRO100State * s, uint32_t addr, uint16_t val) { if (addr <= sizeof(s->mem) - sizeof(val)) { + ru_state_t rtmp = get_ru_state(s); + cu_state_t ctmp = get_cu_state(s); memcpy(&s->mem[addr], &val, sizeof(val)); + set_cu_state(s, ctmp); + set_ru_state(s, rtmp); } logout("addr=%s val=0x%04x\n", regname(addr), val);