From nobody Fri Dec 19 14:08:11 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (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 67A4EBA2B; Wed, 20 Dec 2023 01:28:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="dT7HpBZj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703035719; x=1734571719; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bQjTjgCLfYsPH5p+7Al5Zy19r6O5Dl9UPL8NgLDT+B4=; b=dT7HpBZjpxMHwSTJ2Aii73Q00OouX5DgmKC0DpLwOM4SdvupSY4xhp1X kMNxZAMz2kKmm8bvoKxGaY5XZfqD5r2nLJhrRPaksEQsUgsGYof/LU5gL Y99PenfQkREMHwy8Xl3Uwg9oTG99fXsjHHu0l2ntvdkyn2aBDK5hoWi/7 zoInbpKbnRuFCQN109d/Y6V+RRkES8OiUBc/FTrlTLe0Ub1xyycG8QQMM tgLj68xvCswR7bQjcRgwRowwpJxUM85vMSDIospYEIYPvPDc0V41v0m/G wmP6XVV2aHzJf0eZgMPPqPTWY8z7duNvIQIP+7Qoy5o4JxVfvazjJrzj4 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10929"; a="2965738" X-IronPort-AV: E=Sophos;i="6.04,290,1695711600"; d="scan'208";a="2965738" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2023 17:28:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10929"; a="1023319063" X-IronPort-AV: E=Sophos;i="6.04,290,1695711600"; d="scan'208";a="1023319063" Received: from allen-box.sh.intel.com ([10.239.159.127]) by fmsmga006.fm.intel.com with ESMTP; 19 Dec 2023 17:28:35 -0800 From: Lu Baolu To: Joerg Roedel , Will Deacon , Robin Murphy , Jason Gunthorpe , Kevin Tian , Jean-Philippe Brucker , Nicolin Chen Cc: Yi Liu , Jacob Pan , Longfang Liu , Yan Zhao , iommu@lists.linux.dev, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Lu Baolu , Jason Gunthorpe Subject: [PATCH v9 02/14] iommu/arm-smmu-v3: Remove unrecoverable faults reporting Date: Wed, 20 Dec 2023 09:23:20 +0800 Message-Id: <20231220012332.168188-3-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231220012332.168188-1-baolu.lu@linux.intel.com> References: <20231220012332.168188-1-baolu.lu@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" No device driver registers fault handler to handle the reported unrecoveraable faults. Remove it to avoid dead code. Signed-off-by: Lu Baolu Reviewed-by: Kevin Tian Reviewed-by: Jason Gunthorpe Tested-by: Longfang Liu --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 46 ++++++--------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/ar= m/arm-smmu-v3/arm-smmu-v3.c index 0ffb1cf17e0b..4cf1054ed321 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1461,7 +1461,6 @@ arm_smmu_find_master(struct arm_smmu_device *smmu, u3= 2 sid) static int arm_smmu_handle_evt(struct arm_smmu_device *smmu, u64 *evt) { int ret; - u32 reason; u32 perm =3D 0; struct arm_smmu_master *master; bool ssid_valid =3D evt[0] & EVTQ_0_SSV; @@ -1471,16 +1470,9 @@ static int arm_smmu_handle_evt(struct arm_smmu_devic= e *smmu, u64 *evt) =20 switch (FIELD_GET(EVTQ_0_ID, evt[0])) { case EVT_ID_TRANSLATION_FAULT: - reason =3D IOMMU_FAULT_REASON_PTE_FETCH; - break; case EVT_ID_ADDR_SIZE_FAULT: - reason =3D IOMMU_FAULT_REASON_OOR_ADDRESS; - break; case EVT_ID_ACCESS_FAULT: - reason =3D IOMMU_FAULT_REASON_ACCESS; - break; case EVT_ID_PERMISSION_FAULT: - reason =3D IOMMU_FAULT_REASON_PERMISSION; break; default: return -EOPNOTSUPP; @@ -1490,6 +1482,9 @@ static int arm_smmu_handle_evt(struct arm_smmu_device= *smmu, u64 *evt) if (evt[1] & EVTQ_1_S2) return -EFAULT; =20 + if (!(evt[1] & EVTQ_1_STALL)) + return -EOPNOTSUPP; + if (evt[1] & EVTQ_1_RnW) perm |=3D IOMMU_FAULT_PERM_READ; else @@ -1501,32 +1496,17 @@ static int arm_smmu_handle_evt(struct arm_smmu_devi= ce *smmu, u64 *evt) if (evt[1] & EVTQ_1_PnU) perm |=3D IOMMU_FAULT_PERM_PRIV; =20 - if (evt[1] & EVTQ_1_STALL) { - flt->type =3D IOMMU_FAULT_PAGE_REQ; - flt->prm =3D (struct iommu_fault_page_request) { - .flags =3D IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE, - .grpid =3D FIELD_GET(EVTQ_1_STAG, evt[1]), - .perm =3D perm, - .addr =3D FIELD_GET(EVTQ_2_ADDR, evt[2]), - }; + flt->type =3D IOMMU_FAULT_PAGE_REQ; + flt->prm =3D (struct iommu_fault_page_request) { + .flags =3D IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE, + .grpid =3D FIELD_GET(EVTQ_1_STAG, evt[1]), + .perm =3D perm, + .addr =3D FIELD_GET(EVTQ_2_ADDR, evt[2]), + }; =20 - if (ssid_valid) { - flt->prm.flags |=3D IOMMU_FAULT_PAGE_REQUEST_PASID_VALID; - flt->prm.pasid =3D FIELD_GET(EVTQ_0_SSID, evt[0]); - } - } else { - flt->type =3D IOMMU_FAULT_DMA_UNRECOV; - flt->event =3D (struct iommu_fault_unrecoverable) { - .reason =3D reason, - .flags =3D IOMMU_FAULT_UNRECOV_ADDR_VALID, - .perm =3D perm, - .addr =3D FIELD_GET(EVTQ_2_ADDR, evt[2]), - }; - - if (ssid_valid) { - flt->event.flags |=3D IOMMU_FAULT_UNRECOV_PASID_VALID; - flt->event.pasid =3D FIELD_GET(EVTQ_0_SSID, evt[0]); - } + if (ssid_valid) { + flt->prm.flags |=3D IOMMU_FAULT_PAGE_REQUEST_PASID_VALID; + flt->prm.pasid =3D FIELD_GET(EVTQ_0_SSID, evt[0]); } =20 mutex_lock(&smmu->streams_mutex); --=20 2.34.1