From nobody Mon Apr 29 06:37:51 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1608828633; cv=none; d=zohomail.com; s=zohoarc; b=I9lpLqOwbNKZ8R8v2o0oWKNu9h+oPP8ILIjzLg+cmuyfPvfaRmeOcjS4zu5snn14VFbRqutslq6WcxzOF26jUIImtA8aIj3NRIcBNNNBaVRje9+wtrMmoor9usrg9IJd/J1oR6yc1v7g0Rl8DrTAdmpn5ynSD6GKAxgS6GWGuWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608828633; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=0Gwe/uH290dVrTI4AHMKTVEIDPSN+P/JGMKSEXHISQI=; b=Y3cubAHghEFhxivze/c+s6BBnIe7sKWqMcD8UeAb1W4B612Ki2oZU6RdUd8LF86pbnl+hMJfstreAx1olVcAA57cxtOeD2Oi47kbbk5Kt/NU4GgPs4HqNwRLDJGZdkprerrzE7Y1etSJMi9Gg1aM8Z7tVQmtbCNJfJEtRgbMdlA= 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 Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 160882863365193.64972124373116; Thu, 24 Dec 2020 08:50:33 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.58757.103523 (Exim 4.92) (envelope-from ) id 1ksToM-0003ts-G3; Thu, 24 Dec 2020 16:49:58 +0000 Received: by outflank-mailman (output) from mailman id 58757.103523; Thu, 24 Dec 2020 16:49:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ksToM-0003tl-CG; Thu, 24 Dec 2020 16:49:58 +0000 Received: by outflank-mailman (input) for mailman id 58757; Thu, 24 Dec 2020 16:49:57 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ksToK-0003tg-VM for xen-devel@lists.xenproject.org; Thu, 24 Dec 2020 16:49:56 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ksToK-0001WK-CA; Thu, 24 Dec 2020 16:49:56 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ksToJ-0000p5-W2; Thu, 24 Dec 2020 16:49:56 +0000 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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Message-Id:Date:Subject:Cc:To:From; bh=0Gwe/uH290dVrTI4AHMKTVEIDPSN+P/JGMKSEXHISQI=; b=40zIj8FINXzlpLKDBLWkZfXXqj oOdjLtspiSLDlGW2FTUoaEQ0ZQHGzVMruRNnYA/K3T31wnpuVRBIxhvxLs6IsJgNc6hotiakHnQmZ RDPq149gfqbjQJg221dfk70y5XIjwrIzdWfOmfck4tIXp0/qnkeWAjawNXuSVl+R+tM4=; From: Julien Grall To: xen-devel@lists.xenproject.org Cc: bertrand.marquis@arm.com, Rahul.Singh@arm.com, Julien Grall , Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH] xen/iommu: smmu: Rework how the SMMU version is detected Date: Thu, 24 Dec 2020 16:49:53 +0000 Message-Id: <20201224164953.32357-1-julien@xen.org> X-Mailer: git-send-email 2.17.1 X-ZohoMail-DKIM: pass (identity @xen.org) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julien Grall Clang 11 will throw the following error: smmu.c:2284:18: error: cast to smaller integer type 'enum arm_smmu_arch_ver= sion' from 'const void *' [-Werror,-Wvoid-pointer-to-enum-cast] smmu->version =3D (enum arm_smmu_arch_version)of_id->data; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The error can be prevented by introduce static variable for each SMMU version and store a pointer for each of them. Signed-off-by: Julien Grall --- Only build tested --- xen/drivers/passthrough/arm/smmu.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/a= rm/smmu.c index ed04d85e05e9..4a507d7aff64 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -2249,12 +2249,15 @@ static int arm_smmu_device_cfg_probe(struct arm_smm= u_device *smmu) return 0; } =20 +static const enum arm_smmu_arch_version smmu_v1_version =3D ARM_SMMU_V1; +static const enum arm_smmu_arch_version smmu_v2_version =3D ARM_SMMU_V2; + static const struct of_device_id arm_smmu_of_match[] =3D { - { .compatible =3D "arm,smmu-v1", .data =3D (void *)ARM_SMMU_V1 }, - { .compatible =3D "arm,smmu-v2", .data =3D (void *)ARM_SMMU_V2 }, - { .compatible =3D "arm,mmu-400", .data =3D (void *)ARM_SMMU_V1 }, - { .compatible =3D "arm,mmu-401", .data =3D (void *)ARM_SMMU_V1 }, - { .compatible =3D "arm,mmu-500", .data =3D (void *)ARM_SMMU_V2 }, + { .compatible =3D "arm,smmu-v1", .data =3D &smmu_v1_version }, + { .compatible =3D "arm,smmu-v2", .data =3D &smmu_v2_version }, + { .compatible =3D "arm,mmu-400", .data =3D &smmu_v1_version }, + { .compatible =3D "arm,mmu-401", .data =3D &smmu_v1_version }, + { .compatible =3D "arm,mmu-500", .data =3D &smmu_v2_version }, { }, }; MODULE_DEVICE_TABLE(of, arm_smmu_of_match); @@ -2281,7 +2284,7 @@ static int arm_smmu_device_dt_probe(struct platform_d= evice *pdev) smmu->dev =3D dev; =20 of_id =3D of_match_node(arm_smmu_of_match, dev->of_node); - smmu->version =3D (enum arm_smmu_arch_version)of_id->data; + smmu->version =3D *(enum arm_smmu_arch_version *)of_id->data; =20 res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); smmu->base =3D devm_ioremap_resource(dev, res); --=20 2.17.1