From nobody Tue Dec 30 15:11:24 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F1781C47071 for ; Wed, 15 Nov 2023 03:06:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234341AbjKODG7 (ORCPT ); Tue, 14 Nov 2023 22:06:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234339AbjKODG5 (ORCPT ); Tue, 14 Nov 2023 22:06:57 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 670CCE8; Tue, 14 Nov 2023 19:06:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700017612; x=1731553612; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+27rcw1/f3/AhTJroO+Evk9Qld2gqVV5BrWP+/wpvhU=; b=cs70JN+d2ZdoeSKOTq8JHQghjFwyVLTfC2L+/vYx455WYr6SIXzqG1Wn fPpOviRS9mTy9LI6B5Ysj2ZAzkyw9JZWXc+sVJAHCUcZVMPxbI7+uGXB5 gtiNFgDFQSV99Liit4t6Hk2lU9utquncUmyi1uLK+w//makcPOthPzY2Q b/4+fAB+GVypEvdtlAD3Ja6yDQhnNJS7QiYUOJovfLmnRDmsCBM3Si/6l k8h2PE4FarmcohdTV9acWqCvMBTmFCXvcTuvfNgPjmINFojtNtwfSaw7T m86OQAn+PENsnJUhBV+JiBqG3XVXvrg4ews3VJf9F7hk1uBVfwV4xuW0N g==; X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="394715319" X-IronPort-AV: E=Sophos;i="6.03,303,1694761200"; d="scan'208";a="394715319" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 19:06:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10894"; a="1012128778" X-IronPort-AV: E=Sophos;i="6.03,303,1694761200"; d="scan'208";a="1012128778" Received: from allen-box.sh.intel.com ([10.239.159.127]) by fmsmga006.fm.intel.com with ESMTP; 14 Nov 2023 19:06:49 -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 , Yan Zhao , iommu@lists.linux.dev, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v7 02/12] iommu/arm-smmu-v3: Remove unrecoverable faults reporting Date: Wed, 15 Nov 2023 11:02:16 +0800 Message-Id: <20231115030226.16700-3-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231115030226.16700-1-baolu.lu@linux.intel.com> References: <20231115030226.16700-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 7445454c2af2..505400538a2e 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1463,7 +1463,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; @@ -1473,16 +1472,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; @@ -1492,6 +1484,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 @@ -1503,32 +1498,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