From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH 4/4] VT-d/qinval: queue index is always unsigned Date: Mon, 16 Jun 2014 14:56:50 +0100 Message-ID: <539EF7A2.2040205@citrix.com> References: <539F025A020000780001AA25@mail.emea.novell.com> <539F03F1020000780001AA40@mail.emea.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6870630918479375385==" Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WwXP6-00036C-IC for xen-devel@lists.xenproject.org; Mon, 16 Jun 2014 13:56:56 +0000 In-Reply-To: <539F03F1020000780001AA40@mail.emea.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich Cc: Yang Z Zhang , xen-devel , xiantao.zhang@intel.com List-Id: xen-devel@lists.xenproject.org --===============6870630918479375385== Content-Type: multipart/alternative; boundary="------------000402040504030906080203" --------------000402040504030906080203 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit On 16/06/14 13:49, Jan Beulich wrote: > At once drop bogus initializers. > > Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper > > --- a/xen/drivers/passthrough/vtd/qinval.c > +++ b/xen/drivers/passthrough/vtd/qinval.c > @@ -43,7 +43,7 @@ static void print_qi_regs(struct iommu * > printk("DMAR_IQT_REG = %"PRIx64"\n", val); > } > > -static int qinval_next_index(struct iommu *iommu) > +static unsigned int qinval_next_index(struct iommu *iommu) > { > u64 tail; > > @@ -58,7 +58,7 @@ static int qinval_next_index(struct iomm > return tail; > } > > -static void qinval_update_qtail(struct iommu *iommu, int index) > +static void qinval_update_qtail(struct iommu *iommu, unsigned int index) > { > u64 val; > > @@ -68,7 +68,7 @@ static void qinval_update_qtail(struct i > dmar_writeq(iommu->reg, DMAR_IQT_REG, (val << QINVAL_INDEX_SHIFT)); > } > > -static int gen_cc_inv_dsc(struct iommu *iommu, int index, > +static int gen_cc_inv_dsc(struct iommu *iommu, unsigned int index, > u16 did, u16 source_id, u8 function_mask, u8 granu) > { > unsigned long flags; > @@ -101,7 +101,7 @@ int queue_invalidate_context(struct iomm > { > int ret; > unsigned long flags; > - int index = -1; > + unsigned int index; > > spin_lock_irqsave(&iommu->register_lock, flags); > index = qinval_next_index(iommu); > @@ -112,7 +112,7 @@ int queue_invalidate_context(struct iomm > return ret; > } > > -static int gen_iotlb_inv_dsc(struct iommu *iommu, int index, > +static int gen_iotlb_inv_dsc(struct iommu *iommu, unsigned int index, > u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr) > { > unsigned long flags; > @@ -149,7 +149,7 @@ int queue_invalidate_iotlb(struct iommu > { > int ret; > unsigned long flags; > - int index = -1; > + unsigned int index; > > spin_lock_irqsave(&iommu->register_lock, flags); > > @@ -161,7 +161,7 @@ int queue_invalidate_iotlb(struct iommu > return ret; > } > > -static int gen_wait_dsc(struct iommu *iommu, int index, > +static int gen_wait_dsc(struct iommu *iommu, unsigned int index, > u8 iflag, u8 sw, u8 fn, u32 sdata, volatile u32 *saddr) > { > unsigned long flags; > @@ -192,7 +192,7 @@ static int queue_invalidate_wait(struct > { > s_time_t start_time; > volatile u32 poll_slot = QINVAL_STAT_INIT; > - int index = -1; > + unsigned int index; > int ret; > unsigned long flags; > > @@ -231,7 +231,7 @@ static int invalidate_sync(struct iommu > return 0; > } > > -static int gen_dev_iotlb_inv_dsc(struct iommu *iommu, int index, > +static int gen_dev_iotlb_inv_dsc(struct iommu *iommu, unsigned int index, > u32 max_invs_pend, u16 sid, u16 size, u64 addr) > { > unsigned long flags; > @@ -266,7 +266,7 @@ int qinval_device_iotlb(struct iommu *io > { > int ret; > unsigned long flags; > - int index = -1; > + unsigned int index; > > spin_lock_irqsave(&iommu->register_lock, flags); > index = qinval_next_index(iommu); > @@ -277,7 +277,7 @@ int qinval_device_iotlb(struct iommu *io > return ret; > } > > -static int gen_iec_inv_dsc(struct iommu *iommu, int index, > +static int gen_iec_inv_dsc(struct iommu *iommu, unsigned int index, > u8 granu, u8 im, u16 iidx) > { > unsigned long flags; > @@ -308,7 +308,7 @@ int queue_invalidate_iec(struct iommu *i > { > int ret; > unsigned long flags; > - int index = -1; > + unsigned int index; > > spin_lock_irqsave(&iommu->register_lock, flags); > index = qinval_next_index(iommu); > > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel --------------000402040504030906080203 Content-Type: text/html; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit
On 16/06/14 13:49, Jan Beulich wrote:
At once drop bogus initializers.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>


