All of lore.kernel.org
 help / color / mirror / Atom feed
From: Borislav Petkov <bp@alien8.de>
To: Jiang Liu <jiang.liu@linux.intel.com>
Cc: lkml <linux-kernel@vger.kernel.org>,
	"Maling list - DRI developers" <dri-devel@lists.freedesktop.org>,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	"Alex Deucher" <alexander.deucher@amd.com>,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"Christian König" <christian.koenig@amd.com>
Subject: Re: WARNING: CPU: 4 PID: 863 at include/drm/drm_crtc.h:1577 drm_helper_choose_encoder_dpms+0x88/0x90() - evildoer found and neutralized
Date: Sat, 3 Oct 2015 11:35:38 +0200	[thread overview]
Message-ID: <20151003093538.GA3786@pd.tnic> (raw)
In-Reply-To: <560F8583.2010403@linux.intel.com>

On Sat, Oct 03, 2015 at 03:36:35PM +0800, Jiang Liu wrote:
> The above change is not needed, pcibios_disable_irq() will
> first check !pci_has_managed_irq(dev) before actually freeing
> PCI irq. pci_has_managed_irq(dev) only returns true if
> pcibios_alloc_irq() succeeds.
> 
> So to summary, I think we only need following change to fix the
> regression:
>  int pcibios_alloc_irq(struct pci_dev *dev)
>  {
> +	if (pci_dev_msi_enabled(dev))
> +		return -EBUSY;
> 
> What do you think?

Yap, that works too. I've got only this ontop of 4.3+tip:

---
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index dc78a4a9a466..a4687aa6c1fb 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -675,6 +675,9 @@ int pcibios_add_device(struct pci_dev *dev)
 
 int pcibios_alloc_irq(struct pci_dev *dev)
 {
+	if (pci_dev_msi_enabled(dev))
+		return -EBUSY;
+
 	return pcibios_enable_irq(dev);
 }
 
---

and it suspend+resumed fine.

I guess it is time for Joerg to write a proper patch. :-)

Thanks.

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

WARNING: multiple messages have this Message-ID (diff)
From: Borislav Petkov <bp@alien8.de>
To: Jiang Liu <jiang.liu@linux.intel.com>
Cc: "Joerg Roedel" <joro@8bytes.org>,
	"Daniel Vetter" <daniel@ffwll.ch>,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	"Alex Deucher" <alexdeucher@gmail.com>,
	"Alex Deucher" <alexander.deucher@amd.com>,
	"Christian König" <christian.koenig@amd.com>,
	"Maling list - DRI developers" <dri-devel@lists.freedesktop.org>,
	lkml <linux-kernel@vger.kernel.org>
Subject: Re: WARNING: CPU: 4 PID: 863 at include/drm/drm_crtc.h:1577 drm_helper_choose_encoder_dpms+0x88/0x90() - evildoer found and neutralized
Date: Sat, 3 Oct 2015 11:35:38 +0200	[thread overview]
Message-ID: <20151003093538.GA3786@pd.tnic> (raw)
In-Reply-To: <560F8583.2010403@linux.intel.com>

On Sat, Oct 03, 2015 at 03:36:35PM +0800, Jiang Liu wrote:
> The above change is not needed, pcibios_disable_irq() will
> first check !pci_has_managed_irq(dev) before actually freeing
> PCI irq. pci_has_managed_irq(dev) only returns true if
> pcibios_alloc_irq() succeeds.
> 
> So to summary, I think we only need following change to fix the
> regression:
>  int pcibios_alloc_irq(struct pci_dev *dev)
>  {
> +	if (pci_dev_msi_enabled(dev))
> +		return -EBUSY;
> 
> What do you think?

Yap, that works too. I've got only this ontop of 4.3+tip:

---
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index dc78a4a9a466..a4687aa6c1fb 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -675,6 +675,9 @@ int pcibios_add_device(struct pci_dev *dev)
 
 int pcibios_alloc_irq(struct pci_dev *dev)
 {
+	if (pci_dev_msi_enabled(dev))
+		return -EBUSY;
+
 	return pcibios_enable_irq(dev);
 }
 
---

and it suspend+resumed fine.

I guess it is time for Joerg to write a proper patch. :-)

Thanks.

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.

  reply	other threads:[~2015-10-03  9:35 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-21 13:31 WARNING: CPU: 4 PID: 863 at include/drm/drm_crtc.h:1577 drm_helper_choose_encoder_dpms+0x88/0x90() Borislav Petkov
2015-09-22 19:06 ` Borislav Petkov
2015-09-22 19:06   ` Borislav Petkov
2015-09-22 19:58 ` Alex Deucher
2015-09-22 19:58   ` Alex Deucher
2015-09-22 20:21   ` Borislav Petkov
2015-09-22 20:21     ` Borislav Petkov
2015-09-22 20:54     ` Alex Deucher
2015-09-22 20:54       ` Alex Deucher
2015-09-23  7:25       ` Daniel Vetter
2015-09-23  8:59         ` Borislav Petkov
2015-09-23  8:59           ` Borislav Petkov
2015-09-23 14:44           ` Daniel Vetter
2015-09-23 14:44             ` Daniel Vetter
2015-09-23 16:06             ` Borislav Petkov
2015-09-23 16:06               ` Borislav Petkov
2015-09-23 16:18               ` Borislav Petkov
2015-09-23 16:18                 ` Borislav Petkov
2015-09-26 16:46                 ` WARNING: CPU: 4 PID: 863 at include/drm/drm_crtc.h:1577 drm_helper_choose_encoder_dpms+0x88/0x90() - evildoer found and neutralized Borislav Petkov
2015-09-26 16:46                   ` Borislav Petkov
2015-09-29  8:50                   ` Jiang Liu
2015-09-29 10:51                     ` Borislav Petkov
2015-09-29 10:51                       ` Borislav Petkov
2015-09-30  7:45                       ` Jiang Liu
2015-09-30  7:45                         ` Jiang Liu
2015-09-30 12:44                         ` Joerg Roedel
2015-09-30 17:00                           ` Jiang Liu
2015-09-30 17:36                             ` Borislav Petkov
2015-09-30 17:36                               ` Borislav Petkov
2015-09-30 18:07                               ` Joerg Roedel
2015-09-30 18:07                                 ` Joerg Roedel
2015-10-03  7:36                               ` Jiang Liu
2015-10-03  7:36                                 ` Jiang Liu
2015-10-03  9:35                                 ` Borislav Petkov [this message]
2015-10-03  9:35                                   ` Borislav Petkov
2015-10-05 10:03                                 ` Joerg Roedel
2015-10-05 10:03                                   ` Joerg Roedel
2015-10-06 13:13                                   ` Jiang Liu
2015-10-09 10:24                                     ` Joerg Roedel
2015-10-09 10:24                                       ` Joerg Roedel
2015-09-30 18:06                             ` Joerg Roedel
2015-09-30 18:06                               ` Joerg Roedel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151003093538.GA3786@pd.tnic \
    --to=bp@alien8.de \
    --cc=alexander.deucher@amd.com \
    --cc=bhelgaas@google.com \
    --cc=christian.koenig@amd.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=jiang.liu@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.