From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61954C4338F for ; Thu, 5 Aug 2021 08:09:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4139A6104F for ; Thu, 5 Aug 2021 08:09:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234289AbhHEIJr (ORCPT ); Thu, 5 Aug 2021 04:09:47 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:3590 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233484AbhHEIJq (ORCPT ); Thu, 5 Aug 2021 04:09:46 -0400 Received: from fraeml736-chm.china.huawei.com (unknown [172.18.147.201]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4GgLqG2lZkz6F8Fl; Thu, 5 Aug 2021 16:09:14 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml736-chm.china.huawei.com (10.206.15.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Thu, 5 Aug 2021 10:09:31 +0200 Received: from A2006125610.china.huawei.com (10.47.91.4) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Thu, 5 Aug 2021 09:09:24 +0100 From: Shameer Kolothum To: , , CC: , , , , , , , , , , , Subject: [PATCH v7 6/9] =?UTF-8?q?iommu/arm-smmu-v3:=20Refactor=C2=A0arm?= =?UTF-8?q?=5Fsmmu=5Finit=5Fbypass=5Fstes()=20to=20force=20bypass?= Date: Thu, 5 Aug 2021 09:07:21 +0100 Message-ID: <20210805080724.480-7-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20210805080724.480-1-shameerali.kolothum.thodi@huawei.com> References: <20210805080724.480-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.47.91.4] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org By default, disable_bypass flag is set and any dev without an iommu domain installs STE with CFG_ABORT during arm_smmu_init_bypass_stes(). Introduce a "force" flag and move the STE update logic to arm_smmu_init_bypass_stes() so that we can force it to install CFG_BYPASS STE for specific SIDs. This will be useful in follow-up patch to install bypass for IORT RMR SIDs. Signed-off-by: Shameer Kolothum --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 31940e53c675..85f6f1925a36 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1357,12 +1357,21 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_master *master, u32 sid, arm_smmu_cmdq_issue_cmd(smmu, &prefetch_cmd); } -static void arm_smmu_init_bypass_stes(__le64 *strtab, unsigned int nent) +static void arm_smmu_init_bypass_stes(__le64 *strtab, unsigned int nent, bool force) { unsigned int i; + u64 val = STRTAB_STE_0_V; + + if (disable_bypass && !force) + val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_ABORT); + else + val |= FIELD_PREP(STRTAB_STE_0_CFG, STRTAB_STE_0_CFG_BYPASS); for (i = 0; i < nent; ++i) { - arm_smmu_write_strtab_ent(NULL, -1, strtab); + strtab[0] = cpu_to_le64(val); + strtab[1] = cpu_to_le64(FIELD_PREP(STRTAB_STE_1_SHCFG, + STRTAB_STE_1_SHCFG_INCOMING)); + strtab[2] = 0; strtab += STRTAB_STE_DWORDS; } } @@ -1390,7 +1399,7 @@ static int arm_smmu_init_l2_strtab(struct arm_smmu_device *smmu, u32 sid) return -ENOMEM; } - arm_smmu_init_bypass_stes(desc->l2ptr, 1 << STRTAB_SPLIT); + arm_smmu_init_bypass_stes(desc->l2ptr, 1 << STRTAB_SPLIT, false); arm_smmu_write_strtab_l1_desc(strtab, desc); return 0; } @@ -3042,7 +3051,7 @@ static int arm_smmu_init_strtab_linear(struct arm_smmu_device *smmu) reg |= FIELD_PREP(STRTAB_BASE_CFG_LOG2SIZE, smmu->sid_bits); cfg->strtab_base_cfg = reg; - arm_smmu_init_bypass_stes(strtab, cfg->num_l1_ents); + arm_smmu_init_bypass_stes(strtab, cfg->num_l1_ents, false); return 0; } -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,URIBL_RED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2D17C4338F for ; Thu, 5 Aug 2021 08:09:37 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 70BA961040 for ; Thu, 5 Aug 2021 08:09:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 70BA961040 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 49A1840259; Thu, 5 Aug 2021 08:09:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KneUM8s0Zuqk; Thu, 5 Aug 2021 08:09:36 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id C583B4026A; Thu, 5 Aug 2021 08:09:35 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9D825C001A; Thu, 5 Aug 2021 08:09:35 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 5169BC000E for ; Thu, 5 Aug 2021 08:09:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 3F0A540259 for ; Thu, 5 Aug 2021 08:09:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pL-HO6OyZDy7 for ; Thu, 5 Aug 2021 08:09:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 35AF3402AE for ; Thu, 5 Aug 2021 08:09:33 +0000 (UTC) Received: from fraeml736-chm.china.huawei.com (unknown [172.18.147.201]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4GgLqG2lZkz6F8Fl; Thu, 5 Aug 2021 16:09:14 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml736-chm.china.huawei.com (10.206.15.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Thu, 5 Aug 2021 10:09:31 +0200 Received: from A2006125610.china.huawei.com (10.47.91.4) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Thu, 5 Aug 2021 09:09:24 +0100 From: Shameer Kolothum To: , , Subject: [PATCH v7 6/9] =?UTF-8?q?iommu/arm-smmu-v3:=20Refactor=C2=A0arm?= =?UTF-8?q?=5Fsmmu=5Finit=5Fbypass=5Fstes()=20to=20force=20bypass?= Date: Thu, 5 Aug 2021 09:07:21 +0100 Message-ID: <20210805080724.480-7-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20210805080724.480-1-shameerali.kolothum.thodi@huawei.com> References: <20210805080724.480-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.47.91.4] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Cc: robin.murphy@arm.com, jon@solid-run.com, linuxarm@huawei.com, steven.price@arm.com, guohanjun@huawei.com, yangyicong@huawei.com, Sami.Mujawar@arm.com, will@kernel.org, wanghuiqiang@huawei.com X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" QnkgZGVmYXVsdCzCoGRpc2FibGVfYnlwYXNzIGZsYWcgaXMgc2V0IGFuZCBhbnkgZGV2IHdpdGhv dXQKYW4gaW9tbXUgZG9tYWluIGluc3RhbGxzwqBTVEUgd2l0aCBDRkdfQUJPUlQgZHVyaW5nCmFy bV9zbW11X2luaXRfYnlwYXNzX3N0ZXMoKS4gSW50cm9kdWNlIGEgImZvcmNlIiBmbGFnIGFuZApt b3ZlIHRoZSBTVEUgdXBkYXRlIGxvZ2ljIHRvwqBhcm1fc21tdV9pbml0X2J5cGFzc19zdGVzKCkK c28gdGhhdCB3ZSBjYW4gZm9yY2UgaXQgdG8gaW5zdGFsbMKgQ0ZHX0JZUEFTUyBTVEUgZm9yIHNw ZWNpZmljClNJRHMuCgpUaGlzIHdpbGwgYmXCoHVzZWZ1bMKgaW4gZm9sbG93LXVwwqBwYXRjaCB0 byBpbnN0YWxsIGJ5cGFzcwpmb3IgSU9SVCBSTVIgU0lEcy4KClNpZ25lZC1vZmYtYnk6IFNoYW1l ZXIgS29sb3RodW0gPHNoYW1lZXJhbGkua29sb3RodW0udGhvZGlAaHVhd2VpLmNvbT4KLS0tCiBk cml2ZXJzL2lvbW11L2FybS9hcm0tc21tdS12My9hcm0tc21tdS12My5jIHwgMTcgKysrKysrKysr KysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW9tbXUvYXJtL2FybS1zbW11LXYzL2FybS1zbW11LXYz LmMgYi9kcml2ZXJzL2lvbW11L2FybS9hcm0tc21tdS12My9hcm0tc21tdS12My5jCmluZGV4IDMx OTQwZTUzYzY3NS4uODVmNmYxOTI1YTM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2lvbW11L2FybS9h cm0tc21tdS12My9hcm0tc21tdS12My5jCisrKyBiL2RyaXZlcnMvaW9tbXUvYXJtL2FybS1zbW11 LXYzL2FybS1zbW11LXYzLmMKQEAgLTEzNTcsMTIgKzEzNTcsMjEgQEAgc3RhdGljIHZvaWQgYXJt X3NtbXVfd3JpdGVfc3RydGFiX2VudChzdHJ1Y3QgYXJtX3NtbXVfbWFzdGVyICptYXN0ZXIsIHUz MiBzaWQsCiAJCWFybV9zbW11X2NtZHFfaXNzdWVfY21kKHNtbXUsICZwcmVmZXRjaF9jbWQpOwog fQogCi1zdGF0aWMgdm9pZCBhcm1fc21tdV9pbml0X2J5cGFzc19zdGVzKF9fbGU2NCAqc3RydGFi LCB1bnNpZ25lZCBpbnQgbmVudCkKK3N0YXRpYyB2b2lkIGFybV9zbW11X2luaXRfYnlwYXNzX3N0 ZXMoX19sZTY0ICpzdHJ0YWIsIHVuc2lnbmVkIGludCBuZW50LCBib29sIGZvcmNlKQogewogCXVu c2lnbmVkIGludCBpOworCXU2NCB2YWwgPSBTVFJUQUJfU1RFXzBfVjsKKworCWlmIChkaXNhYmxl X2J5cGFzcyAmJiAhZm9yY2UpCisJCXZhbCB8PSBGSUVMRF9QUkVQKFNUUlRBQl9TVEVfMF9DRkcs IFNUUlRBQl9TVEVfMF9DRkdfQUJPUlQpOworCWVsc2UKKwkJdmFsIHw9IEZJRUxEX1BSRVAoU1RS VEFCX1NURV8wX0NGRywgU1RSVEFCX1NURV8wX0NGR19CWVBBU1MpOwogCiAJZm9yIChpID0gMDsg aSA8IG5lbnQ7ICsraSkgewotCQlhcm1fc21tdV93cml0ZV9zdHJ0YWJfZW50KE5VTEwsIC0xLCBz dHJ0YWIpOworCQlzdHJ0YWJbMF0gPSBjcHVfdG9fbGU2NCh2YWwpOworCQlzdHJ0YWJbMV0gPSBj cHVfdG9fbGU2NChGSUVMRF9QUkVQKFNUUlRBQl9TVEVfMV9TSENGRywKKwkJCQkJCSAgIFNUUlRB Ql9TVEVfMV9TSENGR19JTkNPTUlORykpOworCQlzdHJ0YWJbMl0gPSAwOwogCQlzdHJ0YWIgKz0g U1RSVEFCX1NURV9EV09SRFM7CiAJfQogfQpAQCAtMTM5MCw3ICsxMzk5LDcgQEAgc3RhdGljIGlu dCBhcm1fc21tdV9pbml0X2wyX3N0cnRhYihzdHJ1Y3QgYXJtX3NtbXVfZGV2aWNlICpzbW11LCB1 MzIgc2lkKQogCQlyZXR1cm4gLUVOT01FTTsKIAl9CiAKLQlhcm1fc21tdV9pbml0X2J5cGFzc19z dGVzKGRlc2MtPmwycHRyLCAxIDw8IFNUUlRBQl9TUExJVCk7CisJYXJtX3NtbXVfaW5pdF9ieXBh c3Nfc3RlcyhkZXNjLT5sMnB0ciwgMSA8PCBTVFJUQUJfU1BMSVQsIGZhbHNlKTsKIAlhcm1fc21t dV93cml0ZV9zdHJ0YWJfbDFfZGVzYyhzdHJ0YWIsIGRlc2MpOwogCXJldHVybiAwOwogfQpAQCAt MzA0Miw3ICszMDUxLDcgQEAgc3RhdGljIGludCBhcm1fc21tdV9pbml0X3N0cnRhYl9saW5lYXIo c3RydWN0IGFybV9zbW11X2RldmljZSAqc21tdSkKIAlyZWcgfD0gRklFTERfUFJFUChTVFJUQUJf QkFTRV9DRkdfTE9HMlNJWkUsIHNtbXUtPnNpZF9iaXRzKTsKIAljZmctPnN0cnRhYl9iYXNlX2Nm ZyA9IHJlZzsKIAotCWFybV9zbW11X2luaXRfYnlwYXNzX3N0ZXMoc3RydGFiLCBjZmctPm51bV9s MV9lbnRzKTsKKwlhcm1fc21tdV9pbml0X2J5cGFzc19zdGVzKHN0cnRhYiwgY2ZnLT5udW1fbDFf ZW50cywgZmFsc2UpOwogCXJldHVybiAwOwogfQogCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlvbW11IG1haWxpbmcgbGlzdAppb21t dUBsaXN0cy5saW51eC1mb3VuZGF0aW9uLm9yZwpodHRwczovL2xpc3RzLmxpbnV4Zm91bmRhdGlv bi5vcmcvbWFpbG1hbi9saXN0aW5mby9pb21tdQ== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4ADAAC432BE for ; Thu, 5 Aug 2021 08:12:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0603B61050 for ; Thu, 5 Aug 2021 08:12:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0603B61050 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tsXoT9BSeXBqMD6GBtnac7u40zH3iCC+aacYhWwscWs=; b=ansfBNrqMdXpV0 NF76/+ZO9JZw+I4NrVefRCvJoQiPVTN6zzzOv1KoSYI1Xl/KGRSorR+x+tQCFP/yNx4kwxaV+ZW8Q HV229av7zGEwd5V/A0CqFUH+s8BDXyX7USImx1kFcjcnuepNS0cCpejAWy00O9x76X1Xk1EE5Y1rk NzE1KymIPW5kqxO4GPrW2VifFZ8DdUee0Q6bOsQ6K7LfDBonVOClinVKPYe58R/X1o+7sbHH2eXg5 Plm1/DURjq49JxJ6rWJsiqZs2NodG84NHuq2usCyLC7+YShb5+IZT3HZpGRE8MbqCXymsRUfVtsz5 3XTt3XNdeZYIVNIgx4Mg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mBYSI-008aSe-7u; Thu, 05 Aug 2021 08:10:18 +0000 Received: from frasgout.his.huawei.com ([185.176.79.56]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mBYRZ-008a5u-4u for linux-arm-kernel@lists.infradead.org; Thu, 05 Aug 2021 08:09:36 +0000 Received: from fraeml736-chm.china.huawei.com (unknown [172.18.147.201]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4GgLqG2lZkz6F8Fl; Thu, 5 Aug 2021 16:09:14 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml736-chm.china.huawei.com (10.206.15.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Thu, 5 Aug 2021 10:09:31 +0200 Received: from A2006125610.china.huawei.com (10.47.91.4) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Thu, 5 Aug 2021 09:09:24 +0100 From: Shameer Kolothum To: , , CC: , , , , , , , , , , , Subject: [PATCH v7 6/9] =?UTF-8?q?iommu/arm-smmu-v3:=20Refactor=C2=A0arm?= =?UTF-8?q?=5Fsmmu=5Finit=5Fbypass=5Fstes()=20to=20force=20bypass?= Date: Thu, 5 Aug 2021 09:07:21 +0100 Message-ID: <20210805080724.480-7-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20210805080724.480-1-shameerali.kolothum.thodi@huawei.com> References: <20210805080724.480-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.47.91.4] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210805_010933_547127_D4A92C91 X-CRM114-Status: GOOD ( 10.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org QnkgZGVmYXVsdCzCoGRpc2FibGVfYnlwYXNzIGZsYWcgaXMgc2V0IGFuZCBhbnkgZGV2IHdpdGhv dXQKYW4gaW9tbXUgZG9tYWluIGluc3RhbGxzwqBTVEUgd2l0aCBDRkdfQUJPUlQgZHVyaW5nCmFy bV9zbW11X2luaXRfYnlwYXNzX3N0ZXMoKS4gSW50cm9kdWNlIGEgImZvcmNlIiBmbGFnIGFuZApt b3ZlIHRoZSBTVEUgdXBkYXRlIGxvZ2ljIHRvwqBhcm1fc21tdV9pbml0X2J5cGFzc19zdGVzKCkK c28gdGhhdCB3ZSBjYW4gZm9yY2UgaXQgdG8gaW5zdGFsbMKgQ0ZHX0JZUEFTUyBTVEUgZm9yIHNw ZWNpZmljClNJRHMuCgpUaGlzIHdpbGwgYmXCoHVzZWZ1bMKgaW4gZm9sbG93LXVwwqBwYXRjaCB0 byBpbnN0YWxsIGJ5cGFzcwpmb3IgSU9SVCBSTVIgU0lEcy4KClNpZ25lZC1vZmYtYnk6IFNoYW1l ZXIgS29sb3RodW0gPHNoYW1lZXJhbGkua29sb3RodW0udGhvZGlAaHVhd2VpLmNvbT4KLS0tCiBk cml2ZXJzL2lvbW11L2FybS9hcm0tc21tdS12My9hcm0tc21tdS12My5jIHwgMTcgKysrKysrKysr KysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW9tbXUvYXJtL2FybS1zbW11LXYzL2FybS1zbW11LXYz LmMgYi9kcml2ZXJzL2lvbW11L2FybS9hcm0tc21tdS12My9hcm0tc21tdS12My5jCmluZGV4IDMx OTQwZTUzYzY3NS4uODVmNmYxOTI1YTM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2lvbW11L2FybS9h cm0tc21tdS12My9hcm0tc21tdS12My5jCisrKyBiL2RyaXZlcnMvaW9tbXUvYXJtL2FybS1zbW11 LXYzL2FybS1zbW11LXYzLmMKQEAgLTEzNTcsMTIgKzEzNTcsMjEgQEAgc3RhdGljIHZvaWQgYXJt X3NtbXVfd3JpdGVfc3RydGFiX2VudChzdHJ1Y3QgYXJtX3NtbXVfbWFzdGVyICptYXN0ZXIsIHUz MiBzaWQsCiAJCWFybV9zbW11X2NtZHFfaXNzdWVfY21kKHNtbXUsICZwcmVmZXRjaF9jbWQpOwog fQogCi1zdGF0aWMgdm9pZCBhcm1fc21tdV9pbml0X2J5cGFzc19zdGVzKF9fbGU2NCAqc3RydGFi LCB1bnNpZ25lZCBpbnQgbmVudCkKK3N0YXRpYyB2b2lkIGFybV9zbW11X2luaXRfYnlwYXNzX3N0 ZXMoX19sZTY0ICpzdHJ0YWIsIHVuc2lnbmVkIGludCBuZW50LCBib29sIGZvcmNlKQogewogCXVu c2lnbmVkIGludCBpOworCXU2NCB2YWwgPSBTVFJUQUJfU1RFXzBfVjsKKworCWlmIChkaXNhYmxl X2J5cGFzcyAmJiAhZm9yY2UpCisJCXZhbCB8PSBGSUVMRF9QUkVQKFNUUlRBQl9TVEVfMF9DRkcs IFNUUlRBQl9TVEVfMF9DRkdfQUJPUlQpOworCWVsc2UKKwkJdmFsIHw9IEZJRUxEX1BSRVAoU1RS VEFCX1NURV8wX0NGRywgU1RSVEFCX1NURV8wX0NGR19CWVBBU1MpOwogCiAJZm9yIChpID0gMDsg aSA8IG5lbnQ7ICsraSkgewotCQlhcm1fc21tdV93cml0ZV9zdHJ0YWJfZW50KE5VTEwsIC0xLCBz dHJ0YWIpOworCQlzdHJ0YWJbMF0gPSBjcHVfdG9fbGU2NCh2YWwpOworCQlzdHJ0YWJbMV0gPSBj cHVfdG9fbGU2NChGSUVMRF9QUkVQKFNUUlRBQl9TVEVfMV9TSENGRywKKwkJCQkJCSAgIFNUUlRB Ql9TVEVfMV9TSENGR19JTkNPTUlORykpOworCQlzdHJ0YWJbMl0gPSAwOwogCQlzdHJ0YWIgKz0g U1RSVEFCX1NURV9EV09SRFM7CiAJfQogfQpAQCAtMTM5MCw3ICsxMzk5LDcgQEAgc3RhdGljIGlu dCBhcm1fc21tdV9pbml0X2wyX3N0cnRhYihzdHJ1Y3QgYXJtX3NtbXVfZGV2aWNlICpzbW11LCB1 MzIgc2lkKQogCQlyZXR1cm4gLUVOT01FTTsKIAl9CiAKLQlhcm1fc21tdV9pbml0X2J5cGFzc19z dGVzKGRlc2MtPmwycHRyLCAxIDw8IFNUUlRBQl9TUExJVCk7CisJYXJtX3NtbXVfaW5pdF9ieXBh c3Nfc3RlcyhkZXNjLT5sMnB0ciwgMSA8PCBTVFJUQUJfU1BMSVQsIGZhbHNlKTsKIAlhcm1fc21t dV93cml0ZV9zdHJ0YWJfbDFfZGVzYyhzdHJ0YWIsIGRlc2MpOwogCXJldHVybiAwOwogfQpAQCAt MzA0Miw3ICszMDUxLDcgQEAgc3RhdGljIGludCBhcm1fc21tdV9pbml0X3N0cnRhYl9saW5lYXIo c3RydWN0IGFybV9zbW11X2RldmljZSAqc21tdSkKIAlyZWcgfD0gRklFTERfUFJFUChTVFJUQUJf QkFTRV9DRkdfTE9HMlNJWkUsIHNtbXUtPnNpZF9iaXRzKTsKIAljZmctPnN0cnRhYl9iYXNlX2Nm ZyA9IHJlZzsKIAotCWFybV9zbW11X2luaXRfYnlwYXNzX3N0ZXMoc3RydGFiLCBjZmctPm51bV9s MV9lbnRzKTsKKwlhcm1fc21tdV9pbml0X2J5cGFzc19zdGVzKHN0cnRhYiwgY2ZnLT5udW1fbDFf ZW50cywgZmFsc2UpOwogCXJldHVybiAwOwogfQogCi0tIAoyLjE3LjEKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxp bmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3Rz LmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==