On an Intel/Nvidia hybrid graphics system, using the integrated
graphics and powering off the discrete, one of the primary sources
of system hangs seems to be the nouveau driver processing interrupts
while the device is powered off. This short series removes the
unbalanced pci_enable_device() from core switcheroo code, allowing
us to check pci_is_enabled() from the nouveau irq handler to determine
whether to touch hardware. Thanks,
Alex
---
Alex Williamson (2):
drm/nouveau: Check that the device is enabled before processing interrupt
vga_switcheroo: Remove unbalanced pci_enable_device
drivers/gpu/drm/nouveau/nouveau_drv.c | 2 ++
drivers/gpu/drm/nouveau/nouveau_irq.c | 3 +++
drivers/gpu/vga/vga_switcheroo.c | 6 ------
3 files changed, 5 insertions(+), 6 deletions(-)
This is unbalanced and probably more fitting for the client
to take care of. Remove it.
Signed-off-by: Alex Williamson <[email protected]>
---
drivers/gpu/vga/vga_switcheroo.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index e01cacb..f0f244d 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -215,7 +215,6 @@ static int vga_switchoff(struct vga_switcheroo_client *client)
/* stage one happens before delay */
static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
{
- int ret;
int i;
struct vga_switcheroo_client *active = NULL;
@@ -231,11 +230,6 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
if (!active)
return 0;
- /* power up the first device */
- ret = pci_enable_device(new_client->pdev);
- if (ret)
- return ret;
-
if (new_client->pwr_state == VGA_SWITCHEROO_OFF)
vga_switchon(new_client);
We're likely to be sharing an interrupt line with other devices,
which means our handler might get called after we've turned off
the device via vga switcheroo. This can lead to all sorts of
badness, like nv04_fifo_isr() spewing "PFIFO still angry after
100 spins, halt" to the console before the system enters a hard
hang.
We can avoid this by simply checking if the device is still
enabled before processing an interrupt. To avoid races, flush
any inflight interrupts using synchronize_irq(). Note that
since pci_intx() is called after pci_save_state(),
pci_restore_state() will automatically re-enable INTx.
Signed-off-by: Alex Williamson <[email protected]>
---
drivers/gpu/drm/nouveau/nouveau_drv.c | 2 ++
drivers/gpu/drm/nouveau/nouveau_irq.c | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index 155ebdc..405d4f1 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -230,7 +230,9 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
NV_INFO(dev, "And we're gone!\n");
pci_save_state(pdev);
if (pm_state.event == PM_EVENT_SUSPEND) {
+ pci_intx(pdev, 0);
pci_disable_device(pdev);
+ synchronize_irq(drm_dev_to_irq(dev));
pci_set_power_state(pdev, PCI_D3hot);
}
diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c
index 2ba7265..8fd17e6 100644
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
@@ -78,6 +78,9 @@ nouveau_irq_handler(DRM_IRQ_ARGS)
u32 stat;
int i;
+ if (unlikely(!pci_is_enabled(dev->pdev)))
+ return IRQ_NONE;
+
stat = nv_rd32(dev, NV03_PMC_INTR_0);
if (!stat)
return IRQ_NONE;
> This is unbalanced and probably more fitting for the client
> to take care of. ?Remove it.
I've queued this in -next.
Dave.
On Mon, May 2, 2011 at 10:49 AM, Alex Williamson
<[email protected]> wrote:
> We're likely to be sharing an interrupt line with other devices,
> which means our handler might get called after we've turned off
> the device via vga switcheroo. ?This can lead to all sorts of
> badness, like nv04_fifo_isr() spewing "PFIFO still angry after
> 100 spins, halt" to the console before the system enters a hard
> hang.
>
> We can avoid this by simply checking if the device is still
> enabled before processing an interrupt. ?To avoid races, flush
> any inflight interrupts using synchronize_irq(). ?Note that
> since pci_intx() is called after pci_save_state(),
> pci_restore_state() will automatically re-enable INTx.
I still think we should just need the synchronize_irq followed by a
check in the irq handler for all fs,
or is there a race there I'm missing?
Dave.
On Wed, 2011-05-04 at 13:50 +1000, Dave Airlie wrote:
> On Mon, May 2, 2011 at 10:49 AM, Alex Williamson
> <[email protected]> wrote:
> > We're likely to be sharing an interrupt line with other devices,
> > which means our handler might get called after we've turned off
> > the device via vga switcheroo. This can lead to all sorts of
> > badness, like nv04_fifo_isr() spewing "PFIFO still angry after
> > 100 spins, halt" to the console before the system enters a hard
> > hang.
> >
> > We can avoid this by simply checking if the device is still
> > enabled before processing an interrupt. To avoid races, flush
> > any inflight interrupts using synchronize_irq(). Note that
> > since pci_intx() is called after pci_save_state(),
> > pci_restore_state() will automatically re-enable INTx.
>
> I still think we should just need the synchronize_irq followed by a
> check in the irq handler for all fs,
>
> or is there a race there I'm missing?
The synchronize_irq by itself doesn't guarantee anything. The irq
handler could be immediately started on another CPU once that returns
and be well past the first device read before we make it far enough
through pci_set_power_state that the device becomes unresponsive. Can
we guarantee that first device read in the interrupt handler will always
be 0 or -1 in the suspend path? Even as the last milliamperes of charge
drain out of the device?
By adding the device enabled check in the interrupt handler, disabling
the device, then calling synchronize_irq, we guarantee that the entire
interrupt handler path is not being executed and won't be executed again
until we re-enable the device. It does seem a bit odd, but how many
other devices in the system are entirely powered off, with a driver
attached and interrupt handler registered while the system is still
humming along? Thanks,
Alex
On Tue, 2011-05-03 at 22:18 -0600, Alex Williamson wrote:
> On Wed, 2011-05-04 at 13:50 +1000, Dave Airlie wrote:
> > On Mon, May 2, 2011 at 10:49 AM, Alex Williamson
> > <[email protected]> wrote:
> > > We're likely to be sharing an interrupt line with other devices,
> > > which means our handler might get called after we've turned off
> > > the device via vga switcheroo. This can lead to all sorts of
> > > badness, like nv04_fifo_isr() spewing "PFIFO still angry after
> > > 100 spins, halt" to the console before the system enters a hard
> > > hang.
> > >
> > > We can avoid this by simply checking if the device is still
> > > enabled before processing an interrupt. To avoid races, flush
> > > any inflight interrupts using synchronize_irq(). Note that
> > > since pci_intx() is called after pci_save_state(),
> > > pci_restore_state() will automatically re-enable INTx.
> >
> > I still think we should just need the synchronize_irq followed by a
> > check in the irq handler for all fs,
> >
> > or is there a race there I'm missing?
>
> The synchronize_irq by itself doesn't guarantee anything. The irq
> handler could be immediately started on another CPU once that returns
> and be well past the first device read before we make it far enough
> through pci_set_power_state that the device becomes unresponsive. Can
> we guarantee that first device read in the interrupt handler will always
> be 0 or -1 in the suspend path? Even as the last milliamperes of charge
> drain out of the device?
It should always be a valid irq or 0xffffffff. It got nothing to do with
milliamperes of charge, and all to do with the PCI BAR decodes being
turned off.
> By adding the device enabled check in the interrupt handler, disabling
> the device, then calling synchronize_irq, we guarantee that the entire
> interrupt handler path is not being executed and won't be executed again
> until we re-enable the device. It does seem a bit odd, but how many
> other devices in the system are entirely powered off, with a driver
> attached and interrupt handler registered while the system is still
> humming along? Thanks,
The theory is lots. OLPC does this sort of things for its breakfast I'd
have thought.
which is why I still think we are missing something, when we D3 the
device it should be the same as suspend/resume cycle pretty much,
I'll have to think about it a bit more and maybe see what PM guys can
tell us.
mjg59 any clues?
Dave.
On Wed, 2011-05-04 at 14:22 +1000, Dave Airlie wrote:
> On Tue, 2011-05-03 at 22:18 -0600, Alex Williamson wrote:
> > On Wed, 2011-05-04 at 13:50 +1000, Dave Airlie wrote:
> > > On Mon, May 2, 2011 at 10:49 AM, Alex Williamson
> > > <[email protected]> wrote:
> > > > We're likely to be sharing an interrupt line with other devices,
> > > > which means our handler might get called after we've turned off
> > > > the device via vga switcheroo. This can lead to all sorts of
> > > > badness, like nv04_fifo_isr() spewing "PFIFO still angry after
> > > > 100 spins, halt" to the console before the system enters a hard
> > > > hang.
> > > >
> > > > We can avoid this by simply checking if the device is still
> > > > enabled before processing an interrupt. To avoid races, flush
> > > > any inflight interrupts using synchronize_irq(). Note that
> > > > since pci_intx() is called after pci_save_state(),
> > > > pci_restore_state() will automatically re-enable INTx.
> > >
> > > I still think we should just need the synchronize_irq followed by a
> > > check in the irq handler for all fs,
> > >
> > > or is there a race there I'm missing?
> >
> > The synchronize_irq by itself doesn't guarantee anything. The irq
> > handler could be immediately started on another CPU once that returns
> > and be well past the first device read before we make it far enough
> > through pci_set_power_state that the device becomes unresponsive. Can
> > we guarantee that first device read in the interrupt handler will always
> > be 0 or -1 in the suspend path? Even as the last milliamperes of charge
> > drain out of the device?
>
> It should always be a valid irq or 0xffffffff. It got nothing to do with
> milliamperes of charge, and all to do with the PCI BAR decodes being
> turned off.
Unfortunately this depends on the platform behavior for a master abort.
But maybe this bring up another issue; we really want to make sure we're
turning off decode after we've flushed any inflight interrupts. We
can't guarantee that w/o some kind of synchronization and the device
being enabled is probably too late... are you sure you don't want to
uninstall the interrupt handler? ;)
> > By adding the device enabled check in the interrupt handler, disabling
> > the device, then calling synchronize_irq, we guarantee that the entire
> > interrupt handler path is not being executed and won't be executed again
> > until we re-enable the device. It does seem a bit odd, but how many
> > other devices in the system are entirely powered off, with a driver
> > attached and interrupt handler registered while the system is still
> > humming along? Thanks,
>
> The theory is lots. OLPC does this sort of things for its breakfast I'd
> have thought.
>
> which is why I still think we are missing something, when we D3 the
> device it should be the same as suspend/resume cycle pretty much,
Except the whole system goes down for a suspend/resume and we don't
typically have to worry about stray interrupt during the down time. If
our vga switcheroo handler is doing the right thing, we're not only
going to D3, we're entirely removing power from the device. Some
platforms (probably not ones we care about for switcheroo, but
nonetheless) won't put up with a master abort on the bus that would be
caused by reading from an effectively non-existent device. Thanks,
Alex
On Tue, 2011-05-03 at 22:47 -0600, Alex Williamson wrote:
> On Wed, 2011-05-04 at 14:22 +1000, Dave Airlie wrote:
> > On Tue, 2011-05-03 at 22:18 -0600, Alex Williamson wrote:
> > > On Wed, 2011-05-04 at 13:50 +1000, Dave Airlie wrote:
> > > > On Mon, May 2, 2011 at 10:49 AM, Alex Williamson
> > > > <[email protected]> wrote:
> > > > > We're likely to be sharing an interrupt line with other devices,
> > > > > which means our handler might get called after we've turned off
> > > > > the device via vga switcheroo. This can lead to all sorts of
> > > > > badness, like nv04_fifo_isr() spewing "PFIFO still angry after
> > > > > 100 spins, halt" to the console before the system enters a hard
> > > > > hang.
> > > > >
> > > > > We can avoid this by simply checking if the device is still
> > > > > enabled before processing an interrupt. To avoid races, flush
> > > > > any inflight interrupts using synchronize_irq(). Note that
> > > > > since pci_intx() is called after pci_save_state(),
> > > > > pci_restore_state() will automatically re-enable INTx.
> > > >
> > > > I still think we should just need the synchronize_irq followed by a
> > > > check in the irq handler for all fs,
> > > >
> > > > or is there a race there I'm missing?
> > >
> > > The synchronize_irq by itself doesn't guarantee anything. The irq
> > > handler could be immediately started on another CPU once that returns
> > > and be well past the first device read before we make it far enough
> > > through pci_set_power_state that the device becomes unresponsive. Can
> > > we guarantee that first device read in the interrupt handler will always
> > > be 0 or -1 in the suspend path? Even as the last milliamperes of charge
> > > drain out of the device?
> >
> > It should always be a valid irq or 0xffffffff. It got nothing to do with
> > milliamperes of charge, and all to do with the PCI BAR decodes being
> > turned off.
>
> Unfortunately this depends on the platform behavior for a master abort.
> But maybe this bring up another issue; we really want to make sure we're
> turning off decode after we've flushed any inflight interrupts. We
> can't guarantee that w/o some kind of synchronization and the device
> being enabled is probably too late... are you sure you don't want to
> uninstall the interrupt handler? ;)
The x86 behaviour is all we care about btw, don't even think about worry
about someone creating a powerpc with hybrid graphics.
As I said OLPC does this lots. I'm hoping there is some example of how
this should work, maybe it should work like this, but in that case I'd
like a previous example of it.
> > The theory is lots. OLPC does this sort of things for its breakfast I'd
> > have thought.
> >
> > which is why I still think we are missing something, when we D3 the
> > device it should be the same as suspend/resume cycle pretty much,
>
> Except the whole system goes down for a suspend/resume and we don't
> typically have to worry about stray interrupt during the down time. If
> our vga switcheroo handler is doing the right thing, we're not only
> going to D3, we're entirely removing power from the device. Some
> platforms (probably not ones we care about for switcheroo, but
> nonetheless) won't put up with a master abort on the bus that would be
> caused by reading from an effectively non-existent device. Thanks,
Again OLPC and lots of other embedded systems D3 devices without D3ing
the whole system, and AFAIK without deinstalling the irq handlers.
I'll try and find some time to look into it deeper later this week.
Dave.