--- a/xen/drivers/passthrough/vtd/qinval.c
+++ b/xen/drivers/passthrough/vtd/qinval.c
@@ -43,7 +43,7 @@ static void print_qi_regs(struct iommu *
     printk("DMAR_IQT_REG = %"PRIx64"\n", val);
 }
 
-static int qinval_next_index(struct iommu *iommu)
+static unsigned int qinval_next_index(struct iommu *iommu)
 {
     u64 tail;
 
@@ -58,7 +58,7 @@ static int qinval_next_index(struct iomm
     return tail;
 }
 
-static void qinval_update_qtail(struct iommu *iommu, int index)
+static void qinval_update_qtail(struct iommu *iommu, unsigned int index)
 {
     u64 val;
 
@@ -68,7 +68,7 @@ static void qinval_update_qtail(struct i
     dmar_writeq(iommu->reg, DMAR_IQT_REG, (val << QINVAL_INDEX_SHIFT));
 }
 
-static int gen_cc_inv_dsc(struct iommu *iommu, int index,
+static int gen_cc_inv_dsc(struct iommu *iommu, unsigned int index,
     u16 did, u16 source_id, u8 function_mask, u8 granu)
 {
     unsigned long flags;
@@ -101,7 +101,7 @@ int queue_invalidate_context(struct iomm
 {
     int ret;
     unsigned long flags;
-    int index = -1;
+    unsigned int index;
 
     spin_lock_irqsave(&iommu->register_lock, flags);
     index = qinval_next_index(iommu);
@@ -112,7 +112,7 @@ int queue_invalidate_context(struct iomm
     return ret;
 }
 
-static int gen_iotlb_inv_dsc(struct iommu *iommu, int index,
+static int gen_iotlb_inv_dsc(struct iommu *iommu, unsigned int index,
     u8 granu, u8 dr, u8 dw, u16 did, u8 am, u8 ih, u64 addr)
 {
     unsigned long flags;
@@ -149,7 +149,7 @@ int queue_invalidate_iotlb(struct iommu 
 {
     int ret;
     unsigned long flags;
-    int index = -1;
+    unsigned int index;
 
     spin_lock_irqsave(&iommu->register_lock, flags);
 
@@ -161,7 +161,7 @@ int queue_invalidate_iotlb(struct iommu 
     return ret;
 }
 
-static int gen_wait_dsc(struct iommu *iommu, int index,
+static int gen_wait_dsc(struct iommu *iommu, unsigned int index,
     u8 iflag, u8 sw, u8 fn, u32 sdata, volatile u32 *saddr)
 {
     unsigned long flags;
@@ -192,7 +192,7 @@ static int queue_invalidate_wait(struct 
 {
     s_time_t start_time;
     volatile u32 poll_slot = QINVAL_STAT_INIT;
-    int index = -1;
+    unsigned int index;
     int ret;
     unsigned long flags;
 
@@ -231,7 +231,7 @@ static int invalidate_sync(struct iommu 
     return 0;
 }
 
-static int gen_dev_iotlb_inv_dsc(struct iommu *iommu, int index,
+static int gen_dev_iotlb_inv_dsc(struct iommu *iommu, unsigned int index,
     u32 max_invs_pend, u16 sid, u16 size, u64 addr)
 {
     unsigned long flags;
@@ -266,7 +266,7 @@ int qinval_device_iotlb(struct iommu *io
 {
     int ret;
     unsigned long flags;
-    int index = -1;
+    unsigned int index;
 
     spin_lock_irqsave(&iommu->register_lock, flags);
     index = qinval_next_index(iommu);
@@ -277,7 +277,7 @@ int qinval_device_iotlb(struct iommu *io
     return ret;
 }
 
-static int gen_iec_inv_dsc(struct iommu *iommu, int index,
+static int gen_iec_inv_dsc(struct iommu *iommu, unsigned int index,
     u8 granu, u8 im, u16 iidx)
 {
     unsigned long flags;
@@ -308,7 +308,7 @@ int queue_invalidate_iec(struct iommu *i
 {
     int ret;
     unsigned long flags;
-    int index = -1;
+    unsigned int index;
 
     spin_lock_irqsave(&iommu->register_lock, flags);
     index = qinval_next_index(iommu);






_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

--------------000402040504030906080203-- --===============6870630918479375385== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============6870630918479375385==--