From: Sasha Levin <Alexander.Levin@microsoft.com>
To: "stable@vger.kernel.org" <stable@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Laurentiu Tudor <laurentiu.tudor@nxp.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL 4.18 38/92] mmc: sdhci-of-esdhc: set proper dma mask for ls104x chips
Date: Sat, 15 Sep 2018 01:30:16 +0000 [thread overview]
Message-ID: <20180915012944.179481-38-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20180915012944.179481-1-alexander.levin@microsoft.com>
From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
[ Upstream commit 5552d7ad596c3fea953f40fef74170ce0760c04d ]
SDHCI controller in ls1043a and ls1046a generate 40-bit wide addresses
when doing DMA. Make sure that the corresponding dma mask is correctly
configured.
Context: when enabling smmu on these chips the following problem is
encountered: the smmu input address size is 48 bits so the dma mappings
for sdhci end up 48-bit wide. However, on these chips sdhci only use
40-bits of that address size when doing dma.
So you end up with a 48-bit address translation in smmu but the device
generates transactions with clipped 40-bit addresses, thus smmu context
faults are triggered. Setting up the correct dma mask fixes this
situation.
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
drivers/mmc/host/sdhci-of-esdhc.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
index 4ffa6b173a21..8332f56e6c0d 100644
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -22,6 +22,7 @@
#include <linux/sys_soc.h>
#include <linux/clk.h>
#include <linux/ktime.h>
+#include <linux/dma-mapping.h>
#include <linux/mmc/host.h>
#include "sdhci-pltfm.h"
#include "sdhci-esdhc.h"
@@ -427,6 +428,11 @@ static void esdhc_of_adma_workaround(struct sdhci_host *host, u32 intmask)
static int esdhc_of_enable_dma(struct sdhci_host *host)
{
u32 value;
+ struct device *dev = mmc_dev(host->mmc);
+
+ if (of_device_is_compatible(dev->of_node, "fsl,ls1043a-esdhc") ||
+ of_device_is_compatible(dev->of_node, "fsl,ls1046a-esdhc"))
+ dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));
value = sdhci_readl(host, ESDHC_DMA_SYSCTL);
value |= ESDHC_DMA_SNOOP;
--
2.17.1
next prev parent reply other threads:[~2018-09-15 6:47 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-15 1:29 [PATCH AUTOSEL 4.18 01/92] binfmt_elf: Respect error return from `regset->active' Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 02/92] net/mlx5: Add missing SET_DRIVER_VERSION command translation Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 03/92] arm64: dts: uniphier: Add missing cooling device properties for CPUs Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 04/92] audit: fix use-after-free in audit_add_watch Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 06/92] vfs: fix freeze protection in mnt_want_write_file() for overlayfs Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 05/92] mtdchar: fix overflows in adjustment of `count` Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 07/92] bpf: fix rcu annotations in compute_effective_progs() Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 08/92] spi: dw: fix possible race condition Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 10/92] mtd: rawnand: fscm: Avoid collision on PC def when compiling for MIPS Sasha Levin
2018-09-15 17:21 ` Miquel Raynal
2018-09-20 2:32 ` Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 09/92] Bluetooth: Use lock_sock_nested in bt_accept_enqueue Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 11/92] mtd: rawnand: sunxi: Add an U suffix to NFC_PAGE_OP definition Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 12/92] evm: Don't deadlock if a crypto algorithm is unavailable Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 13/92] KVM: PPC: Book3S HV: Add of_node_put() in success path Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 14/92] security: check for kstrdup() failure in lsm_append() Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 15/92] PM / devfreq: use put_device() instead of kfree() Sasha Levin
2018-09-15 1:29 ` [PATCH AUTOSEL 4.18 16/92] KVM: PPC: Book3S: Fix matching of hardware and emulated TCE tables Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 17/92] MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 19/92] pinctrl: mt7622: Fix probe fail by misuse the selector Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 18/92] configfs: fix registered group removal Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 20/92] pinctrl: rza1: Fix selector use for groups and functions Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 21/92] pinctrl: pinmux: Return selector to the pinctrl driver Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 22/92] arm64: dts: mt7622: update a clock property for UART0 Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 23/92] sched/core: Use smp_mb() in wake_woken_function() Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 24/92] efi/esrt: Only call efi_mem_reserve() for boot services memory Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 25/92] net: hns3: Reset net device with rtnl_lock Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 26/92] net: hns3: Fix for reset_level default assignment probelm Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 27/92] ARM: hisi: handle of_iomap and fix missing of_node_put Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 28/92] ARM: hisi: fix error handling and " Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 29/92] net: hns3: Fix return value error in hns3_reset_notify_down_enet Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 30/92] ARM: hisi: check of_iomap and fix missing of_node_put Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 31/92] liquidio: fix hang when re-binding VF host drv after running DPDK VF driver Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 32/92] gpu: ipu-v3: csi: pass back mbus_code_to_bus_cfg error codes Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 33/92] ASoC: hdmi-codec: fix routing Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 34/92] gpiolib: don't allow userspace to set values of input lines Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 35/92] serial: 8250: of: Correct of_platform_serial_setup() error handling Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 36/92] tty: fix termios input-speed encoding when using BOTHER Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 37/92] tty: fix termios input-speed encoding Sasha Levin
2018-09-15 1:30 ` Sasha Levin [this message]
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 39/92] mmc: tegra: prevent HS200 on Tegra 3 Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 40/92] mmc: sdhci: do not try to use 3.3V signaling if not supported Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 41/92] drm/nouveau: Fix runtime PM leak in drm_open() Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 42/92] drm/nouveau/debugfs: Wake up GPU before doing any reclocking Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 43/92] drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 45/92] parport: sunbpp: fix error return code Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 46/92] sched/fair: Fix util_avg of new tasks for asymmetric systems Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 48/92] coresight: tpiu: Fix disabling timeouts Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 47/92] coresight: Handle errors in finding input/output ports Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 49/92] coresight: ETM: Add support for Arm Cortex-A73 and Cortex-A35 Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 51/92] tools/testing/nvdimm: Fix support for emulating controller temperature Sasha Levin
2018-09-15 1:34 ` Dan Williams
2018-09-15 1:40 ` Sasha Levin
2018-09-15 1:56 ` Dan Williams
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 50/92] f2fs: do checkpoint in kill_sb Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 52/92] drm/amd/display: support access ddc for mst branch Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 53/92] ASoC: qdsp6: q6afe-dai: fix a range check in of_q6afe_parse_dai_data() Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 54/92] lightnvm: pblk: assume that chunks are closed on 1.2 devices Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 55/92] lightnvm: pblk: enable line minor version detection Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 57/92] gpio: pxa: Fix potential NULL dereference Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 56/92] staging: bcm2835-audio: Don't leak workqueue if open fails Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 58/92] gpiolib: Mark gpio_suffixes array with __maybe_unused Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 59/92] net: gemini: Allow multiple ports to instantiate Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 60/92] net: mvpp2: make sure we use single queue mode on PPv2.1 Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 61/92] rcutorture: Use monotonic timestamp for stall detection Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 62/92] mfd: 88pm860x-i2c: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 63/92] input: rohm_bu21023: " Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 65/92] drm/amdkfd: Fix kernel queue 64 bit doorbell offset calculation Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 64/92] rcu: Fix grace-period hangs due to race with CPU offline Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 66/92] drm/amdkfd: Fix error codes in kfd_get_process Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 67/92] rtc: bq4802: add error handling for devm_ioremap Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 68/92] selftests: vDSO - fix to return KSFT_SKIP when test couldn't be run Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 69/92] selftests/android: initialize heap_type to avoid compiling warning Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 70/92] ALSA: pcm: Fix snd_interval_refine first/last with open min/max Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 71/92] scsi: libfc: fixup 'sleeping function called from invalid context' Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 73/92] scsi: lpfc: Fix panic if driver unloaded when port is offline Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 72/92] scsi: lpfc: Fix NVME Target crash in defer rcv logic Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 74/92] remoteproc: qcom: q6v5-pil: fix modem hang on SDM845 after axis2 clk unvote Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 75/92] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 77/92] drm/panel: type promotion bug in s6e8aa0_read_mtp_id() Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 76/92] ASoC: rt5651: Fix workqueue cancel vs irq free race on remove Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 78/92] arm64: perf: Disable PMU while processing counter overflows Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 79/92] drm/amd/pp: Send khz clock values to DC for smu7/8 Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 80/92] dmaengine: hsu: Support dmaengine_terminate_sync() Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 81/92] dmaengine: idma64: " Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 83/92] staging: fsl-dpaa2/eth: Fix DMA mapping direction Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 82/92] dmaengine: sh: rcar-dmac: avoid to write CHCR.TE to 1 if TCR is set to 0 Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 84/92] IB/nes: Fix a compiler warning Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 85/92] block/DAC960.c: fix defined but not used build warnings Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 86/92] IB/mlx5: fix uaccess beyond "count" in debugfs read/write handlers Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 87/92] blk-mq: only attempt to merge bio if there is rq in sw queue Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 88/92] blk-mq: avoid to synchronize rcu inside blk_cleanup_queue() Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 89/92] gpiolib: Respect error code of ->get_direction() Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 90/92] pinctrl: msm: Fix msm_config_group_get() to be compliant Sasha Levin
2018-09-15 1:30 ` [PATCH AUTOSEL 4.18 91/92] pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() " Sasha Levin
2018-09-15 1:31 ` [PATCH AUTOSEL 4.18 92/92] clk: tegra: bpmp: Don't crash when a clock fails to register 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=20180915012944.179481-38-alexander.levin@microsoft.com \
--to=alexander.levin@microsoft.com \
--cc=laurentiu.tudor@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=ulf.hansson@linaro.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).