* [PATCH] VT-d/qinval: make further functions static
@ 2014-06-24 14:13 Jan Beulich
2014-06-24 14:59 ` Andrew Cooper
2014-06-24 19:37 ` Tian, Kevin
0 siblings, 2 replies; 3+ messages in thread
From: Jan Beulich @ 2014-06-24 14:13 UTC (permalink / raw)
To: xen-devel; +Cc: Yang Z Zhang, Kevin Tian
[-- Attachment #1: Type: text/plain, Size: 4438 bytes --]
... and with that change their return types to void as they can't
actually fail, simplifying error handling in their callers.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
Note that this depends on the earlier sent patch titled "VT-d/qinval:
eliminate redundant locking".
--- a/xen/drivers/passthrough/vtd/extern.h
+++ b/xen/drivers/passthrough/vtd/extern.h
@@ -42,12 +42,6 @@ void iommu_flush_cache_page(void *addr,
int iommu_alloc(struct acpi_drhd_unit *drhd);
void iommu_free(struct acpi_drhd_unit *drhd);
-int queue_invalidate_context(struct iommu *iommu,
- u16 did, u16 source_id, u8 function_mask, u8 granu);
-int queue_invalidate_iotlb(struct iommu *iommu,
- u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr);
-int queue_invalidate_iec(struct iommu *iommu,
- u8 granu, u8 im, u16 iidx);
int iommu_flush_iec_global(struct iommu *iommu);
int iommu_flush_iec_index(struct iommu *iommu, u8 im, u16 iidx);
void clear_fault_bits(struct iommu *iommu);
--- a/xen/drivers/passthrough/vtd/qinval.c
+++ b/xen/drivers/passthrough/vtd/qinval.c
@@ -68,7 +68,7 @@ static void qinval_update_qtail(struct i
dmar_writeq(iommu->reg, DMAR_IQT_REG, (val << QINVAL_INDEX_SHIFT));
}
-int queue_invalidate_context(struct iommu *iommu,
+static void queue_invalidate_context(struct iommu *iommu,
u16 did, u16 source_id, u8 function_mask, u8 granu)
{
unsigned long flags;
@@ -96,11 +96,9 @@ int queue_invalidate_context(struct iomm
spin_unlock_irqrestore(&iommu->register_lock, flags);
unmap_vtd_domain_page(qinval_entries);
-
- return 0;
}
-int queue_invalidate_iotlb(struct iommu *iommu,
+static void queue_invalidate_iotlb(struct iommu *iommu,
u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr)
{
unsigned long flags;
@@ -131,8 +129,6 @@ int queue_invalidate_iotlb(struct iommu
unmap_vtd_domain_page(qinval_entries);
qinval_update_qtail(iommu, index);
spin_unlock_irqrestore(&iommu->register_lock, flags);
-
- return 0;
}
static int queue_invalidate_wait(struct iommu *iommu,
@@ -227,7 +223,7 @@ int qinval_device_iotlb(struct iommu *io
return 0;
}
-int queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx)
+static void queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx)
{
unsigned long flags;
unsigned int index;
@@ -252,21 +248,21 @@ int queue_invalidate_iec(struct iommu *i
unmap_vtd_domain_page(qinval_entries);
qinval_update_qtail(iommu, index);
spin_unlock_irqrestore(&iommu->register_lock, flags);
-
- return 0;
}
static int __iommu_flush_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx)
{
- int ret = queue_invalidate_iec(iommu, granu, im, iidx);
- int rc = invalidate_sync(iommu);
+ int ret;
+ queue_invalidate_iec(iommu, granu, im, iidx);
+ ret = invalidate_sync(iommu);
/*
* reading vt-d architecture register will ensure
* draining happens in implementation independent way.
*/
(void)dmar_readq(iommu->reg, DMAR_CAP_REG);
- return ret ?: rc;
+
+ return ret;
}
int iommu_flush_iec_global(struct iommu *iommu)
@@ -303,13 +299,9 @@ static int flush_context_qi(
if ( qi_ctrl->qinval_maddr != 0 )
{
- int rc;
-
- ret = queue_invalidate_context(iommu, did, sid, fm,
- type >> DMA_CCMD_INVL_GRANU_OFFSET);
- rc = invalidate_sync(iommu);
- if ( !ret )
- ret = rc;
+ queue_invalidate_context(iommu, did, sid, fm,
+ type >> DMA_CCMD_INVL_GRANU_OFFSET);
+ ret = invalidate_sync(iommu);
}
return ret;
}
@@ -348,9 +340,9 @@ static int flush_iotlb_qi(
if (cap_read_drain(iommu->cap))
dr = 1;
/* Need to conside the ih bit later */
- ret = queue_invalidate_iotlb(iommu,
- (type >> DMA_TLB_FLUSH_GRANU_OFFSET), dr,
- dw, did, (u8)size_order, 0, addr);
+ queue_invalidate_iotlb(iommu,
+ type >> DMA_TLB_FLUSH_GRANU_OFFSET, dr,
+ dw, did, size_order, 0, addr);
if ( flush_dev_iotlb )
ret = dev_invalidate_iotlb(iommu, did, addr, size_order, type);
rc = invalidate_sync(iommu);
[-- Attachment #2: VT-d-qi-more-statics.patch --]
[-- Type: text/plain, Size: 4480 bytes --]
VT-d/qinval: make further functions static
... and with that change their return types to void as they can't
actually fail, simplifying error handling in their callers.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
Note that this depends on the earlier sent patch titled "VT-d/qinval:
eliminate redundant locking".
--- a/xen/drivers/passthrough/vtd/extern.h
+++ b/xen/drivers/passthrough/vtd/extern.h
@@ -42,12 +42,6 @@ void iommu_flush_cache_page(void *addr,
int iommu_alloc(struct acpi_drhd_unit *drhd);
void iommu_free(struct acpi_drhd_unit *drhd);
-int queue_invalidate_context(struct iommu *iommu,
- u16 did, u16 source_id, u8 function_mask, u8 granu);
-int queue_invalidate_iotlb(struct iommu *iommu,
- u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr);
-int queue_invalidate_iec(struct iommu *iommu,
- u8 granu, u8 im, u16 iidx);
int iommu_flush_iec_global(struct iommu *iommu);
int iommu_flush_iec_index(struct iommu *iommu, u8 im, u16 iidx);
void clear_fault_bits(struct iommu *iommu);
--- a/xen/drivers/passthrough/vtd/qinval.c
+++ b/xen/drivers/passthrough/vtd/qinval.c
@@ -68,7 +68,7 @@ static void qinval_update_qtail(struct i
dmar_writeq(iommu->reg, DMAR_IQT_REG, (val << QINVAL_INDEX_SHIFT));
}
-int queue_invalidate_context(struct iommu *iommu,
+static void queue_invalidate_context(struct iommu *iommu,
u16 did, u16 source_id, u8 function_mask, u8 granu)
{
unsigned long flags;
@@ -96,11 +96,9 @@ int queue_invalidate_context(struct iomm
spin_unlock_irqrestore(&iommu->register_lock, flags);
unmap_vtd_domain_page(qinval_entries);
-
- return 0;
}
-int queue_invalidate_iotlb(struct iommu *iommu,
+static void queue_invalidate_iotlb(struct iommu *iommu,
u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr)
{
unsigned long flags;
@@ -131,8 +129,6 @@ int queue_invalidate_iotlb(struct iommu
unmap_vtd_domain_page(qinval_entries);
qinval_update_qtail(iommu, index);
spin_unlock_irqrestore(&iommu->register_lock, flags);
-
- return 0;
}
static int queue_invalidate_wait(struct iommu *iommu,
@@ -227,7 +223,7 @@ int qinval_device_iotlb(struct iommu *io
return 0;
}
-int queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx)
+static void queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx)
{
unsigned long flags;
unsigned int index;
@@ -252,21 +248,21 @@ int queue_invalidate_iec(struct iommu *i
unmap_vtd_domain_page(qinval_entries);
qinval_update_qtail(iommu, index);
spin_unlock_irqrestore(&iommu->register_lock, flags);
-
- return 0;
}
static int __iommu_flush_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx)
{
- int ret = queue_invalidate_iec(iommu, granu, im, iidx);
- int rc = invalidate_sync(iommu);
+ int ret;
+ queue_invalidate_iec(iommu, granu, im, iidx);
+ ret = invalidate_sync(iommu);
/*
* reading vt-d architecture register will ensure
* draining happens in implementation independent way.
*/
(void)dmar_readq(iommu->reg, DMAR_CAP_REG);
- return ret ?: rc;
+
+ return ret;
}
int iommu_flush_iec_global(struct iommu *iommu)
@@ -303,13 +299,9 @@ static int flush_context_qi(
if ( qi_ctrl->qinval_maddr != 0 )
{
- int rc;
-
- ret = queue_invalidate_context(iommu, did, sid, fm,
- type >> DMA_CCMD_INVL_GRANU_OFFSET);
- rc = invalidate_sync(iommu);
- if ( !ret )
- ret = rc;
+ queue_invalidate_context(iommu, did, sid, fm,
+ type >> DMA_CCMD_INVL_GRANU_OFFSET);
+ ret = invalidate_sync(iommu);
}
return ret;
}
@@ -348,9 +340,9 @@ static int flush_iotlb_qi(
if (cap_read_drain(iommu->cap))
dr = 1;
/* Need to conside the ih bit later */
- ret = queue_invalidate_iotlb(iommu,
- (type >> DMA_TLB_FLUSH_GRANU_OFFSET), dr,
- dw, did, (u8)size_order, 0, addr);
+ queue_invalidate_iotlb(iommu,
+ type >> DMA_TLB_FLUSH_GRANU_OFFSET, dr,
+ dw, did, size_order, 0, addr);
if ( flush_dev_iotlb )
ret = dev_invalidate_iotlb(iommu, did, addr, size_order, type);
rc = invalidate_sync(iommu);
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] VT-d/qinval: make further functions static
2014-06-24 14:13 [PATCH] VT-d/qinval: make further functions static Jan Beulich
@ 2014-06-24 14:59 ` Andrew Cooper
2014-06-24 19:37 ` Tian, Kevin
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Cooper @ 2014-06-24 14:59 UTC (permalink / raw)
To: Jan Beulich, xen-devel; +Cc: Yang Z Zhang, Kevin Tian
[-- Attachment #1.1: Type: text/plain, Size: 4792 bytes --]
On 24/06/14 15:13, Jan Beulich wrote:
> ... and with that change their return types to void as they can't
> actually fail, simplifying error handling in their callers.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
> ---
> Note that this depends on the earlier sent patch titled "VT-d/qinval:
> eliminate redundant locking".
>
> --- a/xen/drivers/passthrough/vtd/extern.h
> +++ b/xen/drivers/passthrough/vtd/extern.h
> @@ -42,12 +42,6 @@ void iommu_flush_cache_page(void *addr,
> int iommu_alloc(struct acpi_drhd_unit *drhd);
> void iommu_free(struct acpi_drhd_unit *drhd);
>
> -int queue_invalidate_context(struct iommu *iommu,
> - u16 did, u16 source_id, u8 function_mask, u8 granu);
> -int queue_invalidate_iotlb(struct iommu *iommu,
> - u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr);
> -int queue_invalidate_iec(struct iommu *iommu,
> - u8 granu, u8 im, u16 iidx);
> int iommu_flush_iec_global(struct iommu *iommu);
> int iommu_flush_iec_index(struct iommu *iommu, u8 im, u16 iidx);
> void clear_fault_bits(struct iommu *iommu);
> --- a/xen/drivers/passthrough/vtd/qinval.c
> +++ b/xen/drivers/passthrough/vtd/qinval.c
> @@ -68,7 +68,7 @@ static void qinval_update_qtail(struct i
> dmar_writeq(iommu->reg, DMAR_IQT_REG, (val << QINVAL_INDEX_SHIFT));
> }
>
> -int queue_invalidate_context(struct iommu *iommu,
> +static void queue_invalidate_context(struct iommu *iommu,
> u16 did, u16 source_id, u8 function_mask, u8 granu)
> {
> unsigned long flags;
> @@ -96,11 +96,9 @@ int queue_invalidate_context(struct iomm
> spin_unlock_irqrestore(&iommu->register_lock, flags);
>
> unmap_vtd_domain_page(qinval_entries);
> -
> - return 0;
> }
>
> -int queue_invalidate_iotlb(struct iommu *iommu,
> +static void queue_invalidate_iotlb(struct iommu *iommu,
> u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr)
> {
> unsigned long flags;
> @@ -131,8 +129,6 @@ int queue_invalidate_iotlb(struct iommu
> unmap_vtd_domain_page(qinval_entries);
> qinval_update_qtail(iommu, index);
> spin_unlock_irqrestore(&iommu->register_lock, flags);
> -
> - return 0;
> }
>
> static int queue_invalidate_wait(struct iommu *iommu,
> @@ -227,7 +223,7 @@ int qinval_device_iotlb(struct iommu *io
> return 0;
> }
>
> -int queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx)
> +static void queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx)
> {
> unsigned long flags;
> unsigned int index;
> @@ -252,21 +248,21 @@ int queue_invalidate_iec(struct iommu *i
> unmap_vtd_domain_page(qinval_entries);
> qinval_update_qtail(iommu, index);
> spin_unlock_irqrestore(&iommu->register_lock, flags);
> -
> - return 0;
> }
>
> static int __iommu_flush_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx)
> {
> - int ret = queue_invalidate_iec(iommu, granu, im, iidx);
> - int rc = invalidate_sync(iommu);
> + int ret;
>
> + queue_invalidate_iec(iommu, granu, im, iidx);
> + ret = invalidate_sync(iommu);
> /*
> * reading vt-d architecture register will ensure
> * draining happens in implementation independent way.
> */
> (void)dmar_readq(iommu->reg, DMAR_CAP_REG);
> - return ret ?: rc;
> +
> + return ret;
> }
>
> int iommu_flush_iec_global(struct iommu *iommu)
> @@ -303,13 +299,9 @@ static int flush_context_qi(
>
> if ( qi_ctrl->qinval_maddr != 0 )
> {
> - int rc;
> -
> - ret = queue_invalidate_context(iommu, did, sid, fm,
> - type >> DMA_CCMD_INVL_GRANU_OFFSET);
> - rc = invalidate_sync(iommu);
> - if ( !ret )
> - ret = rc;
> + queue_invalidate_context(iommu, did, sid, fm,
> + type >> DMA_CCMD_INVL_GRANU_OFFSET);
> + ret = invalidate_sync(iommu);
> }
> return ret;
> }
> @@ -348,9 +340,9 @@ static int flush_iotlb_qi(
> if (cap_read_drain(iommu->cap))
> dr = 1;
> /* Need to conside the ih bit later */
> - ret = queue_invalidate_iotlb(iommu,
> - (type >> DMA_TLB_FLUSH_GRANU_OFFSET), dr,
> - dw, did, (u8)size_order, 0, addr);
> + queue_invalidate_iotlb(iommu,
> + type >> DMA_TLB_FLUSH_GRANU_OFFSET, dr,
> + dw, did, size_order, 0, addr);
> if ( flush_dev_iotlb )
> ret = dev_invalidate_iotlb(iommu, did, addr, size_order, type);
> rc = invalidate_sync(iommu);
>
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
[-- Attachment #1.2: Type: text/html, Size: 5536 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] VT-d/qinval: make further functions static
2014-06-24 14:13 [PATCH] VT-d/qinval: make further functions static Jan Beulich
2014-06-24 14:59 ` Andrew Cooper
@ 2014-06-24 19:37 ` Tian, Kevin
1 sibling, 0 replies; 3+ messages in thread
From: Tian, Kevin @ 2014-06-24 19:37 UTC (permalink / raw)
To: Jan Beulich, xen-devel; +Cc: Zhang, Yang Z
> From: Jan Beulich [mailto:JBeulich@suse.com]
> Sent: Tuesday, June 24, 2014 7:14 AM
>
> ... and with that change their return types to void as they can't
> actually fail, simplifying error handling in their callers.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Kevin Tian <kevin.tian@intel.com>
> ---
> Note that this depends on the earlier sent patch titled "VT-d/qinval:
> eliminate redundant locking".
>
> --- a/xen/drivers/passthrough/vtd/extern.h
> +++ b/xen/drivers/passthrough/vtd/extern.h
> @@ -42,12 +42,6 @@ void iommu_flush_cache_page(void *addr,
> int iommu_alloc(struct acpi_drhd_unit *drhd);
> void iommu_free(struct acpi_drhd_unit *drhd);
>
> -int queue_invalidate_context(struct iommu *iommu,
> - u16 did, u16 source_id, u8 function_mask, u8 granu);
> -int queue_invalidate_iotlb(struct iommu *iommu,
> - u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr);
> -int queue_invalidate_iec(struct iommu *iommu,
> - u8 granu, u8 im, u16 iidx);
> int iommu_flush_iec_global(struct iommu *iommu);
> int iommu_flush_iec_index(struct iommu *iommu, u8 im, u16 iidx);
> void clear_fault_bits(struct iommu *iommu);
> --- a/xen/drivers/passthrough/vtd/qinval.c
> +++ b/xen/drivers/passthrough/vtd/qinval.c
> @@ -68,7 +68,7 @@ static void qinval_update_qtail(struct i
> dmar_writeq(iommu->reg, DMAR_IQT_REG, (val <<
> QINVAL_INDEX_SHIFT));
> }
>
> -int queue_invalidate_context(struct iommu *iommu,
> +static void queue_invalidate_context(struct iommu *iommu,
> u16 did, u16 source_id, u8 function_mask, u8 granu)
> {
> unsigned long flags;
> @@ -96,11 +96,9 @@ int queue_invalidate_context(struct iomm
> spin_unlock_irqrestore(&iommu->register_lock, flags);
>
> unmap_vtd_domain_page(qinval_entries);
> -
> - return 0;
> }
>
> -int queue_invalidate_iotlb(struct iommu *iommu,
> +static void queue_invalidate_iotlb(struct iommu *iommu,
> u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr)
> {
> unsigned long flags;
> @@ -131,8 +129,6 @@ int queue_invalidate_iotlb(struct iommu
> unmap_vtd_domain_page(qinval_entries);
> qinval_update_qtail(iommu, index);
> spin_unlock_irqrestore(&iommu->register_lock, flags);
> -
> - return 0;
> }
>
> static int queue_invalidate_wait(struct iommu *iommu,
> @@ -227,7 +223,7 @@ int qinval_device_iotlb(struct iommu *io
> return 0;
> }
>
> -int queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16 iidx)
> +static void queue_invalidate_iec(struct iommu *iommu, u8 granu, u8 im, u16
> iidx)
> {
> unsigned long flags;
> unsigned int index;
> @@ -252,21 +248,21 @@ int queue_invalidate_iec(struct iommu *i
> unmap_vtd_domain_page(qinval_entries);
> qinval_update_qtail(iommu, index);
> spin_unlock_irqrestore(&iommu->register_lock, flags);
> -
> - return 0;
> }
>
> static int __iommu_flush_iec(struct iommu *iommu, u8 granu, u8 im, u16
> iidx)
> {
> - int ret = queue_invalidate_iec(iommu, granu, im, iidx);
> - int rc = invalidate_sync(iommu);
> + int ret;
>
> + queue_invalidate_iec(iommu, granu, im, iidx);
> + ret = invalidate_sync(iommu);
> /*
> * reading vt-d architecture register will ensure
> * draining happens in implementation independent way.
> */
> (void)dmar_readq(iommu->reg, DMAR_CAP_REG);
> - return ret ?: rc;
> +
> + return ret;
> }
>
> int iommu_flush_iec_global(struct iommu *iommu)
> @@ -303,13 +299,9 @@ static int flush_context_qi(
>
> if ( qi_ctrl->qinval_maddr != 0 )
> {
> - int rc;
> -
> - ret = queue_invalidate_context(iommu, did, sid, fm,
> - type >>
> DMA_CCMD_INVL_GRANU_OFFSET);
> - rc = invalidate_sync(iommu);
> - if ( !ret )
> - ret = rc;
> + queue_invalidate_context(iommu, did, sid, fm,
> + type >>
> DMA_CCMD_INVL_GRANU_OFFSET);
> + ret = invalidate_sync(iommu);
> }
> return ret;
> }
> @@ -348,9 +340,9 @@ static int flush_iotlb_qi(
> if (cap_read_drain(iommu->cap))
> dr = 1;
> /* Need to conside the ih bit later */
> - ret = queue_invalidate_iotlb(iommu,
> - (type >> DMA_TLB_FLUSH_GRANU_OFFSET), dr,
> - dw, did, (u8)size_order, 0, addr);
> + queue_invalidate_iotlb(iommu,
> + type >>
> DMA_TLB_FLUSH_GRANU_OFFSET, dr,
> + dw, did, size_order, 0, addr);
> if ( flush_dev_iotlb )
> ret = dev_invalidate_iotlb(iommu, did, addr, size_order, type);
> rc = invalidate_sync(iommu);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-24 19:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-24 14:13 [PATCH] VT-d/qinval: make further functions static Jan Beulich
2014-06-24 14:59 ` Andrew Cooper
2014-06-24 19:37 ` Tian, Kevin
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.