[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 6/6] intel-hda: fix codec addressing.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 6/6] intel-hda: fix codec addressing. |
Date: |
Tue, 9 Nov 2010 11:47:49 +0100 |
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.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/intel-hda.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/intel-hda.c b/hw/intel-hda.c
index 5e13dc3..b34b140 100644
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@ -56,7 +56,7 @@ 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);
@@ -643,15 +643,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,
},
--
1.7.1
- [Qemu-devel] [PATCH v2 0/6] intel-hda: bugfixes and msi support, Gerd Hoffmann, 2010/11/09
- [Qemu-devel] [PATCH v2 2/6] hda-audio: exit cleanup, Gerd Hoffmann, 2010/11/09
- [Qemu-devel] [PATCH v2 4/6] intel-hda: update irq status on WAKEEN changes., Gerd Hoffmann, 2010/11/09
- [Qemu-devel] [PATCH v2 6/6] intel-hda: fix codec addressing.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 1/6] intel-hda: exit cleanup, Gerd Hoffmann, 2010/11/09
- [Qemu-devel] [PATCH v2 5/6] intel-hda: add msi support, Gerd Hoffmann, 2010/11/09
- [Qemu-devel] [PATCH v2 3/6] intel-hda: Honor WAKEEN bits., Gerd Hoffmann, 2010/11/09
- Re: [Qemu-devel] [PATCH v2 0/6] intel-hda: bugfixes and msi support, malc, 2010/11/09