From patchwork Tue Mar 25 16:55:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 27063 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 03AE020539 for ; Tue, 25 Mar 2014 16:57:55 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lj1sf1804400pab.9 for ; Tue, 25 Mar 2014 09:57:55 -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:in-reply-to :references: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=PUH5rpviZSuKVAnnwMXfzt3SdEk0GK1pOvw2xdX79wY=; b=EkVak5mxEfKmkCYAQn7S8XLsJ8fjDuyjkUjEAP3c8zi+6sb/zbS2e+uJXqzh7gWxmc qRPv13+iEfhuyahp9OT43N4O07CXie2vM56RNTal3a5QkBiLDlXiFAUieAatzCePfIaT 2HXylH2BDtbY6lNQ0aylQNPDj0CPfw6kCUFzn2kY9f/vSbp2lC9/pLsopbnWreqyn9xE boi+qOGFFinolSmFycAE8ZA8W6j7/wBFXVV7NqTQR7kpaDeue/l+t/ry0mojHY+Uywsh yclADgTHGyC+yliY9kTlrlABmNmcjS35MXwr947E/kEutJJGKQq70nxhh/vKlOnRnRsb etxA== X-Gm-Message-State: ALoCoQnCnt+2j2ugu2V0hKQpIxYbCW80Yw/Gvax894f2xMYazAPN0YkJUlyCKam1Db2z63K7ETJA X-Received: by 10.68.197.73 with SMTP id is9mr29227610pbc.0.1395766675269; Tue, 25 Mar 2014 09:57:55 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.134 with SMTP id b6ls269101qgb.91.gmail; Tue, 25 Mar 2014 09:57:55 -0700 (PDT) X-Received: by 10.52.251.199 with SMTP id zm7mr48376285vdc.21.1395766675121; Tue, 25 Mar 2014 09:57:55 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id wy9si2610022vdc.181.2014.03.25.09.57.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Mar 2014 09:57:55 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id id10so911562vcb.26 for ; Tue, 25 Mar 2014 09:57:55 -0700 (PDT) X-Received: by 10.52.119.197 with SMTP id kw5mr47809980vdb.5.1395766675042; Tue, 25 Mar 2014 09:57:55 -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.220.78.9 with SMTP id i9csp320367vck; Tue, 25 Mar 2014 09:57:54 -0700 (PDT) X-Received: by 10.140.27.109 with SMTP id 100mr54306537qgw.14.1395766674703; Tue, 25 Mar 2014 09:57:54 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id i5si7739359qcd.5.2014.03.25.09.57.54 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 25 Mar 2014 09:57:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) 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 1WSUeg-0000lP-Mb; Tue, 25 Mar 2014 16:56:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WSUeY-0000bE-UJ for xen-devel@lists.xenproject.org; Tue, 25 Mar 2014 16:56:45 +0000 Received: from [85.158.143.35:6737] by server-2.bemta-4.messagelabs.com id 36/F6-06539-A45B1335; Tue, 25 Mar 2014 16:56:42 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-13.tower-21.messagelabs.com!1395766601!4616494!1 X-Originating-IP: [74.125.83.44] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30428 invoked from network); 25 Mar 2014 16:56:41 -0000 Received: from mail-ee0-f44.google.com (HELO mail-ee0-f44.google.com) (74.125.83.44) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 25 Mar 2014 16:56:41 -0000 Received: by mail-ee0-f44.google.com with SMTP id e49so690005eek.3 for ; Tue, 25 Mar 2014 09:56:41 -0700 (PDT) X-Received: by 10.15.91.77 with SMTP id r53mr3877228eez.70.1395766601257; Tue, 25 Mar 2014 09:56:41 -0700 (PDT) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id h47sm33377501eey.13.2014.03.25.09.56.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Mar 2014 09:56:40 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 25 Mar 2014 16:55:33 +0000 Message-Id: <1395766541-23979-27-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395766541-23979-1-git-send-email-julien.grall@linaro.org> References: <1395766541-23979-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 26/34] xen/arm: traps: Drop dump_guest_s1_walk 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=neutral (google.com: 209.85.220.181 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: This function is not used neither export. Signed-off-by: Julien Grall Cc: Ian Campbell Cc: Stefano Stabellini Cc: Tim Deegan Acked-by: Ian Campbell --- xen/arch/arm/traps.c | 56 -------------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 2109d03..b1475f3 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1422,62 +1422,6 @@ static void do_sysreg(struct cpu_user_regs *regs, } #endif -void dump_guest_s1_walk(struct domain *d, vaddr_t addr) -{ - register_t ttbcr = READ_SYSREG(TCR_EL1); - uint64_t ttbr0 = READ_SYSREG64(TTBR0_EL1); - paddr_t paddr; - uint32_t offset; - uint32_t *first = NULL, *second = NULL; - - printk("dom%d VA 0x%08"PRIvaddr"\n", d->domain_id, addr); - printk(" TTBCR: 0x%08"PRIregister"\n", ttbcr); - printk(" TTBR0: 0x%016"PRIx64" = 0x%"PRIpaddr"\n", - ttbr0, p2m_lookup(d, ttbr0 & PAGE_MASK, NULL)); - - if ( ttbcr & TTBCR_EAE ) - { - printk("Cannot handle LPAE guest PT walk\n"); - return; - } - if ( (ttbcr & TTBCR_N_MASK) != 0 ) - { - printk("Cannot handle TTBR1 guest walks\n"); - return; - } - - paddr = p2m_lookup(d, ttbr0 & PAGE_MASK, NULL); - if ( paddr == INVALID_PADDR ) - { - printk("Failed TTBR0 maddr lookup\n"); - goto done; - } - first = map_domain_page(paddr>>PAGE_SHIFT); - - offset = addr >> (12+10); - printk("1ST[0x%"PRIx32"] (0x%"PRIpaddr") = 0x%08"PRIx32"\n", - offset, paddr, first[offset]); - if ( !(first[offset] & 0x1) || - !(first[offset] & 0x2) ) - goto done; - - paddr = p2m_lookup(d, first[offset] & PAGE_MASK, NULL); - - if ( paddr == INVALID_PADDR ) - { - printk("Failed L1 entry maddr lookup\n"); - goto done; - } - second = map_domain_page(paddr>>PAGE_SHIFT); - offset = (addr >> 12) & 0x3FF; - printk("2ND[0x%"PRIx32"] (0x%"PRIpaddr") = 0x%08"PRIx32"\n", - offset, paddr, second[offset]); - -done: - if (second) unmap_domain_page(second); - if (first) unmap_domain_page(first); -} - static void do_trap_instr_abort_guest(struct cpu_user_regs *regs, union hsr hsr) {