On Sun, Dec 09, 2018 at 09:23:39PM +1100, Michael Ellerman wrote:
> Christoph Hellwig <hch@xxxxxx> writes:
>
> > Configure the dma settings at device setup time, and stop playing games
> > with get_pci_dma_ops. This prepares for using the common dma_configure
> > code later on.
> >
> > Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> > ---
> > arch/powerpc/platforms/cell/iommu.c | 20 +++++++++++---------
> > 1 file changed, 11 insertions(+), 9 deletions(-)
>
> This one's crashing, haven't dug into why yet:
Can you provide a gdb assembly of the exact crash site? This looks
like for some odd reason the DT structures aren't fully setup by the
time we are probing the device, which seems odd.
Either way, something like the patch below would ensure we call
cell_iommu_get_fixed_address from a similar context as before, can you
check if that fixes the issue?
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 93c7e4aef571..4891b338bf9f 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -569,19 +569,12 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)
return &window->table;
}
-static u64 cell_iommu_get_fixed_address(struct device *dev);
-
static void cell_dma_dev_setup(struct device *dev)
{
- if (cell_iommu_enabled) {
- u64 addr = cell_iommu_get_fixed_address(dev);
-
- if (addr != OF_BAD_ADDR)
- set_dma_offset(dev, addr + dma_iommu_fixed_base);
+ if (cell_iommu_enabled)
set_iommu_table_base(dev, cell_get_iommu_table(dev));
- } else {
+ else
set_dma_offset(dev, cell_dma_nommu_offset);
- }
}
static void cell_pci_dma_dev_setup(struct pci_dev *dev)
@@ -865,8 +858,16 @@ static u64 cell_iommu_get_fixed_address(struct device *dev)
static bool cell_pci_iommu_bypass_supported(struct pci_dev *pdev, u64 mask)
{
- return mask == DMA_BIT_MASK(64) &&
- cell_iommu_get_fixed_address(&pdev->dev) != OF_BAD_ADDR;
+ if (mask == DMA_BIT_MASK(64)) {
+ u64 addr = cell_iommu_get_fixed_address(&pdev->dev);
+
+ if (addr != OF_BAD_ADDR) {
+ set_dma_offset(&pdev->dev, dma_iommu_fixed_base + addr);
+ return true;
+ }
+ }
+
+ return true;
}
static void insert_16M_pte(unsigned long addr, unsigned long *ptab,
