From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 8039043784B for ; Thu, 30 Jul 2026 13:29:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785418186; cv=none; b=a3smXrJigheOFC9tRu9u0YBHAjYlKnqCMx6ffYhySdXrs/fKS77mJRGRok7B/FTF/F0ev3/hWHEvpWxhySXj7W3pQWRdfUzpPsAMKqmjxVUx0i/9lLEflfhMYNMbbn4/CcPmf79lLU0AHsnGbp3MzjhLwwMk+VC0XfDikMqgsLI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785418186; c=relaxed/simple; bh=0nxp1o2ipBKscUADiWjzkVftGYkzppsXEG9Cty/+pmo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IdnGOMv+GScUv9HaoHVoygd2eFnjJTcHtMpYAYK18iPgGBOoArpzaCoW8eWg/RDMZoX36kcGDgYpnrywOE2tptF18wi3Rk8sI0xS3CU3C3kCchZEd1U0ui53o8Wlhj0RLdLoGoBSgZcSYKo3FtBXhEoUZYtxdIlfWJw/q1iAKFE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=LYURgvp1; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=PbfzIxC/; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="LYURgvp1"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="PbfzIxC/" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66UDDQ1k427123 for ; Thu, 30 Jul 2026 13:29:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 4GiyYr8BNvsq5rBrfJ99f2IOVz7T7wBUN5vtVYuv3w8=; b=LYURgvp1IOeS0d3m HJGWxB91RSgH72Uo0Wdct4qEB0Z5w9mxpcC7DbYvvYgDuF1tehH0if988qoHbQYq Le4FvAaQhwnLlpAhDjC+Uf2YdruL91L9z3E/sI6FTdT6/uBoD8ABT8NfEreerjze TUut3vh+uCVTZltfqpNOLy4MeoIYwudZua9D0jXR8J4tbo3jB1qBLkpAkJ22i2zg UudXYyrIDWVIK7zHsR4SQ62EX7OnbzzAQEWXvV1kRqS0fuY6ClwmX62gWdItC+ed zMIWYBBCVSmlxo21fpgvXeVO9+NLYuIDXOtl9x+2YmLOxlS+lWoJlzX9vsL7aOqL LzdfQQ== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fr3tyh1hu-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 30 Jul 2026 13:29:43 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51c1e6f602cso38547081cf.3 for ; Thu, 30 Jul 2026 06:29:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785418182; x=1786022982; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4GiyYr8BNvsq5rBrfJ99f2IOVz7T7wBUN5vtVYuv3w8=; b=PbfzIxC/qIbV5vJMq282+aNILibwrowIG71RSUqgD3ERG8dtYhds5ybRlM33+O3izc fIuxXU/UXg5ckBPmasRtAiug9QYkCpA0qzS1y5QocuKMMtUYVAR6DWRosckaVZZqglrc oEgPjuj3b86dMjyXjcEMP106VjGIMrUP5fBVI0NbErdcRdiD0/Ztq4SXWxSoMklw/owK dl9RBiNkcBuaz4nQp9sVKxeljQlewyoJwuZhGD7pNSK7qnkLHkD3OfRRuhm+GSaPx72v zdTVfns2Cp3DoaDTwRfZeEKTF4ulA015eCiQoKxuWalvdAd0P8qKKmOYmegXw0HTufD3 FUwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785418182; x=1786022982; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=4GiyYr8BNvsq5rBrfJ99f2IOVz7T7wBUN5vtVYuv3w8=; b=q5I8RszxiJqPcjNTh53d3M55nS94SczkYU/Bfylzc/sDFqXRvhQOFD1/XyS68NZMXV YSoPtisSHIl5EMSk1ALpaeK6Gk8s7hPaXrokF01yzj3kNzbC6sIJhVmUHTUeHugze1TK ztMFz9CNCRFa+qUV+azFR31epR8V7HPtirk7BdcU+4kX/ee6SY0KDpwq5Trj3SuK+XEf 9+p8X3yNoJKL0OVmfKalNXyjCIc5oNun7u2jH0D62Jf33YyTqfWi90ev5YNh3mQtgBU5 8w+xT8M4wq0agBFpvUBV1unLhRlQqoqqxJli/g/v3OtYQ3fPtLXazou/GckCrYp+2z3U SgjA== X-Forwarded-Encrypted: i=1; AHgh+RrjAgn60dUPt2M/D56arekmfjxNt7N2yV06FgFwQ5zUrlzgpFTOoETQqubNbdmOEYpnjnNgAzXB2sFxLW0=@vger.kernel.org X-Gm-Message-State: AOJu0Yxle8l9YhGwRhPcxnPXiG1L3ZPr7vHaYUT4P+0rAokKS9EYM6h1 IbBMXX1EB1US4KtA2Z8bJl5e856l1MOhXLEN9HBbz6TZ7L59GhPkQ8VBXwLLM1fec8sjF5ByhiF b6MBpXEdtqU+8JcFyvx/ydOmbLlHGCjILIu3F1M1rEH064PCCbGKMDk8rmPrUqZwZpjM= X-Gm-Gg: AR+sD12QscvGkglvb9i0Q03EkbQpW1TQI5jtjRXopHpOiq07JprCwUMR8jIl/4dGI6R e/OeqA1cDH9RqwnbUGI34Iy1MmP08eZ8N9296mAVAGlZUHFr4vnTCZN/raNV5EoJTfQZCTXcabR B7JVsdO478qGBiF+aCLXfLd5NWcDU+2tLOpeTbgTnrAUZQP3qaZBlY0BxZsyIcY5IT5v6Yp9KEm jIXSBfW9br3s7bQfNA6SNy1M4Vkk8BdN7NnPBmSwpSfpnb1YSIUbQeHQc2KS1Td5m1gI9cx7rgU FvZVP5k9WPTkflAD3iakmlzQh1bIRbAyniSNVkSDfcu/MxDMpBKPh9EcbTlgPg8EQoV3JVlPQGT 0rZwcV7c1GCQzk7uBRQAfWHO0vIX1NhgH+JBfvuv5sx5gygGETicOZRsRiUIgKFKOgVl6BDLYxg g2SJuEmFP/GXx1xw== X-Received: by 2002:a05:622a:5ce:b0:51b:eb55:2916 with SMTP id d75a77b69052e-52b384c4702mr28152551cf.34.1785418182328; Thu, 30 Jul 2026 06:29:42 -0700 (PDT) X-Received: by 2002:a05:622a:5ce:b0:51b:eb55:2916 with SMTP id d75a77b69052e-52b384c4702mr28152121cf.34.1785418181713; Thu, 30 Jul 2026 06:29:41 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-39f6acaa009sm2976631fa.34.2026.07.30.06.29.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 06:29:40 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 30 Jul 2026 16:29:33 +0300 Subject: [PATCH 3/3] drm/msm: detach the ARM DMA mapping before attaching our own domain Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260730-fix-qcom-smmu-v1-3-b12fa067804e@oss.qualcomm.com> References: <20260730-fix-qcom-smmu-v1-0-b12fa067804e@oss.qualcomm.com> In-Reply-To: <20260730-fix-qcom-smmu-v1-0-b12fa067804e@oss.qualcomm.com> To: Rob Clark , "Joerg Roedel (AMD)" , Will Deacon , Robin Murphy , Sricharan Ramabadhran , Joerg Roedel , Russell King , Lu Baolu , Jerry Snitselaar , Jason Gunthorpe , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Heiko Stuebner Cc: linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-rockchip@lists.infradead.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2725; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=0nxp1o2ipBKscUADiWjzkVftGYkzppsXEG9Cty/+pmo=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ1Z24J6b6wVbFP1Dv968/8bQ87nekTkSTCwmWXuZJ85pD 0p7dd+ok9GYhYGRi0FWTJHFp6Blasym5LAPO6bWwwxiZQKZwsDFKQATYZZg/5/7tEvjz+Qk7vJX k3zOtPEfveHQZOPl4cMrqnnMZovt2isnJ07bw6x5j8vBskrclyXQJOLU3mYN69k+OdufMkn28yd oXdC4vNBQvF0jvuL/n/j/7K8ND0z8nx1RFSH2t/XxES9nFumAE3fvXWXY3DaTe9kqjnu9bZuNdo dLV1y6baTwef+y11rGEiq3b7B7s71kDXk0Z+4zrVfqWba7mTbLbGKtv2mh8vb1iVWJ3zx2CRku9 i18yJBVJC0nkiZqmZ1xIevEvNvmuSaTanI/pWr3Ou90PDhR7LSPW+8h1VfV63zFRHgmWO5Su/0z ZW7YKlWpl857L8hvdYlhjq6SKXyqyHe6lFEr5nTGR6P5AA== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: mumUCrRo2GfLM2m7li7Y20XzzarGEWJd X-Authority-Analysis: v=2.4 cv=JZOMa0KV c=1 sm=1 tr=0 ts=6a6b51c7 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=epCurf6C53ZFYVxhAokA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMwMDEwMiBTYWx0ZWRfX3ueK8idMsObm AjjZrc3Ri51GetGuisrNLjDWyGZakW/KlLjqdLqwfmLUFAeX6ITUa5G0j99Rv49K7Jj3ol7sgU3 faiM2uhlOQdmBe0i1HrEFU5R2s9Bzl4qQQIAs/E8bg8PGvA2jC6nK5pWzpJVeEC4nt8XRjV6WPQ PF0UQZn7yNT66DNIyslSyfV6iLn91mWNywTQ4gKOn0nL9e/VV9myOO3w+ODy4yax4M4a0f3xBHN TTTu6VdsO/WezjKYZ3MYBU7O23adJC0HF70RuA8bHK8xYlwMJfVKBhEPRTmlb5qA9ZXoYMrSkKe xV/A9Q7UsbGc1iWgkxeB7N417o+Hn6xydedNcN8rePDe7HFaQgUV2C0N0w20y2gj2cQ5kzwkJE+ BbIb2fpuTgQ7hOJ77We6+ZdpNS53QkqYuAvW+echIOnn0nvoYTmZ0tdM5N4NN755EaM7sxe9rh+ ajcmWl9pbNGeT8uqrGQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMwMDEwMiBTYWx0ZWRfX4ZICuKD9pRgI 4ZzH46hRial9SE+3idKqTzcNs3IwB0XZI6eqxh4xDVyxGmRBK8MzuXO3EjEA5F8RHrfpxtsFDrh ArHvpAPRFH0i/n9KvBgs5BKrlhYCyT8= X-Proofpoint-ORIG-GUID: mumUCrRo2GfLM2m7li7Y20XzzarGEWJd X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-30_04,2026-07-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 suspectscore=0 lowpriorityscore=0 bulkscore=0 adultscore=0 phishscore=0 clxscore=1015 malwarescore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607300102 On ARM32 with CONFIG_ARM_DMA_USE_IOMMU, arch_setup_dma_ops() creates a dma_iommu_mapping for every IOMMU-backed device and attaches its domain to the device's IOMMU group. That domain is neither the group's default nor its blocking domain, so when msm_iommu_new() later attaches the domain the driver manages itself, __iommu_attach_group() refuses it: if (group->domain && group->domain != group->default_domain && group->domain != group->blocking_domain) return -EBUSY; Both the GPU and the display controller are hit by this on apq8064 (IFC6410), leaving the board with no GPU and no display: adreno 4300000.gpu: failed to load adreno gpu adreno 4300000.gpu: probe with driver adreno failed with error -16 mdp4 5100000.display-controller: [drm:msm_drm_kms_init] *ERROR* failed to load kms mdp4 5100000.display-controller: adev bind failed: -16 Other ARM32 DRM drivers that manage their own domains (tegra, rockchip, exynos) drop the arch mapping first. Do the same in msm_iommu_new(), which both the display and the GPU paths go through. With this the GPU and the KMS device both initialise: [drm] Initialized msm 1.13.0 for 4300000.gpu on minor 0 [drm] Initialized msm-kms 1.13.0 for 5100000.display-controller on minor 1 Signed-off-by: Dmitry Baryshkov Assisted-by: Claude:claude-opus-5 --- drivers/gpu/drm/msm/msm_iommu.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c index 897e42c8d5c8..da6782fca6bd 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -7,6 +7,15 @@ #include #include #include + +#if defined(CONFIG_ARM_DMA_USE_IOMMU) +#include +#else +#define arm_iommu_detach_device(...) ({ }) +#define arm_iommu_release_mapping(...) ({ }) +#define to_dma_iommu_mapping(dev) NULL +#endif + #include "msm_drv.h" #include "msm_gpu_trace.h" #include "msm_mmu.h" @@ -749,6 +758,19 @@ struct msm_mmu *msm_iommu_new(struct device *dev, unsigned long quirks) mutex_init(&iommu->init_lock); + /* + * ARM32 attaches a DMA mapping domain to every IOMMU-backed device, + * which would make attaching our own domain fail with -EBUSY. + */ + if (IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)) { + struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev); + + if (mapping) { + arm_iommu_detach_device(dev); + arm_iommu_release_mapping(mapping); + } + } + ret = iommu_attach_device(iommu->domain, dev); if (ret) { iommu_domain_free(domain); -- 2.47.3