From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B81382D0C75; Sat, 12 Sep 2026 12:26:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789215971; cv=none; b=kxVYFlYX8JM18lNqoG/l957iD4ta9kg7fJAdhsCun3XElkPQ22OrqHuAm8IomKx65ygEOtsS06AS5JHXaS/QmQvkctxfOUJxQSXN6AwUvcTN91o+6iEkhrrTIM28HNLDE0qgkKcHTJjdQPHM0AroEJX7x1S7jnYNYKrkoPQ8f2Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789215971; c=relaxed/simple; bh=Uf5DxFh75KKMMube6e9vDSDQ5HJIq6Eo4tsSbwI0UgU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=e1GbRujrZUr6pdmyTBGPnZa8wJsgTRe1MpqY1TsvXWZ+1MAfh827TmW0t1YRXAilzWyP3nSCSu2OCNp6QyMRYVMhG0YiWW7oV8bQPj3nHUqw7e9LwGEEGvbYZ+UfK4ltkhYvjWsdC6lzQVdKfyYqTRGRDoHTdl6mVJs9TTq0aXs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KKJJlF8a; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KKJJlF8a" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC5D91F000FF; Sat, 12 Sep 2026 12:26:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789215970; bh=G3Mz0+8784XVip4OUlZpiwOyWFhOkNn7YU84mp3i6ew=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KKJJlF8aa8P6gXUlgdOCvMYrPjQGEbNrIO6P08xgGHSB0FvHrVSqyijhuU58LWEK9 4WdUShLGBGIvMi/aGfwXySuG9Ml5/DoCwhBtAsngoqG7r6Oz5HHbe8P8Zjsh3XxQKu H8Gk0KXRXt6KNDtJoo3pvHCpp4jycJ8S5yzY0S54= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Konrad Dybcio , Mukesh Ojha , Will Deacon , Sasha Levin Subject: [PATCH 6.12 0640/1376] iommu/qcom: Fix inverted fault report check in qcom_iommu_fault() Date: Sat, 12 Sep 2026 08:51:06 +0200 Message-ID: <20260912065621.805182465@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.535295758@linuxfoundation.org> References: <20260912065607.535295758@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mukesh Ojha [ Upstream commit 1f33b8208a1978b0c0d6ad60a47fe4bb7a235e58 ] report_iommu_fault() returns 0 when a fault handler successfully handles the fault, and -ENOSYS when no handler is installed. The condition '!report_iommu_fault()' evaluates to true (printing "Unhandled context fault") precisely when the fault *was* handled, and stays silent when no handler is present — the opposite of what is intended. Remove the '!' so the driver logs unhandled faults correctly. Fixes: 049541e178d5 ("iommu: qcom: wire up fault handler") Reviewed-by: Konrad Dybcio Signed-off-by: Mukesh Ojha Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/iommu/arm/arm-smmu/qcom_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c index b3cca55c42184..09d847666a68e 100644 --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c @@ -200,7 +200,7 @@ static irqreturn_t qcom_iommu_fault(int irq, void *dev) fsynr = iommu_readl(ctx, ARM_SMMU_CB_FSYNR0); iova = iommu_readq(ctx, ARM_SMMU_CB_FAR); - if (!report_iommu_fault(ctx->domain, ctx->dev, iova, 0)) { + if (report_iommu_fault(ctx->domain, ctx->dev, iova, 0)) { dev_err_ratelimited(ctx->dev, "Unhandled context fault: fsr=0x%x, " "iova=0x%016llx, fsynr=0x%x, cb=%d\n", -- 2.53.0