From patchwork Mon Jan 19 16:29:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 43317 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4985D2034D for ; Mon, 19 Jan 2015 16:31:16 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id bs8sf8290770wib.1 for ; Mon, 19 Jan 2015 08:31:15 -0800 (PST) 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:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=0vL1with+uTFBfL6grZf46jqQp2QZqQWyqNNuy3B2ac=; b=fZcJOFkG3DMt4H4DL1dubIqe+xvLWbfdKmjI2VccZ/XhCoe3Vdcd1x/4Lu124C2LxW qCrglhpLOLQJNr6lcv5BJS/CgOVNT5W2TgKVDHRsJyEVlq8FdknQ3Dw2o3UB9OCiEVoK NeaIDW7EdT40iZNj6fqKBU53cCqdoDb3uTqCrzB/+SiZDvTmTtAPaqaEpuwSrh0RgTV4 +bBhy2hm4aq59YweLOcH+QTdi77ua6hMgYIPl+xeA1VLIdbwMUo1Z6eCiVqQWzk7RtIz YvTqSEmic/hOAL4NR/yjat00zMCeJIzr1i3hqWTg4Js+v29GyRGrfc149bO2IaFN5ZyX USLQ== X-Gm-Message-State: ALoCoQmPG9qhdPcWucRKcpGaht0pgEImyTx/YXdC+PJ6wzOtFPHw43Y00rvPjYC2haFg8hJOJr8G X-Received: by 10.112.13.161 with SMTP id i1mr379968lbc.20.1421685075621; Mon, 19 Jan 2015 08:31:15 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.220.164 with SMTP id px4ls581773lac.34.gmail; Mon, 19 Jan 2015 08:31:15 -0800 (PST) X-Received: by 10.152.36.1 with SMTP id m1mr17203142laj.95.1421685075472; Mon, 19 Jan 2015 08:31:15 -0800 (PST) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id oe5si12488255lbb.2.2015.01.19.08.31.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 19 Jan 2015 08:31:14 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by mail-lb0-f181.google.com with SMTP id u14so19583330lbd.12 for ; Mon, 19 Jan 2015 08:31:13 -0800 (PST) X-Received: by 10.152.45.4 with SMTP id i4mr32893779lam.74.1421685073411; Mon, 19 Jan 2015 08:31:13 -0800 (PST) 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.112.9.200 with SMTP id c8csp1144435lbb; Mon, 19 Jan 2015 08:31:12 -0800 (PST) X-Received: by 10.52.114.73 with SMTP id je9mr1091500vdb.96.1421685071468; Mon, 19 Jan 2015 08:31:11 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id kq14si4728120vcb.49.2015.01.19.08.31.10 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 19 Jan 2015 08:31:11 -0800 (PST) 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 1YDFDD-0006Sy-DY; Mon, 19 Jan 2015 16:29:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YDFDC-0006RL-70 for xen-devel@lists.xenproject.org; Mon, 19 Jan 2015 16:29:58 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 4E/5B-02696-5013DB45; Mon, 19 Jan 2015 16:29:57 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-14.tower-27.messagelabs.com!1421684996!21553148!1 X-Originating-IP: [209.85.212.174] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15143 invoked from network); 19 Jan 2015 16:29:56 -0000 Received: from mail-wi0-f174.google.com (HELO mail-wi0-f174.google.com) (209.85.212.174) by server-14.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 19 Jan 2015 16:29:56 -0000 Received: by mail-wi0-f174.google.com with SMTP id n3so396938wiv.1 for ; Mon, 19 Jan 2015 08:29:56 -0800 (PST) X-Received: by 10.180.98.138 with SMTP id ei10mr37239259wib.32.1421684996140; Mon, 19 Jan 2015 08:29:56 -0800 (PST) Received: from chilopoda.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id fw6sm14830368wib.1.2015.01.19.08.29.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Jan 2015 08:29:55 -0800 (PST) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Mon, 19 Jan 2015 16:29:13 +0000 Message-Id: <1421684957-29884-7-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1421684957-29884-1-git-send-email-julien.grall@linaro.org> References: <1421684957-29884-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH 06/10] xen/arm: vgic-v3: Print the domain/vcpu in each message 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.217.181 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: Also remove vGICv3 in the message log as gdprintk already print the name of the file. Signed-off-by: Julien Grall --- xen/arch/arm/vgic-v3.c | 85 ++++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 9818a6b..704b774 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -179,13 +179,13 @@ static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, /* Reserved0 */ goto read_as_zero; default: - printk("vGICv3: vGICR: read r%d offset %#08x\n not found", - dabt.reg, gicr_reg); + gdprintk(XENLOG_ERR, "vGICR: read r%d offset %#08x\n not found", + dabt.reg, gicr_reg); return 0; } bad_width: - printk("vGICv3: vGICR: bad read width %d r%d offset %#08x\n", - dabt.size, dabt.reg, gicr_reg); + gdprintk(XENLOG_ERR, "vGICR: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, gicr_reg); domain_crash_synchronous(); return 0; @@ -249,7 +249,8 @@ static int __vgic_v3_rdistr_rd_mmio_write(struct vcpu *v, mmio_info_t *info, /* RO */ goto write_ignore; default: - printk("vGICR: write r%d offset %#08x\n not found", dabt.reg, gicr_reg); + gdprintk(XENLOG_ERR, "vGICR: write r%d offset %#08x\n not found", + dabt.reg, gicr_reg); return 0; } write_ignore: @@ -341,15 +342,14 @@ static int __vgic_v3_distr_common_mmio_read(struct vcpu *v, mmio_info_t *info, vgic_unlock_rank(v, rank, flags); return 1; default: - printk("vGICv3: vGICD/vGICR: unhandled read r%d offset %#08x\n", - dabt.reg, reg); + gdprintk(XENLOG_ERR, "vGIC{D,R}: unhandled read r%d offset %#08x\n", + dabt.reg, reg); return 0; } bad_width: - dprintk(XENLOG_ERR, - "vGICv3: vGICD/vGICR: bad read width %d r%d offset %#08x\n", - dabt.size, dabt.reg, reg); + gdprintk(XENLOG_ERR, "vGIC{D,R}: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, reg); domain_crash_synchronous(); return 0; @@ -456,15 +456,16 @@ static int __vgic_v3_distr_common_mmio_write(struct vcpu *v, mmio_info_t *info, vgic_unlock_rank(v, rank, flags); return 1; default: - printk("vGICv3: vGICD/vGICR: unhandled write r%d " - "=%"PRIregister" offset %#08x\n", dabt.reg, *r, reg); + gdprintk(XENLOG_ERR, + "vGIC{D,R}: unhandled write r%d=%"PRIregister" offset %#08x\n", + dabt.reg, *r, reg); return 0; } bad_width: - dprintk(XENLOG_ERR, - "vGICv3: vGICD/vGICR: bad write width %d r%d=%"PRIregister" " - "offset %#08x\n", dabt.size, dabt.reg, *r, reg); + gdprintk(XENLOG_ERR, + "vGIC{D,R}: bad write width %d r%d=%"PRIregister" offset %#08x\n", + dabt.size, dabt.reg, *r, reg); domain_crash_synchronous(); return 0; @@ -521,13 +522,13 @@ static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, if ( dabt.size != DABT_WORD ) goto bad_width; return 1; default: - printk("vGICv3: vGICR: read r%d offset %#08x\n not found", - dabt.reg, gicr_reg); + gdprintk(XENLOG_ERR, "vGICR: SGI: read r%d offset %#08x\n not found", + dabt.reg, gicr_reg); return 0; } bad_width: - printk("vGICv3: vGICR: bad read width %d r%d offset %#08x\n", - dabt.size, dabt.reg, gicr_reg); + gdprintk(XENLOG_ERR, "vGICR: SGI: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, gicr_reg); domain_crash_synchronous(); return 0; @@ -587,14 +588,15 @@ static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, /* We do not implement security extensions for guests, write ignore */ goto write_ignore; default: - printk("vGICv3: vGICR SGI: write r%d offset %#08x\n not found", - dabt.reg, gicr_reg); + gdprintk(XENLOG_ERR, "vGICR: SGI: write r%d offset %#08x\n not found", + dabt.reg, gicr_reg); return 0; } bad_width: - printk("vGICR SGI: bad write width %d r%d=%"PRIregister" offset %#08x\n", - dabt.size, dabt.reg, *r, gicr_reg); + gdprintk(XENLOG_ERR, + "vGICR: SGI: bad write width %d r%d=%"PRIregister" offset %#08x\n", + dabt.size, dabt.reg, *r, gicr_reg); domain_crash_synchronous(); return 0; @@ -622,7 +624,7 @@ static int vgic_v3_rdistr_mmio_read(struct vcpu *v, mmio_info_t *info) return vgic_v3_rdistr_sgi_mmio_read(v, info, (offset - SZ_64K)); else gdprintk(XENLOG_WARNING, - "vGICv3: vGICR: unknown gpa read address %"PRIpaddr"\n", + "vGICR: unknown gpa read address %"PRIpaddr"\n", info->gpa); return 0; @@ -646,7 +648,7 @@ static int vgic_v3_rdistr_mmio_write(struct vcpu *v, mmio_info_t *info) return vgic_v3_rdistr_sgi_mmio_write(v, info, (offset - SZ_64K)); else gdprintk(XENLOG_WARNING, - "vGICV3: vGICR: unknown gpa write address %"PRIpaddr"\n", + "vGICR: unknown gpa write address %"PRIpaddr"\n", info->gpa); return 0; @@ -796,14 +798,14 @@ static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) /* These are reserved register addresses */ goto read_as_zero; default: - printk("vGICv3: vGICD: unhandled read r%d offset %#08x\n", - dabt.reg, gicd_reg); + gdprintk(XENLOG_ERR, "vGICD: unhandled read r%d offset %#08x\n", + dabt.reg, gicd_reg); return 0; } bad_width: - dprintk(XENLOG_ERR, "vGICv3: vGICD: bad read width %d r%d offset %#08x\n", - dabt.size, dabt.reg, gicd_reg); + gdprintk(XENLOG_ERR, "vGICD: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, gicd_reg); domain_crash_synchronous(); return 0; @@ -865,8 +867,9 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case 0x020 ... 0x03c: case 0xc000 ... 0xffcc: /* Implementation defined -- write ignored */ - printk("vGICv3: vGICD: write unknown 0x020 - 0x03c r%d offset %#08x\n", - dabt.reg, gicd_reg); + gdprintk(XENLOG_WARNING, + "vGICD: write unknown 0x020 - 0x03c r%d offset %#08x\n", + dabt.reg, gicd_reg); goto write_ignore; case GICD_IGROUPR ... GICD_IGROUPRN: case GICD_ISENABLER ... GICD_ISENABLERN: @@ -910,8 +913,9 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) new_target = new_irouter & MPIDR_AFF0_MASK; if ( new_target >= v->domain->max_vcpus ) { - printk("vGICv3: vGICD: wrong irouter at offset %#08x\n val 0x%lx vcpu %x", - gicd_reg, new_target, v->domain->max_vcpus); + gdprintk(XENLOG_ERR, + "vGICD: wrong irouter at offset %#08x\n val 0x%lx vcpu %x", + gicd_reg, new_target, v->domain->max_vcpus); vgic_unlock_rank(v, rank, flags); return 0; } @@ -951,19 +955,20 @@ static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) case 0xf30 ... 0x5fcc: case 0x8000 ... 0xbfcc: /* Reserved register addresses */ - printk("vGICv3: vGICD: write unknown 0x00c 0xfcc r%d offset %#08x\n", - dabt.reg, gicd_reg); + gdprintk(XENLOG_WARNING, "write unknown 0x00c 0xfcc r%d offset %#08x\n", + dabt.reg, gicd_reg); goto write_ignore; default: - printk("vGICv3: vGICD: unhandled write r%d=%"PRIregister" " - "offset %#08x\n", dabt.reg, *r, gicd_reg); + gdprintk(XENLOG_ERR, + "vGICD: unhandled write r%d=%"PRIregister" offset %#08x\n", + dabt.reg, *r, gicd_reg); return 0; } bad_width: - dprintk(XENLOG_ERR, - "VGICv3: vGICD: bad write width %d r%d=%"PRIregister" " - "offset %#08x\n", dabt.size, dabt.reg, *r, gicd_reg); + gdprintk(XENLOG_ERR, + "vGICD: bad write width %d r%d=%"PRIregister" offset %#08x\n", + dabt.size, dabt.reg, *r, gicd_reg); domain_crash_synchronous(); return 0;