x86: irq_remapping: Fix the regression of hpet irq remapping
PATCH 1/1 x86: irq_remapping: Fix the regression of hpet irq remapping
Commit 71054d8841b4 introduced x86_msi_ops.setup_hpet_msi to setup hpet MSI irq when irq remapping enabled. This caused a regression of hpet MSI irq remapping.
Original code flow before commit 71054d8841b4:hpet_setup_msi_irq()
arch_setup_hpet_msi() setup_hpet_msi_remapped() remap_ops->setup_hpet_msi() alloc_irte() msi_compose_msg() hpet_msi_write() ...
Current code flow after commit 71054d8841b4:hpet_setup_msi_irq()
x86_msi.setup_hpet_msi() setup_hpet_msi_remapped() intel_setup_hpet_msi() alloc_irte()
Currently, we only alloc_irte() for hpet MSI, but have not composed and wrote its msg...
--- drivers/iommu/irq_remapping.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
drivers/iommu/irq_remapping.c +8 -1
@@ -12,6 +12,7 @@#include <asm/processor.h> #include <asm/x86_init.h> #include <asm/apic.h> +#include <asm/hpet.h> #include "irq_remapping.h"
@@ -332,10 +333,16 @@ static int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq,static int setup_hpet_msi_remapped (unsigned int irq,unsigned int id) { +int ret; +if (!remap_ops || !remap_ops->setup_hpet_msi)return -ENODEV ; -return remap_ops->setup_hpet_msi (irq, id); + ret = remap_ops->setup_hpet_msi (irq, id); +if (ret) +return -EINVAL ; + +return default_setup_hpet_msi (irq, id); }void panic_if_irq_remap (const char *msg)
Signature · 1 line
1.7.1
A message that is not in the archive (sent off-list or not yet received): 1410512753-6428-1-git-send-email-wangyijing-hv44wF8Li93QT0dZR+AlfA@public.gmane.org
Quoted 49 lines · Yijing Wang
Commit
71054d8841b4introduced x86_msi_ops.setup_hpet_msi to setup hpet MSI irq when irq remapping enabled. This caused a regression of hpet MSI irq remapping.Original code flow before commit
71054d8841b4:hpet_setup_msi_irq()arch_setup_hpet_msi() setup_hpet_msi_remapped() remap_ops->setup_hpet_msi() alloc_irte() msi_compose_msg() hpet_msi_write() ...Current code flow after commit
71054d8841b4:hpet_setup_msi_irq()x86_msi.setup_hpet_msi() setup_hpet_msi_remapped() intel_setup_hpet_msi() alloc_irte()Currently, we only
alloc_irte()for hpet MSI, but have not composed and wrote its msg...Signed-off-by Yijing Wang <[email protected]>--- drivers/iommu/irq_remapping.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)drivers/iommu/irq_remapping.c +3
-0@@ -12,6 +12,7 @@#include <asm/processor.h> #include <asm/x86_init.h> #include <asm/apic.h> +#include <asm/hpet.h> #include "irq_remapping.h" @@ -332,10 +333,16 @@ static int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq,static int setup_hpet_msi_remapped (unsigned int irq,unsigned int id) { +int ret; +
drivers/iommu/irq_remapping.c static int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq, · line 346
Quoted 10 lines
drivers/iommu/irq_remapping.c +5
-1if (!remap_ops || !remap_ops->setup_hpet_msi)return -ENODEV ; -return remap_ops->setup_hpet_msi (irq, id); + ret = remap_ops->setup_hpet_msi (irq, id); +if (ret) +return -EINVAL ; + +return default_setup_hpet_msi (irq, id); }
Hi Yijing,
How about move default_setup_hpet_msi(irq, id) intointel_setup_hpet_msi and amd.setup_hpet_msi? Regards!
Gerry
Quoted 3 lines
drivers/iommu/irq_remapping.c +0
-0void panic_if_irq_remap (const char *msg)
A message that is not in the archive (sent off-list or not yet received): 5412B69C.8000202-VuQAYsv1563Yd54FQh9/[email protected]
Quoted 55 lines · Jiang Liu
Quoted 52 lines · Yijing Wang
Commit
71054d8841b4introduced x86_msi_ops.setup_hpet_msi to setup hpet MSI irq when irq remapping enabled. This caused a regression of hpet MSI irq remapping.Original code flow before commit
71054d8841b4:hpet_setup_msi_irq()arch_setup_hpet_msi() setup_hpet_msi_remapped() remap_ops->setup_hpet_msi() alloc_irte() msi_compose_msg() hpet_msi_write() ...Current code flow after commit
71054d8841b4:hpet_setup_msi_irq()x86_msi.setup_hpet_msi() setup_hpet_msi_remapped() intel_setup_hpet_msi() alloc_irte()Currently, we only
alloc_irte()for hpet MSI, but have not composed and wrote its msg...Signed-off-by Yijing Wang <[email protected]>--- drivers/iommu/irq_remapping.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)drivers/iommu/irq_remapping.c +3
-0@@ -12,6 +12,7 @@#include <asm/processor.h> #include <asm/x86_init.h> #include <asm/apic.h> +#include <asm/hpet.h> #include "irq_remapping.h" @@ -332,10 +333,16 @@ static int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq,static int setup_hpet_msi_remapped (unsigned int irq,unsigned int id) { +int ret; +if (!remap_ops || !remap_ops->setup_hpet_msi)return -ENODEV ;
Quoted 10 lines
drivers/iommu/irq_remapping.c static int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq, · line 346
Quoted 7 lines
drivers/iommu/irq_remapping.c +5
-1-return remap_ops->setup_hpet_msi (irq, id); + ret = remap_ops->setup_hpet_msi (irq, id); +if (ret) +return -EINVAL ; + +return default_setup_hpet_msi (irq, id); }Hi Yijing,
How about movedefault_setup_hpet_msi(irq, id)intointel_setup_hpet_msiand amd.setup_hpet_msi?
Hmmm, because the common irq remapping code is placed at irq_remapping.c, so what about change remap_ops->setup_hpet_msi to remap_ops->alloc_remapping_irq(),
static int setup_hpet_msi_remapped(unsigned int irq, unsigned int id) {
+ int ret;
+
if (!remap_ops || !remap_ops->alloc_remapping_irq)
return -ENODEV;
- return remap_ops->alloc_remapping_irq(irq, id);
+ ret = remap_ops->alloc_remapping_irq(irq, id);
+ if (ret)
+ return -EINVAL;
+
+ return default_setup_hpet_msi(irq, id);
}
Thanks!
Yijing.
Quoted 8 lines
Regards!
Gerrydrivers/iommu/irq_remapping.c static int msi_setup_remapped_irq(struct pci_dev *pdev, unsigned int irq, · line 348
Quoted 3 lines
drivers/iommu/irq_remapping.c +0
-0void panic_if_irq_remap (const char *msg).
Signature · 2 lines
Thanks! Yijing