From nobody Mon Feb 9 09:34:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1675590388; cv=none; d=zohomail.com; s=zohoarc; b=UF6ZnCXtiqJpg7UjHZxFkN1SeIAqDQs9Ok8mJaegpQpUsDMczb3reQnuY9VTy5GCrf7p/BAGy4dwGFdD5SomS9ckxlhlqyJPEVUtC7fqJDL0HdmJ+OKk/3f7vJEp4kf3bQ/YsO9iHjC3fu8XTciBq4vQjmgE3N5zn6droSr0+7Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675590388; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6DE0/Utxelv22le0usG9jthLMRWON7SKkmZ8fA6Ht84=; b=cW9uPtPtbilndmge6YyC29/1GauIZnuErQbFNBTvz/ckMC1mf/WfNW+JnjWd9WQzxcyc9KeQv5Bd8oNJKdSdtTXZCB3aAOwvxNAtjZFeSoSdwmAY3xwE2msIV8D10iZlDVvUYWoLv1nJfLJdnm46kG5JnP7Os21ObbKW3pIhPKg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675590388087170.37302272598276; Sun, 5 Feb 2023 01:46:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pObbF-0006Lj-EO; Sun, 05 Feb 2023 04:46:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <303rfYwgKCmwcWYcdKPKQYYQVO.MYWaOWe-NOfOVXYXQXe.YbQ@flex--smostafa.bounces.google.com>) id 1pObb2-0005EL-IQ for qemu-devel@nongnu.org; Sun, 05 Feb 2023 04:46:04 -0500 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <303rfYwgKCmwcWYcdKPKQYYQVO.MYWaOWe-NOfOVXYXQXe.YbQ@flex--smostafa.bounces.google.com>) id 1pObb1-0001ap-0K for qemu-devel@nongnu.org; Sun, 05 Feb 2023 04:46:04 -0500 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-4bdeb1bbeafso92719857b3.4 for ; Sun, 05 Feb 2023 01:45:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=6DE0/Utxelv22le0usG9jthLMRWON7SKkmZ8fA6Ht84=; b=A7DbTiKmLazlCY1Fx5UeKRs80eTPs6zppJKhi/8fqaLQ7DcCSTHj2YqWg77xwM3dOw /+pCLYAiE31otWLCtbb7W3hkXWC5B5SOb9tP3YRj20KJ++WJNr5VuXjLpzG7gzbA1MDn Yv9uXIiRy4ZvB3RUDS0lkGFQ8WMpsjSWykkesQhJ/4PZ0TQzcTpd9ca8e2elBgTKcL5R UQXB+ieJokbOwOt37LEh/Z1FyWbq3tANvYLr6eaUp6w55GlK8hT4q+9nte9JZZE3djLt TTn3hnbLgBYXbzNFT7nYaNNMsHL2eQD4QcpTdjcqJLPYNg9h6Gg0LHuWgvF5zAi8jkso sDNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6DE0/Utxelv22le0usG9jthLMRWON7SKkmZ8fA6Ht84=; b=mGaIz0IHcmjU16Gfv0i/Oda2LioDg0Pvs2brL6v97X3vs+OT5p5X4T+t34pF38Nqcz ywXTBMO8k/zfYLKW6xfPERoA/9nEY0ISJgjJLV4nSUYKwxNovlYtMaWktK/1zlOolAoE 2BYGBaux8sxC0CTMqTlBaY/LyaErtt3Eh92gAB7Qd3ijFL1ocTHIk9U9w6PLxuKb851z HAqZO/dedFchWxLSNtzzW5HiydlAAAQnHdAdVt6fKtaHYO/kTQzvsrgFAre9KBhQUX8S F2CCV0DVFYGLQ3NyPqDGVs7rrPymf7LuUS+On0mDkm4mCH1vts5/kSJOYU4BjjM9OQSF xp9w== X-Gm-Message-State: AO0yUKVRoKzTVU0+jAvTm/SKwp6ogTkxJ5dd3ExsKH+idb5DAGfh3xfk eX0nX9M8e2y+kVFEo2X8ogeHx3IZ3zGhtfy+HAfIshTF8D2mshDJVUR7Y814EFe9DGmg/w93yai K0fzRSuBBP+/kxVDs8RsCtibjWmWMJp1v+StJL6Xh8cIEWtbfeRMv1odqZdPlyZzuug== X-Google-Smtp-Source: AK7set+Le2o2/MjXcIAtfLFZ0Va56mQ0qwhH8tnpu4RsUhlzlAOgTttTjqSkJWCQrbhBCCdZvVjkk5w2bq0sxA== X-Received: from mostafa.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:333c]) (user=smostafa job=sendgmr) by 2002:a05:690c:10:b0:506:c617:9e38 with SMTP id bc16-20020a05690c001000b00506c6179e38mr1928075ywb.54.1675590355995; Sun, 05 Feb 2023 01:45:55 -0800 (PST) Date: Sun, 5 Feb 2023 09:44:11 +0000 In-Reply-To: <20230205094411.793816-1-smostafa@google.com> Mime-Version: 1.0 References: <20230205094411.793816-1-smostafa@google.com> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog Message-ID: <20230205094411.793816-17-smostafa@google.com> Subject: [RFC PATCH 16/16] hw/arm/smmuv3: Enable stage-2 support From: Mostafa Saleh To: qemu-devel@nongnu.org Cc: jean-philippe@linaro.org, eric.auger@redhat.com, peter.maydell@linaro.org, qemu-arm@nongnu.org, Mostafa Saleh Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::114a; envelope-from=303rfYwgKCmwcWYcdKPKQYYQVO.MYWaOWe-NOfOVXYXQXe.YbQ@flex--smostafa.bounces.google.com; helo=mail-yw1-x114a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, 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, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1675590389545100002 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As everything is in place, we can use the new system property to advertise which stage is supported and remove bad_ste from STE stage2 config. Signed-off-by: Mostafa Saleh --- hw/arm/smmuv3.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 5f792d96ab..4b66760104 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -256,7 +256,14 @@ static void smmuv3_init_regs(SMMUv3State *s) * IDR0: stage1 only, AArch64 only, coherent access, 16b ASID, * multi-level stream table */ - s->idr[0] =3D FIELD_DP32(s->idr[0], IDR0, S1P, 1); /* stage 1 supporte= d */ + if (STAGE1_SUPPORTED(s->features)) { + s->idr[0] =3D FIELD_DP32(s->idr[0], IDR0, S1P, 1); + } + + if (STAGE2_SUPPORTED(s->features)) { + s->idr[0] =3D FIELD_DP32(s->idr[0], IDR0, S2P, 1); + } + s->idr[0] =3D FIELD_DP32(s->idr[0], IDR0, TTF, 2); /* AArch64 PTW only= */ s->idr[0] =3D FIELD_DP32(s->idr[0], IDR0, COHACC, 1); /* IO coherent */ s->idr[0] =3D FIELD_DP32(s->idr[0], IDR0, ASID16, 1); /* 16-bit ASID */ @@ -451,10 +458,6 @@ static int decode_ste(SMMUv3State *s, SMMUTransCfg *cf= g, qemu_log_mask(LOG_UNIMP, "SMMUv3 Stall not implemented!\n"); goto bad_ste; } - - /* This is still here as stage 2 has not been fully enabled yet. */ - qemu_log_mask(LOG_UNIMP, "SMMUv3 does not support stage 2 yet\n"); - goto bad_ste; } =20 if (STE_S1CDMAX(ste) !=3D 0) { --=20 2.39.1.519.gcb327c4b5f-goog