From patchwork Wed Aug 26 14:36:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugenio Perez Martin X-Patchwork-Id: 1351963 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=LsjYs4M7; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4Bc7lS1VLYz9sTQ for ; Thu, 27 Aug 2020 00:38:44 +1000 (AEST) Received: from localhost ([::1]:46136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kAwZW-0006Jp-5a for incoming@patchwork.ozlabs.org; Wed, 26 Aug 2020 10:38:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kAwZ6-00069X-HM for qemu-devel@nongnu.org; Wed, 26 Aug 2020 10:38:16 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:49811 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kAwZ4-0006Fb-TJ for qemu-devel@nongnu.org; Wed, 26 Aug 2020 10:38:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598452694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jv3tIIUr8czQPi8/wz1NY8KWW690wGow6avNY6L+3Zo=; b=LsjYs4M7ui61VIijYUo1aBGH8KFR/qAhcTeqkRFgAUBusiqqDCdM1VvoU1qFAIPfTf4WmM rY/o7/M4hADD/CJcDu8ZD76Z1ZiwoDP/7KECzhK/A2BuZ+Z4sccoCaiooNkQxXKghbD/Iq 4MDxXgfg/MQsHGqSBgP4G2AI2I5j3hU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-577-pev9AbiKOWOBu0jeG-W7EQ-1; Wed, 26 Aug 2020 10:38:12 -0400 X-MC-Unique: pev9AbiKOWOBu0jeG-W7EQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D972AE778; Wed, 26 Aug 2020 14:38:10 +0000 (UTC) Received: from eperezma.remote.csb (ovpn-115-59.ams2.redhat.com [10.36.115.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03C4B76E00; Wed, 26 Aug 2020 14:37:57 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: qemu-devel@nongnu.org, Peter Xu Subject: [RFC v6 05/13] hw/arm/smmu: Fill IOMMUTLBEntry notifier type Date: Wed, 26 Aug 2020 16:36:43 +0200 Message-Id: <20200826143651.7915-6-eperezma@redhat.com> In-Reply-To: <20200826143651.7915-1-eperezma@redhat.com> References: <20200625191651.5817-1-eperezma@redhat.com> <20200826143651.7915-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eperezma@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=eperezma@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/26 03:56:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: , Cc: Peter Maydell , Aleksandar Rikalo , Yan Zhao , Eduardo Habkost , Juan Quintela , Jason Wang , "Michael S. Tsirkin" , Eric Auger , qemu-arm@nongnu.org, =?utf-8?q?Herv=C3=A9_Poussineau?= , Avi Kivity , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Eugenio Pérez --- hw/arm/smmu-common.c | 2 ++ hw/arm/smmuv3.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index b02ffb8822..88cf1b86ea 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -181,6 +181,7 @@ static int smmu_ptw_64(SMMUTransCfg *cfg, tlbe->iova = iova; tlbe->addr_mask = (1 << granule_sz) - 1; + tlbe->type = IOMMU_IOTLB_NONE; while (level <= 3) { uint64_t subpage_size = 1ULL << level_shift(level, granule_sz); @@ -395,6 +396,7 @@ static void smmu_unmap_notifier_range(IOMMUNotifier *n) entry.iova = n->start; entry.perm = IOMMU_NONE; entry.addr_mask = n->end - n->start; + entry.type = IOMMU_IOTLB_UNMAP, memory_region_notify_iommu_one(n, &entry); } diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 3bb85ab7e1..dee987b2b1 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -635,6 +635,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, .translated_addr = addr, .addr_mask = ~(hwaddr)0, .perm = IOMMU_NONE, + .type = IOMMU_IOTLB_NONE, }; SMMUIOTLBKey key, *new_key; @@ -837,6 +838,7 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr, entry.iova = iova; entry.addr_mask = (1 << tt->granule_sz) - 1; entry.perm = IOMMU_NONE; + entry.type = IOMMU_NOTIFIER_UNMAP; memory_region_notify_iommu_one(n, &entry); }