1. Patchew
  2. QEMU
  3. [PATCH 0/8] hw/ppc: Convert UIC device to QOM
  4. View patch

[PATCH 1/8] hw/ppc/ppc4xx_devs: Make code style fixes to UIC code

Peter Maydell posted 8 patches 5 years, 1 month ago
Maintainers: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, David Gibson <david@gibson.dropbear.id.au>, BALATON Zoltan <balaton@eik.bme.hu>
There is a newer version of this series
[PATCH 1/8] hw/ppc/ppc4xx_devs: Make code style fixes to UIC code
Posted by Peter Maydell 5 years, 1 month ago 
In a following commit we will move the PPC UIC implementation to
its own file in hw/intc. To prevent checkpatch complaining about that
code-motion, fix up the minor style issues first.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/ppc/ppc4xx_devs.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index f1651e04d9a..f2f9ca4ffec 100644
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -105,7 +105,7 @@ struct ppcuic_t {
     qemu_irq *irqs;
 };
 
-static void ppcuic_trigger_irq (ppcuic_t *uic)
+static void ppcuic_trigger_irq(ppcuic_t *uic)
 {
     uint32_t ir, cr;
     int start, end, inc, i;
@@ -156,26 +156,28 @@ static void ppcuic_trigger_irq (ppcuic_t *uic)
     }
 }
 
