On Mon, Mar 16, 2015 at 06:20:27PM +0100, Michael S. Tsirkin wrote:
> commit d52877c7b1afb8c37ebe17e2005040b79cb618b0
> pci/irq: let pci_device_shutdown to call pci_msi_shutdown v2
>
> attempted to address the problem of kexec getting
> started after linux enabled msi/msix for a device,
> and drivers being confused by msi being enabled,
> by disabling msi at shutdown.
>
> But arguably, it's better to disable msi/msix when kexec
> starts - for example, kexec might run after a crash (kdump)
> and shutdown callbacks are not always invoked in that case.
>
> Cc: Yinghai Lu <yhlu.kernel.s...@gmail.com>
> Cc: Ulrich Obergfell <uober...@redhat.com>
> Cc: Fam Zheng <f...@redhat.com>
> Cc: Rusty Russell <ru...@rustcorp.com.au>
> Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
> ---
> drivers/pci/pci-driver.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
> index 3cb2210..dac6d47 100644
> --- a/drivers/pci/pci-driver.c
> +++ b/drivers/pci/pci-driver.c
> @@ -305,6 +305,12 @@ static long local_pci_probe(void *_ddi)
> */
> pm_runtime_get_sync(dev);
> pci_dev->driver = pci_drv;
> + /*
> + * When using kexec, msi might be left enabled by the previous kernel,
> + * this breaks things as some drivers assume msi/msi-x is off at boot.
> + * Fix this by forcing msi off at startup.
> + */
> + pci_msi_off(dev);
should be
pci_msi_off(pci_dev);
obviously.
Which likely means I pushed a wrong tree
to the test machine again, so this wasn't
tested as I thought it is :(
I'll re-test and repost day after tomorrow,
Fam, can you tweak this manually when you are testing?
I don't want to spam the list.
> rc = pci_drv->probe(pci_dev, ddi->id);
> if (!rc)
> return rc;
> --
> MST
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
