From: Jiang Liu <jiang.liu@linux.intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Joerg Roedel <joro@8bytes.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Yinghai Lu <yinghai@kernel.org>, Borislav Petkov <bp@alien8.de>
Cc: Joerg Roedel <jroedel@suse.de>, Tony Luck <tony.luck@intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org,
iommu@lists.linux-foundation.org,
Jiang Liu <jiang.liu@linux.intel.com>
Subject: [Patch v1 13/17] iommu/amd: Check for irq-remap support amd_iommu_prepare()
Date: Wed, 17 Dec 2014 12:35:44 +0800 [thread overview]
Message-ID: <1418790948-22804-14-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <1418790948-22804-1-git-send-email-jiang.liu@linux.intel.com>
From: Joerg Roedel <jroedel@suse.de>
This allows to get rid of the irq_remapping_supported()
function and all its call-backs into the Intel and AMD
IOMMU drivers.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
drivers/iommu/amd_iommu_init.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index b0522f15730f..0039f87f48b8 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -2123,6 +2123,9 @@ static int __init iommu_go_to_state(enum iommu_init_state state)
#ifdef CONFIG_IRQ_REMAP
int __init amd_iommu_prepare(void)
{
+ if (!amd_iommu_irq_remap)
+ return -1;
+
return iommu_go_to_state(IOMMU_ACPI_FINISHED);
}
--
1.7.10.4
next prev parent reply other threads:[~2014-12-17 4:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-17 4:35 [Patch v1 00/17] Refine IR initialization flow and fixes bugs related to X2APIC Jiang Liu
2014-12-17 4:35 ` [Patch v1 01/17] x86, smpboot: Remove pointless preempt_disable() in native_smp_prepare_cpus() Jiang Liu
2014-12-17 4:35 ` [Patch v1 02/17] iommu, x86: Restructure setup of the irq remapping feature Jiang Liu
2014-12-17 4:35 ` [Patch v1 03/17] iommu/vt-d: Move iommu preparatory allocations to irq_remap_ops.prepare Jiang Liu
2014-12-17 4:35 ` [Patch v1 04/17] iommu/vt-d: Convert allocations to GFP_KERNEL Jiang Liu
2014-12-17 4:35 ` [Patch v1 05/17] x86/apic: Panic if kernel doesn't support x2apic but BIOS has enabled x2apic Jiang Liu
2014-12-17 4:35 ` [Patch v1 06/17] x86/apic: Kill useless variable x2apic_enabled in function enable_IR_x2apic() Jiang Liu
2014-12-17 4:35 ` [Patch v1 07/17] x86/apic: Correctly detect X2APIC status in function enable_IR() Jiang Liu
2014-12-17 4:35 ` [Patch v1 08/17] x86/apic: Refine enable_IR_x2apic() and related functions Jiang Liu
2014-12-17 4:35 ` [Patch v1 09/17] iommu/vt-d: Prepare for killing function irq_remapping_supported() Jiang Liu
2014-12-17 4:35 ` [Patch v1 10/17] iommu/vt-d: Allocate IRQ remapping data structures only for all IOMMUs Jiang Liu
2014-12-17 4:35 ` [Patch v1 11/17] iommu/vt-d: Allow IR works in XAPIC mode though CPU works in X2APIC mode Jiang Liu
2014-12-17 4:35 ` [Patch v1 12/17] x86/apic: Only disable CPU x2apic mode when necessary Jiang Liu
2014-12-17 4:35 ` Jiang Liu [this message]
2014-12-17 4:35 ` [Patch v1 14/17] iommu/irq_remapping: Kill function irq_remapping_supported() and related code Jiang Liu
2014-12-17 4:35 ` [Patch v1 15/17] iommu/irq_remapping: Refine function irq_remapping_prepare() for maintenance Jiang Liu
2014-12-17 4:35 ` [Patch v1 16/17] iommu/irq_remapping: Change variable disable_irq_remap to be static Jiang Liu
2014-12-17 4:35 ` [Patch v1 17/17] iommu/irq_remapping: Normailize the way to detect whether IR is enabled Jiang Liu
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=1418790948-22804-14-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=benh@kernel.crashing.org \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
--cc=yinghai@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
Powered by JetHome