From patchwork Wed Jul 2 13:19:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 32983 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 819B220560 for ; Wed, 2 Jul 2014 13:21:34 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id uy5sf65849474obc.9 for ; Wed, 02 Jul 2014 06:21:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:cc:subject :precedence:list-id:list-unsubscribe:list-post:list-help :list-subscribe:mime-version:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive :content-type:content-transfer-encoding; bh=NSWS6EkX4nNn9wHEm9T0SeFIV9STRm/4g0qyhcjOeI0=; b=lhAIFr3Qj/5wpgLgjBEDSK3rGE0kdz7HLC6Br7oEpaWSsxnLRdS5mZ1MSQrLDv0raW IulS0o1JYRBQwz1oSZ84C7tLeu/H4iHpexkol+xRnK2aekbtzvBuDGX1UkLX0SQ2qxBc GsmA/loOhLO56EfYcwl209ahv5iv76Ipi5MAc581VZ5eZ2XHBWrDQr31ldFA9caczRTK spLxZfG1aQXWquXpUsz1bVO+azr5Cli3Lu3DHkrz4EiJq5//hQ2tzAJBiTyRV15KTw91 lW/UBYuCTQRgD5/Ra9gfCPCOoCkNtrOglp6MnJDrwT40G8iYR0lvyPT1pcoZ299iyGWS nFJA== X-Gm-Message-State: ALoCoQnXqNWUEI22023S9mgcAgWYce2e2HEOh6OlbBd0PkXQ3ggCIhCnJ3/MP6XBsEJ8EwHf/uxu X-Received: by 10.182.250.229 with SMTP id zf5mr28959779obc.4.1404307294100; Wed, 02 Jul 2014 06:21:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.34 with SMTP id i31ls51022qgf.51.gmail; Wed, 02 Jul 2014 06:21:33 -0700 (PDT) X-Received: by 10.52.252.193 with SMTP id zu1mr41442269vdc.7.1404307293943; Wed, 02 Jul 2014 06:21:33 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id zc18si2090331vdb.46.2014.07.02.06.21.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Jul 2014 06:21:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.182 as permitted sender) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id oy12so11067358veb.41 for ; Wed, 02 Jul 2014 06:21:33 -0700 (PDT) X-Received: by 10.58.182.234 with SMTP id eh10mr290961vec.41.1404307293855; Wed, 02 Jul 2014 06:21:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp292703vcb; Wed, 2 Jul 2014 06:21:33 -0700 (PDT) X-Received: by 10.42.148.67 with SMTP id q3mr3782109icv.5.1404307293094; Wed, 02 Jul 2014 06:21:33 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id l6si5904859igv.10.2014.07.02.06.21.32 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 02 Jul 2014 06:21:33 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2KRc-0007r2-9D; Wed, 02 Jul 2014 13:19:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X2KRa-0007qv-V9 for xen-devel@lists.xenproject.org; Wed, 02 Jul 2014 13:19:27 +0000 Received: from [85.158.143.35:3329] by server-3.bemta-4.messagelabs.com id AE/81-16194-ED604B35; Wed, 02 Jul 2014 13:19:26 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-4.tower-21.messagelabs.com!1404307165!15342803!1 X-Originating-IP: [209.85.212.171] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21545 invoked from network); 2 Jul 2014 13:19:25 -0000 Received: from mail-wi0-f171.google.com (HELO mail-wi0-f171.google.com) (209.85.212.171) by server-4.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 2 Jul 2014 13:19:25 -0000 Received: by mail-wi0-f171.google.com with SMTP id n15so9627761wiw.16 for ; Wed, 02 Jul 2014 06:19:25 -0700 (PDT) X-Received: by 10.180.198.116 with SMTP id jb20mr4239262wic.59.1404307165086; Wed, 02 Jul 2014 06:19:25 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id cd1sm55073946wjc.19.2014.07.02.06.19.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Jul 2014 06:19:24 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Wed, 2 Jul 2014 14:19:20 +0100 Message-Id: <1404307160-4883-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v2] xen/arm: Small fixes after GICv2 changes by commit ee65c87 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: The commit ee65c87 moves the GICv2 code in a separate file. Even though this patch is only deals with code movement, a comment was modify for no reason. Also rename gicv_v2_init into gicv2v_setup which is what the function does and less confusing with the other function called gicv2_init. Signed-off-by: Julien Grall --- Changes in v2: - Update the caller of gic_v2_init --- xen/arch/arm/gic-v2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 695c232..cc60af8 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -372,12 +372,12 @@ static void gicv2_clear_lr(int lr) writel_relaxed(0, GICH + GICH_LR + lr * 4); } -static int gicv_v2_init(struct domain *d) +static int gicv2v_setup(struct domain *d) { int ret; /* - * Domain 0 gets the hardware address. + * The hardware domain gets the hardware address. * Guests get the virtual platform layout. */ if ( is_hardware_domain(d) ) @@ -566,7 +566,7 @@ const static struct gic_hw_operations gicv2_ops = { .save_state = gicv2_save_state, .restore_state = gicv2_restore_state, .dump_state = gicv2_dump_state, - .gicv_setup = gicv_v2_init, + .gicv_setup = gicv2v_setup, .gic_host_irq_type = &gicv2_host_irq_type, .gic_guest_irq_type = &gicv2_guest_irq_type, .eoi_irq = gicv2_eoi_irq,