From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Marc St-Amand <mstamand@ciena.com>,
Harini Katakam <harini.katakam@xilinx.com>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Conor Dooley <conor.dooley@microchip.com>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
claudiu.beznea@microchip.com, kuba@kernel.org,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 22/23] net: macb: Align the dma and coherent dma masks
Date: Tue, 15 Feb 2022 10:29:56 -0500 [thread overview]
Message-ID: <20220215152957.581303-22-sashal@kernel.org> (raw)
In-Reply-To: <20220215152957.581303-1-sashal@kernel.org>
From: Marc St-Amand <mstamand@ciena.com>
[ Upstream commit 37f7860602b5b2d99fc7465f6407f403f5941988 ]
Single page and coherent memory blocks can use different DMA masks
when the macb accesses physical memory directly. The kernel is clever
enough to allocate pages that fit into the requested address width.
When using the ARM SMMU, the DMA mask must be the same for single
pages and big coherent memory blocks. Otherwise the translation
tables turn into one big mess.
[ 74.959909] macb ff0e0000.ethernet eth0: DMA bus error: HRESP not OK
[ 74.959989] arm-smmu fd800000.smmu: Unhandled context fault: fsr=0x402, iova=0x3165687460, fsynr=0x20001, cbfrsynra=0x877, cb=1
[ 75.173939] macb ff0e0000.ethernet eth0: DMA bus error: HRESP not OK
[ 75.173955] arm-smmu fd800000.smmu: Unhandled context fault: fsr=0x402, iova=0x3165687460, fsynr=0x20001, cbfrsynra=0x877, cb=1
Since using the same DMA mask does not hurt direct 1:1 physical
memory mappings, this commit always aligns DMA and coherent masks.
Signed-off-by: Marc St-Amand <mstamand@ciena.com>
Signed-off-by: Harini Katakam <harini.katakam@xilinx.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Tested-by: Conor Dooley <conor.dooley@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/cadence/macb_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 1e8bf6b9834bb..2af464ac250ac 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4534,7 +4534,7 @@ static int macb_probe(struct platform_device *pdev)
#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
if (GEM_BFEXT(DAW64, gem_readl(bp, DCFG6))) {
- dma_set_mask(&pdev->dev, DMA_BIT_MASK(44));
+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(44));
bp->hw_dma_cap |= HW_DMA_CAP_64B;
}
#endif
--
2.34.1
next prev parent reply other threads:[~2022-02-15 15:35 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-15 15:29 [PATCH AUTOSEL 5.10 01/23] ARM: OMAP2+: hwmod: Add of_node_put() before break Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 02/23] ARM: OMAP2+: adjust the location of put_device() call in omapdss_init_of Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 03/23] phy: usb: Leave some clocks running during suspend Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 04/23] usb: usb251xb: add boost-up property support Sasha Levin
2022-02-20 10:12 ` Pavel Machek
2022-02-28 12:23 ` Richard Leitner
2022-03-02 9:24 ` Tommaso Merciai
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 05/23] irqchip/sifive-plic: Add missing thead,c900-plic match string Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 06/23] netfilter: conntrack: don't refresh sctp entries in closed state Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 07/23] arm64: dts: meson-gx: add ATF BL32 reserved-memory region Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 08/23] arm64: dts: meson-g12: " Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 09/23] arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610 Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 10/23] pidfd: fix test failure due to stack overflow on some arches Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 11/23] selftests: fixup build warnings in pidfd / clone3 tests Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 12/23] kconfig: let 'shell' return enough output for deep path names Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 13/23] scsi: lpfc: Remove NVMe support if kernel has NVME_FC disabled Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 14/23] scsi: lpfc: Reduce log messages seen after firmware download Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 15/23] ata: libata-core: Disable TRIM on M88V29 Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 16/23] soc: aspeed: lpc-ctrl: Block error printing on probe defer cases Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 17/23] xprtrdma: fix pointer derefs in error cases of rpcrdma_ep_create Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 18/23] drm/rockchip: dw_hdmi: Do not leave clock enabled in error case Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 19/23] tracing: Fix tp_printk option related with tp_printk_stop_on_boot Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 20/23] NFSD: Fix offset type in I/O trace points Sasha Levin
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 21/23] net: usb: qmi_wwan: Add support for Dell DW5829e Sasha Levin
2022-02-15 15:29 ` Sasha Levin [this message]
2022-02-15 15:29 ` [PATCH AUTOSEL 5.10 23/23] kconfig: fix failing to generate auto.conf Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220215152957.581303-22-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=claudiu.beznea@microchip.com \
--cc=conor.dooley@microchip.com \
--cc=davem@davemloft.net \
--cc=harini.katakam@xilinx.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mstamand@ciena.com \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).