From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA76A3D9DDB for ; Tue, 29 Sep 2026 03:45:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790653536; cv=none; b=uFDmbietb1WuP/QkinRhcKT6y8VOOIj4zPyp3xTpw5/JUbb03jjlk1KERHJCjhz2+Sh/qRt9tt5yagOLkF5cj0LMjuyMObLE/cS1SlCc2OboPFxvCPpceUM26B4BPBJFAk91trHwG1XkbBE43/kuVCgyqyGYA4GCYmNvx5nf+nw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790653536; c=relaxed/simple; bh=t6s4Oe+o2p1ts8W0BX63x7TlPfAs6I5sA3X1EA+4bIY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=lbcTel/ZKEQcS1SrTqi0tW+3tqvk4V5MFgZMUEgkTqGWoaexHN/w2ZHnjEym6xxLuFroR1Go+XHB6pMGAB5lfGUJ1tu4uQ+7PntETZgb0VAElAl1agpdrCoOf1GFGEgq4x265OLRaYa7QJOJSF3AhoDcV3eY29/hr1E7CzAauvU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--praan.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=q9PKogkv; arc=none smtp.client-ip=209.85.210.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--praan.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="q9PKogkv" Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-88551591365so314604b3a.0 for ; Mon, 28 Sep 2026 20:45:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1790653534; x=1791258334; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=mNojz/m5/pZo5fqQWuhdwjNU5hLUXAkkyG3PUmd5nDE=; b=q9PKogkv6YDgLQIyhJ2XD4moH50hdabhUOPoy47SxRomxKDEP3/Ay8iBcqXMN90vQr 9OfQrr4QEjagrkQtUceDMFrlvYjLeXmg8mz4Zp35tdp6Ucj9BASOEaZQlsfoag4fqHhG t29HgZjZ4u+hzmCxeg3/BXP6t/uXFlOIEoaGKGxGwdzYSgGZgZWG1fsop4TzPWqjAsg4 woOnbf1g7DohYaSE9on7VWetqFAmoPJzQ3kG6bHBLv/wQ/dJ77Vz1ZnCFrnjYWPTSeHR 7bJWsrQJaT2koKaF4JCJtouRED6b7yyEaG4juDHcnujiIkVqd+7nXW+eF5sAVRNA1nQV ZbeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790653534; x=1791258334; h=content-type: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:content-type; bh=mNojz/m5/pZo5fqQWuhdwjNU5hLUXAkkyG3PUmd5nDE=; b=n5B96n8IeEHhEsXrfD+hi8kw6S2B6DjfZZmmGBJeaIBG1iDTASuEyOTUEkE6BUpk0F CCm5rKORK1i6sww3ZaPZm0W1SOz+PbaLJfGvP8favlXNKdBuPfDUvYHmu0dqwIC3Q2Mj FZqafYojKP7iOon+rfSYnB4fVM+0o0ddhzdXFXnRaPfDlnlrRVCCHAXAliUgf1zmsH0d 5KpZbNRPmmhZr916OhnGjW4bSZHzzhhs+amD5oSxSoeiOftY1ukIIWXNGrFKAAGb/XK/ 0FEbsNlUMe8cjqcqALw1QYVx2JWfX/AU+6H1NAQY63PVY3cmGw5C/WtnfqumAEJZYUn3 BqxQ== X-Forwarded-Encrypted: i=1; AKwUvBxLU7aSX0hm5xGhik71bQlYOqC3Ue8EF9H2HkirORaUp5z5+YGCRDjHDKfdYLSPrWL+ozWkCgw9UH0Dw18=@vger.kernel.org X-Gm-Message-State: AFuF++ksSxMxyMltM5oQVtk3fzzim9f3+a4jFbVZ9T99ATb1eqegssEf /u3MgDfAqZqbB6354nkWzVpWwVEE0HEnqbfWhDb0M4ylgMzIsdEHoCQsUGiIhwXS4IlcWIH1EZL d0w== X-Received: from pflr18.prod.google.com ([2002:aa7:9892:0:b0:878:112:ded2]) (user=praan job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:1703:b0:878:3705:5724 with SMTP id d2e1a72fcca58-8856314d6ffmr806898b3a.48.1790653532960; Mon, 28 Sep 2026 20:45:32 -0700 (PDT) Date: Tue, 29 Sep 2026 03:45:00 +0000 In-Reply-To: <20260929034510.2023173-1-praan@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260929034510.2023173-1-praan@google.com> X-Mailer: git-send-email 2.56.0.rc1.315.gc6ed9934b7-goog Message-ID: <20260929034510.2023173-7-praan@google.com> Subject: [PATCH v11 06/16] iommu/tegra241-cmdqv: Restore PROD and CONS after resume From: Pranjal Shrivastava To: iommu@lists.linux.dev Cc: Will Deacon , Joerg Roedel , Robin Murphy , Jason Gunthorpe , Mostafa Saleh , Nicolin Chen , Daniel Mentz , Ashish Mhetre , linux-arm-kernel@lists.infradead.org, Thomas Gleixner , Radu Rendec , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman , rafael@kernel.org, Danilo Krummrich , driver-core@lists.linux.dev, Pranjal Shrivastava Content-Type: text/plain; charset="UTF-8" From: Ashish Mhetre PROD and CONS indices for vcmdqs are getting set to 0 after resume. Because of this the vcmdq is not consuming commands after resume. Fix this by restoring PROD and CONS indices after resume from saved pointers. Reviewed-by: Nicolin Chen Signed-off-by: Ashish Mhetre Signed-off-by: Pranjal Shrivastava --- drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c index a394bf0f487f..c7989fcd2c62 100644 --- a/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c +++ b/drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c @@ -567,6 +567,16 @@ static int tegra241_vcmdq_hw_init(struct tegra241_vcmdq *vcmdq) /* Configure and enable VCMDQ */ writeq_relaxed(vcmdq->cmdq.q.q_base, REG_VCMDQ_PAGE1(vcmdq, BASE)); + /* + * HW Registers reset to 0 when power-cycled. Restore them from their + * SW copies to prevent executing stale/ghost commands after resume. + * Note on RPM: Power-cycles can never happen when VCMDQs are assigned + * to the Guests since the relevant frameworks (IOMMUFD / VFIO) hold + * active PM references preventing suspend while VMs are active. + */ + writel_relaxed(vcmdq->cmdq.q.llq.prod, REG_VCMDQ_PAGE0(vcmdq, PROD)); + writel_relaxed(vcmdq->cmdq.q.llq.cons, REG_VCMDQ_PAGE0(vcmdq, CONS)); + ret = vcmdq_write_config(vcmdq, VCMDQ_EN); if (ret) { dev_err(vcmdq->cmdqv->dev, -- 2.56.0.rc1.315.gc6ed9934b7-goog