diff options
| author | Scott Wood <oss@buserror.net> | 2018-12-24 03:09:39 +0100 |
|---|---|---|
| committer | Scott Wood <oss@buserror.net> | 2018-12-24 03:11:20 +0100 |
| commit | 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 (patch) | |
| tree | ec8c7bbbea6797c6c786857c9e7ca38e59cdc21e /arch/powerpc | |
| parent | powerpc/configs/85xx: Enable CONFIG_DEBUG_KERNEL (diff) | |
| download | linux-63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7.tar.xz linux-63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7.zip | |
Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask"
This reverts commit c6e5485e0cb509292a14e880e1944143f99758c7
due to failures such as:
e1000e 2000:01:00.0: Tx DMA map failed
Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index f82d274fc91d..918be816b097 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -135,7 +135,7 @@ static int fsl_pci_dma_set_mask(struct device *dev, u64 dma_mask) * mapping that allows addressing any RAM address from across PCI. */ if (dev_is_pci(dev) && dma_mask >= pci64_dma_offset * 2 - 1) { - dev->bus_dma_mask = 0; + set_dma_ops(dev, &dma_nommu_ops); set_dma_offset(dev, pci64_dma_offset); } @@ -395,6 +395,10 @@ static void setup_pci_atmu(struct pci_controller *hose) out_be32(&pci->piw[win_idx].piwar, piwar); } + /* + * install our own dma_set_mask handler to fixup dma_ops + * and dma_offset + */ ppc_md.dma_set_mask = fsl_pci_dma_set_mask; pr_info("%pOF: Setup 64-bit PCI DMA window\n", hose->dn); |