From patchwork Mon Jul 15 14:41:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 18364 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f198.google.com (mail-ye0-f198.google.com [209.85.213.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 20C7B25E13 for ; Mon, 15 Jul 2013 14:42:02 +0000 (UTC) Received: by mail-ye0-f198.google.com with SMTP id m13sf12912824yen.9 for ; Mon, 15 Jul 2013 07:42:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=MpzaYpnYARq2BLo4bDoaEVSLx1cGc2lsNIwYN0EA7AQ=; b=jQtgkXUST2189ZGgPKnc/xOiYSN4PM4fbjDcSbupWQdPV2C1OjwargWDZEPXa3enMi VIxv/kKOM8+BT93AU2HhDdXigZ/+M+Nz8oe/74rZvG1cvPMmeVRaLkRykhhMZRKHpLOe /9ZJ8ArdgdQJ99uXWqL2omyLnbzrsnHsaFiy4BhlIiPtqYvOo2/zm2BkOpovd/6AsMpt EDzmYo6lo45ohR2fR0eyNtyEnpcongdaILzLTJFfBJO4cMdMifFpkVGdbFcXaUjypUgu mShJtr9/yxfSDtTiXXWdNcqNwP2kJv2CiJCTaAYmPZGW5z3EsmWhm84n948yHxqLlB7z u/7Q== X-Received: by 10.236.201.19 with SMTP id a19mr28110370yho.24.1373899321777; Mon, 15 Jul 2013 07:42:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.58.4 with SMTP id m4ls4477011qeq.52.gmail; Mon, 15 Jul 2013 07:42:01 -0700 (PDT) X-Received: by 10.52.228.33 with SMTP id sf1mr16650852vdc.86.1373899321677; Mon, 15 Jul 2013 07:42:01 -0700 (PDT) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by mx.google.com with ESMTPS id im6si14827523vdb.137.2013.07.15.07.42.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Jul 2013 07:42:01 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.48; Received: by mail-vb0-f48.google.com with SMTP id w15so3225191vbf.35 for ; Mon, 15 Jul 2013 07:42:01 -0700 (PDT) X-Received: by 10.58.128.71 with SMTP id nm7mr12945835veb.51.1373899321568; Mon, 15 Jul 2013 07:42:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.149.77 with SMTP id s13csp72762vcv; Mon, 15 Jul 2013 07:42:00 -0700 (PDT) X-Received: by 10.194.174.38 with SMTP id bp6mr32889945wjc.83.1373899320210; Mon, 15 Jul 2013 07:42:00 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id l8si17470843wjb.16.2013.07.15.07.41.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Jul 2013 07:42:00 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=74.125.82.178; Received: by mail-we0-f178.google.com with SMTP id u53so10189891wes.37 for ; Mon, 15 Jul 2013 07:41:59 -0700 (PDT) X-Received: by 10.180.37.133 with SMTP id y5mr9199449wij.30.1373899319658; Mon, 15 Jul 2013 07:41:59 -0700 (PDT) Received: from belegaer.uk.xensource.com. (firewall.ctxuk.citrix.com. [46.33.159.2]) by mx.google.com with ESMTPSA id u9sm21375761wif.6.2013.07.15.07.41.58 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Jul 2013 07:41:58 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Cc: ian.campbell@citrix.com, Stefano.Stabellini@eu.citrix.com, patches@linaro.org, Julien Grall Subject: [PATCH v2] xen/arm: Implement MPIDR per VCPU Date: Mon, 15 Jul 2013 15:41:55 +0100 Message-Id: <1373899315-19137-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQmHwlMGjhthJG0nb2NCcEImA8me4S6UKgth0vLFzjGFpsd0xifCGP5bB5s1KNBEYZlGk8Sg X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Use different affinity for each VCPU and always expose an SMP systems to the guest. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- Changes in v2: - Create a virtual MPIDR during the VCPU initialization --- xen/arch/arm/domain.c | 10 ++++++++-- xen/include/asm-arm/domain.h | 2 +- xen/include/asm-arm/processor.h | 6 ++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 6937abf..bcf1755 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -140,7 +140,7 @@ static void ctxt_switch_to(struct vcpu *n) isb(); WRITE_SYSREG32(n->domain->arch.vpidr, VPIDR_EL2); - WRITE_SYSREG(n->domain->arch.vmpidr, VMPIDR_EL2); + WRITE_SYSREG(n->arch.vmpidr, VMPIDR_EL2); /* VGIC */ gic_restore_state(n); @@ -451,7 +451,14 @@ int vcpu_initialise(struct vcpu *v) return rc; v->arch.sctlr = SCTLR_BASE; + /* + * By default exposes an SMP system with AFFO set to the VCPU ID + * TODO: Handle multi-threading processor and cluster + */ + v->arch.vmpidr = MPIDR_SMP | (v->vcpu_id << MPIDR_AFF0_SHIFT); + v->arch.actlr = READ_SYSREG32(ACTLR_EL1); + /* XXX: Handle other than CA15 cpus */ if ( v->domain->max_vcpus > 1 ) v->arch.actlr |= ACTLR_CA15_SMP; @@ -490,7 +497,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) /* Default the virtual ID to match the physical */ d->arch.vpidr = boot_cpu_data.midr.bits; - d->arch.vmpidr = boot_cpu_data.mpidr.bits; clear_page(d->shared_info); share_xen_page_with_guest( diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 339b6e6..425eb71 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -68,7 +68,6 @@ struct arch_domain /* Virtual CPUID */ uint32_t vpidr; - register_t vmpidr; struct { uint64_t offset; @@ -194,6 +193,7 @@ struct arch_vcpu /* CP 15 */ uint32_t csselr; + uint32_t vmpidr; uint32_t gic_hcr, gic_vmcr, gic_apr; uint32_t gic_lr[64]; diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 1c9d793..5181e7b 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -6,6 +6,12 @@ /* MIDR Main ID Register */ #define MIDR_MASK 0xff0ffff0 +/* MPIDR Multiprocessor Affinity Register */ +#define MPIDR_UP (1 << 30) +#define MPIDR_SMP (1 << 31) +#define MPIDR_AFF0_SHIFT (0) +#define MPIDR_AFF0_MASK (0xff << MPIDR_AFF0_SHIFT) + /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE 0x80000000 #define TTBCR_N_MASK 0x07