linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lyude Paul <lyude@redhat.com>
To: nouveau@lists.freedesktop.org, linux-pci@vger.kernel.org,
	Lukas Wunner <lukas@wunner.de>
Cc: Daniel Drake <drake@endlessm.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Aaron Plattner <aplattner@nvidia.com>,
	Peter Wu <peter@lekensteyn.nl>,
	Ilia Mirkin <imirkin@alum.mit.edu>,
	Karol Herbst <kherbst@redhat.com>,
	Maik Freudenberg <hhfeuer@gmx.de>,
	linux-kernel@vger.kernel.org
Subject: [PATCH] PCI: Use pci_reset_bus() in quirk_reset_lenovo_thinkpad_50_nvgpu()
Date: Thu,  1 Aug 2019 18:01:17 -0400	[thread overview]
Message-ID: <20190801220117.14952-1-lyude@redhat.com> (raw)

Since quirk_nvidia_hda() was added there's now two nvidia device
functions on any laptops with nvidia GPUs: the HDA controller, and the
GPU itself. Unfortunately this has the sideaffect of breaking
quirk_reset_lenovo_thinkpad_50_nvgpu() since pci_reset_function() was
using pci_parent_bus_reset() to reset the GPU's respective PCI bus, and
pci_parent_bus_reset() does not work on busses which have more then a
single device function present.

So, fix this by simply calling pci_reset_bus() instead which properly
resets the GPU bus and all device functions under it, including both the
GPU and the HDA controller.

Fixes: b516ea586d71 ("PCI: Enable NVIDIA HDA controllers")
Cc: Lukas Wunner <lukas@wunner.de>
Cc: Daniel Drake <drake@endlessm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Aaron Plattner <aplattner@nvidia.com>
Cc: Peter Wu <peter@lekensteyn.nl>
Cc: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Karol Herbst <kherbst@redhat.com>
Cc: Maik Freudenberg <hhfeuer@gmx.de>
Cc: linux-pci@vger.kernel.org
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
 drivers/pci/quirks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 208aacf39329..44c4ae1abd00 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -5256,7 +5256,7 @@ static void quirk_reset_lenovo_thinkpad_p50_nvgpu(struct pci_dev *pdev)
 	 */
 	if (ioread32(map + 0x2240c) & 0x2) {
 		pci_info(pdev, FW_BUG "GPU left initialized by EFI, resetting\n");
-		ret = pci_reset_function(pdev);
+		ret = pci_reset_bus(pdev);
 		if (ret < 0)
 			pci_err(pdev, "Failed to reset GPU: %d\n", ret);
 	}
-- 
2.21.0


             reply	other threads:[~2019-08-01 22:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-01 22:01 Lyude Paul [this message]
2019-08-01 23:45 ` [Nouveau] [PATCH] PCI: Use pci_reset_bus() in quirk_reset_lenovo_thinkpad_50_nvgpu() Ben Skeggs
2019-08-12 19:13 ` Lyude Paul
2019-08-15 22:15 ` Bjorn Helgaas

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=20190801220117.14952-1-lyude@redhat.com \
    --to=lyude@redhat.com \
    --cc=aplattner@nvidia.com \
    --cc=bhelgaas@google.com \
    --cc=drake@endlessm.com \
    --cc=hhfeuer@gmx.de \
    --cc=imirkin@alum.mit.edu \
    --cc=kherbst@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lukas@wunner.de \
    --cc=nouveau@lists.freedesktop.org \
    --cc=peter@lekensteyn.nl \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).