From nobody Fri Oct 31 23:14:55 2025 Delivered-To: importer@patchew.org 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; 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; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1744804768; cv=none; d=zohomail.com; s=zohoarc; b=MwmBJ4ZKNnmMKdutQuB0buLy3KnpTxml7KVAnXIaNI2TtVkzjdvlumI9XfbHs/H5fDwLZAaFRXTZwt7E0p2pRy+V8nFuhhiMqidkI/SWkGOTxWN/9YpNc0i7W9wwb+vZzWPWE2EhkXSSKYMEVximRFf+yd0pz8q0ViuVifI8rUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744804768; 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=fmL/ZnaF9EKDwjrLJuzd3+BdV4GeJNNzHF8jTkdgEEU=; b=dTchXvO81m8gk/qzcDRpxSk3UBU0j/cHMEA6zLTWjL/3VQ1cF/QGBeL3LLPchGiSizPZd6Z9sCKD/q5ZtzTt78a50BiQO3N16gsVYsbXjTEOgrMwCYXetyeqGxW8yc1duCJg6U/u0GHZRREIAhKhYFRzZEzFrV2+Hsr5cKOq8xM= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1744804768665531.1405153599346; Wed, 16 Apr 2025 04:59:28 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.955718.1349339 (Exim 4.92) (envelope-from ) id 1u51Q5-0006W1-AY; Wed, 16 Apr 2025 11:59:09 +0000 Received: by outflank-mailman (output) from mailman id 955718.1349339; Wed, 16 Apr 2025 11:59:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u51Q5-0006VY-18; Wed, 16 Apr 2025 11:59:09 +0000 Received: by outflank-mailman (input) for mailman id 955718; Wed, 16 Apr 2025 11:59:08 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u51Q3-0006Ay-Vx for xen-devel@lists.xenproject.org; Wed, 16 Apr 2025 11:59:07 +0000 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [2a00:1450:4864:20::433]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 32184829-1aba-11f0-9ffb-bf95429c2676; Wed, 16 Apr 2025 13:59:05 +0200 (CEST) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-39ac8e7688aso4026123f8f.2 for ; Wed, 16 Apr 2025 04:59:05 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4405b5a9846sm18761905e9.35.2025.04.16.04.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Apr 2025 04:59:04 -0700 (PDT) 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" X-Inumbo-ID: 32184829-1aba-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744804745; x=1745409545; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fmL/ZnaF9EKDwjrLJuzd3+BdV4GeJNNzHF8jTkdgEEU=; b=YfrSm1QUIkYZzliUTjTuDYVhVYe8aohQJXpYJyDf+iz1SH6F7Il0VFXMPZk7rYd4GM fNh+kuHSR6QydgrSgNdg1YmTiUgoRgpSQyYbbKYgNbl53JyZWNLB2XMsMhcpj2Yt6ayx W258UamQ1NnHEPX9bsnhV320tgpZLQ41NR3TY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744804745; x=1745409545; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fmL/ZnaF9EKDwjrLJuzd3+BdV4GeJNNzHF8jTkdgEEU=; b=MSZaXhcFVM5+RLTX3T85DsuLlBnoSFLrlQt1IyrX4XpeFUledl7nlmuD+n4RXIEvPd RNM8iy5HwPRb7l5tNgj7UqmpBNQCAl9F51isuV+FHKiBzuIiV1DJ32sVxIN7/Mq/if4S 9afUFaFzrUzP4RP13GZr4VUIwFXMszZGWTroAvzY/DFos/QR4TFgP11ig5Hx/q8go6AV YXUZ74agKA80DsMZtXd5C1zxb9I+5eneA4jL1T4UwK8qF6lRXcn5dDjZpweGh8JENYTU 9DMlsyXbRJD1cFjtFsL0U/26ve6v6aoIi5dd0Vkk1cjuYVxRye/q89z4K0AZ8J1JZxgx jpdA== X-Gm-Message-State: AOJu0Yz6ISW+Y2klXRT9Fh5h95B4vY2Ko9+vBvSLhwX6nzu9wRdvbqb/ OskWj0MoyZk1cW+TtupG0eeJhGMMAw6+1E6Sn5k3plNln+75pK8+x0OJTuIANIcNeml2MCOn4/l O5NY= X-Gm-Gg: ASbGncvRKlrDlGLeKCJAjyEyfo59e8mS4dCs9MBctGwOQmkNspQ7rnAf0AJrkYUIuaX M9iOvyFxkfyNmKZtovfG53Es9tIeUpQyBSvQlv2d2ynB5QES50ZSTtzhs7R+422zM9kDxoGxwrj sXiO8OaGOkUftVxjLxVNVsQ70+/6UuQsN4Hf3og7Tqz3+czzpxwQjZP5eM5u6BmYGdsytQKmVSz oLr0FKz8w9ASQXpaN4CmkfBCtSKam45ZCx1vb4kZSV1hukLyN3RLdRLCuDhIa9q/hf9zOqu63pU 5QbPvfuLNzqDwNZ/Wo+VRqlGAFUcynK80KHq94lm4SyPWrHWpokMtT9WlvK7oaUqAB7bCVFgVMp 4Hv4Abqk1cmTvlw== X-Google-Smtp-Source: AGHT+IGoC35KrZip6fCDcL/oUGzi+YtFZJnDE7FrGERYhKy4EnzKfqCJeF21k2rDsfPw8nhjHTWBow== X-Received: by 2002:a05:6000:240c:b0:399:71d4:b8 with SMTP id ffacd0b85a97d-39ee5b1682emr1420910f8f.23.1744804744884; Wed, 16 Apr 2025 04:59:04 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Volodymyr Babchuk , Bertrand Marquis , Shawn Anastasio , Oleksii Kurochko , "Daniel P . Smith" , Lin Liu Subject: [PATCH v6 02/15] drivers/smmu-v3: Fix impending MISRA R20.6 violation Date: Wed, 16 Apr 2025 12:58:47 +0100 Message-Id: <20250416115900.2491661-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250416115900.2491661-1-andrew.cooper3@citrix.com> References: <20250416115900.2491661-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1744804771407019100 cpu_to_le64() is about to become a macro, at which point the #ifdef in the middle of it becomes undefined behaviour. Use a logcal variable to prepare strtab, where the #ifdef is fine to use. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Bertrand Marquis Reviewed-by: Nicola Vetrini --- CC: Anthony PERARD CC: Michal Orzel CC: Jan Beulich CC: Julien Grall CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Shawn Anastasio CC: Oleksii Kurochko CC: Daniel P. Smith CC: Lin Liu v6: * New Eclair log from v5: https://saas.eclairit.com:3787/fs/var/local/eclair/xen-project.ecdf/xen-p= roject/people/andyhhp/xen/ECLAIR_normal/xen-bswap/ARM64/9556392204/PROJECT.= ecd;/by_service/MC3A2.R20.6.html --- xen/drivers/passthrough/arm/smmu-v3.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthroug= h/arm/smmu-v3.c index cee572402203..df162350578c 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -722,15 +722,17 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu= _master *master, u32 sid, } =20 if (s2_cfg) { - BUG_ON(ste_live); - dst[2] =3D cpu_to_le64( + u64 strtab =3D FIELD_PREP(STRTAB_STE_2_S2VMID, s2_cfg->vmid) | FIELD_PREP(STRTAB_STE_2_VTCR, s2_cfg->vtcr) | #ifdef __BIG_ENDIAN STRTAB_STE_2_S2ENDI | #endif STRTAB_STE_2_S2PTW | STRTAB_STE_2_S2AA64 | - STRTAB_STE_2_S2R); + STRTAB_STE_2_S2R; + + BUG_ON(ste_live); + dst[2] =3D cpu_to_le64(strtab); =20 dst[3] =3D cpu_to_le64(s2_cfg->vttbr & STRTAB_STE_3_S2TTB_MASK); =20 --=20 2.39.5