From patchwork Sun Mar 24 12:28:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 13600805 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 A9287CD11BF for ; Sun, 24 Mar 2024 12:21:25 +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:Cc:To:In-Reply-To: References:Message-Id:Subject:Date:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=PHE2B4XH2bPhduW5sjOx50udsIcxKoix4f3GbEBowrQ=; b=3tuO7f0opWOmfE+Y5LxXIlsMMv WSvaOYG1NJaCtym/wrIZh3fxw0tDoAvI0F7AMaQZq2n/GWfDk2O6yzjbhe+VdqJ24lsq995csryYU uWYxf77iBRfQsKytZby9iWMnGzNje1ikCCELXfeJW7iHhvoBhagbUfh977Db6NMw6qHwYBDIxz7hd cwSDzwQVGVGO7kjZUcbo4LsGokQcafQVmY/nQzZHoTV4F6YZ1xo/qihjqvWJ0/oIqSr8tNyk5InFO P4pTbx1KA1h5hblhqj91hULx68YhT0rXKVU4jhhLtDcy3eEGPz488ba9aPg4PLcOVatIgciZgo61J j9Mok7vQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1roMqf-0000000CXBg-2Tsq; Sun, 24 Mar 2024 12:21:13 +0000 Received: from mail-db8eur05on2062d.outbound.protection.outlook.com ([2a01:111:f400:7e1a::62d] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1roMqW-0000000CX5K-3fSV for linux-arm-kernel@lists.infradead.org; Sun, 24 Mar 2024 12:21:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hDOlp35AzeiFy19SKvkufR7udgqDgl8UEbDz3wx170GRiSFM36RlS52j1P90reQOL4JDTGDw/SB92GOfc5nW0435K74NRFfql5U39jLyZGpPNLC6bYq6Ucd4h5XXhRlN2vhNzq+zcAbGnavO3zdjHDBUYtRhRwTJO+8zb8c20H7ymCoVqtQE7MV+rat2WU8VYAnLoU/LOSnIgefYteQ1edvyctPU0IFPEVzb0NqvVKa7PNN4I172NzIqCarMiKlbtqqSl9k53ijgd1rvNLxMfrfsExPrrcY3UaMqQyh5UWP5kOllgcApwJzhnFv8SAYEB8sWqXgsCPs3RgCGkVDFGg== 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=eWUwpvRdGYCbTQ05mtW1+fJhbr7iX8XIT4j6BO/zlBo=; b=FiA7wFyY6U3XeJ8PSkTzA4c9maSRm2kUlGWfF9GcG3nL9xADIOfA0O/VaHKL8zvuyBXyp6sR6GFVmkDcpjSEkcQVIqkVNX+ePY+2mNUIyYGqc5Tl/cBF+XmUAwZ+xSw4oaZlP4oph8A+uOn4/6QfcJiE0yGrui8j7wDIV3cSlpHC0CZFo05ov0r3smiOY9P5Mqrr9wp3u+6NIv80yyWznIJrGNy6rwYv+Em2bIfMWANzTKUE+FsK58D9ThtkUbYbKfdlcYOucIg+UcTTfapOa+zcJgfTXu1EghU7DqHzkyCUIq30ByasGdi7bIaLl7OX2oCiklAKN/M4mhpLAz2Ubw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eWUwpvRdGYCbTQ05mtW1+fJhbr7iX8XIT4j6BO/zlBo=; b=QF/pYychNBHzYZPGI04RDa/1/si8qQekkxmM2i5Us50Q8WO4H2DNV46ANBjNjDjDBWHndzplfX4ZdKBfp4iHTV9Q9xK1BLmyHM5vH65pukvCFla69cN0nz+1aJdE8NlNswgAHVC/a0cMWvPg8AfW0W/jlUln2N74cD9BMEXFEqA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by GVXPR04MB9901.eurprd04.prod.outlook.com (2603:10a6:150:113::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.30; Sun, 24 Mar 2024 12:20:50 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d%4]) with mapi id 15.20.7386.037; Sun, 24 Mar 2024 12:20:50 +0000 From: "Peng Fan (OSS)" Date: Sun, 24 Mar 2024 20:28:58 +0800 Subject: [PATCH 1/3] iommu/arm-smmu-v3: save bypass in smmu device structure Message-Id: <20240324-smmu-v3-v1-1-11bc96e156a5@nxp.com> References: <20240324-smmu-v3-v1-0-11bc96e156a5@nxp.com> In-Reply-To: <20240324-smmu-v3-v1-0-11bc96e156a5@nxp.com> To: Will Deacon , Robin Murphy , Joerg Roedel , Thomas Gleixner , Marc Zyngier Cc: Bixuan Cui , linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Peng Fan X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1711283345; l=2466; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=J39T/x6ksIZycb9izGpKSZJk900zTRqTi3UlHlbNKMA=; b=FXwmzpUlEcqcqb3b81GkB7JiZ8q1e2dNd0NH4VvaEmA223U+lJv8QeeGfZ4t5UZAO8XFHFIBJ zhceHUMlvJeCkYMAWUrcIz/dPamU6LbqZB6EBuRh8fKXTLE4vmjeRxk X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SI2PR01CA0017.apcprd01.prod.exchangelabs.com (2603:1096:4:191::19) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|GVXPR04MB9901:EE_ X-MS-Office365-Filtering-Correlation-Id: 16573211-9a32-4ffa-3b8e-08dc4bfcd802 X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 66kgUotgW3Bi09kAgdEfoNUcpn06q0ATX23ued8yNrdW4KLDHxm6Kyi5TeWa0MmEnMsEPZl/bLH5pram3fr3gMGeXIr+TO/LvK5gK8e5pV2LrfF3SKvF0AEWSsRU/J4fATo8Tr35gBvmcQJk1iBhDJfHwPeM2jZ7uxRYEHM7qbPZzmro3NCAWkY3NaODGVUUWd40wXaSWXfXa2VjK9/nRMNp1e4Hj0zBMyfp90TT9wHWCeLDodDhdz4AEfKQO6Vg3bZeRnrL78gjy5xtdC06neG4zorA7EouYPGEP8TI8qHzZrja248zvJeskxIHeJCrwJfEU+GS7Yhah65hi8eInWxtkU/Q9OmWHFvsFAJ6GW9yTuwDsf5dNLXY6+usnf9AigAYVQzhcjnuZOc6EePxtkB9/S9eBIBb3YNxzYEKbhCAnIHFWs4ltehpMhhCBWGacouW+TJ1Z+uDyMsKNPcE947faYj+pC5oz6mrMklhrDXtGNJA01UXONXvXUGnQYnkr32DM0XDPCltkERwihVobXtbMAlZHgxupQVQPT4M+xBDPGvu7N/eqxsLImKwg0SAu977/f0UIUQJEakwds/dYvLHfKOOrJpzASA6M9srq8GGo8+yaaq22rRNYa9ylC2neh0kgP2IoZ3OEmPqMAjnBWtnrVsFj/WTRe+Sz6cfFa8pdVzZoyyftpZol/igYV+3DiUGQ/SOIq8OPaNa62+0hx4rw3/nD6NVAezwJgc0G1o= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9417.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(52116005)(1800799015)(376005)(366007)(38350700005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?ELAwe7FXrRk0wt6qt9vhnU+gW5b2?= =?utf-8?q?dzW67TVHmHO+5WiuN6VWoP8favIEmDGfc88IQ/69mIPWjCWsNo+b8tPUfw61QbOBW?= =?utf-8?q?/T7k3FbtHnsTb0gE5+mnwn+PJMNDP1DfDZN+gV7pWNe8q54qwSqKkyIKGad+CEeUG?= =?utf-8?q?AtEmVikbT7h0Q+MHzWYgBzblktbJ8PXRNLdyljIDjjrIeLN0EBEDaI5tPKcW1iQvB?= =?utf-8?q?/J/dhAMsdFZu0kPwCq149pMB+927oDLCkP/b4yjyL3YeDlmIHcRUvUovfuOrjnCoa?= =?utf-8?q?gDjfHO5oBaIps0FdipOxJOX2WG/JkAwGekmR0HNKkrRR/w0qq4r0EzGTa/8dQB8VZ?= =?utf-8?q?Lk5yRgpkwR2k0SUHUoDNck3F8tCJzmD8vSPNoF7lDYTnjJ+F6ehB4BUxWvd0Lr6TA?= =?utf-8?q?S/2Mv4uJ4ZvQd7eXSR9t7Hrvx80rP5055WRvrxqfeSfvfMfzN6q3Lyvcw1AXWAT9Q?= =?utf-8?q?86/kB8t/JS8sNIqQSVxUEXS7vMr3wABFBZSC7t3sS6f4uTV5JjQWM1wjKAysykq4r?= =?utf-8?q?RO3sFEVV6q1oSqG+QdGhAnvwML+JITXyFfBBFBaeuwOKbmX5u4UwoC4qpPaMagxjc?= =?utf-8?q?2rxhPDftKeHoxT4n2QjaQbrPo53sfVotwBbonJh1WU+HcgTr7nTruyTvDPp/k29ZW?= =?utf-8?q?JdJlg4j3VGORVENIIO/D0Vn/QN92XBHDyRWqMZholQo+W+z/0EFrVDuhggYIcwUxX?= =?utf-8?q?1BPYszcyrglB3H1xukfxye9dQd4k6U7DwRcExfWcfyTN3PesBqP4hBy2ZLsV2hXCZ?= =?utf-8?q?88YQMDXfnbH8mntzyis2ziJDCPzu0kBX4tG4SmSq/7JB5b5lSXXQyGf9zdYDjp2AS?= =?utf-8?q?C3oJkAlRvFREOvUgdsKP98AxgOuhvmaRWGbkdo0PbzbacIhxsCQYw+DyluLVoZ3b7?= =?utf-8?q?zNLsIpSZV6R/Lvy2Z4mje3o/yCj24kns12pLMRXeYj/pNyxmcm9YG+mOc2esKO/eM?= =?utf-8?q?0xn25u/MocrxlxNd80DYsg3cWiJ/qt8HYir+oxWXDmQ4Hcj0yDgB9Edzgip5U5x2b?= =?utf-8?q?Vgg8dEJjNQxP5iY2GZgE7sKJaN4nYoojGD/3x9aObS6Vk2wLwgKIZDhVZvIO6ulnz?= =?utf-8?q?io7SB6XhvXVocXMm+veWhYl782+lpgUz5g83Vvav9wXPxweq427EAsR4WjEv5/LzC?= =?utf-8?q?3hPGmBCHmRxZ0TdNg0WxHwIX9JtdUfZknP6RcrNcDdFTIp+Z7PbdCOmwuTclZBa0v?= =?utf-8?q?wt7wyV+25TeeQN2MkmiywbtHbHHDCLRNTn2tsa6f2JotN7iLR02vgUr9YNkTCf6yV?= =?utf-8?q?0G8XBJmOKKYdsWiysR9Pa7kWPRD7KUJRDEtKxW9XDdIikhjoX9Y6NRGXbK5d7eSxq?= =?utf-8?q?7kqnzSePJCuosOH/ZeohbO0jKeCIxlCeA4fYJo0UzEFpO907+cBsoSQ4Za5goYxUE?= =?utf-8?q?Y84a0DDpNLhOiOaoaD2I7v1YFXRvMbccYhPtWXbLNBlMQVrTubnecYk9x/FSq2Yba?= =?utf-8?q?fQIADat41R+hwSmU6ymnr3gBwyuXfHRUNfDnVWqpj27ZZJT0+OlWL9k+yvTY4VjXo?= =?utf-8?q?MeXcgFkiU/8/?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16573211-9a32-4ffa-3b8e-08dc4bfcd802 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2024 12:20:50.8729 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3I0VKA7sFfPj7R7KPzZnw6/hNSqYxOoGkYm/F3GP+FhqEhkAcHn+hk3XuR+R9vdfemAZ44CzOF18eJ5WBMqUwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB9901 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240324_052105_025472_CD1BE1A9 X-CRM114-Status: GOOD ( 15.42 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Peng Fan 'bypass' will be used in smmu resume function, so need to save its value for future usage. Signed-off-by: Peng Fan --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 ++++----- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 1 + 2 files changed, 5 insertions(+), 5 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 5ed036225e69..a8a569573c2f 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3494,7 +3494,7 @@ static int arm_smmu_device_disable(struct arm_smmu_device *smmu) return ret; } -static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool bypass) +static int arm_smmu_device_reset(struct arm_smmu_device *smmu) { int ret; u32 reg, enables; @@ -3612,7 +3612,7 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool bypass) enables &= ~(CR0_EVTQEN | CR0_PRIQEN); /* Enable the SMMU interface, or ensure bypass */ - if (!bypass || disable_bypass) { + if (!smmu->bypass || disable_bypass) { enables |= CR0_SMMUEN; } else { ret = arm_smmu_update_gbpa(smmu, 0, GBPA_ABORT); @@ -4007,7 +4007,6 @@ static int arm_smmu_device_probe(struct platform_device *pdev) resource_size_t ioaddr; struct arm_smmu_device *smmu; struct device *dev = &pdev->dev; - bool bypass; smmu = devm_kzalloc(dev, sizeof(*smmu), GFP_KERNEL); if (!smmu) @@ -4023,7 +4022,7 @@ static int arm_smmu_device_probe(struct platform_device *pdev) } /* Set bypass mode according to firmware probing result */ - bypass = !!ret; + smmu->bypass = !!ret; /* Base address */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -4087,7 +4086,7 @@ static int arm_smmu_device_probe(struct platform_device *pdev) arm_smmu_rmr_install_bypass_ste(smmu); /* Reset the device */ - ret = arm_smmu_device_reset(smmu, bypass); + ret = arm_smmu_device_reset(smmu); if (ret) return ret; diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h index 23baf117e7e4..97064a6aa87c 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -683,6 +683,7 @@ struct arm_smmu_device { struct rb_root streams; struct mutex streams_mutex; + bool bypass; }; struct arm_smmu_stream {