From patchwork Wed Dec 15 09:06:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xu Kuohai X-Patchwork-Id: 12696218 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 6A459C433EF for ; Wed, 15 Dec 2021 09:03:01 +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:Message-ID:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=2FwXQWrHhtD474Cfc3Eh84O3qd/kXlpOr4677hMaL+U=; b=p4AlUCsEfl5gku oep22gTClIyOcpJ3p9FP+l7/vI6VvD9TZEY5lKHitf49n1qT9JkapUIWa4nAVQacjkK8eTOh6wFT+ OOttLQ0DcO1SItpJ0JMG4FiUCM7fkwasXNSiEYLDORNEWiHrkrgs5jekVE1P0ZDvHC0n0gGZsoYDa E3A7jDKaRbqeTycjN7+TEHKgRmSAh/zbaClY6urJzKdxy7SrO3PwFHLJ5I0VBThcEhId4r/5dWlGo Xq7zzTRIcHmZIVmpFpPkoFxPdj5cEU41YRLdO18XHf/LqfGAVGw4g1k1MTaseW5g5w2AjA0SW2/TM OkZsKlFaRJ336UkRCEzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxQAS-00HSBf-Ji; Wed, 15 Dec 2021 09:01:44 +0000 Received: from szxga02-in.huawei.com ([45.249.212.188]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxQAP-00HS92-28 for linux-arm-kernel@lists.infradead.org; Wed, 15 Dec 2021 09:01:42 +0000 Received: from dggeme764-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4JDTjt3HFPz91ky; Wed, 15 Dec 2021 17:00:50 +0800 (CST) Received: from huawei.com (10.67.174.119) by dggeme764-chm.china.huawei.com (10.3.19.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.20; Wed, 15 Dec 2021 17:01:34 +0800 From: Xu Kuohai To: Russell King , , Subject: [PATCH] ARM: Add unwinding annotations to __loop.*delay functions Date: Wed, 15 Dec 2021 09:06:07 +0000 Message-ID: <20211215090607.3737830-1-xukuohai@huawei.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Originating-IP: [10.67.174.119] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggeme764-chm.china.huawei.com (10.3.19.110) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211215_010141_327598_48261F73 X-CRM114-Status: UNSURE ( 8.39 ) X-CRM114-Notice: Please train this message. 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 The unwind directives can't handle nested function entries, so only the outermost function __loop_udelay is annotated, and the inner nested entries share the same unwind info with __loop_udelay. Signed-off-by: Xu Kuohai --- arch/arm/lib/delay-loop.S | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/delay-loop.S b/arch/arm/lib/delay-loop.S index 3ccade0f8130..f0a076f9abc5 100644 --- a/arch/arm/lib/delay-loop.S +++ b/arch/arm/lib/delay-loop.S @@ -7,6 +7,7 @@ #include #include #include +#include .text @@ -21,6 +22,7 @@ */ ENTRY(__loop_udelay) +UNWIND(.fnstart) ldr r2, .LC1 mul r0, r2, r0 @ r0 = delay_us * UDELAY_MULT ENTRY(__loop_const_udelay) @ 0 <= r0 <= 0xfffffaf0 @@ -54,6 +56,7 @@ ENTRY(__loop_delay) #endif bhi __loop_delay ret lr -ENDPROC(__loop_udelay) -ENDPROC(__loop_const_udelay) ENDPROC(__loop_delay) +ENDPROC(__loop_const_udelay) +UNWIND(.fnend) +ENDPROC(__loop_udelay)