From patchwork Mon Apr 17 10:46:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 84167 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2032299vqo; Mon, 17 Apr 2023 04:03:48 -0700 (PDT) X-Google-Smtp-Source: AKy350YhxZoQQSZgB2vA4qx1OTr7CcwQ4iAXxHVicC2t+zCcNU9FVXzMnraY5Gh2oJ1tRvx7ZFpu X-Received: by 2002:aca:ef02:0:b0:38d:f25c:243b with SMTP id n2-20020acaef02000000b0038df25c243bmr1712127oih.13.1681729427922; Mon, 17 Apr 2023 04:03:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681729427; cv=none; d=google.com; s=arc-20160816; b=Xa4uhxCbkmYQOuXQXz6mxMzDvLJmq/7FN0/0wtVTu88GDH29l7aFniY0/CenchQL4J biA5DrYS5mqzd/yJS0QDmk6dDF5aebnfMt6Arcj3JYcs+5sAOO8NrTIlTrHc4nS2oP6a JH+3TJxyaSpCDQgy5NQig+zuog5QlmLHpVeRiZiu+GkTokETIE0gjEIwUeRmCvAeCZGD 6ropDL91UqQX1COer1szCwldaYXigNYe6JMXDLJBX9Meo7V1p0DtPURzrFSEAziqtE4I HLXqyrOeyMQCvIM56dgFXeMf1bJcnkVj201BGX1YMbwkILEjadg4JNLGSyd4XByfUCRl PTeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=2eRms53gsCOGxd9wfLLeeaNB85kzjJoqLxCQxZQiw6Q=; b=LzUshvDurCrWnEpal6a8HUYM5HSzdzI7dm7LwiIortY5lrNIr239/OAKlkHgHCJNBM XLz5SPPMAOT7khGyqiCOrYRfkHqVX6L98/CgUuchHrcANO+7tSAt/oCgNfFIxFhq5edH v1tndVi/bNsYlA0E9Y91B4Qh8lIGrkz1mTwsJI8ElpAiky0uUZESlZaLtl1o3uJOGkfb LHlYntvrYUbXq6zfacYrugIhl5MWWh99usO2EX+4zfQalofIzKQCq1ICptOhVE0LDOKb /KbsPWBwd+yorW8Zt6sKOwI2K3X64fgKwCivpo5RcFrgA7+lnsdMaZ3Re9TY+EiJRhgp /R1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="EBRq/5zI"; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ev13-20020a056808290d00b003877dc1c2cbsi10092896oib.346.2023.04.17.04.03.30; Mon, 17 Apr 2023 04:03:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="EBRq/5zI"; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230196AbjDQKtB (ORCPT + 99 others); Mon, 17 Apr 2023 06:49:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229940AbjDQKsm (ORCPT ); Mon, 17 Apr 2023 06:48:42 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29D704ECB; Mon, 17 Apr 2023 03:47:52 -0700 (PDT) Date: Mon, 17 Apr 2023 10:46:45 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1681728406; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2eRms53gsCOGxd9wfLLeeaNB85kzjJoqLxCQxZQiw6Q=; b=EBRq/5zINw18RCMNTUNRcjn31FnbGfhFsFDo6+OCRE6uy8Lcb0TRyRCup0stmkAW3fso5A 10pnTaNorpzMp6RlihHjG125uPA4seEwOar+ylIGlsFXgBOzsEPdlnj4K0nzLM/D5DsxxP N62unRu8lUrMK6Tbzr/gksmG5ekuvj42s3XhUcm85U1UhT89F6rpk/ItgpBt6coZb2Z7BP 755yEG4Q3dLH8amZVISFk6KpetDO+ObfQ4Egt7qSYe8clABOzXrRoF7wnlCu8MW7pV9uyP M8bGoNj3fUtpvpyvLv3p9XjvaZeEIct5cPkRuOdKsi9zLM3XTax93aL/wv5Ikw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1681728406; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2eRms53gsCOGxd9wfLLeeaNB85kzjJoqLxCQxZQiw6Q=; b=iCeuKA7/qepbW3Bjx3np1pkdJN+xPOvas8qTXg7k7Qja1UHolCPXUE0n8V2m9pm4cbgGEa srKEs5xNKsaUhLBw== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/core] scsi: message: fusion: Mark mpt_halt_firmware() __noreturn Cc: kernel test robot , Mark Rutland , Josh Poimboeuf , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <168172840572.404.16516527452411089196.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763016438719672548?= X-GMAIL-MSGID: =?utf-8?q?1763421116193415016?= The following commit has been merged into the objtool/core branch of tip: Commit-ID: 6e36a56a5f617262c0e8ae7e961487361c720b9e Gitweb: https://git.kernel.org/tip/6e36a56a5f617262c0e8ae7e961487361c720b9e Author: Josh Poimboeuf AuthorDate: Wed, 12 Apr 2023 16:49:40 -07:00 Committer: Peter Zijlstra CommitterDate: Fri, 14 Apr 2023 17:31:27 +02:00 scsi: message: fusion: Mark mpt_halt_firmware() __noreturn mpt_halt_firmware() doesn't return. Mark it as such. Fixes the following warnings: vmlinux.o: warning: objtool: mptscsih_abort+0x7f4: unreachable instruction vmlinux.o: warning: objtool: mptctl_timeout_expired+0x310: unreachable instruction Reported-by: kernel test robot Reported-by: Mark Rutland Debugged-by: Peter Zijlstra Signed-off-by: Josh Poimboeuf Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/d8129817423422355bf30e90dadc6764261b53e0.1681342859.git.jpoimboe@kernel.org --- drivers/message/fusion/mptbase.c | 2 +- drivers/message/fusion/mptbase.h | 2 +- tools/objtool/check.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 9b3ba2d..4f0afce 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c @@ -6935,7 +6935,7 @@ EXPORT_SYMBOL(mpt_clear_taskmgmt_in_progress_flag); * @ioc: Pointer to MPT_ADAPTER structure * **/ -void +void __noreturn mpt_halt_firmware(MPT_ADAPTER *ioc) { u32 ioc_raw_state; diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h index 4bd0682..0f226cd 100644 --- a/drivers/message/fusion/mptbase.h +++ b/drivers/message/fusion/mptbase.h @@ -945,7 +945,7 @@ extern int mpt_raid_phys_disk_get_num_paths(MPT_ADAPTER *ioc, u8 phys_disk_num); extern int mpt_set_taskmgmt_in_progress_flag(MPT_ADAPTER *ioc); extern void mpt_clear_taskmgmt_in_progress_flag(MPT_ADAPTER *ioc); -extern void mpt_halt_firmware(MPT_ADAPTER *ioc); +extern void __noreturn mpt_halt_firmware(MPT_ADAPTER *ioc); /* diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 724a63b..e1b01ea 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -219,6 +219,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func, "lbug_with_loc", "machine_real_restart", "make_task_dead", + "mpt_halt_firmware", "nmi_panic_self_stop", "panic", "panic_smp_self_stop",