[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 06/11] xen/arm: new vgic: update vgic_cpu_base



Hi,

On 23/09/2021 08:11, Penny Zheng wrote:
From: Stefano Stabellini <stefano.stabellini@xxxxxxxxxx>

In vgic_v2_map_resources, use the new vgic_cpu_base field of struct
vgic_dist instead of original local variable.

I think this wants to be folded in patch #5.


Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxx>
Signed-off-by: Penny Zheng <penny.zheng@xxxxxxx>
---
  xen/arch/arm/vgic/vgic-v2.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/xen/arch/arm/vgic/vgic-v2.c b/xen/arch/arm/vgic/vgic-v2.c
index b5ba4ace87..fd452fcb5a 100644
--- a/xen/arch/arm/vgic/vgic-v2.c
+++ b/xen/arch/arm/vgic/vgic-v2.c
@@ -258,7 +258,7 @@ void vgic_v2_enable(struct vcpu *vcpu)
  int vgic_v2_map_resources(struct domain *d)
  {
      struct vgic_dist *dist = &d->arch.vgic;
-    paddr_t cbase, csize;
+    paddr_t csize;
      paddr_t vbase;
      int ret;
@@ -276,7 +276,7 @@ int vgic_v2_map_resources(struct domain *d)
           * Note that we assume the size of the CPU interface is always
           * aligned to PAGE_SIZE.
           */
-        cbase = gic_v2_hw_data.cbase;
+        d->arch.vgic.vgic_cpu_base = gic_v2_hw_data.cbase;
          csize = gic_v2_hw_data.csize;
          vbase = gic_v2_hw_data.vbase;
      }
@@ -290,7 +290,7 @@ int vgic_v2_map_resources(struct domain *d)
           * region.
           */
          BUILD_BUG_ON(GUEST_GICC_SIZE != SZ_8K);
-        cbase = GUEST_GICC_BASE;
+        d->arch.vgic.vgic_cpu_base = GUEST_GICC_BASE;
          csize = GUEST_GICC_SIZE;
          vbase = gic_v2_hw_data.vbase + gic_v2_hw_data.aliased_offset;
      }
@@ -308,8 +308,8 @@ int vgic_v2_map_resources(struct domain *d)
       * Map the gic virtual cpu interface in the gic cpu interface
       * region of the guest.
       */
-    ret = map_mmio_regions(d, gaddr_to_gfn(cbase), csize / PAGE_SIZE,
-                           maddr_to_mfn(vbase));
+    ret = map_mmio_regions(d, gaddr_to_gfn(d->arch.vgic.vgic_cpu_base),
+                           csize / PAGE_SIZE, maddr_to_mfn(vbase));
      if ( ret )
      {
          gdprintk(XENLOG_ERR, "Unable to remap VGIC CPU to VCPU\n");


--
Julien Grall



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.