From: Joerg Roedel <joro@8bytes.org> To: iommu@lists.linux-foundation.org Cc: zhen-hual@hp.com, bhe@redhat.com, dwmw2@infradead.org, vgoyal@redhat.com, dyoung@redhat.com, alex.williamson@redhat.com, ddutile@redhat.com, ishii.hironobu@jp.fujitsu.com, indou.takao@jp.fujitsu.com, bhelgaas@google.com, doug.hatch@hp.com, jerry.hoemann@hp.com, tom.vaden@hp.com, li.zhang6@hp.com, lisa.mitchell@hp.com, billsumnerlinux@gmail.com, rwright@hp.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, kexec@lists.infradead.org, joro@8bytes.org, jroedel@suse.de Subject: [PATCH 11/17] iommu/vt-d: Move QI initialization to intel_setup_irq_remapping Date: Fri, 5 Jun 2015 16:10:57 +0200 [thread overview] Message-ID: <1433513463-19128-12-git-send-email-joro@8bytes.org> (raw) In-Reply-To: <1433513463-19128-1-git-send-email-joro@8bytes.org> From: Joerg Roedel <jroedel@suse.de> This function needs a working QI later when kdump recovery is moved to this function. Tested-by: Baoquan He <bhe@redhat.com> Signed-off-by: Joerg Roedel <jroedel@suse.de> --- drivers/iommu/intel_irq_remapping.c | 63 ++++++++++--------------------------- 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index d22518d..70e4955 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -519,6 +519,19 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu) ir_table->base = page_address(pages); ir_table->bitmap = bitmap; iommu->ir_table = ir_table; + + if (!iommu->qi) { + /* + * Clear previous faults. + */ + dmar_fault(-1, iommu); + dmar_disable_qi(iommu); + if (dmar_enable_qi(iommu)) { + pr_err("Failed to enable queued invalidation\n"); + goto out_free_pages; + } + } + return 0; out_free_pages: @@ -655,18 +668,6 @@ static int __init intel_enable_irq_remapping(void) } for_each_iommu(iommu, drhd) { - /* - * If the queued invalidation is already initialized, - * shouldn't disable it. - */ - if (iommu->qi) - continue; - - /* - * Clear previous faults. - */ - dmar_fault(-1, iommu); - iommu_check_pre_ir_status(iommu); if (!is_kdump_kernel() && iommu->pre_enabled_ir) { @@ -675,8 +676,6 @@ static int __init intel_enable_irq_remapping(void) pr_warn("IRQ remapping was enabled on %s but we are not in kdump mode\n", iommu->name); } - - dmar_disable_qi(iommu); } /* @@ -693,20 +692,6 @@ static int __init intel_enable_irq_remapping(void) pr_info("Queued invalidation will be enabled to support x2apic and Intr-remapping.\n"); /* - * Enable queued invalidation for all the DRHD's. - */ - for_each_iommu(iommu, drhd) { - int ret = dmar_enable_qi(iommu); - - if (ret) { - printk(KERN_ERR "DRHD %Lx: failed to enable queued, " - " invalidation, ecap %Lx, ret %d\n", - drhd->reg_base_addr, iommu->ecap, ret); - goto error; - } - } - - /* * Setup Interrupt-remapping for all the DRHD's now. */ for_each_iommu(iommu, drhd) { @@ -1270,28 +1255,12 @@ static int dmar_ir_add(struct dmar_drhd_unit *dmaru, struct intel_iommu *iommu) /* Setup Interrupt-remapping now. */ ret = intel_setup_irq_remapping(iommu); if (ret) { - pr_err("DRHD %Lx: failed to allocate resource\n", + pr_err("DRHD %Lx: failed to setup IRQ remapping\n", iommu->reg_phys); - ir_remove_ioapic_hpet_scope(iommu); - return ret; - } - - if (!iommu->qi) { - /* Clear previous faults. */ - dmar_fault(-1, iommu); - iommu_disable_irq_remapping(iommu); - dmar_disable_qi(iommu); - } - - /* Enable queued invalidation */ - ret = dmar_enable_qi(iommu); - if (!ret) { - iommu_set_irq_remapping(iommu, eim); - } else { - pr_err("DRHD %Lx: failed to enable queued invalidation, ecap %Lx, ret %d\n", - iommu->reg_phys, iommu->ecap, ret); intel_teardown_irq_remapping(iommu); ir_remove_ioapic_hpet_scope(iommu); + } else { + iommu_set_irq_remapping(iommu, eim); } return ret; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: rwright-VXdhtT5mjnY@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, billsumnerlinux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, doug.hatch-VXdhtT5mjnY@public.gmane.org, dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, jroedel-l3A5Bk7waGM@public.gmane.org, tom.vaden-VXdhtT5mjnY@public.gmane.org, lisa.mitchell-VXdhtT5mjnY@public.gmane.org, zhen-hual-VXdhtT5mjnY@public.gmane.org, bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, li.zhang6-VXdhtT5mjnY@public.gmane.org, kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, ishii.hironobu-+CUm20s59erQFUHtdCDX3A@public.gmane.org, dwmw2-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org Subject: [PATCH 11/17] iommu/vt-d: Move QI initialization to intel_setup_irq_remapping Date: Fri, 5 Jun 2015 16:10:57 +0200 [thread overview] Message-ID: <1433513463-19128-12-git-send-email-joro@8bytes.org> (raw) In-Reply-To: <1433513463-19128-1-git-send-email-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org> From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org> This function needs a working QI later when kdump recovery is moved to this function. Tested-by: Baoquan He <bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org> --- drivers/iommu/intel_irq_remapping.c | 63 ++++++++++--------------------------- 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index d22518d..70e4955 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -519,6 +519,19 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu) ir_table->base = page_address(pages); ir_table->bitmap = bitmap; iommu->ir_table = ir_table; + + if (!iommu->qi) { + /* + * Clear previous faults. + */ + dmar_fault(-1, iommu); + dmar_disable_qi(iommu); + if (dmar_enable_qi(iommu)) { + pr_err("Failed to enable queued invalidation\n"); + goto out_free_pages; + } + } + return 0; out_free_pages: @@ -655,18 +668,6 @@ static int __init intel_enable_irq_remapping(void) } for_each_iommu(iommu, drhd) { - /* - * If the queued invalidation is already initialized, - * shouldn't disable it. - */ - if (iommu->qi) - continue; - - /* - * Clear previous faults. - */ - dmar_fault(-1, iommu); - iommu_check_pre_ir_status(iommu); if (!is_kdump_kernel() && iommu->pre_enabled_ir) { @@ -675,8 +676,6 @@ static int __init intel_enable_irq_remapping(void) pr_warn("IRQ remapping was enabled on %s but we are not in kdump mode\n", iommu->name); } - - dmar_disable_qi(iommu); } /* @@ -693,20 +692,6 @@ static int __init intel_enable_irq_remapping(void) pr_info("Queued invalidation will be enabled to support x2apic and Intr-remapping.\n"); /* - * Enable queued invalidation for all the DRHD's. - */ - for_each_iommu(iommu, drhd) { - int ret = dmar_enable_qi(iommu); - - if (ret) { - printk(KERN_ERR "DRHD %Lx: failed to enable queued, " - " invalidation, ecap %Lx, ret %d\n", - drhd->reg_base_addr, iommu->ecap, ret); - goto error; - } - } - - /* * Setup Interrupt-remapping for all the DRHD's now. */ for_each_iommu(iommu, drhd) { @@ -1270,28 +1255,12 @@ static int dmar_ir_add(struct dmar_drhd_unit *dmaru, struct intel_iommu *iommu) /* Setup Interrupt-remapping now. */ ret = intel_setup_irq_remapping(iommu); if (ret) { - pr_err("DRHD %Lx: failed to allocate resource\n", + pr_err("DRHD %Lx: failed to setup IRQ remapping\n", iommu->reg_phys); - ir_remove_ioapic_hpet_scope(iommu); - return ret; - } - - if (!iommu->qi) { - /* Clear previous faults. */ - dmar_fault(-1, iommu); - iommu_disable_irq_remapping(iommu); - dmar_disable_qi(iommu); - } - - /* Enable queued invalidation */ - ret = dmar_enable_qi(iommu); - if (!ret) { - iommu_set_irq_remapping(iommu, eim); - } else { - pr_err("DRHD %Lx: failed to enable queued invalidation, ecap %Lx, ret %d\n", - iommu->reg_phys, iommu->ecap, ret); intel_teardown_irq_remapping(iommu); ir_remove_ioapic_hpet_scope(iommu); + } else { + iommu_set_irq_remapping(iommu, eim); } return ret; -- 1.9.1
next prev parent reply other threads:[~2015-06-05 14:12 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-06-05 14:10 [PATCH 00/17] Fixes and Cleanups for the Intel VT-d driver Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel 2015-06-05 14:10 ` [PATCH 01/17] iommu/vt-d: Fix compile error when CONFIG_INTEL_IOMMU=n Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel 2015-06-05 14:10 ` [PATCH 02/17] iommu/vt-d: Remove __iommu_save_to_oldmem() function Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel 2015-06-05 14:10 ` [PATCH 03/17] iommu/vt-d: Make two functions static Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel 2015-06-05 14:10 ` [PATCH 04/17] iommu/vt-d: Load old data structures only in kdump kernel Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel 2015-06-05 14:10 ` [PATCH 05/17] iommu/vt-d: Mark root-entry present in set_root_entry Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel 2015-06-05 14:10 ` [PATCH 06/17] iommu/vt-d: Rework loading of old root-entry table Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel 2015-06-05 14:10 ` [PATCH 07/17] iommu/vt-d: Copy context-tables outside of spin_lock Joerg Roedel 2015-06-05 14:10 ` [PATCH 08/17] iommu/vt-d: Don't reuse domain-ids from old kernel Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel 2015-06-05 14:10 ` [PATCH 09/17] iommu/vt-d: Clean up log messages in intel-iommu.c Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel 2015-06-05 14:10 ` [PATCH 10/17] iommu/vt-d: Allocate irq remapping table bitmap with GFP_KERNEL Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel [this message] 2015-06-05 14:10 ` [PATCH 11/17] iommu/vt-d: Move QI initialization to intel_setup_irq_remapping Joerg Roedel 2015-06-05 14:10 ` [PATCH 12/17] iommu/vt-d: Move EIM detection to intel_prepare_irq_remapping Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel 2015-06-05 14:10 ` [PATCH 13/17] iommu/vt-d: Split up iommu_set_irq_remapping Joerg Roedel 2015-06-05 14:10 ` Joerg Roedel 2015-06-05 14:11 ` [PATCH 14/17] iommu/vt-d: Move kdump pointer intialization to __iommu_load_old_irte Joerg Roedel 2015-06-05 14:11 ` Joerg Roedel 2015-06-05 14:11 ` [PATCH 15/17] iommu/vt-d: Mark irt entries from old kernel as allocated Joerg Roedel 2015-06-05 14:11 ` Joerg Roedel 2015-06-05 14:11 ` [PATCH 16/17] iommu/vt-d: Copy old irte in intel_setup_irq_remapping Joerg Roedel 2015-06-05 14:11 ` [PATCH 17/17] iommu/vt-d: Remove update code for old ir-table Joerg Roedel 2015-06-05 14:11 ` Joerg Roedel 2015-06-08 8:06 ` [PATCH 00/17] Fixes and Cleanups for the Intel VT-d driver Li, ZhenHua 2015-06-08 8:06 ` Li, ZhenHua 2015-06-08 8:06 ` Li, ZhenHua 2015-06-08 8:23 ` Joerg Roedel 2015-06-08 8:23 ` Joerg Roedel 2015-06-08 8:23 ` Joerg Roedel 2015-06-08 8:26 ` Li, ZhenHua 2015-06-08 8:26 ` Li, ZhenHua
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=1433513463-19128-12-git-send-email-joro@8bytes.org \ --to=joro@8bytes.org \ --cc=alex.williamson@redhat.com \ --cc=bhe@redhat.com \ --cc=bhelgaas@google.com \ --cc=billsumnerlinux@gmail.com \ --cc=ddutile@redhat.com \ --cc=doug.hatch@hp.com \ --cc=dwmw2@infradead.org \ --cc=dyoung@redhat.com \ --cc=indou.takao@jp.fujitsu.com \ --cc=iommu@lists.linux-foundation.org \ --cc=ishii.hironobu@jp.fujitsu.com \ --cc=jerry.hoemann@hp.com \ --cc=jroedel@suse.de \ --cc=kexec@lists.infradead.org \ --cc=li.zhang6@hp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=lisa.mitchell@hp.com \ --cc=rwright@hp.com \ --cc=tom.vaden@hp.com \ --cc=vgoyal@redhat.com \ --cc=zhen-hual@hp.com \ /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: linkBe 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.