* [Patch v2] iommu/vt-d: Adjsut the return value of the parse_ioapics_under_ir
@ 2015-10-22 6:00 ` Baoquan He
0 siblings, 0 replies; 3+ messages in thread
From: Baoquan He @ 2015-10-22 6:00 UTC (permalink / raw)
To: joro; +Cc: linux-kernel, iommu, Baoquan He
Adjust the return value of parse_ioapics_under_ir as negative value representing
failure and "0" representing succcess. Just make it consistent with other
function implementation, and we can judge if calling is successfull by
if (!parse_ioapics_under_ir()) style.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
v1->v2:
Drop the patch 2/1 of v1 patchset since it's a wrong patch.
Joerg suggested that replace "-1" with "-ENODEV" which is more specific.
drivers/iommu/intel_irq_remapping.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index 9ec4e0d..12b11be 100644
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -672,7 +672,7 @@ static int __init intel_prepare_irq_remapping(void)
if (!dmar_ir_support())
return -ENODEV;
- if (parse_ioapics_under_ir() != 1) {
+ if (!parse_ioapics_under_ir()) {
pr_info("Not enabling interrupt remapping\n");
goto error;
}
@@ -916,7 +916,7 @@ static int __init parse_ioapics_under_ir(void)
}
if (!ir_supported)
- return 0;
+ return -ENODEV;
for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) {
int ioapic_id = mpc_ioapic_id(ioapic_idx);
@@ -928,7 +928,7 @@ static int __init parse_ioapics_under_ir(void)
}
}
- return 1;
+ return 0;
}
static int __init ir_dev_scope_init(void)
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Patch v2] iommu/vt-d: Adjsut the return value of the parse_ioapics_under_ir
@ 2015-10-22 6:00 ` Baoquan He
0 siblings, 0 replies; 3+ messages in thread
From: Baoquan He @ 2015-10-22 6:00 UTC (permalink / raw)
To: joro-zLv9SwRftAIdnm+yROfE0A
Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Adjust the return value of parse_ioapics_under_ir as negative value representing
failure and "0" representing succcess. Just make it consistent with other
function implementation, and we can judge if calling is successfull by
if (!parse_ioapics_under_ir()) style.
Signed-off-by: Baoquan He <bhe-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
v1->v2:
Drop the patch 2/1 of v1 patchset since it's a wrong patch.
Joerg suggested that replace "-1" with "-ENODEV" which is more specific.
drivers/iommu/intel_irq_remapping.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index 9ec4e0d..12b11be 100644
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -672,7 +672,7 @@ static int __init intel_prepare_irq_remapping(void)
if (!dmar_ir_support())
return -ENODEV;
- if (parse_ioapics_under_ir() != 1) {
+ if (!parse_ioapics_under_ir()) {
pr_info("Not enabling interrupt remapping\n");
goto error;
}
@@ -916,7 +916,7 @@ static int __init parse_ioapics_under_ir(void)
}
if (!ir_supported)
- return 0;
+ return -ENODEV;
for (ioapic_idx = 0; ioapic_idx < nr_ioapics; ioapic_idx++) {
int ioapic_id = mpc_ioapic_id(ioapic_idx);
@@ -928,7 +928,7 @@ static int __init parse_ioapics_under_ir(void)
}
}
- return 1;
+ return 0;
}
static int __init ir_dev_scope_init(void)
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] iommu/vt-d: Propagate error-value from ir_parse_ioapic_hpet_scope()
2015-10-22 6:00 ` Baoquan He
(?)
@ 2015-10-23 10:04 ` Joerg Roedel
-1 siblings, 0 replies; 3+ messages in thread
From: Joerg Roedel @ 2015-10-23 10:04 UTC (permalink / raw)
To: Baoquan He; +Cc: linux-kernel, iommu
On Thu, Oct 22, 2015 at 02:00:51PM +0800, Baoquan He wrote:
> Adjust the return value of parse_ioapics_under_ir as negative value representing
> failure and "0" representing succcess. Just make it consistent with other
> function implementation, and we can judge if calling is successfull by
> if (!parse_ioapics_under_ir()) style.
>
> Signed-off-by: Baoquan He <bhe@redhat.com>
Applied thanks. I also put below patch on-top to also propate the error
value returned from ir_parse_ioapic_hpet_scope().
>From 66ef950d1841487c852d68d00977726f1cd9f053 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <jroedel@suse.de>
Date: Fri, 23 Oct 2015 11:57:13 +0200
Subject: [PATCH] iommu/vt-d: Propagate error-value from
ir_parse_ioapic_hpet_scope()
Propagate the error-value from the function ir_parse_ioapic_hpet_scope()
in parse_ioapics_under_ir() and cleanup its calling loop.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/intel_irq_remapping.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index 7843252..f3a9bd1 100644
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -934,13 +934,18 @@ static int __init parse_ioapics_under_ir(void)
bool ir_supported = false;
int ioapic_idx;
- for_each_iommu(iommu, drhd)
- if (ecap_ir_support(iommu->ecap)) {
- if (ir_parse_ioapic_hpet_scope(drhd->hdr, iommu))
- return -1;
+ for_each_iommu(iommu, drhd) {
+ int ret;
- ir_supported = true;
- }
+ if (!ecap_ir_support(iommu->ecap))
+ continue;
+
+ ret = ir_parse_ioapic_hpet_scope(drhd->hdr, iommu);
+ if (ret)
+ return ret;
+
+ ir_supported = true;
+ }
if (!ir_supported)
return -ENODEV;
--
1.8.4.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-23 10:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-22 6:00 [Patch v2] iommu/vt-d: Adjsut the return value of the parse_ioapics_under_ir Baoquan He
2015-10-22 6:00 ` Baoquan He
2015-10-23 10:04 ` [PATCH] iommu/vt-d: Propagate error-value from ir_parse_ioapic_hpet_scope() Joerg Roedel
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.