| Submitter | Gerd Hoffmann |
|---|---|
| Date | Nov. 9, 2010, 10:47 a.m. |
| Message ID | <1289299669-5504-7-git-send-email-kraxel@redhat.com> |
| Download | mbox | patch |
| Permalink | /patch/70524/ |
| State | New |
| Headers | show |
Comments
On Tue, 9 Nov 2010, Gerd Hoffmann wrote: > 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. > I have applied and the reverted this one. > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > 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; Since there are no braces here.
Patch
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, },
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 <kraxel@redhat.com> --- hw/intel-hda.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)