Skip to content

Commit 57b605a

Browse files
tsbogendgregkh
authored andcommitted
parisc: DMA API: return error instead of BUG_ON for dma ops on non dma devs
commit 33f9e02 upstream. Enabling parport pc driver on a B2600 (and probably other 64bit PARISC systems) produced following BUG: CPU: 0 PID: 1 Comm: swapper Not tainted 4.12.0-rc5-30198-g1132d5e #156 task: 000000009e050000 task.stack: 000000009e04c000 YZrvWESTHLNXBCVMcbcbcbcbOGFRQPDI PSW: 00001000000001101111111100001111 Not tainted r00-03 000000ff0806ff0f 000000009e04c990 0000000040871b78 000000009e04cac0 r04-07 0000000040c14de0 ffffffffffffffff 000000009e07f098 000000009d82d200 r08-11 000000009d82d210 0000000000000378 0000000000000000 0000000040c345e0 r12-15 0000000000000005 0000000040c345e0 0000000000000000 0000000040c9d5e0 r16-19 0000000040c345e0 00000000f00001c4 00000000f00001bc 0000000000000061 r20-23 000000009e04ce28 0000000000000010 0000000000000010 0000000040b89e40 r24-27 0000000000000003 0000000000ffffff 000000009d82d210 0000000040c14de0 r28-31 0000000000000000 000000009e04ca90 000000009e04cb40 0000000000000000 sr00-03 0000000000000000 0000000000000000 0000000000000000 0000000000000000 sr04-07 0000000000000000 0000000000000000 0000000000000000 0000000000000000 IASQ: 0000000000000000 0000000000000000 IAOQ: 00000000404aece0 00000000404aece4 IIR: 03ffe01f ISR: 0000000010340000 IOR: 000001781304cac8 CPU: 0 CR30: 000000009e04c000 CR31: 00000000e2976de2 ORIG_R28: 0000000000000200 IAOQ[0]: sba_dma_supported+0x80/0xd0 IAOQ[1]: sba_dma_supported+0x84/0xd0 RP(r2): parport_pc_probe_port+0x178/0x1200 Cause is a call to dma_coerce_mask_and_coherenet in parport_pc_probe_port, which PARISC DMA API doesn't handle very nicely. This commit gives back DMA_ERROR_CODE for DMA API calls, if device isn't capable of DMA transaction. Signed-off-by: Thomas Bogendoerfer <[email protected]> Signed-off-by: Helge Deller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent fbc8f9a commit 57b605a

File tree

5 files changed

+41
-7
lines changed

5 files changed

+41
-7
lines changed

arch/parisc/include/asm/dma-mapping.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
** flush/purge and allocate "regular" cacheable pages for everything.
2121
*/
2222

23+
#define DMA_ERROR_CODE (~(dma_addr_t)0)
24+
2325
#ifdef CONFIG_PA11
2426
extern const struct dma_map_ops pcxl_dma_ops;
2527
extern const struct dma_map_ops pcx_dma_ops;
@@ -54,12 +56,13 @@ parisc_walk_tree(struct device *dev)
5456
break;
5557
}
5658
}
57-
BUG_ON(!dev->platform_data);
5859
return dev->platform_data;
5960
}
60-
61-
#define GET_IOC(dev) (HBA_DATA(parisc_walk_tree(dev))->iommu)
62-
61+
62+
#define GET_IOC(dev) ({ \
63+
void *__pdata = parisc_walk_tree(dev); \
64+
__pdata ? HBA_DATA(__pdata)->iommu : NULL; \
65+
})
6366

6467
#ifdef CONFIG_IOMMU_CCIO
6568
struct parisc_device;

