Skip to content

Commit b0b6284

Browse files
Maciej W. Rozyckigregkh
authored andcommitted
TC: Set DMA masks for devices
commit 3f2aa24 upstream. Fix a TURBOchannel support regression with commit 205e1b7 ("dma-mapping: warn when there is no coherent_dma_mask") that caused coherent DMA allocations to produce a warning such as: defxx: v1.11 2014/07/01 Lawrence V. Stefani and others tc1: DEFTA at MMIO addr = 0x1e900000, IRQ = 20, Hardware addr = 08-00-2b-a3-a3-29 ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at ./include/linux/dma-mapping.h:516 dfx_dev_register+0x670/0x678 Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 4.19.0-rc6 fail0verflow#2 Stack : ffffffff8009ffc0 fffffffffffffec0 0000000000000000 ffffffff80647650 0000000000000000 0000000000000000 ffffffff806f5f80 ffffffffffffffff 0000000000000000 0000000000000000 0000000000000001 ffffffff8065d4e8 98000000031b6300 ffffffff80563478 ffffffff805685b0 ffffffffffffffff 0000000000000000 ffffffff805d6720 0000000000000204 ffffffff80388df8 0000000000000000 0000000000000009 ffffffff8053efd0 ffffffff806657d0 0000000000000000 ffffffff803177f8 0000000000000000 ffffffff806d0000 9800000003078000 980000000307b9e0 000000001e900000 ffffffff80067940 0000000000000000 ffffffff805d6720 0000000000000204 ffffffff80388df8 ffffffff805176c0 ffffffff8004dc78 0000000000000000 ffffffff80067940 ... Call Trace: [<ffffffff8004dc78>] show_stack+0xa0/0x130 [<ffffffff80067940>] __warn+0x128/0x170 ---[ end trace b1d1e094f67f3bb2 ]--- This is because the TURBOchannel bus driver fails to set the coherent DMA mask for devices enumerated. Set the regular and coherent DMA masks for TURBOchannel devices then, observing that the bus protocol supports a 34-bit (16GiB) DMA address space, by interpreting the value presented in the address cycle across the 32 `ad' lines as a 32-bit word rather than byte address[1]. The architectural size of the TURBOchannel DMA address space exceeds the maximum amount of RAM any actual TURBOchannel system in existence may have, hence both masks are the same. This removes the warning shown above. References: [1] "TURBOchannel Hardware Specification", EK-369AA-OD-007B, Digital Equipment Corporation, January 1993, Section "DMA", pp. 1-15 -- 1-17 Signed-off-by: Maciej W. Rozycki <[email protected]> Signed-off-by: Paul Burton <[email protected]> Patchwork: https://patchwork.linux-mips.org/patch/20835/ Fixes: 205e1b7 ("dma-mapping: warn when there is no coherent_dma_mask") Cc: [email protected] # 4.16+ Cc: Ralf Baechle <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 14dd2a1 commit b0b6284

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

drivers/tc/tc.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
* TURBOchannel bus services.
33
*
44
* Copyright (c) Harald Koerfgen, 1998
5-
* Copyright (c) 2001, 2003, 2005, 2006 Maciej W. Rozycki
5+
* Copyright (c) 2001, 2003, 2005, 2006, 2018 Maciej W. Rozycki
66
* Copyright (c) 2005 James Simmons
77
*
88
* This file is subject to the terms and conditions of the GNU
99
* General Public License. See the file "COPYING" in the main
1010
* directory of this archive for more details.
1111
*/
1212
#include <linux/compiler.h>
13+
#include <linux/dma-mapping.h>
1314
#include <linux/errno.h>
1415
#include <linux/init.h>
1516
#include <linux/ioport.h>
@@ -92,6 +93,11 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus)
9293
tdev->dev.bus = &tc_bus_type;
9394
tdev->slot = slot;
9495

96+
/* TURBOchannel has 34-bit DMA addressing (16GiB space). */
97+
tdev->dma_mask = DMA_BIT_MASK(34);
98+
tdev->dev.dma_mask = &tdev->dma_mask;
99+
tdev->dev.coherent_dma_mask = DMA_BIT_MASK(34);
100+
95101
for (i = 0; i < 8; i++) {
96102
tdev->firmware[i] =
97103
readb(module + offset + TC_FIRM_VER + 4 * i);

include/linux/tc.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ struct tc_dev {
8484
device. */
8585
struct device dev; /* Generic device interface. */
8686
struct resource resource; /* Address space of this device. */
87+
u64 dma_mask; /* DMA addressable range. */
8788
char vendor[9];
8889
char name[9];
8990
char firmware[9];

0 commit comments

Comments
 (0)