From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25BAAC433DF for ; Mon, 24 Aug 2020 09:49:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF06E206BE for ; Mon, 24 Aug 2020 09:49:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="pmRdiGpV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF06E206BE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kA96L-0006CF-67 for qemu-devel@archiver.kernel.org; Mon, 24 Aug 2020 05:49:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kA95P-0004R4-3S for qemu-devel@nongnu.org; Mon, 24 Aug 2020 05:48:19 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:34029) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kA95N-0004ln-GI for qemu-devel@nongnu.org; Mon, 24 Aug 2020 05:48:18 -0400 Received: by mail-wr1-x42e.google.com with SMTP id f7so8030100wrw.1 for ; Mon, 24 Aug 2020 02:48:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=d76Q5LBvtJQn3pY+eXI6scN5N0T9wemtRcn+yfENPBU=; b=pmRdiGpVTUV8Fs7xfolkkHIzyaxRfwQ4lq1jAbGUBH1WY8+nIsIbSlfOLVw5xSS+Kq MTjHNSi1igJQ2k5njpMkC6A7BGE91nnyCjkro6F+Z2rYN2d5Kbm9YoULA5z9ucYgbRtX dTUMWm9goVk6dbV1qbIMT5UAessNmlfh6CJ9AaXvays566EaiqZpZbMfDoBJI3+1112Z lYsEvw7jibRZsjJHo4VKvOFTDhIgq+6fnZ5pHYsmE047dnBaaUwQfJLLdF7HHd1a9ir8 JKBxJCkF6h1YybFDj/HhSujd6dS7vfJ3rrqjVoKyZkWSEqbGc0Cyu9ZmwMbBIKFfZkk6 MeaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d76Q5LBvtJQn3pY+eXI6scN5N0T9wemtRcn+yfENPBU=; b=G0NVXXh7OX9DKQBVSpyyKooI7FrUYWKUUZNudcs2R6x/YCNDemOsy+uUyfSVeW71i0 j1n2glmijiYZG55RFcGvaNvUUcr02u6Z/uiX83yltcLmn4TNxlo2+cXGYIRIFBkgJ82e dLLjf+5EZnmDVA/aHbHMvURyyD7++qHUiFLj1k8V4wwM8qB1LL4Ss0Axa/lm2oobnfVh Ay7bDIbiTnOkQqtmWRShH+FvxyECcMmsdBOhYAmsdpSgLvrJniv8FOuU6WvNmANM4jaM fB0BmUWRwodJ3A67Y6CPKF1jeiMYjQbtU5uVBoHnpUyOPrEFVuL7kMsNEhjK+NRRB/7j aB3g== X-Gm-Message-State: AOAM530aDWGmTgZ50yfANZxAHXwBzpTbbF2EGkZDX7HJjjbLCMwY8E0q 0SGsiRm6zwLdW2sXbmUSc62T9jw1EeRHHR5D X-Google-Smtp-Source: ABdhPJwL5cnKfXGwkhIGo0t4qfcqZqF1pvR5RWIZChOz/ADhyRu30HvwR40mf5wI62y+PZIvKpdwpA== X-Received: by 2002:adf:ec10:: with SMTP id x16mr4847820wrn.74.1598262495937; Mon, 24 Aug 2020 02:48:15 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id q6sm24877057wma.22.2020.08.24.02.48.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 02:48:15 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 02/27] hw/arm/smmu-common: Factorize some code in smmu_ptw_64() Date: Mon, 24 Aug 2020 10:47:46 +0100 Message-Id: <20200824094811.15439-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200824094811.15439-1-peter.maydell@linaro.org> References: <20200824094811.15439-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Eric Auger Page and block PTE decoding can share some code. Let's first handle table PTE and factorize some code shared by page and block PTEs. Signed-off-by: Eric Auger Reviewed-by: Peter Maydell Message-id: 20200728150815.11446-2-eric.auger@redhat.com Signed-off-by: Peter Maydell --- hw/arm/smmu-common.c | 48 ++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index e13a5f4a7cb..a3f9e473985 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -186,7 +186,7 @@ static int smmu_ptw_64(SMMUTransCfg *cfg, uint64_t subpage_size = 1ULL << level_shift(level, granule_sz); uint64_t mask = subpage_size - 1; uint32_t offset = iova_level_offset(iova, inputsize, level, granule_sz); - uint64_t pte; + uint64_t pte, gpa; dma_addr_t pte_addr = baseaddr + offset * sizeof(pte); uint8_t ap; @@ -199,56 +199,42 @@ static int smmu_ptw_64(SMMUTransCfg *cfg, if (is_invalid_pte(pte) || is_reserved_pte(pte, level)) { trace_smmu_ptw_invalid_pte(stage, level, baseaddr, pte_addr, offset, pte); - info->type = SMMU_PTW_ERR_TRANSLATION; - goto error; + break; } - if (is_page_pte(pte, level)) { - uint64_t gpa = get_page_pte_address(pte, granule_sz); + if (is_table_pte(pte, level)) { + ap = PTE_APTABLE(pte); - ap = PTE_AP(pte); if (is_permission_fault(ap, perm)) { info->type = SMMU_PTW_ERR_PERMISSION; goto error; } - - tlbe->translated_addr = gpa + (iova & mask); - tlbe->perm = PTE_AP_TO_PERM(ap); + baseaddr = get_table_pte_address(pte, granule_sz); + level++; + continue; + } else if (is_page_pte(pte, level)) { + gpa = get_page_pte_address(pte, granule_sz); trace_smmu_ptw_page_pte(stage, level, iova, baseaddr, pte_addr, pte, gpa); - return 0; - } - if (is_block_pte(pte, level)) { + } else { uint64_t block_size; - hwaddr gpa = get_block_pte_address(pte, level, granule_sz, - &block_size); - - ap = PTE_AP(pte); - if (is_permission_fault(ap, perm)) { - info->type = SMMU_PTW_ERR_PERMISSION; - goto error; - } + gpa = get_block_pte_address(pte, level, granule_sz, + &block_size); trace_smmu_ptw_block_pte(stage, level, baseaddr, pte_addr, pte, iova, gpa, block_size >> 20); - - tlbe->translated_addr = gpa + (iova & mask); - tlbe->perm = PTE_AP_TO_PERM(ap); - return 0; } - - /* table pte */ - ap = PTE_APTABLE(pte); - + ap = PTE_AP(pte); if (is_permission_fault(ap, perm)) { info->type = SMMU_PTW_ERR_PERMISSION; goto error; } - baseaddr = get_table_pte_address(pte, granule_sz); - level++; - } + tlbe->translated_addr = gpa + (iova & mask); + tlbe->perm = PTE_AP_TO_PERM(ap); + return 0; + } info->type = SMMU_PTW_ERR_TRANSLATION; error: -- 2.20.1