From nobody Wed May 8 08:51:03 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1571133740; cv=none; d=zoho.com; s=zohoarc; b=NbCkQt/r1wLGDqZGK0xfNiol73tiaKmJdh+2qg8VmkgS4SeP+nNAKa94OJbqrAbeyRNgy7YAvfearAoob2sTIiFqPZw32z4NPS+VfgwW13zwdLiOn/g29fbisSrNKDZMX94+Wk46meWQrwhcyicd75s05hq1Mh9BZkxv8+mjNlc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571133740; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=pKJ5dBpRnQxmbgQw6TEXMJftKd04Y0Wc/zBxhoXgJ1s=; b=kZaeeYx7fCnb1nB/rawdEf3ACdoqrkB6eVR8jp4/78pZaw2Ctes9wSOpDp4AhYzI1EQJPhnkSkfohkyfJI6uG65NEd8gdDaUCr4Vl9j4BjPFps2KyXDK6vVO6ifz1bEUa0JBvn/M/mXyS7oICMqzHWp7Y10eK2lYd+03XVfkkWQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1571133740993299.3267154413229; Tue, 15 Oct 2019 03:02:20 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKJdj-0003yZ-2m; Tue, 15 Oct 2019 10:01:15 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKJdh-0003yU-Pe for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 10:01:13 +0000 Received: from mail-lj1-x242.google.com (unknown [2a00:1450:4864:20::242]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b7d6df02-ef32-11e9-beca-bc764e2007e4; Tue, 15 Oct 2019 10:01:13 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id m13so19526499ljj.11 for ; Tue, 15 Oct 2019 03:01:12 -0700 (PDT) Received: from aanisov-work.kyiv.epam.com (ll-22.209.223.85.sovam.net.ua. [85.223.209.22]) by smtp.gmail.com with ESMTPSA id y26sm5521974ljj.90.2019.10.15.03.01.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Oct 2019 03:01:09 -0700 (PDT) X-Inumbo-ID: b7d6df02-ef32-11e9-beca-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3BVhpSuNtR36SkX5drqgZZn7VVZJw5UnhWE0EdaCaJA=; b=qnWYIKazEjIQWMPjBFpHqHcDMsy2upYuKitVbVTIScTcJJZIfWCr3LxK4nCoFcJiSU h8zrZ5c3Da1nBYIfQww42tXQ4X2OwlayDPI3jSnCJe9CDOGS47AstiytDsI9zqomjR80 geN3qAn5QQVYFLQf3xkLVfP9pBIWSz6lpy60UNIOkQP+4P+BpgnZq7hKNFssQgc27DCm 5xACREgWrXuc0ye3hYajubSWGI5Ony7NhmX+TilYvpS4AASzk78GDlT//xQb4K/rJPOF fH5Vhph2+bsdU2E5TA70ao2r1MDl4ovaykhxAjWWX3J3aI7nCW5B/ota4Kh9yVeJnW/f CxEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3BVhpSuNtR36SkX5drqgZZn7VVZJw5UnhWE0EdaCaJA=; b=O1m+KRfUdo1qaRfCnFniGQJqMYn9neCgCm7J3lD6GDsh2UvA0w0xcte5ByjmeAh131 KIIsaIC8jZfZyJoAYm1BlW2E9c+aYjRfNL8tiXFDDy9PtBaLzFfS7Xf2KGtQGF1EHCkN WIEzuLKKKvbFBLBS6AV60JLWRF+1iAz6c3O2MosfZkCS799HejbzgdT2fQKX1Gp0eg7k 5scZF8E79lRKTN9VfuJB6Lkp2O4xbZJejIkCXQeERdeex8y3ZDQai5tfM1yUFZN9NofG 6qzh2pvjI0ZzLRhq8uMG9r4AvZQXzPXulyiRjCmdOngfB+P2Oo6eAddYaiQRrfaJzbKA xYDw== X-Gm-Message-State: APjAAAWD/8pL4Ru90CN70XRzkjWFrU4lj70gOw5m7vsoYTliCHtgRmDD y8suxFFdNEwKFDVS8M0ZzDa9fAJI1Do= X-Google-Smtp-Source: APXvYqwQZvwniWx4gcCrszNeXj5kgXjsjIVrk62Zl2dgiugyyrCw2UHSCWegsAFPjVLrT6fXwKzkcA== X-Received: by 2002:a2e:9f4d:: with SMTP id v13mr22202420ljk.226.1571133671280; Tue, 15 Oct 2019 03:01:11 -0700 (PDT) From: Andrii Anisov To: xen-devel@lists.xenproject.org Date: Tue, 15 Oct 2019 13:01:08 +0300 Message-Id: <1571133668-5875-1-git-send-email-andrii.anisov@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [Xen-devel] [PATCH] arm/gic: Make sense of assertions X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Julien Grall , Stefano Stabellini , Andrii Anisov , Volodymyr Babchuk MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Andrii Anisov ARM Compiler complains about assertion conditions being always true, because sgi is of enum type what has all its values under 16. In order to preserve those asserts, specify the available SGI number right in the enum and use it for the assertions. This also eliminates nasty hardcoded values. Signed-off-by: Andrii Anisov --- xen/arch/arm/gic.c | 6 +++--- xen/include/asm-arm/gic.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 113655a..bf373d7 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -294,7 +294,7 @@ void __init gic_init(void) =20 void send_SGI_mask(const cpumask_t *cpumask, enum gic_sgi sgi) { - ASSERT(sgi < 16); /* There are only 16 SGIs */ + ASSERT(sgi < NUMBER_OF_GIC_SGIS); =20 gic_hw_ops->send_SGI(sgi, SGI_TARGET_LIST, cpumask); } @@ -306,14 +306,14 @@ void send_SGI_one(unsigned int cpu, enum gic_sgi sgi) =20 void send_SGI_self(enum gic_sgi sgi) { - ASSERT(sgi < 16); /* There are only 16 SGIs */ + ASSERT(sgi < NUMBER_OF_GIC_SGIS); =20 gic_hw_ops->send_SGI(sgi, SGI_TARGET_SELF, NULL); } =20 void send_SGI_allbutself(enum gic_sgi sgi) { - ASSERT(sgi < 16); /* There are only 16 SGIs */ + ASSERT(sgi < NUMBER_OF_GIC_SGIS); =20 gic_hw_ops->send_SGI(sgi, SGI_TARGET_OTHERS, NULL); } diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 793d324..5b72388 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -280,6 +280,8 @@ enum gic_sgi { GIC_SGI_EVENT_CHECK =3D 0, GIC_SGI_DUMP_STATE =3D 1, GIC_SGI_CALL_FUNCTION =3D 2, + /* There are only 16 SGIs */ + NUMBER_OF_GIC_SGIS =3D 16 }; =20 /* SGI irq mode types */ --=20 2.7.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel