From: Baoquan He <bhe@redhat.com>
To: jroedel@suse.de
Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
Baoquan He <bhe@redhat.com>
Subject: [PATCH v10 03/12] Revert "iommu/amd: Suppress IO_PAGE_FAULTs in kdump kernel"
Date: Wed, 9 Aug 2017 16:33:35 +0800 [thread overview]
Message-ID: <1502267624-7066-4-git-send-email-bhe@redhat.com> (raw)
In-Reply-To: <1502267624-7066-1-git-send-email-bhe@redhat.com>
This reverts commit 54bd63570484167cb13edf81e31fff107b879981.
We still need the IO_PAGE_FAULT message to warn error after the
issue of on-flight dma in kdump kernel is fixed.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
drivers/iommu/amd_iommu.c | 3 +--
drivers/iommu/amd_iommu_init.c | 9 ---------
drivers/iommu/amd_iommu_types.h | 1 -
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 354cbd6392cd..6d2fc40a086d 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2086,8 +2086,7 @@ static void set_dte_entry(u16 devid, struct protection_domain *domain, bool ats)
flags |= tmp;
}
-
- flags &= ~(DTE_FLAG_SA | 0xffffULL);
+ flags &= ~(0xffffUL);
flags |= domain->id;
amd_iommu_dev_table[devid].data[1] = flags;
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 277838dbc3a6..7044510654fe 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -29,7 +29,6 @@
#include <linux/export.h>
#include <linux/iommu.h>
#include <linux/kmemleak.h>
-#include <linux/crash_dump.h>
#include <asm/pci-direct.h>
#include <asm/iommu.h>
#include <asm/gart.h>
@@ -1942,14 +1941,6 @@ static void init_device_table_dma(void)
for (devid = 0; devid <= amd_iommu_last_bdf; ++devid) {
set_dev_entry_bit(devid, DEV_ENTRY_VALID);
set_dev_entry_bit(devid, DEV_ENTRY_TRANSLATION);
- /*
- * In kdump kernels in-flight DMA from the old kernel might
- * cause IO_PAGE_FAULTs. There are no reports that a kdump
- * actually failed because of that, so just disable fault
- * reporting in the hardware to get rid of the messages
- */
- if (is_kdump_kernel())
- set_dev_entry_bit(devid, DEV_ENTRY_NO_PAGE_FAULT);
}
}
diff --git a/drivers/iommu/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
index 0c98b2cf04cc..db7ceb4d0957 100644
--- a/drivers/iommu/amd_iommu_types.h
+++ b/drivers/iommu/amd_iommu_types.h
@@ -322,7 +322,6 @@
#define IOMMU_PTE_IW (1ULL << 62)
#define DTE_FLAG_IOTLB (1ULL << 32)
-#define DTE_FLAG_SA (1ULL << 34)
#define DTE_FLAG_GV (1ULL << 55)
#define DTE_FLAG_MASK (0x3ffULL << 32)
#define DTE_GLX_SHIFT (56)
--
2.5.5
next prev parent reply other threads:[~2017-08-09 8:33 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-09 8:33 [PATCH v10 00/12] Fix the on-flight DMA issue on system with amd iommu Baoquan He
2017-08-09 8:33 ` [PATCH v10 01/12] iommu/amd: Detect pre enabled translation Baoquan He
[not found] ` <1502267624-7066-1-git-send-email-bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-08-09 8:33 ` [PATCH v10 02/12] iommu/amd: add several helper functions Baoquan He
2017-08-09 8:33 ` [PATCH v10 04/12] iommu/amd: Define bit fields for DTE particularly Baoquan He
2017-08-09 8:33 ` [PATCH v10 08/12] iommu: Add is_attach_deferred call-back to iommu-ops Baoquan He
2017-08-15 16:18 ` [PATCH v10 00/12] Fix the on-flight DMA issue on system with amd iommu Joerg Roedel
[not found] ` <20170815161810.GI2853-l3A5Bk7waGM@public.gmane.org>
2017-08-16 1:31 ` Baoquan He
2017-08-09 8:33 ` Baoquan He [this message]
2017-08-09 8:33 ` [PATCH v10 05/12] iommu/amd: Add function copy_dev_tables() Baoquan He
2017-08-09 8:33 ` [PATCH v10 06/12] iommu/amd: copy old trans table from old kernel Baoquan He
2017-08-09 8:33 ` [PATCH v10 07/12] iommu/amd: Do sanity check for address translation and irq remap of old dev table entry Baoquan He
2017-08-09 8:33 ` [PATCH v10 09/12] iommu/amd: Use is_attach_deferred call-back Baoquan He
2017-08-09 8:33 ` [PATCH v10 10/12] iommu/amd: Allocate memory below 4G for dev table if translation pre-enabled Baoquan He
2017-08-09 8:33 ` [PATCH v10 11/12] iommu/amd: Don't copy GCR3 table root pointer Baoquan He
2017-08-09 8:33 ` [PATCH v10 12/12] iommu/amd: Disable iommu only if amd_iommu=off is specified Baoquan He
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=1502267624-7066-4-git-send-email-bhe@redhat.com \
--to=bhe@redhat.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@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).