drivers/parisc/ccio-dma.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ ccio_map_single(struct device *dev, void *addr, size_t size,
741741

742742
BUG_ON(!dev);
743743
ioc = GET_IOC(dev);
744+
if (!ioc)
745+
return DMA_ERROR_CODE;
744746

745747
BUG_ON(size <= 0);
746748

@@ -814,6 +816,10 @@ ccio_unmap_page(struct device *dev, dma_addr_t iova, size_t size,
814816

815817
BUG_ON(!dev);
816818
ioc = GET_IOC(dev);
819+
if (!ioc) {
820+
WARN_ON(!ioc);
821+
return;
822+
}
817823

818824
DBG_RUN("%s() iovp 0x%lx/%x\n",
819825
__func__, (long)iova, size);
@@ -918,6 +924,8 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
918924

919925
BUG_ON(!dev);
920926
ioc = GET_IOC(dev);
927+
if (!ioc)
928+
return 0;
921929

922930
DBG_RUN_SG("%s() START %d entries\n", __func__, nents);
923931

@@ -990,6 +998,10 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
990998

991999
BUG_ON(!dev);
9921000
ioc = GET_IOC(dev);
1001+
if (!ioc) {
1002+
WARN_ON(!ioc);
1003+
return;
1004+
}
9931005

9941006
DBG_RUN_SG("%s() START %d entries, %p,%x\n",
9951007
__func__, nents, sg_virt(sglist), sglist->length);

drivers/parisc/dino.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,10 @@ struct dino_device
154154
};
155155

156156
/* Looks nice and keeps the compiler happy */
157-
#define DINO_DEV(d) ((struct dino_device *) d)
157+
#define DINO_DEV(d) ({ \
158+
void *__pdata = d; \
159+
BUG_ON(!__pdata); \
160+
(struct dino_device *)__pdata; })
158161

159162

160163
/*

drivers/parisc/lba_pci.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,10 @@ static u32 lba_t32;
111111

112112

113113
/* Looks nice and keeps the compiler happy */
114-
#define LBA_DEV(d) ((struct lba_device *) (d))
115-
114+
#define LBA_DEV(d) ({ \
115+
void *__pdata = d; \
116+
BUG_ON(!__pdata); \
117+
(struct lba_device *)__pdata; })
116118

117119
/*
118120
** Only allow 8 subsidiary busses per LBA

drivers/parisc/sba_iommu.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,8 @@ static int sba_dma_supported( struct device *dev, u64 mask)
691691
return 0;
692692

693693
ioc = GET_IOC(dev);
694+
if (!ioc)
695+
return 0;
694696

695697
/*
696698
* check if mask is >= than the current max IO Virt Address
@@ -722,6 +724,8 @@ sba_map_single(struct device *dev, void *addr, size_t size,
722724
int pide;
723725

724726
ioc = GET_IOC(dev);
727+
if (!ioc)
728+
return DMA_ERROR_CODE;
725729

726730
/* save offset bits */
727731
offset = ((dma_addr_t) (long) addr) & ~IOVP_MASK;
@@ -813,6 +817,10 @@ sba_unmap_page(struct device *dev, dma_addr_t iova, size_t size,
813817
DBG_RUN("%s() iovp 0x%lx/%x\n", __func__, (long) iova, size);
814818

815819
ioc = GET_IOC(dev);
820+
if (!ioc) {
821+
WARN_ON(!ioc);
822+
return;
823+
}
816824
offset = iova & ~IOVP_MASK;
817825
iova ^= offset; /* clear offset bits */
818826
size += offset;
@@ -952,6 +960,8 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
952960
DBG_RUN_SG("%s() START %d entries\n", __func__, nents);
953961

954962
ioc = GET_IOC(dev);
963+
if (!ioc)
964+
return 0;
955965

956966
/* Fast path single entry scatterlists. */
957967
if (nents == 1) {
@@ -1037,6 +1047,10 @@ sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
10371047
__func__, nents, sg_virt(sglist), sglist->length);
10381048

10391049
ioc = GET_IOC(dev);
1050+
if (!ioc) {
1051+
WARN_ON(!ioc);
1052+
return;
1053+
}
10401054

10411055
#ifdef SBA_COLLECT_STATS
10421056
ioc->usg_calls++;

0 commit comments

Comments
 (0)