From nobody Sun Apr 12 22:43:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1775558114; cv=pass; d=zohomail.com; s=zohoarc; b=he2t9Lh7RreMPv5Bt2eadqo2PScbUvkBoLWktHa/VQZnECs3wiHoIjGFge+UsM8eClU64AzaHDjFfu6vM5wGDKODnKG6W+r9YL76E54qqsZ55BerG7gxrCVhDticGZcYoNvIRt1XT5ttCFR/gGxCyRxwrkgNE9L7DaVqGWU3lqQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775558114; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5FsyXc/HkQPSBh7FT68V2jh2g5O0eVPGIt38pfYk7xc=; b=SQjUG4GDYVSAocudo4VKXi5WJY0xG36epvfrzqeYDNROuwdmMqIibBG9FVL46i7wHNu7oTdDkZoN/dKpM+/hpoDB0wqiEHfq695kHnlYvI3HtsA96Oz79qoxdhemzjIUbr08Bi+WuXL9YtmVGbG0BvR6sIFRry6Rr3f7ukUnp6o= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1775558114264317.87713928865026; Tue, 7 Apr 2026 03:35:14 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1274860.1560849 (Exim 4.92) (envelope-from ) id 1wA3ln-0000Jp-PS; Tue, 07 Apr 2026 10:34:55 +0000 Received: by outflank-mailman (output) from mailman id 1274860.1560849; Tue, 07 Apr 2026 10:34:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wA3ln-0000Ji-MA; Tue, 07 Apr 2026 10:34:55 +0000 Received: by outflank-mailman (input) for mailman id 1274860; Tue, 07 Apr 2026 10:34:54 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wA3lm-0000Df-8M for xen-devel@lists.xenproject.org; Tue, 07 Apr 2026 10:34:54 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wA3ll-003scJ-KD for xen-devel@lists.xenproject.org; Tue, 07 Apr 2026 12:34:53 +0200 Received: from [10.42.69.7] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69d4ddcc-2eae-0a2a0a5409dd-0a2a4507c6e0-4 for ; Tue, 07 Apr 2026 12:34:53 +0200 Received: from [40.107.208.19] (helo=PH0PR06CU001.outbound.protection.outlook.com) by tlsNG-ef75cf.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.0) (envelope-from ) id 69d4ddca-ba2d-0a2a45070019-286bd0134b52-3 for ; Tue, 07 Apr 2026 12:34:52 +0200 Received: from BLAP220CA0009.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:32c::14) by DS4PR12MB9684.namprd12.prod.outlook.com (2603:10b6:8:281::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.18; Tue, 7 Apr 2026 10:34:44 +0000 Received: from BL6PEPF00022573.namprd02.prod.outlook.com (2603:10b6:208:32c:cafe::cd) by BLAP220CA0009.outlook.office365.com (2603:10b6:208:32c::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9769.33 via Frontend Transport; Tue, 7 Apr 2026 10:34:46 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by BL6PEPF00022573.mail.protection.outlook.com (10.167.249.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17 via Frontend Transport; Tue, 7 Apr 2026 10:34:43 +0000 Received: from satlexmb07.amd.com (10.181.42.216) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Tue, 7 Apr 2026 05:34:43 -0500 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Tue, 7 Apr 2026 05:34:41 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=amd.com header.i="@amd.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KuebTZT8WYBrPrnpJZh3SOhjxXCNsG7rj7k0a9P5c66FXtsaJWZkNVf9fiZTicextd9Trak22fiKbwPdtIwLtUOcF1QZOJPxyLSELu2FwL0DompOXzRinD//Z4KOpUm+BvPDn+DBUwmqWz/AR7foaxzLdYrKnUlMsylAp9eVwYs+auNs4TUWjrPJ3vgiLl5PvvPiO61u4ve+8wVkA1BuFuuTQfBgONeTPSVnAoiAbc33EpIknt7Z1xbfq2hFmOB0DvQfgY76J1svcMgpsWht00qdEnY1ljKAmBzvtG0jd1FYa6qOw5XiXbQIbYQ0kF3gOLpiEnDb2J55OTditKh4Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=5FsyXc/HkQPSBh7FT68V2jh2g5O0eVPGIt38pfYk7xc=; b=L4t2+z50RWLlDtdbKbejWAFz49mVbph23myo8hTpTDr/36XmAEOJNPbc3kV9pu0AST53AqCRAOa7Zl9Hvt7RjEJUNWccsYIwhrcKCcUWC0vx+md2KZagA8mXaDGqv5y2Ad/lzPI+RZDe7iAorLZo1/qf/IrTF1XjeLZeLHgFZrebhMgOdhB259vbcTdHtLvSabbJ1ObI4D3iXs37Y41mkQe62dgtO/ZCANGYEUI5yg5u/qP6JeHoeuUuY/2BT6LPRQiau8N1FmzC7At9vjvJDBMBTVgqCPRYwyiwO+8KLw8mdhxK6RTs3IVrmf2Ps5zWyFdasqyMtAFA2z1VMA8O3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5FsyXc/HkQPSBh7FT68V2jh2g5O0eVPGIt38pfYk7xc=; b=uGVyJkkFpjyy5pDkZxTZhqarRrJMkGM7AEaRCFzhqTQKI43MuKGXa83Sx6eo94oMZTyWtWRX0tcdSGUGBeGHDqr3IwsJKWZAHvg5/a1uFuUFjL+qX9jJ+618DtpE5HpTVMXIhoCw9wsZ+68NPm4EvVq2PWiwOBCj5xuLgaGkER8= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C From: Michal Orzel To: CC: Michal Orzel , Julien Grall , "Rahul Singh" , Stefano Stabellini , Bertrand Marquis , Volodymyr Babchuk Subject: [PATCH 1/2] iommu/arm: smmu: Fix variable shadowing Date: Tue, 7 Apr 2026 12:34:32 +0200 Message-ID: <20260407103434.90838-2-michal.orzel@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260407103434.90838-1-michal.orzel@amd.com> References: <20260407103434.90838-1-michal.orzel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF00022573:EE_|DS4PR12MB9684:EE_ X-MS-Office365-Filtering-Correlation-Id: 6c59e368-66fa-4f3b-960b-08de94914840 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700016|376014|82310400026|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: qwDsbJwn3Nac1a6PpgDdC0Y0t14DfM9fDQ9OTIB7qJKT4VHLP4POJvOwQbHKokqTeda7bf4dK4/J9dAVI6HnjFsojK43z8XgH6ADTgrreJxPfW5KUVYTLO7E1bjeE3x5pMpLp4wtz5OEFxb9OPSp0KrDLwqas50gQXLUMvRLT+McJw8XnVxI/fmWFd5sE8gGMejEfGtAVfQqTI49qYuy/ApdGYKtYTcFVMJ3jCNyNq70q7iTEnSflb5PNX+pBXZMfFTlf7YTpecurbUSdLHhGGyZ9Dgt/Jx/CR2T7Q37FORUMuvrvxAxHCLmkMLTbC6OhYBd4frcVSjx6zXYD6s8uQEuxdsmsb0TMSg06bIyWH2ioaSWQ5kYihpBoJp4QG3+jh4zyXpaLVAdTdy3L9TytgNa2hlHNPx4fLd7s1efODDBiBOxB6Gst4IwmcbLLIiI2TJhPegy4stPBGdB8goG6qirbDfmDJ3P3gUSzcyS0X7AHDEfAX3UMqD1Tqs1xqKEAetGUV1Idd94/T1QpO6oCG2pGRvNWnrBhzVsaHUG+bUya5xos/Tka0vrh4hGDr1FMgREjcWY8HkRL9ymFqoyCD3TQWuuuRKpbnZD+p2ophTzTFTYm5DJjwxGECeEwnnuGxx//BaSYrYB/rMqmhfqZ4MeUKnzapQuz2oGji1sFM4wo6EXyumAaxmTBGEglI2vGFsZdgBDbf95y1IjDW5kk0P09boeDNIH3jy3vxcsMC9jXoM66wWyC5qpW9/uGQF28BYeQn6EXxoJaTrnofdurQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700016)(376014)(82310400026)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: o5i2fVkrKIFq0qCSZOb7topoNTc25SVAThatCbo9/jAet/04sGxWWHAtT6rFUpbEpShmIrJOUXTcK2V8Ws1ppOaiUIR56cfwpGD0k6Oaq7cD7pGq7oKAomDqtHWE+YJS5zavZhmG4c+l2WC+fp2m1HjF7zS9ydhRKNOljVOFh7LuSYKRwdUJD58XtzATZpixu8Y1kGjz4mqoX9b0bbtGhylTG95XZ1sPfrEoiTsie2q0hT8TubYLrhkm0whWPXcG5EVSnqWwc2GdfbCts5mRIlV6xYGI5TkEwoss3LN+z/ABpeQybjWehhUX3Dc4oN6nTohepfUiFXhzEzSemxH5UT1Muc5oPx9FL9X/fY6JNWLmjiFuVsnfF+NM55ut3ia3nItcabPAw9q+9XnjNx9fkve03tGfh1sd7ZWBKfU7RUmDmN5cV6hCpri5GokTP1Nv X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2026 10:34:43.6124 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6c59e368-66fa-4f3b-960b-08de94914840 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF00022573.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9684 X-purgate-ID: tlsNG-ef75cf/1775558092-1294941E-461F5AE5/0/0 X-purgate-type: clean X-purgate-size: 2052 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1775558115578158500 Content-Type: text/plain; charset="utf-8" Rename 'pdev' to 'pci_dev' in the dev_print_pci() macro to avoid shadowing local 'pdev' variables at call sites. Remove the unused 'ret' declaration from arm_smmu_dt_add_device_generic() where the function-scope 'ret' is sufficient. Fix shadowing of 'domain' in arm_smmu_assign_dev() by removing the inner-scope redeclaration, using the function-scope variable instead. This fixes MISRA C R5.3. Signed-off-by: Michal Orzel Reviewed-by: Stefano Stabellini --- xen/drivers/passthrough/arm/smmu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/a= rm/smmu.c index 22d306d0cb80..d63c9015510e 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -130,8 +130,8 @@ typedef enum irqreturn irqreturn_t; printk(lvl "smmu: %s: " fmt, dev_name((dev)), ## __VA_ARGS__); \ else \ { \ - struct pci_dev *pdev =3D dev_to_pci((dev)); \ - printk(lvl "smmu: %pp: " fmt, &pdev->sbdf, ## __VA_ARGS__); \ + struct pci_dev *pci_dev =3D dev_to_pci((dev)); \ + printk(lvl "smmu: %pp: " fmt, &pci_dev->sbdf, ## __VA_ARGS__); \ } \ }) #endif @@ -927,7 +927,6 @@ static int arm_smmu_dt_add_device_generic(u8 devfn, str= uct device *dev) if ( dev_is_pci(dev) ) { struct pci_dev *pdev =3D dev_to_pci(dev); - int ret; =20 /* Ignore calls for phantom functions */ if ( devfn !=3D pdev->devfn ) @@ -2788,7 +2787,7 @@ static int arm_smmu_assign_dev(struct domain *d, u8 d= evfn, /* dom_io is used as a sentinel for quarantined devices */ if ( d =3D=3D dom_io ) { - struct iommu_domain *domain =3D dev_iommu_domain(dev); + domain =3D dev_iommu_domain(dev); if ( !iommu_quarantine ) return 0; =20 --=20 2.43.0 From nobody Sun Apr 12 22:43:27 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1775558110; cv=pass; d=zohomail.com; s=zohoarc; b=ZcjLifUAn5cxjqb8acB0mrEHChi6mITKcIECFAUFwm72OuUVMtieOsuJG1EcUmJ1p6ENMvvyTo3LmlqF0aSdp59p7hijLejVgF5ZsZvMUlhrJU+AFg7iq1lHtXVP997P7rVBIO3PrF1NJI3vvHX5XUkV24iLnb6yYvgxy0VIeWs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1775558110; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nSwn/eZd22mkj92Lxkd7s8YIYQ6Q3aCLzhHR4QqHess=; b=cTR8yNgKEaeNXz45nxOJlc/zxLrhMxicBkwlHGmIBYsYjvU3tvA1MzfjEW3Y5fKLxbHcrwuWneocnLOWt48R1RA1l9yjiNBjnQEi6aOgbxxlGeY5vMNRqYn4QIt90yRwa4DtNoCC4Qn0iuMTM0w/MV4uHkzMOOcfwN8CM3hL5HM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1775558110818138.9250443286711; Tue, 7 Apr 2026 03:35:10 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1274859.1560839 (Exim 4.92) (envelope-from ) id 1wA3ll-0008VY-Do; Tue, 07 Apr 2026 10:34:53 +0000 Received: by outflank-mailman (output) from mailman id 1274859.1560839; Tue, 07 Apr 2026 10:34:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wA3ll-0008VP-Aq; Tue, 07 Apr 2026 10:34:53 +0000 Received: by outflank-mailman (input) for mailman id 1274859; Tue, 07 Apr 2026 10:34:52 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wA3lk-0008Ua-9L for xen-devel@lists.xenproject.org; Tue, 07 Apr 2026 10:34:52 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wA3lj-003scJ-LH for xen-devel@lists.xenproject.org; Tue, 07 Apr 2026 12:34:51 +0200 Received: from [10.42.69.8] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69d4ddba-2eae-0a2a0a5409dd-0a2a4508d7e0-34 for ; Tue, 07 Apr 2026 12:34:51 +0200 Received: from [40.107.208.23] (helo=PH0PR06CU001.outbound.protection.outlook.com) by tlsNG-c1860d.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.0) (envelope-from ) id 69d4ddc9-fab6-0a2a45080019-286bd0177e63-4 for ; Tue, 07 Apr 2026 12:34:50 +0200 Received: from BLAP220CA0005.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:32c::10) by DM4PR12MB6398.namprd12.prod.outlook.com (2603:10b6:8:b5::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17; Tue, 7 Apr 2026 10:34:45 +0000 Received: from BL6PEPF00022573.namprd02.prod.outlook.com (2603:10b6:208:32c:cafe::7a) by BLAP220CA0005.outlook.office365.com (2603:10b6:208:32c::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9769.32 via Frontend Transport; Tue, 7 Apr 2026 10:34:14 +0000 Received: from satlexmb07.amd.com (165.204.84.17) by BL6PEPF00022573.mail.protection.outlook.com (10.167.249.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17 via Frontend Transport; Tue, 7 Apr 2026 10:34:45 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Tue, 7 Apr 2026 05:34:44 -0500 Received: from satlexmb07.amd.com (10.181.42.216) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 7 Apr 2026 05:34:44 -0500 Received: from XIR-MICHALO-L1.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Tue, 7 Apr 2026 05:34:43 -0500 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=amd.com header.i="@amd.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mTHUU4hgpNv43oTMmGQpoEem9sORjHUatH9ZtawaPM0dL+c8ieetnRBQ8a+WrLZYGF8AK9yYNgFhvaPKShSnNv3apwj/PdQsV5oEr3IIXkAnqPvzSSM5o9j8DroXFqzFyrq87/3Izaei/y2edjt57qtuqL3FKMM721g3fQX/bSe/GJZyAWvj5p+4Ye9/FDON/RPe5CylUjRKeag1+3ZQVcJslj8M5aQejs1Xvez9T2TXhqbA5Y0/d502CYs21O40KBO0eejclB7f6Sz/Ei/QVM2Xmz2nn9ePLoXUdR8dxrfbIp9VHJ/9Ei9Sjmf9v5QIS2pBJ81V2q/uJ1L8sdQH/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=nSwn/eZd22mkj92Lxkd7s8YIYQ6Q3aCLzhHR4QqHess=; b=An4o+z4kI/l7sv+mBi8Xxt5xDEFMx6bmsbvMb8nIiJbLg9lzT+hzN0bIkm5tfronTJq3X2c/HV1k4lU5E311B+rk3yHag+z4SGays5s4IthmE2Zn65/NboujllGn8gscoF+/YbYAIYRHFd/3OLp8N8zCqcycEafLMQHcwXSDB7tT83ATRy2UJlI4kfkTT7zMHQE/kdGTFGxXJpoB1wOxlwVdTZdb6KTS5AYc4y8Ua0w+0O8Qy9xDr5uZzIVc5CbQhItRr8Tq52GeLZInr9f5PjzzGogKuUjLBsJFEIq5iP89kfIHG779WXKm4yoMv7k4VAOYjmY/Cr3tJsxoiCxiEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nSwn/eZd22mkj92Lxkd7s8YIYQ6Q3aCLzhHR4QqHess=; b=1mjmYP0OKB7qftzqiclgK2TT3Iyz89Fn0pPhoWaOtdovTxLDlqgL5EdJLSmoKNLZl6lLq7LCMFDLaRm8noozGJIMFohkqW4w6+HS4BF63het53TpUg2Rg6DlH0N1aqYWmXYw602s3nbKy/RpCrfcWiMtqkVMhn5iR70hYqjTahE= X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C From: Michal Orzel To: CC: Michal Orzel , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk Subject: [PATCH 2/2] iommu/arm: ipmmu-vmsa: Fix variable shadowing Date: Tue, 7 Apr 2026 12:34:33 +0200 Message-ID: <20260407103434.90838-3-michal.orzel@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260407103434.90838-1-michal.orzel@amd.com> References: <20260407103434.90838-1-michal.orzel@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: None (SATLEXMB04.amd.com: michal.orzel@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF00022573:EE_|DM4PR12MB6398:EE_ X-MS-Office365-Filtering-Correlation-Id: d2d4ad18-a010-4583-496f-08de9491492c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700016|376014|82310400026|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: 0SWErfz8ZB7oFhnH7++AZKjW6MMPL0SZiFPvvN2tynAuxZ5N9N6owEB6NplcF7eGCGOsYPOGTYBVnEPZhdfFGUsXu1Hi6by7dKfe8n8Qu95BEAXrdfJrRsaXMgTXan0Hk/PZXrKe6AT1tnTG7f+gMD9b2f/XxqCs9Ceoz8zHkgdw/uY6nkpG5eVpS0OS1d1/MIqMympkLVO7Kat6xEq/QltAfryzkqzCvVyypenOUPk+1+PGjF4f7iEj/pUanOH2uycQ/28DwbXxBYQ67ilWaXwWvKXvnJycadqeKPeWq9DI0WOZPXLYlA24sBvwuWRDahPz9Qf+bt7F38qkXQelxKZffySH00ob+aPmQ+dlw29q/14NV87eT0nRQ1J6RApdEfUQKR+JmjQ0jZShNXKIkprrlU5HVYj5ohWBJjvKXJcQ5/y5yGPV9Q8Nhb/zI+/xB043h34ySwf+aXY9znGGfn71bUOi27VX4v6AMBJj7RNWXPSGK8f5rajgbvkrSkM02aHkmy9VHjnaktYj3Afm73gHfC5BXeB/8CPhtJLqtG3fjM43vQpBnvq3uXT3K3Tou0pMGyQJo35eO0fDwbw0Jwga9Hr8GA8VPGZmGSeVI6k5ZtUqH3HOqD1DmyXwIOV9D+cryF1rJzaaus5ZCIVqFH+1VNfjFjZZ5Geydr+pNmMJA4ycXIZpGL40nZDttVI7+eXPUj1NKHhqLJTy8bafeeHUpLxTBcRwzuY2w/CDO4d43huWr7IlZeQo1v0OkJ1qWERc88JUtKz7/2F2Dvhl7w== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700016)(376014)(82310400026)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5x2pRPTXNjPQ3Rz4vGotTWguqoK+S8+grTjwH1kUZuGS3q2ItoUGzJk0RcTkjOJhNGwIaJzMXzG1AF5AWBcxbXi9t6c6XkW+ud9MDHJm9J+iOGzXXXOsdrgRULVAuM6j0OUk9vcPc5CClDYRW73JX0mfu/fhYFNPNYuf+eaBUbl/fA3xVQLSZJGSo1LeSijCdDqBNaBt7MLxFAtZqGXFr7+fCSlxdv2J+HChhpi2yC8LwkVNwPH91UnBDYSQ+3CwCLImFqoBk5CHnYmeHlq6pitzGAhDEzJTGkcVFWuZQVaTyKZy7qdYeRFSB5vget3QpKEyurKB4bROGZQjxm43FgTZr17b5Fm8x+ZRzmve0163Ut8iQUgDa9D/OvMSk3TvEZpkK1Wd3C6z7fRazzxyFX+03/sDYouxtJWklDIwqID836ZrlcJJBIJ0eM5IMlD+ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2026 10:34:45.1513 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d2d4ad18-a010-4583-496f-08de9491492c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF00022573.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6398 X-purgate-ID: tlsNG-c1860d/1775558091-76B4C497-64DD0121/0/0 X-purgate-type: clean X-purgate-size: 1679 X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1775558111708158500 Content-Type: text/plain; charset="utf-8" Rename 'pdev' to 'pci_dev' in the dev_print_pci() macro to avoid shadowing local 'pdev' variables at call sites. Remove the unused 'ret' declaration from ipmmu_assign_device() where the function-scope 'ret' is sufficient. This fixes MISRA C R5.3. Signed-off-by: Michal Orzel Reviewed-by: Oleksandr Tyshchenko Reviewed-by: Stefano Stabellini --- xen/drivers/passthrough/arm/ipmmu-vmsa.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/arm/ipmmu-vmsa.c b/xen/drivers/passthr= ough/arm/ipmmu-vmsa.c index ea9fa9ddf3ce..fa9ab9cb1330 100644 --- a/xen/drivers/passthrough/arm/ipmmu-vmsa.c +++ b/xen/drivers/passthrough/arm/ipmmu-vmsa.c @@ -65,8 +65,8 @@ printk(lvl "ipmmu: %s: " fmt, dev_name((dev)), ## __VA_ARGS__); \ else \ { \ - struct pci_dev *pdev =3D dev_to_pci((dev)); \ - printk(lvl "ipmmu: %pp: " fmt, &pdev->sbdf, ## __VA_ARGS__); \ + struct pci_dev *pci_dev =3D dev_to_pci((dev)); = \ + printk(lvl "ipmmu: %pp: " fmt, &pci_dev->sbdf, ## __VA_ARGS__); = \ } \ }) #endif @@ -1171,8 +1171,6 @@ static int ipmmu_assign_device(struct domain *d, u8 d= evfn, struct device *dev, /* dom_io is used as a sentinel for quarantined devices */ if ( d =3D=3D dom_io ) { - int ret; - /* * Try to de-assign: do not return error if it was already * de-assigned. --=20 2.43.0