From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: catalin.marinas@arm.com, will@kernel.org, robin.murphy@arm.com, m.szyprowski@samsung.com, hch@lst.de, phil@raspberrypi.org, stefan.wahren@i2se.com, f.fainelli@gmail.com, mbrugger@suse.com, Jisheng.Zhang@synaptics.com, Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Subject: [RFC 4/4] arm64: mm: set direct_dma_min_mask according to dma-ranges Date: Wed, 17 Jul 2019 17:31:35 +0200 [thread overview] Message-ID: <20190717153135.15507-5-nsaenzjulienne@suse.de> (raw) In-Reply-To: <20190717153135.15507-1-nsaenzjulienne@suse.de> Now that we parse the dma-ranges during initialization we can fine-tune the DMA mask used by the direct DMA implementation. We set the mask based on the size of the DMA addressable memory, and if bigger than 4GB we force it to DMA_BIT_MASK(32) as it's always been. Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> --- arch/arm64/mm/init.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 5708adf0db52..f8af2c99667c 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -52,6 +52,8 @@ EXPORT_SYMBOL(memstart_addr); phys_addr_t arm64_dma_phys_limit __ro_after_init; +extern u64 dma_direct_min_mask; + #ifdef CONFIG_KEXEC_CORE /* * reserve_crashkernel() - reserves memory for crash kernel @@ -198,8 +200,12 @@ static int __init early_init_dt_scan_dma_ranges(unsigned long node, if (size > (1ULL << 32)) size = 1ULL << 32; - if (*dma_phys_limit > (phys_addr + size)) + if (*dma_phys_limit > (phys_addr + size)) { + /* Set min DMA mask in case is was smaller than 32 */ + dma_direct_min_mask = size - 1; + *dma_phys_limit = phys_addr + size; + } return 0; } -- 2.22.0
WARNING: multiple messages have this Message-ID (diff)
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: stefan.wahren@i2se.com, f.fainelli@gmail.com, catalin.marinas@arm.com, phil@raspberrypi.org, robin.murphy@arm.com, Jisheng.Zhang@synaptics.com, mbrugger@suse.com, will@kernel.org, hch@lst.de, Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, m.szyprowski@samsung.com Subject: [RFC 4/4] arm64: mm: set direct_dma_min_mask according to dma-ranges Date: Wed, 17 Jul 2019 17:31:35 +0200 [thread overview] Message-ID: <20190717153135.15507-5-nsaenzjulienne@suse.de> (raw) In-Reply-To: <20190717153135.15507-1-nsaenzjulienne@suse.de> Now that we parse the dma-ranges during initialization we can fine-tune the DMA mask used by the direct DMA implementation. We set the mask based on the size of the DMA addressable memory, and if bigger than 4GB we force it to DMA_BIT_MASK(32) as it's always been. Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> --- arch/arm64/mm/init.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 5708adf0db52..f8af2c99667c 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -52,6 +52,8 @@ EXPORT_SYMBOL(memstart_addr); phys_addr_t arm64_dma_phys_limit __ro_after_init; +extern u64 dma_direct_min_mask; + #ifdef CONFIG_KEXEC_CORE /* * reserve_crashkernel() - reserves memory for crash kernel @@ -198,8 +200,12 @@ static int __init early_init_dt_scan_dma_ranges(unsigned long node, if (size > (1ULL << 32)) size = 1ULL << 32; - if (*dma_phys_limit > (phys_addr + size)) + if (*dma_phys_limit > (phys_addr + size)) { + /* Set min DMA mask in case is was smaller than 32 */ + dma_direct_min_mask = size - 1; + *dma_phys_limit = phys_addr + size; + } return 0; } -- 2.22.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-07-17 15:31 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-17 15:31 [RFC 0/4] Raspberry Pi 4 DMA addressing support Nicolas Saenz Julienne 2019-07-17 15:31 ` Nicolas Saenz Julienne 2019-07-17 15:31 ` Nicolas Saenz Julienne 2019-07-17 15:31 ` [RFC 1/4] arm64: mm: use arm64_dma_phys_limit instead of calling max_zone_dma_phys() Nicolas Saenz Julienne 2019-07-17 15:31 ` Nicolas Saenz Julienne 2019-07-17 15:31 ` [RFC 2/4] arm64: mm: parse dma-ranges in order to better estimate arm64_dma_phys_limit Nicolas Saenz Julienne 2019-07-17 15:31 ` Nicolas Saenz Julienne 2019-07-24 13:54 ` Catalin Marinas 2019-07-24 13:54 ` Catalin Marinas 2019-07-17 15:31 ` [RFC 3/4] dma-direct: add dma_direct_min_mask Nicolas Saenz Julienne 2019-07-17 15:31 ` Nicolas Saenz Julienne 2019-07-17 15:31 ` Nicolas Saenz Julienne 2019-07-18 9:15 ` Christoph Hellwig 2019-07-18 9:15 ` Christoph Hellwig 2019-07-18 9:15 ` Christoph Hellwig 2019-07-18 11:18 ` Nicolas Saenz Julienne 2019-07-18 11:18 ` Nicolas Saenz Julienne 2019-07-18 11:18 ` Nicolas Saenz Julienne 2019-07-19 13:08 ` Nicolas Saenz Julienne 2019-07-19 13:08 ` Nicolas Saenz Julienne 2019-07-19 13:08 ` Nicolas Saenz Julienne 2019-07-24 13:51 ` Catalin Marinas 2019-07-24 13:51 ` Catalin Marinas 2019-07-24 13:51 ` Catalin Marinas 2019-07-24 13:56 ` Christoph Hellwig 2019-07-24 13:56 ` Christoph Hellwig 2019-07-24 13:56 ` Christoph Hellwig 2019-07-24 14:27 ` Nicolas Saenz Julienne 2019-07-24 14:27 ` Nicolas Saenz Julienne 2019-07-24 14:27 ` Nicolas Saenz Julienne 2019-07-17 15:31 ` Nicolas Saenz Julienne [this message] 2019-07-17 15:31 ` [RFC 4/4] arm64: mm: set direct_dma_min_mask according to dma-ranges Nicolas Saenz Julienne
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=20190717153135.15507-5-nsaenzjulienne@suse.de \ --to=nsaenzjulienne@suse.de \ --cc=Jisheng.Zhang@synaptics.com \ --cc=catalin.marinas@arm.com \ --cc=f.fainelli@gmail.com \ --cc=hch@lst.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=mbrugger@suse.com \ --cc=phil@raspberrypi.org \ --cc=robin.murphy@arm.com \ --cc=stefan.wahren@i2se.com \ --cc=will@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.