From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHxa7-0004jR-7X for qemu-devel@nongnu.org; Thu, 14 Aug 2014 12:08:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHxa2-0001tP-EL for qemu-devel@nongnu.org; Thu, 14 Aug 2014 12:08:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHxa1-0001tF-Uw for qemu-devel@nongnu.org; Thu, 14 Aug 2014 12:08:46 -0400 Date: Thu, 14 Aug 2014 18:08:50 +0200 From: "Michael S. Tsirkin" Message-ID: <1408032488-11096-4-git-send-email-mst@redhat.com> References: <1408032488-11096-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1408032488-11096-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 03/12] hw/audio/intel-hda: Fix MSI capability address List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , "Vassili Karpov (malc)" , Gerd Hoffmann , Anthony Liguori , Jan Kiszka From: Jan Kiszka According to ICH9 spec, the MSI capability is located at 0x60. This is important for guest drivers that do not parse the capability chain and use absolute addresses instead. CC: Gerd Hoffmann Signed-off-by: Jan Kiszka Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/i386/pc.h | 7 ++++++- hw/audio/intel-hda.c | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index dc3058b..895b415 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -300,7 +300,12 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); int e820_get_num_entries(void); bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); -#define PC_COMPAT_2_1 +#define PC_COMPAT_2_1 \ + {\ + .driver = "intel-hda",\ + .property = "old_msi_addr",\ + .value = "on",\ + } #define PC_COMPAT_2_0 \ PC_COMPAT_2_1, \ diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index aa49b47..0ac911e 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -187,6 +187,7 @@ struct IntelHDAState { /* properties */ uint32_t debug; uint32_t msi; + bool old_msi_addr; }; #define TYPE_INTEL_HDA_GENERIC "intel-hda-generic" @@ -1141,7 +1142,7 @@ static int intel_hda_init(PCIDevice *pci) "intel-hda", 0x4000); pci_register_bar(&d->pci, 0, 0, &d->mmio); if (d->msi) { - msi_init(&d->pci, 0x50, 1, true, false); + msi_init(&d->pci, d->old_msi_addr ? 0x50 : 0x60, 1, true, false); } hda_codec_bus_init(DEVICE(pci), &d->codecs, sizeof(d->codecs), @@ -1236,6 +1237,7 @@ static const VMStateDescription vmstate_intel_hda = { static Property intel_hda_properties[] = { DEFINE_PROP_UINT32("debug", IntelHDAState, debug, 0), DEFINE_PROP_UINT32("msi", IntelHDAState, msi, 1), + DEFINE_PROP_BOOL("old_msi_addr", IntelHDAState, old_msi_addr, false), DEFINE_PROP_END_OF_LIST(), }; -- MST