From: Jiang Liu <jiang.liu@linux.intel.com>
To: "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Joerg Roedel <joro@8bytes.org>,
David Woodhouse <dwmw2@infradead.org>,
Borislav Petkov <bp@alien8.de>
Cc: Jiang Liu <jiang.liu@linux.intel.com>,
Tony Luck <tony.luck@intel.com>,
iommu@lists.linux-foundation.org, x86@kernel.org,
linux-kernel@vger.kernel.org
Subject: [RFC Patch V1 6/9] iommu/irq_remapping: Refine function irq_remapping_prepare() for maintenance
Date: Wed, 10 Dec 2014 14:47:48 +0800 [thread overview]
Message-ID: <1418194071-13785-7-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <1418194071-13785-1-git-send-email-jiang.liu@linux.intel.com>
Do not directly assign intel_irq_remap_ops to remap_ops.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
drivers/iommu/irq_remapping.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
index 2d75f0d69b76..a28001af4e15 100644
--- a/drivers/iommu/irq_remapping.c
+++ b/drivers/iommu/irq_remapping.c
@@ -85,15 +85,15 @@ int __init irq_remapping_prepare(void)
if (disable_irq_remap)
return -ENOSYS;
- remap_ops = &intel_irq_remap_ops;
-
-#ifdef CONFIG_AMD_IOMMU
- if (amd_iommu_irq_ops.prepare() == 0) {
+ if (intel_irq_remap_ops.prepare() == 0)
+ remap_ops = &intel_irq_remap_ops;
+ else if (IS_ENABLED(CONFIG_AMD_IOMMU) &&
+ amd_iommu_irq_ops.prepare() == 0)
remap_ops = &amd_iommu_irq_ops;
- return 0;
- }
-#endif
- return remap_ops->prepare();
+ else
+ return -ENOSYS;
+
+ return 0;
}
int __init irq_remapping_enable(void)
--
1.7.10.4
next prev parent reply other threads:[~2014-12-10 6:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-10 6:47 [RFC Patch V1 0/9] Simplify initialization of IR on x86 platforms Jiang Liu
2014-12-10 6:47 ` [RFC Patch V1 1/9] x86, apic: Kill useless variable x2apic_enabled in function enable_IR_x2apic() Jiang Liu
2014-12-10 6:47 ` [RFC Patch V1 2/9] x86, apic: Correctly detect X2APIC status in function enable_IR() Jiang Liu
2014-12-10 6:47 ` [RFC Patch V1 3/9] x86, apic: Refine enable_IR_x2apic() and related functions Jiang Liu
2014-12-10 6:47 ` [RFC Patch V1 4/9] iommu/vt-d: Prepare for killing function irq_remapping_supported() Jiang Liu
2014-12-10 6:47 ` [RFC Patch V1 5/9] iommu/irq_remapping: Kill function irq_remapping_supported() and related code Jiang Liu
2014-12-10 6:47 ` Jiang Liu [this message]
2014-12-10 6:47 ` [RFC Patch V1 7/9] iommu/irq_remapping: Change variable disable_irq_remap to be static Jiang Liu
2014-12-10 6:47 ` [RFC Patch V1 8/9] iommu/irq_remapping: Normailize the way to detect whether IR is enabled Jiang Liu
2014-12-10 6:47 ` [RFC Patch V1 9/9] iommu/irq_remapping: Kill unused function irq_remapping_print_chip() 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=1418194071-13785-7-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=bp@alien8.de \
--cc=dwmw2@infradead.org \
--cc=hpa@zytor.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@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