From patchwork Tue Nov 9 16:28:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 70555 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 16C14B7107 for ; Wed, 10 Nov 2010 03:30:21 +1100 (EST) Received: from localhost ([127.0.0.1]:57081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PFr5N-0005r3-H0 for incoming@patchwork.ozlabs.org; Tue, 09 Nov 2010 11:30:17 -0500 Received: from [140.186.70.92] (port=57191 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PFr3w-0005RJ-4u for qemu-devel@nongnu.org; Tue, 09 Nov 2010 11:28:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PFr3v-0005cH-8V for qemu-devel@nongnu.org; Tue, 09 Nov 2010 11:28:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PFr3v-0005bm-1i for qemu-devel@nongnu.org; Tue, 09 Nov 2010 11:28:47 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oA9GSfmc026173 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 9 Nov 2010 11:28:41 -0500 Received: from rincewind.home.kraxel.org (vpn1-5-23.ams2.redhat.com [10.36.5.23]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oA9GSdXi025988; Tue, 9 Nov 2010 11:28:40 -0500 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id A9252451C3; Tue, 9 Nov 2010 17:28:38 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 9 Nov 2010 17:28:38 +0100 Message-Id: <1289320118-15206-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH] intel-hda: fix codec addressing. 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 HDA bus supports up to 15 codecs, with addresses 0 ... 14. We get that wrong in two places: * When handing out addresses we accept address 15 as valid. * The bitmasks for two registers (WAKEEN and STATESTS) don't have bit 14 set. This patch fixes it. [ v2: codestyle: add braces ] Signed-off-by: Gerd Hoffmann --- hw/intel-hda.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/intel-hda.c b/hw/intel-hda.c index 9018280..4e14447 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c @@ -56,8 +56,9 @@ static int hda_codec_dev_init(DeviceState *qdev, DeviceInfo *base) if (dev->cad == -1) { dev->cad = bus->next_cad; } - if (dev->cad > 15) + if (dev->cad >= 15) { return -1; + } bus->next_cad = dev->cad + 1; return info->init(dev); } @@ -634,15 +635,15 @@ static const struct IntelHDAReg regtab[] = { [ ICH6_REG_WAKEEN ] = { .name = "WAKEEN", .size = 2, - .wmask = 0x3fff, + .wmask = 0x7fff, .offset = offsetof(IntelHDAState, wake_en), .whandler = intel_hda_set_wake_en, }, [ ICH6_REG_STATESTS ] = { .name = "STATESTS", .size = 2, - .wmask = 0x3fff, - .wclear = 0x3fff, + .wmask = 0x7fff, + .wclear = 0x7fff, .offset = offsetof(IntelHDAState, state_sts), .whandler = intel_hda_set_state_sts, },