diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-07-23 15:47:56 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-08-04 14:18:17 -0700 |
| commit | 556ab45f9a775bfa4762bacc0a4afb5b44b067bc (patch) | |
| tree | 6caf3f7c72617d50d78c4197b872fd0a22b18c99 /drivers/dma/ioat/dma_v3.c | |
| parent | 128f904ac87cb6e63921e80f378fdf9ba532c0f6 (diff) | |
| download | blackbird-op-linux-556ab45f9a775bfa4762bacc0a4afb5b44b067bc.tar.gz blackbird-op-linux-556ab45f9a775bfa4762bacc0a4afb5b44b067bc.zip | |
ioat2: catch and recover from broken vtd configurations v6
On some platforms (MacPro3,1) the BIOS assigns the ioatdma device to the
incorrect iommu causing faults when the driver initializes. Add a quirk
to catch this misconfiguration and try falling back to untranslated
operation (which works in the MacPro3,1 case).
Assuming there are other platforms with misconfigured iommus teach the
ioatdma driver to treat initialization failures as non-fatal (just fail
the driver load and emit a warning instead of triggering a BUG_ON).
This can be classified as a boot regression since 2.6.32 on affected
platforms since the ioatdma module did not autoload prior to that
kernel.
Cc: <stable@kernel.org>
Acked-by: David Woodhouse <David.Woodhouse@intel.com>
Reported-by: Chris Li <lkml@chrisli.org>
Tested-by: Chris Li <lkml@chrisli.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/ioat/dma_v3.c')
| -rw-r--r-- | drivers/dma/ioat/dma_v3.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c index 1cdd22e1051b..d0f499098479 100644 --- a/drivers/dma/ioat/dma_v3.c +++ b/drivers/dma/ioat/dma_v3.c @@ -361,7 +361,10 @@ static void ioat3_timer_event(unsigned long data) chanerr = readl(chan->reg_base + IOAT_CHANERR_OFFSET); dev_err(to_dev(chan), "%s: Channel halted (%x)\n", __func__, chanerr); - BUG_ON(is_ioat_bug(chanerr)); + if (test_bit(IOAT_RUN, &chan->state)) + BUG_ON(is_ioat_bug(chanerr)); + else /* we never got off the ground */ + return; } /* if we haven't made progress and we have already |