-static void ppcuic_set_irq (void *opaque, int irq_num, int level)
+static void ppcuic_set_irq(void *opaque, int irq_num, int level)
 {
     ppcuic_t *uic;
     uint32_t mask, sr;
 
     uic = opaque;
-    mask = 1U << (31-irq_num);
+    mask = 1U << (31 - irq_num);
     LOG_UIC("%s: irq %d level %d uicsr %08" PRIx32
                 " mask %08" PRIx32 " => %08" PRIx32 " %08" PRIx32 "\n",
                 __func__, irq_num, level,
                 uic->uicsr, mask, uic->uicsr & mask, level << irq_num);
-    if (irq_num < 0 || irq_num > 31)
+    if (irq_num < 0 || irq_num > 31) {
         return;
+    }
     sr = uic->uicsr;
 
     /* Update status register */
     if (uic->uictr & mask) {
         /* Edge sensitive interrupt */
-        if (level == 1)
+        if (level == 1) {
             uic->uicsr |= mask;
+        }
     } else {
         /* Level sensitive interrupt */
         if (level == 1) {
@@ -188,11 +190,12 @@ static void ppcuic_set_irq (void *opaque, int irq_num, int level)
     }
     LOG_UIC("%s: irq %d level %d sr %" PRIx32 " => "
                 "%08" PRIx32 "\n", __func__, irq_num, level, uic->uicsr, sr);
-    if (sr != uic->uicsr)
+    if (sr != uic->uicsr) {
         ppcuic_trigger_irq(uic);
+    }
 }
 
-static uint32_t dcr_read_uic (void *opaque, int dcrn)
+static uint32_t dcr_read_uic(void *opaque, int dcrn)
 {
     ppcuic_t *uic;
     uint32_t ret;
@@ -220,13 +223,15 @@ static uint32_t dcr_read_uic (void *opaque, int dcrn)
         ret = uic->uicsr & uic->uicer;
         break;
     case DCR_UICVR:
-        if (!uic->use_vectors)
+        if (!uic->use_vectors) {
             goto no_read;
+        }
         ret = uic->uicvr;
         break;
     case DCR_UICVCR:
-        if (!uic->use_vectors)
+        if (!uic->use_vectors) {
             goto no_read;
+        }
         ret = uic->uicvcr;
         break;
     default:
@@ -238,7 +243,7 @@ static uint32_t dcr_read_uic (void *opaque, int dcrn)
     return ret;
 }
 
-static void dcr_write_uic (void *opaque, int dcrn, uint32_t val)
+static void dcr_write_uic(void *opaque, int dcrn, uint32_t val)
 {
     ppcuic_t *uic;
 
-- 
2.20.1
Re: [PATCH 1/8] hw/ppc/ppc4xx_devs: Make code style fixes to UIC code
Posted by Philippe Mathieu-Daudé 5 years, 1 month ago 
On 12/12/20 1:15 AM, Peter Maydell wrote:
> In a following commit we will move the PPC UIC implementation to
> its own file in hw/intc. To prevent checkpatch complaining about that
> code-motion, fix up the minor style issues first.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/ppc/ppc4xx_devs.c | 25 +++++++++++++++----------
>  1 file changed, 15 insertions(+), 10 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Re: [PATCH 1/8] hw/ppc/ppc4xx_devs: Make code style fixes to UIC code
Posted by Edgar E. Iglesias 5 years, 1 month ago 
On Sat, Dec 12, 2020 at 12:15:30AM +0000, Peter Maydell wrote:
> In a following commit we will move the PPC UIC implementation to
> its own file in hw/intc. To prevent checkpatch complaining about that
> code-motion, fix up the minor style issues first.

Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Tested-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>


> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/ppc/ppc4xx_devs.c | 25 +++++++++++++++----------
>  1 file changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
> index f1651e04d9a..f2f9ca4ffec 100644
> --- a/hw/ppc/ppc4xx_devs.c
> +++ b/hw/ppc/ppc4xx_devs.c
> @@ -105,7 +105,7 @@ struct ppcuic_t {
>      qemu_irq *irqs;
>  };
>  
> -static void ppcuic_trigger_irq (ppcuic_t *uic)
> +static void ppcuic_trigger_irq(ppcuic_t *uic)
>  {
>      uint32_t ir, cr;
>      int start, end, inc, i;
> @@ -156,26 +156,28 @@ static void ppcuic_trigger_irq (ppcuic_t *uic)
>      }
>  }
>  
> -static void ppcuic_set_irq (void *opaque, int irq_num, int level)
> +static void ppcuic_set_irq(void *opaque, int irq_num, int level)
>  {
>      ppcuic_t *uic;
>      uint32_t mask, sr;
>  
>      uic = opaque;
> -    mask = 1U << (31-irq_num);
> +    mask = 1U << (31 - irq_num);
>      LOG_UIC("%s: irq %d level %d uicsr %08" PRIx32
>                  " mask %08" PRIx32 " => %08" PRIx32 " %08" PRIx32 "\n",
>                  __func__, irq_num, level,
>                  uic->uicsr, mask, uic->uicsr & mask, level << irq_num);
> -    if (irq_num < 0 || irq_num > 31)
> +    if (irq_num < 0 || irq_num > 31) {
>          return;
> +    }
>      sr = uic->uicsr;
>  
>      /* Update status register */
>      if (uic->uictr & mask) {
>          /* Edge sensitive interrupt */
> -        if (level == 1)
> +        if (level == 1) {
>              uic->uicsr |= mask;
> +        }
>      } else {
>          /* Level sensitive interrupt */
>          if (level == 1) {
> @@ -188,11 +190,12 @@ static void ppcuic_set_irq (void *opaque, int irq_num, int level)
>      }
>      LOG_UIC("%s: irq %d level %d sr %" PRIx32 " => "
>                  "%08" PRIx32 "\n", __func__, irq_num, level, uic->uicsr, sr);
> -    if (sr != uic->uicsr)
> +    if (sr != uic->uicsr) {
>          ppcuic_trigger_irq(uic);
> +    }
>  }
>  
> -static uint32_t dcr_read_uic (void *opaque, int dcrn)
> +static uint32_t dcr_read_uic(void *opaque, int dcrn)
>  {
>      ppcuic_t *uic;
>      uint32_t ret;
> @@ -220,13 +223,15 @@ static uint32_t dcr_read_uic (void *opaque, int dcrn)
>          ret = uic->uicsr & uic->uicer;
>          break;
>      case DCR_UICVR:
> -        if (!uic->use_vectors)
> +        if (!uic->use_vectors) {
>              goto no_read;
> +        }
>          ret = uic->uicvr;
>          break;
>      case DCR_UICVCR:
> -        if (!uic->use_vectors)
> +        if (!uic->use_vectors) {
>              goto no_read;
> +        }
>          ret = uic->uicvcr;
>          break;
>      default:
> @@ -238,7 +243,7 @@ static uint32_t dcr_read_uic (void *opaque, int dcrn)
>      return ret;
>  }
>  
> -static void dcr_write_uic (void *opaque, int dcrn, uint32_t val)
> +static void dcr_write_uic(void *opaque, int dcrn, uint32_t val)
>  {
>      ppcuic_t *uic;
>  
> -- 
> 2.20.1
>
Re: [PATCH 1/8] hw/ppc/ppc4xx_devs: Make code style fixes to UIC code
Posted by David Gibson 5 years, 1 month ago 
On Sat, Dec 12, 2020 at 12:15:30AM +0000, Peter Maydell wrote:
> In a following commit we will move the PPC UIC implementation to
> its own file in hw/intc. To prevent checkpatch complaining about that
> code-motion, fix up the minor style issues first.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Applied to ppc-for-6.0, thanks.

> ---
>  hw/ppc/ppc4xx_devs.c | 25 +++++++++++++++----------
>  1 file changed, 15 insertions(+), 10 deletions(-)
> 
> diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
> index f1651e04d9a..f2f9ca4ffec 100644
> --- a/hw/ppc/ppc4xx_devs.c
> +++ b/hw/ppc/ppc4xx_devs.c
> @@ -105,7 +105,7 @@ struct ppcuic_t {
>      qemu_irq *irqs;
>  };
>  
> -static void ppcuic_trigger_irq (ppcuic_t *uic)
> +static void ppcuic_trigger_irq(ppcuic_t *uic)
>  {
>      uint32_t ir, cr;
>      int start, end, inc, i;
> @@ -156,26 +156,28 @@ static void ppcuic_trigger_irq (ppcuic_t *uic)
>      }
>  }
>  
> -static void ppcuic_set_irq (void *opaque, int irq_num, int level)
> +static void ppcuic_set_irq(void *opaque, int irq_num, int level)
>  {
>      ppcuic_t *uic;
>      uint32_t mask, sr;
>  
>      uic = opaque;
> -    mask = 1U << (31-irq_num);
> +    mask = 1U << (31 - irq_num);
>      LOG_UIC("%s: irq %d level %d uicsr %08" PRIx32
>                  " mask %08" PRIx32 " => %08" PRIx32 " %08" PRIx32 "\n",
>                  __func__, irq_num, level,
>                  uic->uicsr, mask, uic->uicsr & mask, level << irq_num);
> -    if (irq_num < 0 || irq_num > 31)
> +    if (irq_num < 0 || irq_num > 31) {
>          return;
> +    }
>      sr = uic->uicsr;
>  
>      /* Update status register */
>      if (uic->uictr & mask) {
>          /* Edge sensitive interrupt */
> -        if (level == 1)
> +        if (level == 1) {
>              uic->uicsr |= mask;
> +        }
>      } else {
>          /* Level sensitive interrupt */
>          if (level == 1) {
> @@ -188,11 +190,12 @@ static void ppcuic_set_irq (void *opaque, int irq_num, int level)
>      }
>      LOG_UIC("%s: irq %d level %d sr %" PRIx32 " => "
>                  "%08" PRIx32 "\n", __func__, irq_num, level, uic->uicsr, sr);
> -    if (sr != uic->uicsr)
> +    if (sr != uic->uicsr) {
>          ppcuic_trigger_irq(uic);
> +    }
>  }
>  
> -static uint32_t dcr_read_uic (void *opaque, int dcrn)
> +static uint32_t dcr_read_uic(void *opaque, int dcrn)
>  {
>      ppcuic_t *uic;
>      uint32_t ret;
> @@ -220,13 +223,15 @@ static uint32_t dcr_read_uic (void *opaque, int dcrn)
>          ret = uic->uicsr & uic->uicer;
>          break;
>      case DCR_UICVR:
> -        if (!uic->use_vectors)
> +        if (!uic->use_vectors) {
>              goto no_read;
> +        }
>          ret = uic->uicvr;
>          break;
>      case DCR_UICVCR:
> -        if (!uic->use_vectors)
> +        if (!uic->use_vectors) {
>              goto no_read;
> +        }
>          ret = uic->uicvcr;
>          break;
>      default:
> @@ -238,7 +243,7 @@ static uint32_t dcr_read_uic (void *opaque, int dcrn)
>      return ret;
>  }
>  
> -static void dcr_write_uic (void *opaque, int dcrn, uint32_t val)
> +static void dcr_write_uic(void *opaque, int dcrn, uint32_t val)
>  {
>      ppcuic_t *uic;
>  

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Re: [PATCH 1/8] hw/ppc/ppc4xx_devs: Make code style fixes to UIC code
Posted by Thomas Huth 5 years, 1 month ago 
On 12/12/2020 01.15, Peter Maydell wrote:
> In a following commit we will move the PPC UIC implementation to
> its own file in hw/intc. To prevent checkpatch complaining about that
> code-motion, fix up the minor style issues first.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/ppc/ppc4xx_devs.c | 25 +++++++++++++++----------
>  1 file changed, 15 insertions(+), 10 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.