From: tip-bot for Christoph Hellwig <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hch@lst.de, mingo@kernel.org,
tglx@linutronix.de, tedheadster@gmail.com, hpa@zytor.com
Subject: [tip:x86/urgent] x86/swiotlb: Enable swiotlb for > 4GiG ram on 32-bit kernels
Date: Mon, 15 Oct 2018 02:09:50 -0700 [thread overview]
Message-ID: <tip-6f3bc8028570e4c326030e8795dbcd57c561b723@git.kernel.org> (raw)
In-Reply-To: <20181014075208.2715-1-hch@lst.de>
Commit-ID: 6f3bc8028570e4c326030e8795dbcd57c561b723
Gitweb: https://git.kernel.org/tip/6f3bc8028570e4c326030e8795dbcd57c561b723
Author: Christoph Hellwig <hch@lst.de>
AuthorDate: Sun, 14 Oct 2018 09:52:08 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 15 Oct 2018 10:55:03 +0200
x86/swiotlb: Enable swiotlb for > 4GiG ram on 32-bit kernels
We already build the swiotlb code for 32b-t kernels with PAE support,
but the code to actually use swiotlb has only been enabled for 64-bit
kernel for an unknown reason.
Before Linux 4.18 we paper over this fact because the networking code,
the scsi layer and some random block drivers implemented their own
bounce buffering scheme.
Fixes: 21e07dba9fb1 ("scsi: reduce use of block bounce buffers")
Fixes: ab74cfebafa3 ("net: remove the PCI_DMA_BUS_IS_PHYS check in illegal_highdma")
Reported-by: Matthew Whitehead <tedheadster@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Matthew Whitehead <tedheadster@gmail.com>
Cc: konrad.wilk@oracle.com
Cc: iommu@lists.linux-foundation.org
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20181014075208.2715-1-hch@lst.de
---
arch/x86/kernel/pci-swiotlb.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
index 661583662430..71c0b01d93b1 100644
--- a/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@ -42,10 +42,8 @@ IOMMU_INIT_FINISH(pci_swiotlb_detect_override,
int __init pci_swiotlb_detect_4gb(void)
{
/* don't initialize swiotlb if iommu=off (no_iommu=1) */
-#ifdef CONFIG_X86_64
if (!no_iommu && max_possible_pfn > MAX_DMA32_PFN)
swiotlb = 1;
-#endif
/*
* If SME is active then swiotlb will be set to 1 so that bounce
next prev parent reply other threads:[~2018-10-15 9:10 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-14 7:52 [PATCH] x86: enable swiotlb for > 4GiG ram on 32-bit kernels Christoph Hellwig
2018-10-14 7:52 ` Christoph Hellwig
2018-10-14 8:13 ` Thomas Gleixner
2018-10-14 8:13 ` Thomas Gleixner
2018-10-14 8:14 ` Christoph Hellwig
2018-10-14 8:14 ` Christoph Hellwig
2018-10-14 8:57 ` Thomas Gleixner
2018-10-14 8:57 ` Thomas Gleixner
2018-10-14 9:04 ` Ingo Molnar
2018-10-14 9:04 ` Ingo Molnar
2018-10-14 12:49 ` tedheadster
2018-10-14 9:18 ` [tip:x86/urgent] x86/swiotlb: Enable " tip-bot for Christoph Hellwig
2018-10-15 9:09 ` tip-bot for Christoph Hellwig [this message]
2018-10-15 18:52 ` [PATCH] x86: enable " Konrad Rzeszutek Wilk
2018-10-15 18:52 ` Konrad Rzeszutek Wilk
[not found] ` <20181014075208.2715-1-hch-jcswGhMUV9g@public.gmane.org>
2018-10-16 13:11 ` tedheadster
[not found] ` <CAP8WD_Zj5aMcTCVtV-hot3zLNfNuMzHyeogm0Lqb=+XZ1LdkKw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-10-17 10:16 ` Thomas Gleixner
2018-10-17 16:33 ` Christoph Hellwig
[not found] ` <20181017163351.GA23719-jcswGhMUV9g@public.gmane.org>
2018-10-17 17:41 ` tedheadster
[not found] ` <CAP8WD_boL-DxEXxa-ci382Ff8yTdMS9T+sy2Y0-LEX-WPc8L_g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-10-18 12:51 ` Christoph Hellwig
[not found] ` <20181018125116.GA24676-jcswGhMUV9g@public.gmane.org>
2018-10-19 1:00 ` tedheadster
[not found] ` <CAP8WD_Z2XvLsqimSnODwr5gj6GRuzh4SMKN56n6Y0JzufG=E8A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-10-19 5:51 ` Ingo Molnar
2018-10-18 6:12 ` Ingo Molnar
2018-10-19 5:54 ` [tip:x86/urgent] x86/swiotlb: Enable swiotlb for > 4GiG RAM " tip-bot for Christoph Hellwig
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=tip-6f3bc8028570e4c326030e8795dbcd57c561b723@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hch@lst.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tedheadster@gmail.com \
--cc=tglx@linutronix.de \
/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 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.