All of lore.kernel.org
 help / color / mirror / Atom feed
From: Konstantin Khlebnikov <khlebnikov@openvz.org>
To: linux-kernel@vger.kernel.org
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
	kexec@lists.infradead.org,
	"Eric W. Biederman" <ebiederm@xmission.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Jeff Garzik <jgarzik@pobox.com>, Vivek Goyal <vgoyal@redhat.com>
Subject: Re: [PATCH bugfix 3.9] PCI: Don't try to disable Bus Master on disconnected PCI devices
Date: Mon, 01 Apr 2013 12:00:01 +0400	[thread overview]
Message-ID: <51593E81.3030800@openvz.org> (raw)
In-Reply-To: <20130314144936.10073.2403.stgit@zurg>

BUMP. This is degradation from 3.8, so this patch must be in 3.9.

I still don't like this forced clearing bus-master bit. But this hack
definitely fixes problems in kexec, so there is reason to keep it here.

Konstantin Khlebnikov wrote:
> This is fix for commit 7897e6022761ace7377f0f784fca059da55f5d71 from v3.9-rc1
> ("PCI: Disable Bus Master unconditionally in pci_device_shutdown()")
> in turn that was fix for b566a22c23327f18ce941ffad0ca907e50a53d41 from v3.5-rc1
> ("PCI: disable Bus Master on PCI device shutdown")
>
> Unfortunately fixing one bug uncovers another:
> ->shutdown() callback might switch device to deep sleep state.
> PCI config space no longer available after that.
>
> Link: https://lkml.org/lkml/2013/3/12/529
> Signed-off-by: Konstantin Khlebnikov<khlebnikov@openvz.org>
> Reported-and-Tested-by: Vivek Goyal<vgoyal@redhat.com>
> Cc: Bjorn Helgaas<bhelgaas@google.com>
> Cc: Rafael J. Wysocki<rafael.j.wysocki@intel.com>
> ---
>   drivers/pci/pci-driver.c |    5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
> index 1fa1e48..79277fb 100644
> --- a/drivers/pci/pci-driver.c
> +++ b/drivers/pci/pci-driver.c
> @@ -390,9 +390,10 @@ static void pci_device_shutdown(struct device *dev)
>
>   	/*
>   	 * Turn off Bus Master bit on the device to tell it to not
> -	 * continue to do DMA
> +	 * continue to do DMA. Don't touch devices in D3cold or unknown states.
>   	 */
> -	pci_clear_master(pci_dev);
> +	if (pci_dev->current_state <= PCI_D3hot)
> +		pci_clear_master(pci_dev);
>   }
>
>   #ifdef CONFIG_PM
>


_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec

WARNING: multiple messages have this Message-ID (diff)
From: Konstantin Khlebnikov <khlebnikov@openvz.org>
To: linux-kernel@vger.kernel.org
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
	kexec@lists.infradead.org,
	"Eric W. Biederman" <ebiederm@xmission.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Jeff Garzik <jgarzik@pobox.com>, Vivek Goyal <vgoyal@redhat.com>
Subject: Re: [PATCH bugfix 3.9] PCI: Don't try to disable Bus Master on disconnected PCI devices
Date: Mon, 01 Apr 2013 12:00:01 +0400	[thread overview]
Message-ID: <51593E81.3030800@openvz.org> (raw)
In-Reply-To: <20130314144936.10073.2403.stgit@zurg>

BUMP. This is degradation from 3.8, so this patch must be in 3.9.

I still don't like this forced clearing bus-master bit. But this hack
definitely fixes problems in kexec, so there is reason to keep it here.

Konstantin Khlebnikov wrote:
> This is fix for commit 7897e6022761ace7377f0f784fca059da55f5d71 from v3.9-rc1
> ("PCI: Disable Bus Master unconditionally in pci_device_shutdown()")
> in turn that was fix for b566a22c23327f18ce941ffad0ca907e50a53d41 from v3.5-rc1
> ("PCI: disable Bus Master on PCI device shutdown")
>
> Unfortunately fixing one bug uncovers another:
> ->shutdown() callback might switch device to deep sleep state.
> PCI config space no longer available after that.
>
> Link: https://lkml.org/lkml/2013/3/12/529
> Signed-off-by: Konstantin Khlebnikov<khlebnikov@openvz.org>
> Reported-and-Tested-by: Vivek Goyal<vgoyal@redhat.com>
> Cc: Bjorn Helgaas<bhelgaas@google.com>
> Cc: Rafael J. Wysocki<rafael.j.wysocki@intel.com>
> ---
>   drivers/pci/pci-driver.c |    5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
> index 1fa1e48..79277fb 100644
> --- a/drivers/pci/pci-driver.c
> +++ b/drivers/pci/pci-driver.c
> @@ -390,9 +390,10 @@ static void pci_device_shutdown(struct device *dev)
>
>   	/*
>   	 * Turn off Bus Master bit on the device to tell it to not
> -	 * continue to do DMA
> +	 * continue to do DMA. Don't touch devices in D3cold or unknown states.
>   	 */
> -	pci_clear_master(pci_dev);
> +	if (pci_dev->current_state <= PCI_D3hot)
> +		pci_clear_master(pci_dev);
>   }
>
>   #ifdef CONFIG_PM
>


  reply	other threads:[~2013-04-01  8:00 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-14 14:49 [PATCH bugfix 3.9] PCI: Don't try to disable Bus Master on disconnected PCI devices Konstantin Khlebnikov
2013-03-14 14:49 ` Konstantin Khlebnikov
2013-04-01  8:00 ` Konstantin Khlebnikov [this message]
2013-04-01  8:00   ` Konstantin Khlebnikov
2013-04-03 16:15   ` Bjorn Helgaas
2013-04-03 16: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=51593E81.3030800@openvz.org \
    --to=khlebnikov@openvz.org \
    --cc=bhelgaas@google.com \
    --cc=ebiederm@xmission.com \
    --cc=jgarzik@pobox.com \
    --cc=kexec@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rafael.j.wysocki@intel.com \
    --cc=vgoyal@redhat.com \
    /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.