iommu.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Baoquan He <bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org
Cc: kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Vincent.Wan-5C7GfCeVMHo@public.gmane.org,
	iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
	dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Subject: [PATCH v5 2/8] iommu/amd: add early_enable_iommu() wrapper function
Date: Thu, 15 Sep 2016 23:03:20 +0800	[thread overview]
Message-ID: <1473951806-25511-3-git-send-email-bhe@redhat.com> (raw)
In-Reply-To: <1473951806-25511-1-git-send-email-bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Move per iommu enabling code into a wrapper function early_enable_iommu().
This can make later kdump change easier.

Signed-off-by: Baoquan He <bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 drivers/iommu/amd_iommu_init.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 9bf1a04..77c44c8 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -1887,6 +1887,18 @@ static void iommu_apply_resume_quirks(struct amd_iommu *iommu)
 			       iommu->stored_addr_lo | 1);
 }
 
+static void early_enable_iommu(struct amd_iommu *iommu)
+{
+	iommu_disable(iommu);
+	iommu_init_flags(iommu);
+	iommu_set_device_table(iommu);
+	iommu_enable_command_buffer(iommu);
+	iommu_enable_event_buffer(iommu);
+	iommu_set_exclusion_range(iommu);
+	iommu_enable(iommu);
+	iommu_flush_all_caches(iommu);
+}
+
 /*
  * This function finally enables all IOMMUs found in the system after
  * they have been initialized
@@ -1895,16 +1907,8 @@ static void early_enable_iommus(void)
 {
 	struct amd_iommu *iommu;
 
-	for_each_iommu(iommu) {
-		iommu_disable(iommu);
-		iommu_init_flags(iommu);
-		iommu_set_device_table(iommu);
-		iommu_enable_command_buffer(iommu);
-		iommu_enable_event_buffer(iommu);
-		iommu_set_exclusion_range(iommu);
-		iommu_enable(iommu);
-		iommu_flush_all_caches(iommu);
-	}
+	for_each_iommu(iommu)
+		early_enable_iommu(iommu);
 }
 
 static void enable_iommus_v2(void)
-- 
2.5.5

  parent reply	other threads:[~2016-09-15 15:03 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-15 15:03 [PATCH v5 0/8] Fix kdump faults on system with amd iommu Baoquan He
     [not found] ` <1473951806-25511-1-git-send-email-bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-09-15 15:03   ` [PATCH v5 1/8] iommu/amd: Detect pre enabled translation Baoquan He
2016-09-15 15:03   ` Baoquan He [this message]
2016-09-15 15:03   ` [PATCH v5 3/8] iommu/amd: Define bit fields for DTE particularly Baoquan He
2016-09-15 15:03   ` [PATCH v5 4/8] iommu/amd: Add function copy_dev_tables Baoquan He
2016-09-20 11:58     ` Joerg Roedel
     [not found]       ` <20160920115804.GC3541-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2016-09-21 10:17         ` Baoquan He
2016-09-15 15:03   ` [PATCH v5 5/8] iommu/amd: copy old trans table from old kernel Baoquan He
     [not found]     ` <1473951806-25511-6-git-send-email-bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-09-20 12:40       ` Joerg Roedel
     [not found]         ` <20160920124031.GD3541-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2016-09-21 10:18           ` Baoquan He
2016-09-28  1:37           ` Baoquan He
     [not found]             ` <20160928013702.GH14155-ejN7fcUYdH/by3iVrkZq2A@public.gmane.org>
2016-09-28 13:01               ` Baoquan He
2016-09-15 15:03   ` [PATCH v5 6/8] iommu/amd: Do not re-enable dev table entries in kdump Baoquan He
     [not found]     ` <1473951806-25511-7-git-send-email-bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-09-20 12:42       ` Joerg Roedel
     [not found]         ` <20160920124241.GE3541-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2016-09-21 10:20           ` Baoquan He
2016-09-15 15:03   ` [PATCH v5 7/8] iommu/amd: Don't update domain info to dte entry at iommu init stage Baoquan He
     [not found]     ` <1473951806-25511-8-git-send-email-bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-09-20 12:50       ` Joerg Roedel
2016-09-21 10:26         ` Baoquan He
     [not found]           ` <20160921102613.GD13350-ejN7fcUYdH/by3iVrkZq2A@public.gmane.org>
2016-09-21 13:21             ` Baoquan He
2016-09-15 15:03   ` [PATCH v5 8/8] iommu/amd: Update domain into to dte entry during device driver init Baoquan He
2016-09-20 12:53     ` Joerg Roedel
     [not found]       ` <20160920125330.GG3541-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2016-09-21 10:31         ` Baoquan He
2016-09-27  1:51         ` 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=1473951806-25511-3-git-send-email-bhe@redhat.com \
    --to=bhe-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
    --cc=Vincent.Wan-5C7GfCeVMHo@public.gmane.org \
    --cc=dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
    --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
    --cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \
    --cc=kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.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).