From patchwork Tue May 20 14:16:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 4210811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A1B399F23C for ; Tue, 20 May 2014 14:19:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BDD082020F for ; Tue, 20 May 2014 14:19:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B9D1F201C8 for ; Tue, 20 May 2014 14:19:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WmkqX-0004J6-TP; Tue, 20 May 2014 14:16:49 +0000 Received: from mail-we0-f175.google.com ([74.125.82.175]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WmkqU-0004Ct-1n for linux-arm-kernel@lists.infradead.org; Tue, 20 May 2014 14:16:48 +0000 Received: by mail-we0-f175.google.com with SMTP id t61so581954wes.20 for ; Tue, 20 May 2014 07:16:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=0G6T1cOB/cIAiXtfWVxfnGXlWa3KnvoXtojfRdcQKik=; b=jUK7CnnA1PgzeljU+j7z5Id3K9mleuGE550AaWH429hK2urz0dQBYZqZZWFxxSE7jD u/niMr/E7ynr37r8fqvHyQ7W6fsBLfZkCGWqzkRmY3rdPNMlKdEz5NPAIGdZNIdA1Hfu gbUytZD1tExxkJ6rFEaUYcr+75H1gXMX3UuStv1l3suOmeaYxGbMuGvHlXaH5Yj2oOqc hpNi7q0n4iCxDjm2c2jR4HfPnCJr286yeth80TXEOpIv2hQLrHS8JWKhdXQ9BZjuXs2e HjjESJOxq2tmwX/HXLruFyP9kjGhOpE2f8Skibjn0lB+i01kzZHVeE0eg6uXxZyWG15o SjmA== X-Gm-Message-State: ALoCoQmkVem+rl+BTrwZjjCWf9RGRSN8vh42AZ70/b/EE5iEM3m0GZh4xzvtcLZnmTaSOrry9eVU MIME-Version: 1.0 X-Received: by 10.180.13.139 with SMTP id h11mr4447687wic.34.1400595383005; Tue, 20 May 2014 07:16:23 -0700 (PDT) Received: by 10.194.79.66 with HTTP; Tue, 20 May 2014 07:16:22 -0700 (PDT) In-Reply-To: <20140520140153.GL5292@lvm> References: <1400591427-21922-1-git-send-email-haojian.zhuang@linaro.org> <1400591427-21922-15-git-send-email-haojian.zhuang@linaro.org> <20140520134441.GK5292@lvm> <20140520140153.GL5292@lvm> Date: Tue, 20 May 2014 22:16:22 +0800 Message-ID: Subject: Re: [PATCH v9 14/14] virt: arm: support hip04 gic From: Haojian Zhuang To: Christoffer Dall X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140520_071646_392830_E8C2D6B2 X-CRM114-Status: GOOD ( 22.24 ) X-Spam-Score: -0.7 (/) Cc: Nicolas Pitre , Russell King - ARM Linux , Jason Cooper , Arnd Bergmann , "khilman@kernel.org" , Marc Zyngier , Xu Wei , Olof Johansson , "tglx@linutronix.de" , Dave Martin , "linux-arm-kernel@lists.infradead.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 20 May 2014 22:01, Christoffer Dall wrote: > On Tue, May 20, 2014 at 09:52:53PM +0800, Haojian Zhuang wrote: >> On 20 May 2014 21:44, Christoffer Dall wrote: >> > On Tue, May 20, 2014 at 09:10:27PM +0800, Haojian Zhuang wrote: > > [...] > >> >> diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c >> >> index 47b2983..4c0c1e9 100644 >> >> --- a/virt/kvm/arm/vgic.c >> >> +++ b/virt/kvm/arm/vgic.c >> >> @@ -76,6 +76,8 @@ >> >> #define IMPLEMENTER_ARM 0x43b >> >> #define GICC_ARCH_VERSION_V2 0x2 >> >> >> >> +#define vgic_nr_lr(vcpu) (vcpu->hw_cfg & HWCFG_NR_LR_MASK) >> >> + >> >> /* Physical address of vgic virtual cpu interface */ >> >> static phys_addr_t vgic_vcpu_base; >> >> >> >> @@ -97,7 +99,7 @@ static void vgic_retire_disabled_irqs(struct kvm_vcpu *vcpu); >> >> static void vgic_update_state(struct kvm *kvm); >> >> static void vgic_kick_vcpus(struct kvm *kvm); >> >> static void vgic_dispatch_sgi(struct kvm_vcpu *vcpu, u32 reg); >> >> -static u32 vgic_nr_lr; >> >> +static u32 vgic_hw_cfg; >> >> >> >> static unsigned int vgic_maint_irq; >> >> >> >> @@ -624,9 +626,9 @@ static void vgic_unqueue_irqs(struct kvm_vcpu *vcpu) >> >> struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu; >> >> int vcpu_id = vcpu->vcpu_id; >> >> int i, irq, source_cpu; >> >> - u32 *lr; >> >> + u32 *lr, nr_lr = vgic_nr_lr(vgic_cpu); >> > >> > This is static for any system post-boot, right? Can't we set this >> > global variable once like we did before instead of having to define >> > these extra variables and do the bit manipulation all over the place? >> > >> > -Christoffer >> >> I tried to define a global gich_apr variable before. But Marc didn't agree on >> that. He suggested to use vgic_cpu_nr_lr to save both GICH_APR offset >> and nr_lr. >> >> Adding gich_apr variable should be the simpler implementation. >> > You're talking about storing this information on the vgic_cpu struct, > which is accessed on every world-switch patch. There, you don't want > two memory accesses. > It's the implementation of gich_apr in arm32. We needn't add or change anything in struct vgic_cpu. And both the assembly code and the code could be much easier. > Here, on the other hand, you're in host kernel land, and you can do your > bit-shuffling once, and always access a single static variable like we > did before, which will simplify the C-code. > No bit-shuffling in gich_apr implementation. Is it right? Regards Haojian diff --git a/arch/arm/kvm/interrupts_head.S b/arch/arm/kvm/interrupts_head.S index 76af9302..b27e43f 100644 --- a/arch/arm/kvm/interrupts_head.S +++ b/arch/arm/kvm/interrupts_head.S @@ -419,7 +419,9 @@ vcpu .req r0 @ vcpu pointer always in r0 ldr r7, [r2, #GICH_EISR1] ldr r8, [r2, #GICH_ELRSR0] ldr r9, [r2, #GICH_ELRSR1] - ldr r10, [r2, #GICH_APR] + ldr r10, =gich_apr + ldr r10, [r10] + ldr r10, [r2, r10] str r3, [r11, #VGIC_CPU_HCR] str r4, [r11, #VGIC_CPU_VMCR] @@ -435,7 +437,11 @@ vcpu .req r0 @ vcpu pointer always in r0 str r5, [r2, #GICH_HCR] /* Save list registers */ - add r2, r2, #GICH_LR0 + ldr r10, =gich_apr + ldr r10, [r10] + /* the offset between GICH_APR & GICH_LR0 is 0x10 */ + add r10, r10, #0x10 + add r2, r2, r10 add r3, r11, #VGIC_CPU_LR ldr r4, [r11, #VGIC_CPU_NR_LR] 1: ldr r6, [r2], #4 @@ -469,10 +475,16 @@ vcpu .req r0 @ vcpu pointer always in r0 str r3, [r2, #GICH_HCR] str r4, [r2, #GICH_VMCR] - str r8, [r2, #GICH_APR] + ldr r6, =gich_apr + ldr r6, [r6] + str r8, [r2, r6] /* Restore list registers */ - add r2, r2, #GICH_LR0 + ldr r6, =gich_apr + ldr r6, [r6] + /* the offset between GICH_APR & GICH_LR0 is 0x10 */ + add r6, r6, #0x10 + add r2, r2, r6 add r3, r11, #VGIC_CPU_LR ldr r4, [r11, #VGIC_CPU_NR_LR] 1: ldr r6, [r3], #4 @@ -618,3 +630,7 @@ vcpu .req r0 @ vcpu pointer always in r0 .macro load_vcpu mrc p15, 4, vcpu, c13, c0, 2 @ HTPIDR .endm + + .global gich_apr +gich_apr: + .long GICH_APR diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index 47b2983..6bf31db 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -1470,17 +1470,30 @@ static struct notifier_block vgic_cpu_nb = { .notifier_call = vgic_cpu_notify, }; +static const struct of_device_id of_vgic_ids[] = { + { + .compatible = "arm,cortex-a15-gic", + .data = (void *)GICH_APR, + }, { + .compatible = "hisilicon,hip04-gic", + .data = (void *)HIP04_GICH_APR, + }, { + }, +}; + int kvm_vgic_hyp_init(void) { int ret; struct resource vctrl_res; struct resource vcpu_res; + const struct of_device_id *match; - vgic_node = of_find_compatible_node(NULL, NULL, "arm,cortex-a15-gic"); + vgic_node = of_find_matching_node_and_match(NULL, of_vgic_ids, &match); if (!vgic_node) { kvm_err("error: no compatible vgic node in DT\n"); return -ENODEV; } + gich_apr = (unsigned int)match->data; vgic_maint_irq = irq_of_parse_and_map(vgic_node, 0); if (!vgic_maint_irq) {