From nobody Tue Apr 14 15:39:43 2026 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 505C1C00140 for ; Tue, 2 Aug 2022 23:42:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234193AbiHBXma (ORCPT ); Tue, 2 Aug 2022 19:42:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229568AbiHBXm2 (ORCPT ); Tue, 2 Aug 2022 19:42:28 -0400 Received: from esa6.hc1455-7.c3s2.iphmx.com (esa6.hc1455-7.c3s2.iphmx.com [68.232.139.139]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6B2751A2F for ; Tue, 2 Aug 2022 16:42:26 -0700 (PDT) X-IronPort-AV: E=McAfee;i="6400,9594,10427"; a="83820010" X-IronPort-AV: E=Sophos;i="5.93,212,1654527600"; d="scan'208";a="83820010" Received: from unknown (HELO yto-r1.gw.nic.fujitsu.com) ([218.44.52.217]) by esa6.hc1455-7.c3s2.iphmx.com with ESMTP; 03 Aug 2022 08:42:24 +0900 Received: from yto-m3.gw.nic.fujitsu.com (yto-nat-yto-m3.gw.nic.fujitsu.com [192.168.83.66]) by yto-r1.gw.nic.fujitsu.com (Postfix) with ESMTP id 3F3CBDAFD2 for ; Wed, 3 Aug 2022 08:42:23 +0900 (JST) Received: from oym-om1.fujitsu.com (oym-om1.o.css.fujitsu.com [10.85.58.161]) by yto-m3.gw.nic.fujitsu.com (Postfix) with ESMTP id 6652327571 for ; Wed, 3 Aug 2022 08:42:22 +0900 (JST) Received: from cn-r05-10.example.com (n3235113.np.ts.nmh.cs.fujitsu.co.jp [10.123.235.113]) by oym-om1.fujitsu.com (Postfix) with ESMTP id 2E26F4008A7C3; Wed, 3 Aug 2022 08:42:22 +0900 (JST) From: Shuuichirou Ishii To: will@kernel.org, robin.murphy@arm.com, joro@8bytes.org, thunder.leizhen@huawei.com, jgg@ziepe.ca, tglx@linutronix.de, chenxiang66@hisilicon.com, christophe.jaillet@wanadoo.fr, john.garry@huawei.com, baolu.lu@linux.intel.com, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org Cc: ishii.shuuichir@fujitsu.com Subject: [PATCH] iommu/arm-smmu-v3: fixed check process for disable_bypass module parameter Date: Wed, 3 Aug 2022 08:42:07 +0900 Message-Id: <20220802234207.1994093-1-ishii.shuuichir@fujitsu.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The current process does not enable the bypass setting regardless of the value of the disable_bypass module parameter when ACPI is enabled, so the value of the disable_bypass module parameter has been corrected so that it is handled correctly. Signed-off-by: Shuuichirou Ishii --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 88817a3376ef..256d7b2a83a7 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3396,7 +3396,7 @@ static int arm_smmu_device_reset(struct arm_smmu_devi= ce *smmu, bool bypass) enables &=3D ~(CR0_EVTQEN | CR0_PRIQEN); =20 /* Enable the SMMU interface, or ensure bypass */ - if (!bypass || disable_bypass) { + if (!bypass && disable_bypass) { enables |=3D CR0_SMMUEN; } else { ret =3D arm_smmu_update_gbpa(smmu, 0, GBPA_ABORT); --=20 2.27.0