From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:60246)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1THJnD-0003p1-Ro
	for qemu-devel@nongnu.org; Thu, 27 Sep 2012 15:30:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1THJn9-0005fc-Ea
	for qemu-devel@nongnu.org; Thu, 27 Sep 2012 15:30:39 -0400
Received: from mx1.redhat.com ([209.132.183.28]:59319)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1THJn9-0005ds-5z
	for qemu-devel@nongnu.org; Thu, 27 Sep 2012 15:30:35 -0400
Date: Thu, 27 Sep 2012 21:32:02 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20120927193202.GA31306@redhat.com>
References: <20120927142751.28864.67471.reportbug@gimli.ponomarevs.fi>
	<50646F5F.7080703@msgid.tls.msk.ru> <50647E08.7050606@gmail.com>
	<506489CD.8080605@msgid.tls.msk.ru> <50649ABA.8020104@siemens.com>
	<50649E6D.4050102@msgid.tls.msk.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <50649E6D.4050102@msgid.tls.msk.ru>
Subject: Re: [Qemu-devel] Bug#688964: qemu-kvm: Fedora 17 guest hangs on
 boot with soft lockup in udevd
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Michael Tokarev <mjt@tls.msk.ru>
Cc: Jan Kiszka <jan.kiszka@siemens.com>, Gerd Hoffmann <kraxel@redhat.com>, "688964@bugs.debian.org" <688964@bugs.debian.org>, Nikolai Kondrashov <spbnick@gmail.com>, qemu-devel <qemu-devel@nongnu.org>

On Thu, Sep 27, 2012 at 10:43:57PM +0400, Michael Tokarev wrote:
> On 27.09.2012 22:28, Jan Kiszka wrote:
> []
> >> --- a/hw/intel-hda.c
> >> +++ b/hw/intel-hda.c
> >> @@ -1107,6 +1107,9 @@ static void intel_hda_reset(DeviceState *dev)
> >>      DeviceState *qdev;
> >>      HDACodecDevice *cdev;
> >>
> >> +    if (d->msi) {
> >> +        msi_reset(&d->pci);
> >> +    }
> >>      intel_hda_regs_reset(d);
> >>      d->wall_base_ns = qemu_get_clock_ns(vm_clock);
> >>
> >> which is exactly about this hda thing.  I'm CC'ing relevant
> >> people here.
> > 
> > I suppose we are resetting the MSI configuration also in cases here
> > where only the HDA internals are supposed to be reset (when called from
> > intel_hda_set_g_ctl).
> 
> Hmm.  I was looking at this code already (but i don't know the machinery
> anyway).  Here it is (I addedd two printfs in obvious places):
> 
> in intel_hda_reset
> calling intel_hda_reset from intel_hda_set_g_ctl
> in intel_hda_reset
> (at this time it hangs in guest).
> 
> The following patch fixes it.  Is it correct? :)
> 
> /mjt

> diff --git a/hw/intel-hda.c b/hw/intel-hda.c
> index e38861e..fdd7eeb 100644
> --- a/hw/intel-hda.c
> +++ b/hw/intel-hda.c
> @@ -199,7 +199,7 @@ struct IntelHDAReg {
>      void       (*rhandler)(IntelHDAState *d, const IntelHDAReg *reg);
>  };
>  
> -static void intel_hda_reset(DeviceState *dev);
> +static void intel_hda_reset_dev(DeviceState *dev);
>  
>  /* --------------------------------------------------------------------- */
>  
> @@ -500,7 +500,7 @@ static void intel_hda_notify_codecs(IntelHDAState *d, uint32_t stream, bool runn
>  static void intel_hda_set_g_ctl(IntelHDAState *d, const IntelHDAReg *reg, uint32_t old)
>  {
>      if ((d->g_ctl & ICH6_GCTL_RESET) == 0) {
> -        intel_hda_reset(&d->pci.qdev);
> +        intel_hda_reset_dev(&d->pci.qdev);
>      }
>  }
>  
> @@ -1101,15 +1101,12 @@ static const MemoryRegionOps intel_hda_mmio_ops = {
>  
>  /* --------------------------------------------------------------------- */
>  
> -static void intel_hda_reset(DeviceState *dev)
> +static void intel_hda_reset_dev(DeviceState *dev)
>  {
>      IntelHDAState *d = DO_UPCAST(IntelHDAState, pci.qdev, dev);
>      DeviceState *qdev;
>      HDACodecDevice *cdev;
>  
> -    if (d->msi) {
> -        msi_reset(&d->pci);
> -    }
>      intel_hda_regs_reset(d);
>      d->wall_base_ns = qemu_get_clock_ns(vm_clock);
>  
> @@ -1122,6 +1119,15 @@ static void intel_hda_reset(DeviceState *dev)
>      intel_hda_update_irq(d);
>  }
>  
> +static void intel_hda_reset(DeviceState *dev)
> +{
> +    IntelHDAState *d = DO_UPCAST(IntelHDAState, pci.qdev, dev);
> +    if (d->msi) {
> +        msi_reset(&d->pci);
> +    }
> +    intel_hda_reset_dev(dev);
> +}
> +
>  static int intel_hda_init(PCIDevice *pci)
>  {
>      IntelHDAState *d = DO_UPCAST(IntelHDAState, pci, pci);


Looks good to me.
ACK for stable branch.