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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3FF12C4332F for ; Mon, 21 Nov 2022 05:20:00 +0000 (UTC) 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:Content-ID:In-Reply-To: References:Message-ID:Date:Subject:CC:To:From:Reply-To:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qVnC64Wr5Ul7Ke8hVf7bW8Xq0u0pj25uVB4hHAS5+Tg=; b=JlrsmbNWycQzkw /9ZDq0l/XVY3357yXJ7LilmDIi0BtpLZX90aQRDxU5saLlwfT+tek5n30pI33hnz8I6SLxKsewLNa Mvedgn38tpuPsfUMUl/Y6ykjkg0fBQib4e9Vg39sFAmx63u3jK88n8LYGrHHMvR5tkLrlttk5iZj2 FSC8vjbAqX7oEU41NmLXKkSOXk76OPbVghZ+VVo8ki5M7F47ubXlpTaeb3jN6LFO0I/lluBR4acjL +NFg3kziKpxOOvl5fwcHJqr6GMsy5VDAI51L7NqG9cgZe9jLWq01bECORyPt5rMzQstMYH0+rrGaG q8YmxrxtWvNiUQ5mWWSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1owzCn-009WT4-3w; Mon, 21 Nov 2022 05:18:53 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1owzCJ-009WGh-NR; Mon, 21 Nov 2022 05:18:25 +0000 X-UUID: 088453a7ca35455ba2f433622a890127-20221120 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=MIME-Version:Content-Transfer-Encoding:Content-ID:Content-Type:In-Reply-To:References:Message-ID:Date:Subject:CC:To:From; bh=Mc48Hynd/ws2zh6uHfv5FOf8hE9ji7Rv8HAmmTAxz1A=; b=lb7aBWUFB5kVOFY5u+JmxmYcmUa6hi5anEx7enRsDQ/Z+2ZQAdHTgO8TlaNsrc36O+0tnGlfa01R6Ynj/eWM4R7yCH5dW2Y9KdGXkb0eIPSMgWQYj7NerPyKxvj5zNehCxFga9kdshv0MHShPdghoIk5qjW51WdMys+/4kJQ0y8=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.12,REQID:434e5ad7-28a4-4176-8e10-e24f29fad997,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:62cd327,CLOUDID:1214d2f8-3a34-4838-abcf-dfedf9dd068e,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: 088453a7ca35455ba2f433622a890127-20221120 Received: from mtkmbs13n2.mediatek.inc [(172.21.101.108)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1341632570; Sun, 20 Nov 2022 22:18:19 -0700 Received: from mtkmbs10n1.mediatek.inc (172.21.101.34) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.3; Mon, 21 Nov 2022 13:17:57 +0800 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (172.21.101.239) by mtkmbs10n1.mediatek.com (172.21.101.34) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Mon, 21 Nov 2022 13:17:57 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LAGuQ1Jzlj2qAZNwCDWaBLU61TgN0CnIqyPScAdzzgpzA6JoHtZRfz0reDZ8iRwdSrIAdfuA3MUHn0tyTuWdfvmIWm1umOMCI97IYqLoWFjBy7taEZqZGShP5latbVJpTE8LMdKEXPp1TS0mbljp4xxKBLJV3JyStaGd86kKhwwtB3AdS62MEfseGhpui0bCbM1Z57ORn9UWF8gONjcopBM+u3elJ6niaGElwLRbLDQ8eGZnsjsV1CMMrqxIXlc5uw5zSKdwbZmvzn3MPI73rdG5VmWfdG+Juaf5OMFGhGrXdlxLTIE3ZQoYW5JvZfWUfUDEf+PcSKyvvJc20i7ayQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Mc48Hynd/ws2zh6uHfv5FOf8hE9ji7Rv8HAmmTAxz1A=; b=a81g/SxKfPLFBJ4FZoCg8Q5x0fn6gU94A2wLTCFyYyUDod6P2839U1JyNHoBvj3hzZL8wBEUGbc1elXs0UsZgETtCH7YdrplcHdWUA1LSAE9Sa98ND0hIyPYfen4+yZtUghwD/hO3PwDUpE4HtK2Jo1AQFhzXlkqReI04R7D30hwb07gJmDseRuqm0nys8hx4z2vkA3lwdD+7qhlI5gSeMcWmcn60LtXytdbZpbkHBS7rLRu5thoFv/Tdf/e/UhjSpfFrfMsTQaUAJXeab/lfsXAl+sFothxT9UAupZ/iZ1XcyGPFJRt+0KdSp4NgrZmGTP/VRcpPE9V0dnFiEsWww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mediatek.com; dmarc=pass action=none header.from=mediatek.com; dkim=pass header.d=mediatek.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mediateko365.onmicrosoft.com; s=selector2-mediateko365-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Mc48Hynd/ws2zh6uHfv5FOf8hE9ji7Rv8HAmmTAxz1A=; b=P9sRIyLjwi2vOQqofUd+DrVB4a2vxP+EN36yjWzlVMbTBD1dZW1MXRgpod8XeBO7N5Vym7HLridQXTL4hByDusQ3PvX60U4PwtDWUgEstv4oT0cvkZOeXqSvF3ozjjymSFFzQUeQkG1DN9CR6J7Xuv6SjsQGrmy47OvXViyXTqg= Received: from SI2PR03MB5885.apcprd03.prod.outlook.com (2603:1096:4:142::7) by SEYPR03MB6603.apcprd03.prod.outlook.com (2603:1096:101:85::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.15; Mon, 21 Nov 2022 05:17:54 +0000 Received: from SI2PR03MB5885.apcprd03.prod.outlook.com ([fe80::be04:b90a:e582:9b0b]) by SI2PR03MB5885.apcprd03.prod.outlook.com ([fe80::be04:b90a:e582:9b0b%3]) with mapi id 15.20.5834.015; Mon, 21 Nov 2022 05:17:54 +0000 From: =?utf-8?B?WW9uZyBXdSAo5ZC05YuHKQ==?= To: =?utf-8?B?Q2hlbmdjaSBYdSAo6K645om/6LWQKQ==?= CC: "linux-mediatek@lists.infradead.org" , "robh+dt@kernel.org" , "linux-kernel@vger.kernel.org" , "devicetree@vger.kernel.org" , "robin.murphy@arm.com" , "joro@8bytes.org" , Project_Global_Chrome_Upstream_Group , "linux-arm-kernel@lists.infradead.org" , "krzysztof.kozlowski+dt@linaro.org" , "iommu@lists.linux.dev" , "matthias.bgg@gmail.com" , "will@kernel.org" Subject: Re: [PATCH v4 2/4] iommu/mediatek: Adjust mtk_iommu_config flow Thread-Topic: [PATCH v4 2/4] iommu/mediatek: Adjust mtk_iommu_config flow Thread-Index: AQHY4r0QorQZNZOmwEeM6et2DUpC+K5JC70A Date: Mon, 21 Nov 2022 05:17:54 +0000 Message-ID: <2ea0120c31d4230701aa031daf57317720f78cf0.camel@mediatek.com> References: <20221018064239.13391-1-chengci.xu@mediatek.com> <20221018064239.13391-3-chengci.xu@mediatek.com> In-Reply-To: <20221018064239.13391-3-chengci.xu@mediatek.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.5-0ubuntu0.18.04.2 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mediatek.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SI2PR03MB5885:EE_|SEYPR03MB6603:EE_ x-ms-office365-filtering-correlation-id: 0126bf2c-b561-4c05-96b1-08dacb7fbeb9 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: WXG0HGLQJ0v1DQKzWNovPNjErAUiTVcygApAlPM3JY6xLkVPTG1SVtr/EWwmqOZSDfh6NbH2WFV8tpxd28Kk7bKo/dFN7VJETTatotQ9maLanBCqrp6qwHBpGEWJlQ0IfaiDfIt81mfUpajlZLyH598nrlbSX96k8z1hDLn9k0hGajIyiPPf49QRBJyTqvmXzRlrdrR19BWVAdRL67wdegXjfKpnBxkF1Gf9bAyqOJRw7a+eIbyRGhB50tn0SmASS2POzzsagrrvEQe7DRGMkSqf3q5vK1lGt0lhUOFE1NqoI0oHBMVNxXXYn4zrlMHbNKiYv5qeps09Ea7+h2XFnxmb6UgxTCpdvd5JVUWzFuumQX8bTqyGn+qCAiSaxaQzPnowy2L2gQI80WMF8eHrnFjKnYyxuhR136ZB32oEG/vM1t+VE1gqd0RmQm2trybRJXg72wxb7hrE5zIS0uNSOobcl8dKKY3fyO2vsLUwNdhoTBWYK5CyXmDFtPSawlJ1jBJpTfC8Kjlpik4nLxC35BYryXZfkrcaYqvGER6k/Cy0fMkA4nFI9VTv2q0MjUD+oLC7IIn55TY0mosN5Sx9Ftabwie7+9RhiTni2ixAC6iT9+R1pFGWkGDq6Oz5+3mVeaxddJc8SLMDG6eARwIcRftxItCMgBImZKucfO22NG50+88Mqvvwfr8aepUwBCMnPdSmBA/TEPROM1CjpCg5fh97hJ8fbvaLEzTGC7xM6g4= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SI2PR03MB5885.apcprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(396003)(346002)(366004)(136003)(376002)(451199015)(6862004)(6512007)(8936002)(2616005)(85182001)(26005)(186003)(7416002)(5660300002)(38100700002)(36756003)(316002)(478600001)(86362001)(6486002)(6506007)(71200400001)(6636002)(38070700005)(54906003)(37006003)(122000001)(41300700001)(64756008)(66446008)(4326008)(66556008)(76116006)(66476007)(66946007)(8676002)(83380400001)(4001150100001)(2906002)(99106002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?M0RheEVqOWsrT3g1Nkhiak5tbWRqOE9OdnJIRzFRYVJYY3FyTEx0UG1OSTVw?= =?utf-8?B?dkJFM01hZTlKckdsWGxmVkNjeitNdDBqeHgrV255dk9mN3VBL2oycWFEeG5p?= =?utf-8?B?cUplRFo0QjdxT3FHKzV5US9USjZoN0VDMFJ3MndGWlVXWFNsZjZRdWpjelZo?= =?utf-8?B?ZHZ2MXdoc2I2dzUwVjdIS0hvSWVNVnp6R0llTDhCRVJMaTZ2NTNEYkZ1VTZ4?= =?utf-8?B?NFhVWVQ5RHlFOThTYzdmeHUxMmJCMFhwUm9JU01HWkp1TFVDZE1aazBqbVNn?= =?utf-8?B?N0ZTK09sdStSNUhjS2NOR0treGNHRjlLSUFheGF1MUh3alRvdG9SWERLK2tL?= =?utf-8?B?OEJWVDlhazc0MzJEUGxLN1VMQlpXUFlLOGMxWjlQaUpoaXBkeEhoY1BqMi9v?= =?utf-8?B?cWZ3cUpNYlZOcVVNVVpzaEZucmpIcTVtVHBXWEpRZEpCUHdMRGVrYzdLMXE2?= =?utf-8?B?amd2Ri9wVXRNMys2eDRvUHZ4NG9vR2xkWU5VeW9wMVE4TS85UDZPNmpKbUVu?= =?utf-8?B?K2NwZXFKaGV5TFNRQXUvWTdha2Z0R1dPQ09BZW9iYmhsYW9ldGFkeHVRMUYv?= =?utf-8?B?L0tFWHVDc3FFVEVpd1M5RkpZQS9xbHJDR2Exem12SmpiS1RqMnh0RmhXbXI2?= =?utf-8?B?YWRYOEpvWDltLzZHc2twWURyMFVzWnIxTTM1TVF3c1lkZDl4UnkvZTlKY0Zi?= =?utf-8?B?RE5vUXI2VWpURlJyUUVsNFN3T3BEVHlWNjNYVXU0MFVsUU9VRFVYVXZKM1lz?= =?utf-8?B?b3QreVVBQUxBMklmSDFjVFJ3S01YRmNKL2crQW5meTVsdEptUG51Z3FvWUhi?= =?utf-8?B?THVJTDM4UjhCZXBqeEVSVHNqY2NiVFZwaDFaRDB6bERRd3VQTDRZWEc1RXM4?= =?utf-8?B?c0I5N2JIWG9oSXRSdFZIaXBMcTVXNGprclZhOXA3ZS95YUpqWlBiYTJvWGNj?= =?utf-8?B?RlpIaFd5RFZxdmFCWVp6T1BxbXNIWGxGYXhPQ2tiWnY5b0UrU2huRHpvQjN2?= =?utf-8?B?OVcxYU1seDc2SFU0Q09sQW10MkpHcWZOQzExdlp2c1RWZFhyNjg2aGorckZX?= =?utf-8?B?MkdzWE1LMXprYWNEV1J3RDNyNzRXR3lmeG5kVDFiNTRHdWxzYlN2OTUxSERw?= =?utf-8?B?bkdVRFpkWnJwTEIrY1JLVHVjQzU0NUwvS3NGTGkrdEZlbmJwdjA5M2hjc0dx?= =?utf-8?B?dzM4dTBOa3Vpa3ZMbFZ2SEtVdUdERW0wN05DS2FrbmNXdmR3RDJaOGlLa2Qw?= =?utf-8?B?bWdKZ2hjeEkwMDJ5OG04VmQ5THVoVlVqcTlNTVVsUFFHM1dzT2c2czk0Y2Fh?= =?utf-8?B?R3hybEE4ZzVzNllnYWh5OWk0d2JkOVBaMWhUTVRnaW0wTFI5NUQvaDlndDND?= =?utf-8?B?QTN1b003bE5tUEd6Ujk1SHhoUnNTRExwdW5yYi81MmROU2VuQWxxQno0dldY?= =?utf-8?B?MjV5S2dwdjhJVUlISkp5WlpWMC9oYzJqYkQ5U2YrYUlXYUJnU1BkZFp5dTk0?= =?utf-8?B?RkgzUGQrdndLYVJhdmpNOXRwYUJ4V2dEc0dpd3NiOWRCMlIvaUNMN09nVi9G?= =?utf-8?B?SnlHajZudi91T1A0ZkZkdVR6SDk4TTlscUkyeGM4Ni9yY2ZIUlY4UzR2VTFw?= =?utf-8?B?QWpuTnh3cjVuSDRXV01FSUNkUEc0WTVrNWpFNmlGaTJxaVJ2alI4Y0NLVGh2?= =?utf-8?B?S1duNjF5NjI4dUxJUks0a1FDSWFrQWVLL0h1Z2kraTlhcm51RWhxeHNIUkVt?= =?utf-8?B?VkpCSnNTTWhWWnZuUXNYOW1ZZjRkOGp4RjZ1N1IwT3h1MHlQNTB5eEpIS3Zt?= =?utf-8?B?dFN0Zjc4RnRYTzY1czJIR2NtQlg1TSs4NE1GaGk3cmVEVDlpK21XL0ZTRjZQ?= =?utf-8?B?cENha3MvUHBiWDJtTEhKTGhBbDJRb2s1b1I5UUdiNTZib0FQVTBYSDRuNG9F?= =?utf-8?B?U2ZlZUlBL3FtTXZsbjhmN1ppVWJpdlhUMGZyUVVxamkyc25yclg1QlA1VHY3?= =?utf-8?B?dHl2V2htRzJjRnJZeGswNDdjdDdlSFRHOGtpUCtZUDJRVGwwbDJlOTd3dlZY?= =?utf-8?B?M2UrZnJYemphZ2xEY2p1TG5rV1ZNQm5lN0tGNktqNTgrR052a0dRRDVDeFNh?= =?utf-8?B?ZVdTZDUxQUZiQ280eWR6SXVyUWRManAzTnBUQUI2bE9NYlcvcjhoazJmV1NG?= =?utf-8?B?OEE9PQ==?= Content-ID: <8664C8EC211F8E46B725569BF2A09593@apcprd03.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SI2PR03MB5885.apcprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0126bf2c-b561-4c05-96b1-08dacb7fbeb9 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Nov 2022 05:17:54.6840 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a7687ede-7a6b-4ef6-bace-642f677fbe31 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ITMuSUFtOsAErhBPS6IFAPQgY4rC53rIVV2tRpopF4ZEO26BKKKrUTJACW2WsIswqwI5pTkcUwtbSl/8B3htgw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR03MB6603 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221120_211823_830337_7EBD0BCC X-CRM114-Status: GOOD ( 22.75 ) 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="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, 2022-10-18 at 14:42 +0800, Chengci.Xu wrote: > For reduce indention without functional change, prepare for MT8188. > If there are many port in a same larb, current flow will update > larb_mmu->mmu or update INFRA register for too many times. > So we save all port to portid_msk in the front of mtk_iommu_config(), > and then update only once for IOMMU configure. By this modification, > we can prevent MT8188 from sending to many SMC calls, avoiding enter > ATF for each port. > > Signed-off-by: Chengci.Xu > --- > drivers/iommu/mtk_iommu.c | 60 ++++++++++++++++++++++--------------- > -- > 1 file changed, 34 insertions(+), 26 deletions(-) > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 5a4e00e4bbbc..fbaf401f34e0 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -534,41 +534,49 @@ static int mtk_iommu_config(struct > mtk_iommu_data *data, struct device *dev, > unsigned int larbid, portid; > struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); > const struct mtk_iommu_iova_region *region; > - u32 peri_mmuen, peri_mmuen_msk; > + unsigned long portid_msk_ext; > + u32 portid_msk = 0; > int i, ret = 0; > > for (i = 0; i < fwspec->num_ids; ++i) { > - larbid = MTK_M4U_TO_LARB(fwspec->ids[i]); > portid = MTK_M4U_TO_PORT(fwspec->ids[i]); > + portid_msk |= BIT(portid); > + } > > - if (MTK_IOMMU_IS_TYPE(data->plat_data, > MTK_IOMMU_TYPE_MM)) { > - larb_mmu = &data->larb_imu[larbid]; > + if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM)) { > + /* All ports should be in the same larb. just use 0 > here */ > + larbid = MTK_M4U_TO_LARB(fwspec->ids[0]); > + larb_mmu = &data->larb_imu[larbid]; > + region = data->plat_data->iova_region + regionid; > > - region = data->plat_data->iova_region + > regionid; > + portid_msk_ext = portid_msk; > + for_each_set_bit(portid, &portid_msk_ext, 32) Why do we need define a new portid_msk_ext? Can't we use portid_msk directly? > larb_mmu->bank[portid] = upper_32_bits(region- > >iova_base); > > - dev_dbg(dev, "%s iommu for larb(%s) port %d > region %d rgn-bank %d.\n", > - enable ? "enable" : "disable", > dev_name(larb_mmu->dev), > - portid, regionid, larb_mmu- > >bank[portid]); > - > - if (enable) > - larb_mmu->mmu |= > MTK_SMI_MMU_EN(portid); > - else > - larb_mmu->mmu &= > ~MTK_SMI_MMU_EN(portid); > - } else if (MTK_IOMMU_IS_TYPE(data->plat_data, > MTK_IOMMU_TYPE_INFRA)) { > - peri_mmuen_msk = BIT(portid); > - /* PCI dev has only one output id, enable the > next writing bit for PCIe */ > - if (dev_is_pci(dev)) > - peri_mmuen_msk |= BIT(portid + 1); > - > - peri_mmuen = enable ? peri_mmuen_msk : 0; > - ret = regmap_update_bits(data->pericfg, > PERICFG_IOMMU_1, > - peri_mmuen_msk, > peri_mmuen); > - if (ret) > - dev_err(dev, "%s iommu(%s) inframaster > 0x%x fail(%d).\n", > - enable ? "enable" : "disable", > - dev_name(data->dev), > peri_mmuen_msk, ret); > + dev_dbg(dev, "%s iommu for larb(%s) port 0x%x region %d > rgn-bank %d.\n", > + enable ? "enable" : "disable", > dev_name(larb_mmu->dev), > + portid_msk, regionid, upper_32_bits(region- > >iova_base)); > + > + if (enable) > + larb_mmu->mmu |= portid_msk; > + else > + larb_mmu->mmu &= ~portid_msk; > + } else if (MTK_IOMMU_IS_TYPE(data->plat_data, > MTK_IOMMU_TYPE_INFRA)) { > + /* PCI dev has only one output id, enable the next > writing bit for PCIe */ > + if (dev_is_pci(dev)) { > + if (fwspec->num_ids != 1) { > + dev_err(dev, "PCI dev can only have one > port.\n"); > + return -ENODEV; > + } > + portid_msk |= BIT(portid + 1); > } > + > + ret = regmap_update_bits(data->pericfg, > PERICFG_IOMMU_1, > + portid_msk, enable ? > portid_msk : 0); > + if (ret) > + dev_err(dev, "%s iommu(%s) inframaster 0x%x > fail(%d).\n", > + enable ? "enable" : "disable", > + dev_name(data->dev), portid_msk, ret); > } > return ret; > } _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel