diff options
author | Alexander Shishkin <alexander.shishkin@linux.intel.com> | 2017-02-24 09:05:22 -0500 |
---|---|---|
committer | Alexander Shishkin <alexander.shishkin@linux.intel.com> | 2017-08-25 11:47:56 -0400 |
commit | d5c435df4a890be0ef51f3047080756002d140dd (patch) | |
tree | 8e54399e9fcc2e4ca587e3c660c407521017d7d9 /drivers/hwtracing/intel_th | |
parent | a753bfcfdb1f31d74b5ec87faa19f15e8c7b44a2 (diff) |
intel_th: msu: Use the real device in case of IOMMU domain allocation
When allocating DMA buffers for the MSU, use the real device instead
of GTH.
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Diffstat (limited to 'drivers/hwtracing/intel_th')
-rw-r--r-- | drivers/hwtracing/intel_th/msu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c index dbbe31df74df..dfb57eaa9f22 100644 --- a/drivers/hwtracing/intel_th/msu.c +++ b/drivers/hwtracing/intel_th/msu.c | |||
@@ -709,17 +709,17 @@ static int msc_buffer_win_alloc(struct msc *msc, unsigned int nr_blocks) | |||
709 | } | 709 | } |
710 | 710 | ||
711 | for (i = 0; i < nr_blocks; i++) { | 711 | for (i = 0; i < nr_blocks; i++) { |
712 | win->block[i].bdesc = dma_alloc_coherent(msc_dev(msc), size, | 712 | win->block[i].bdesc = |
713 | &win->block[i].addr, | 713 | dma_alloc_coherent(msc_dev(msc)->parent->parent, size, |
714 | GFP_KERNEL); | 714 | &win->block[i].addr, GFP_KERNEL); |
715 | |||
716 | if (!win->block[i].bdesc) | ||
717 | goto err_nomem; | ||
715 | 718 | ||
716 | #ifdef CONFIG_X86 | 719 | #ifdef CONFIG_X86 |
717 | /* Set the page as uncached */ | 720 | /* Set the page as uncached */ |
718 | set_memory_uc((unsigned long)win->block[i].bdesc, 1); | 721 | set_memory_uc((unsigned long)win->block[i].bdesc, 1); |
719 | #endif | 722 | #endif |
720 | |||
721 | if (!win->block[i].bdesc) | ||
722 | goto err_nomem; | ||
723 | } | 723 | } |
724 | 724 | ||
725 | win->msc = msc; | 725 | win->msc = msc; |