From patchwork Fri Jun 16 09:24:49 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: 108998 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1203362vqr; Fri, 16 Jun 2023 02:43:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6pHwo/x4iJEK1qegRMNbNFtMpmJW7ErFGcSRbxJNGZBV6n3GlLAFvUbelSjlIF1xnlRgN+ X-Received: by 2002:a17:90a:5643:b0:25b:de6b:b2d7 with SMTP id d3-20020a17090a564300b0025bde6bb2d7mr9486986pji.11.1686908585295; Fri, 16 Jun 2023 02:43:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686908585; cv=none; d=google.com; s=arc-20160816; b=SBEhL4sTkqKhL/5gpra7L/hqnLqU6td8X641xx8kE32LT2NAINNhhUJc4A4I1RPQFB 25X1CeURzNiTx76E2iBba3Bi5RzdBdfvhuTzb/iH6+hF3ZC/sNg1O5L8gy+Koxzdf3/R iGx1Wloj73LYis0GeEbGcgsCgf3MeMi6ZO0QIl5d2IvTxPh85z9f7zmsJMY+t3NzPpcN OCgbZ5jddgrnnKmOGb2TiW1mg4Dm1wbHeQPojcIH5lsCxNHPwPH3McpOLgL0kJNdY/k2 PNVN+H0M34lnHEpepln+ELhKa0yAq/Ab55qQa+rWnB46X0apchdcHA1wFs1pcXlG1o2z Gsbw== 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=CiZpTVxnUZzuczFQxKQSaLnqyVa2i6IQpsTInmTvxTA=; b=SS0Noi3bYEE+/2E4Rchar6o4iULqZLiFyv1JlesWAVO97AUQiBkqhS3+a1+RQiJ5tw 0RWdrekwcwB8o98wDAeB9Zy1+3JcAy+/2R7O/y3bDNhhytevClzP6aAaDpXnBLUu//gV 473HLlnNE/051+gpI2o9FFvFn1muI2CL0U5nhgk4l1hSAHfN9eEk1tKLg9jBPDmGl5Sr f3YqMijPWeAtNj0YGXTLlJV/3Lr9+sicL9fZNd5QtB7mopskGojmz5PZfFoYTYffo8jj 6eZf0RKTGR9nrkrtZ1WrovxokPy8EqphcnTSDAEBN8i5gAtUUFAwjulCjS7a9vPJFtvw Uahw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wOr7wbXR; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=APPAoGqe; 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 jx5-20020a17090b46c500b00250ce1755e9si1238039pjb.14.2023.06.16.02.42.49; Fri, 16 Jun 2023 02:43:05 -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=wOr7wbXR; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=APPAoGqe; 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 S1344036AbjFPJZ4 (ORCPT + 99 others); Fri, 16 Jun 2023 05:25:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344143AbjFPJYz (ORCPT ); Fri, 16 Jun 2023 05:24:55 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23D0D2695; Fri, 16 Jun 2023 02:24:52 -0700 (PDT) Date: Fri, 16 Jun 2023 09:24:49 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686907489; 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=CiZpTVxnUZzuczFQxKQSaLnqyVa2i6IQpsTInmTvxTA=; b=wOr7wbXRVwz61K1UkEMKsjSCXjeBOeG6EeOoYfwIJGTzZVZn0JHTH0jcCldpT0HQ8rnCS3 LTF+LJFNGFTqSx9LpR5ws5D+wNaIMKE5JZZyJcI1LRSdsU//1z8LrYyHWV9tEBjLBIrJSv 0VP+ReNgJWYT/IPKlR5gouf7OIFg3bWizSI209oihXsfkgI05xkDexkildzCfSBE4zqt0K Au7rGpl95JNee1PfxzzS5vPhCw60ESVNeTW1g+ztaJgEJgyA8+Tl4L6PglDjKvEwysl3de ubO7HXxo5DJ7RfzzSaNBxXnqmrtsSFrl7PPginu1S8FMq+upJb0L8BvYcExYqQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686907489; 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=CiZpTVxnUZzuczFQxKQSaLnqyVa2i6IQpsTInmTvxTA=; b=APPAoGqe3FZ7EM2Vu5vK9SM3arJijq8aVUf6aUXIQWt0/QHU54yJAjgSX77v0D31UtnFTk x0nUTZHien37akBw== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/boot] loongarch/cpu: Switch to arch_cpu_finalize_init() Cc: Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230613224545.195288218@linutronix.de> References: <20230613224545.195288218@linutronix.de> MIME-Version: 1.0 Message-ID: <168690748908.404.7577532475575258816.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,URIBL_BLOCKED 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?1768633295449770030?= X-GMAIL-MSGID: =?utf-8?q?1768851856811734212?= The following commit has been merged into the x86/boot branch of tip: Commit-ID: 9841c423164787feb8f1442f922b7d80a70c82f1 Gitweb: https://git.kernel.org/tip/9841c423164787feb8f1442f922b7d80a70c82f1 Author: Thomas Gleixner AuthorDate: Wed, 14 Jun 2023 01:39:28 +02:00 Committer: Thomas Gleixner CommitterDate: Fri, 16 Jun 2023 10:15:59 +02:00 loongarch/cpu: Switch to arch_cpu_finalize_init() check_bugs() is about to be phased out. Switch over to the new arch_cpu_finalize_init() implementation. No functional change. Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20230613224545.195288218@linutronix.de --- arch/loongarch/Kconfig | 1 + arch/loongarch/include/asm/bugs.h | 15 --------------- arch/loongarch/kernel/setup.c | 4 ++-- 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 arch/loongarch/include/asm/bugs.h diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index d38b066..cbab4f9 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -10,6 +10,7 @@ config LOONGARCH select ARCH_ENABLE_MEMORY_HOTPLUG select ARCH_ENABLE_MEMORY_HOTREMOVE select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI + select ARCH_HAS_CPU_FINALIZE_INIT select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS select ARCH_HAS_PTE_SPECIAL diff --git a/arch/loongarch/include/asm/bugs.h b/arch/loongarch/include/asm/bugs.h deleted file mode 100644 index 9839653..0000000 --- a/arch/loongarch/include/asm/bugs.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * This is included by init/main.c to check for architecture-dependent bugs. - * - * Copyright (C) 2020-2022 Loongson Technology Corporation Limited - */ -#ifndef _ASM_BUGS_H -#define _ASM_BUGS_H - -#include -#include - -extern void check_bugs(void); - -#endif /* _ASM_BUGS_H */ diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index 4444b13..78a0035 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -12,6 +12,7 @@ */ #include #include +#include #include #include #include @@ -37,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -87,7 +87,7 @@ const char *get_system_type(void) return "generic-loongson-machine"; } -void __init check_bugs(void) +void __init arch_cpu_finalize_init(void) { alternative_instructions(); }