From patchwork Mon Mar 6 04:00:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 64428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1649218wrd; Sun, 5 Mar 2023 20:09:37 -0800 (PST) X-Google-Smtp-Source: AK7set/ihnIyi7zykWml1ABm7eDd3PR04JFtpm7TKDrklpMCigoDsP55q1/6xpuk+SBT2TJKE6uh X-Received: by 2002:a17:907:a44:b0:8b1:29ed:e206 with SMTP id be4-20020a1709070a4400b008b129ede206mr12126551ejc.28.1678075776804; Sun, 05 Mar 2023 20:09:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075776; cv=none; d=google.com; s=arc-20160816; b=S6+G3J5K9bu+3hPr009IRXD+APA2WPBkpetN6G2FQf0TzOoEMa2hr96MUmVFVYr9Qo jp7izjmEWQJeYm7pIbvz7zbcxDFWtnoXGB9bWnfb7U1/JqrWiVhEtOG1lZB3FWNbm9hD 6lsu6EbEe7cgVh4j/z+l4DRVDH1x7ypBA1B093zbDU1WZdn8mc03vH26zBgVhcMYK0pa RjAIEK/hl6Y3EkFWsgFwCJ6qRY74Av9Y1azQ2fKE6+dLhQmmQK0QwOCMSYCrQOP4+CDk 27LBd31yTbFL++mYaYfDhKt4xzuMSAeDTfWvwbSZuLBNLs+8CtUmfMIhRhuyir5ldUl7 5AxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WgyXM7Qo3viihserObDO4DAWeU3lIl1inofxTIVc+4I=; b=iIypajLw2gGAmMxHH+zBWgvo4x+fkfZnAjS+/XCntgWwN8K2uHnL+n5GJIsQSC0v+/ +m05v4cklcUCf+rRAyAsSjul1aPcMaYS3/jRlTXsC3CKNHASd6ZtT58T0H4G9wqWmEO0 pgl9KgDy06XsAMIQQFfoL3iEBjuLTy2TfQInoSgMWuqfNOBdafK7VzQZqE5jg5WtY1PE p9jTF6Ogc5eguPhiaIqYyS/JjUWCbkobySE43yEpMMRwLwbkSAgG3SZqyhnEHXNSPSsF ox467anrAWWnIZw49z8WAUC1MwI6lSUgpcNiuMT9zbdhYcls95WNfj7BlwPQgQ3tY26p NrwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=sLHdFy4W; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kz23-20020a17090777d700b008b1ce7098f7si10518927ejc.592.2023.03.05.20.09.13; Sun, 05 Mar 2023 20:09:36 -0800 (PST) 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=@infradead.org header.s=bombadil.20210309 header.b=sLHdFy4W; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229831AbjCFEA6 (ORCPT + 99 others); Sun, 5 Mar 2023 23:00:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229643AbjCFEAp (ORCPT ); Sun, 5 Mar 2023 23:00:45 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4409CF962; Sun, 5 Mar 2023 20:00:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=WgyXM7Qo3viihserObDO4DAWeU3lIl1inofxTIVc+4I=; b=sLHdFy4WxAhVNW1qn8Tqz/mfZx EjfOu5z0GJrrCgy+lXG1pdjvHCSOdl0REBoLuRxbcs5q0hbpogg6e0s1RfznWmvsNTymj4d2ncbJ9 WjaQrOJJyYZpH/jrRrKSlhIPCWhQoDgBG7MaVfJ01cLErJK4CawuAXz7/xVfIYRdvtrr7VuZ5I7rk x2DOe5aFqqcVlHDqUnG0BJei+qIrY6seGHjq5nLOB3lAK7LRZH5b1OxiNr3oyYyciyDKbZ0ltXAoi QRNxtvMOeSEU4M/lNK7mHrpyBwwt3pq8/XGqr04nZOpikMuikxgzQnvDyQk/VeEdZyerMIGW0G+Hz JC9H9TsA==; Received: from [2601:1c2:980:9ec0::df2f] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZ21f-00B9yD-FR; Mon, 06 Mar 2023 04:00:40 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , John Paul Adrian Glaubitz , Yoshinori Sato , Rich Felker , Geert Uytterhoeven , Hitoshi Mitake , linux-sh@vger.kernel.org Subject: [PATCH 1/7 v4] sh: SH2007: drop the bad URL info Date: Sun, 5 Mar 2023 20:00:31 -0800 Message-Id: <20230306040037.20350-2-rdunlap@infradead.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230306040037.20350-1-rdunlap@infradead.org> References: <20230306040037.20350-1-rdunlap@infradead.org> MIME-Version: 1.0 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_NONE 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?1759589985689649345?= X-GMAIL-MSGID: =?utf-8?q?1759589985689649345?= This URL provided is no longer functional, so drop it. Fixes: 3a598264436e ("sh: SH-2007 board support.") Signed-off-by: Randy Dunlap Cc: John Paul Adrian Glaubitz Cc: Yoshinori Sato Cc: Rich Felker Cc: Geert Uytterhoeven Cc: Hitoshi Mitake Cc: linux-sh@vger.kernel.org Reviewed-by: Geert Uytterhoeven Reviewed-by: John Paul Adrian Glaubitz --- v2: skipped v3: skipped v4: refresh/rebase and resend arch/sh/boards/Kconfig | 1 - 1 file changed, 1 deletion(-) diff -- a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig @@ -358,7 +358,6 @@ config SH_SH2007 intended for embedded applications. It has an Ethernet interface (SMC9118), direct connected Compact Flash socket, two serial ports and PC-104 bus. - More information at . config SH_APSH4A3A bool "AP-SH4A-3A" From patchwork Mon Mar 6 04:00:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 64424 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1647658wrd; Sun, 5 Mar 2023 20:03:50 -0800 (PST) X-Google-Smtp-Source: AK7set9dwo4VGn89yopWuupRd4cgmJ4R76Wv8RRWaibYzS17i+bE6vnWNbWgewZZwPF6WmOpgbu6 X-Received: by 2002:a17:903:120b:b0:19e:82aa:dc8a with SMTP id l11-20020a170903120b00b0019e82aadc8amr12425134plh.22.1678075429926; Sun, 05 Mar 2023 20:03:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075429; cv=none; d=google.com; s=arc-20160816; b=yY40hMsXOADzAnS7h5JGiqvoy1KH0spT8fx9jufe4srnACtzn3w9YNv79j9DnlWFEB iwcKKpimlNy646nZVw0YRbeNavr2a594BbyTfoi+w8m+qMNm8kjejcFha9j5SY9NaNgT qm+8FP6RhWjGO4B83i8S3HHKvPIwoed9xJ7o+75oTZOIit4g7EBLDeW3MqPUE78MEL6p Ea7q70C7XWr1h9ML9JQQBfawjrjY4fX2NlVizrQt2PvWuDvnSOiYsf59njg4odOIW3EC beoJSETisCZKdsrFKsrzvLGdY9u96vcyHD5ONIpBRGtHbkIOXAz0RtO5yyiSBWo9HS8T Nftw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=q4i2L9mFgoWjrsHlBXky+D6dbfsBgFxhqp15flWkw9k=; b=T3lKM2D7EPv6L42v3OC2U7oL16WPuJ9g/cEdozStYtyyHK0I0Kpk+L3WFz+WHvnNKe an3M0ZloZkvTAInFemm5oa1ud3FQUazPZRqAY/ux18f34B4I6k4NH0xwPYdyKbctb717 5OuGv3Ts/t6P1qxWTsLFsTKUATzAR0Ni4CwHAuUKi8FJu1Op73NMU7WsDWJS72GWZsSY KtOvdLZm/JzxLDFD+J87P766uiyU6cXzZazTqVV0sATwR7I9AqsKLxVpZCdD8TkLorL/ h9Iny2IoQbWliAl80JogsAfvylgvA6ZVNFedResZXqme0YOsUB/XVCxQUCDzupsltTuF rSsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=2Fzol0Pc; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f7-20020a17090274c700b0019ac69e7385si8001278plt.123.2023.03.05.20.03.37; Sun, 05 Mar 2023 20:03:49 -0800 (PST) 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=@infradead.org header.s=bombadil.20210309 header.b=2Fzol0Pc; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229717AbjCFEAo (ORCPT + 99 others); Sun, 5 Mar 2023 23:00:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbjCFEAm (ORCPT ); Sun, 5 Mar 2023 23:00:42 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2325AF74B; Sun, 5 Mar 2023 20:00:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=q4i2L9mFgoWjrsHlBXky+D6dbfsBgFxhqp15flWkw9k=; b=2Fzol0PcE0ZfGAK4Yenf3qfW1z zwKzKQ8wu4rEHZme/FrfCmoqKeW4wUil7Fj8RApgHgpJLePU+ThWlt03qdxhURSc20gxd+xqt8Hx3 f9GW2U76lHsp8McuSzwMfu/ehyP1f6TuFRBXyQcjgWHzsk5vx8SOd7uXIOcNUGDhnDw7LIIb3yPqO ZJvoLp06YlqmwKlzSweL9C5CU0tXH9MXAE6FLl1y/Z1wdPBXk7zMih+VKWjZsJS5soEkEvIbtYki1 42imzvQdXwiDJrHUlkgJgabfcDO4jzA3GTMAyS28aUnZspWNoDA7sYxk1kGNJVT86YC7qrwtDZViB F1zPvhDw==; Received: from [2601:1c2:980:9ec0::df2f] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZ21g-00B9yD-GM; Mon, 06 Mar 2023 04:00:40 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Igor Zhbanov , John Paul Adrian Glaubitz , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 2/7 v4] sh: nmi_debug: fix return value of __setup handler Date: Sun, 5 Mar 2023 20:00:32 -0800 Message-Id: <20230306040037.20350-3-rdunlap@infradead.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230306040037.20350-1-rdunlap@infradead.org> References: <20230306040037.20350-1-rdunlap@infradead.org> MIME-Version: 1.0 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_NONE 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?1759589622506485896?= X-GMAIL-MSGID: =?utf-8?q?1759589622506485896?= __setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from nmi_debug_setup(). Fixes: 1e1030dccb10 ("sh: nmi_debug support.") Signed-off-by: Randy Dunlap Reported-by: Igor Zhbanov Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru Cc: John Paul Adrian Glaubitz Cc: Yoshinori Sato Cc: Rich Felker Cc: linux-sh@vger.kernel.org Cc: stable@vger.kernel.org Reviewed-by: John Paul Adrian Glaubitz --- v2: add more Cc's; refresh and resend; v3: add Arnd to Cc: list v4: update Cc: list, refresh & resend arch/sh/kernel/nmi_debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -- a/arch/sh/kernel/nmi_debug.c b/arch/sh/kernel/nmi_debug.c --- a/arch/sh/kernel/nmi_debug.c +++ b/arch/sh/kernel/nmi_debug.c @@ -49,7 +49,7 @@ static int __init nmi_debug_setup(char * register_die_notifier(&nmi_debug_nb); if (*str != '=') - return 0; + return 1; for (p = str + 1; *p; p = sep + 1) { sep = strchr(p, ','); @@ -70,6 +70,6 @@ static int __init nmi_debug_setup(char * break; } - return 0; + return 1; } __setup("nmi_debug", nmi_debug_setup); From patchwork Mon Mar 6 04:00:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 64425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1647792wrd; Sun, 5 Mar 2023 20:04:16 -0800 (PST) X-Google-Smtp-Source: AK7set+6PtDExxqVzDs4zmqwqmlqc47h7+4gjWhDWccnW5v3HEj+GOtEG7IyNirCckTIeXKT1I2B X-Received: by 2002:a62:1850:0:b0:5a8:ab3d:3fe with SMTP id 77-20020a621850000000b005a8ab3d03femr8904637pfy.16.1678075455718; Sun, 05 Mar 2023 20:04:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075455; cv=none; d=google.com; s=arc-20160816; b=dUEgkGrR9kCqY03K5N0HirnB8k5yWn/zxNlAwckuqPaPQug0ldgoHcGb4rjmR+hdIL R9LzsNrNFx0KGjlyoovoU1DjtY62kJIwsnCCdcV26vgIn1ilJNlCHWJ0SA2sYFwsx5eK zVOAt65cRuFsBnp+ga/XxcMUgECgbGy4jjo02qYy/E4eDpPlMLvhzBlA580q95q7Bv5P DnpprhE2hwZ4mwK9G2wONgl5u40h/rca6RI15YX1WLPsO2zLi2oG9khD04afTDLsuVT6 eF7D625vGFDR8MEkj+VnH48+0SS4ONW//vOPnFVFkZYVmVaLgNsGtoGZP7nqjObqOdRo FAJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UhjsCF+rddzzypyrP6fAf9gWJ0k8iBH1lmCoUVV1gpY=; b=UTiHB7ZMt/e4B21QOMqe1qkQvQ3lOVaKJHiiVNVBan+G8z+1mswgIU1Q5Cfii008ql a187rvhDP60daaBofTP2k3ChazG1MhQibDCAuKjJbieAAqDeSs3IfVYVkatQ9xItn+m4 k5deUXdFT6QDctuUCdzRYInyJHC1BR0UPAATKGWiLL9aSGAUHbprSlFAPgpOfFPCX08m XDfAhi3OFLWNfksAcTADc9hd43ftFeppu+CmT+e+DqmkMg2U3uC8EnEdn8ubd4WJ1OCO dSuqSHXsrBw5oQ5+vhLekqh/Wuk8qwQ0l3jwvGQHmEEbYRraNbj2xvzCygDD/UbNKXjv wNHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=4+eLkNkd; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v27-20020aa799db000000b005a8efbddf5esi9418608pfi.238.2023.03.05.20.04.03; Sun, 05 Mar 2023 20:04:15 -0800 (PST) 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=@infradead.org header.s=bombadil.20210309 header.b=4+eLkNkd; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229811AbjCFEAs (ORCPT + 99 others); Sun, 5 Mar 2023 23:00:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229684AbjCFEAo (ORCPT ); Sun, 5 Mar 2023 23:00:44 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1391FF764; Sun, 5 Mar 2023 20:00:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=UhjsCF+rddzzypyrP6fAf9gWJ0k8iBH1lmCoUVV1gpY=; b=4+eLkNkdnjDWSXISs50Rh16wOU eWs4XaJTu6YSNuFj9fIjj/06b6S2VLIFPc+huvqMY6RwtgtbU5QAM6kn9bh+AmnfZnbIkvnWSzj7d lGhCFcaEjMH9AQrtl2E6eVA8kfR7RHLYAJbovKNyOtroF66rIXxrli/vS2Kdq+0B/N7VXW4adis2T ZDxpPFGFf4stqhZrj4iepC0PurUxSq3PUjOZqK3Fsv1DjlAsA2/EGmW/4I+ZQdAgISUFxJq6a4Zsz ZXpIEmR76bGq652+QzZBk6UEm2vHJdmA889Hwua/q472BtlcS4OIeLE/Fr78NcNQD/3NCbsAOK1DU K45Wekuw==; Received: from [2601:1c2:980:9ec0::df2f] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZ21h-00B9yD-5Q; Mon, 06 Mar 2023 04:00:41 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Rob Herring , Frank Rowand , devicetree@vger.kernel.org, Rich Felker , Yoshinori Sato , Geert Uytterhoeven , John Paul Adrian Glaubitz , linux-sh@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 3/7 v4] sh: init: use OF_EARLY_FLATTREE for early init Date: Sun, 5 Mar 2023 20:00:33 -0800 Message-Id: <20230306040037.20350-4-rdunlap@infradead.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230306040037.20350-1-rdunlap@infradead.org> References: <20230306040037.20350-1-rdunlap@infradead.org> MIME-Version: 1.0 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_NONE 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?1759589649149714246?= X-GMAIL-MSGID: =?utf-8?q?1759589649149714246?= When CONFIG_OF_EARLY_FLATTREE and CONFIG_SH_DEVICE_TREE are not set, SH3 build fails with a call to early_init_dt_scan(), so in arch/sh/kernel/setup.c and arch/sh/kernel/head_32.S, use CONFIG_OF_EARLY_FLATTREE instead of CONFIG_OF_FLATTREE. Fixes this build error: ../arch/sh/kernel/setup.c: In function 'sh_fdt_init': ../arch/sh/kernel/setup.c:262:26: error: implicit declaration of function 'early_init_dt_scan' [-Werror=implicit-function-declaration] 262 | if (!dt_virt || !early_init_dt_scan(dt_virt)) { Fixes: 03767daa1387 ("sh: fix build regression with CONFIG_OF && !CONFIG_OF_FLATTREE") Fixes: eb6b6930a70f ("sh: fix memory corruption of unflattened device tree") Signed-off-by: Randy Dunlap Suggested-by: Rob Herring Cc: Frank Rowand Cc: devicetree@vger.kernel.org Cc: Rich Felker Cc: Yoshinori Sato Cc: Geert Uytterhoeven Cc: John Paul Adrian Glaubitz Cc: linux-sh@vger.kernel.org Cc: stable@vger.kernel.org Reviewed-by: John Paul Adrian Glaubitz --- v2: use Suggested-by: for Rob. add more Cc's. v3: skipped v4: update Cc's, refresh & resend arch/sh/kernel/head_32.S | 6 +++--- arch/sh/kernel/setup.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff arch/sh/kernel/setup.c arch/sh/kernel/setup.c diff -- a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -244,7 +244,7 @@ void __init __weak plat_early_device_set { } -#ifdef CONFIG_OF_FLATTREE +#ifdef CONFIG_OF_EARLY_FLATTREE void __ref sh_fdt_init(phys_addr_t dt_phys) { static int done = 0; @@ -326,7 +326,7 @@ void __init setup_arch(char **cmdline_p) /* Let earlyprintk output early console messages */ sh_early_platform_driver_probe("earlyprintk", 1, 1); -#ifdef CONFIG_OF_FLATTREE +#ifdef CONFIG_OF_EARLY_FLATTREE #ifdef CONFIG_USE_BUILTIN_DTB unflatten_and_copy_device_tree(); #else diff -- a/arch/sh/kernel/head_32.S b/arch/sh/kernel/head_32.S --- a/arch/sh/kernel/head_32.S +++ b/arch/sh/kernel/head_32.S @@ -64,7 +64,7 @@ ENTRY(_stext) ldc r0, r6_bank #endif -#ifdef CONFIG_OF_FLATTREE +#ifdef CONFIG_OF_EARLY_FLATTREE mov r4, r12 ! Store device tree blob pointer in r12 #endif @@ -315,7 +315,7 @@ ENTRY(_stext) 10: #endif -#ifdef CONFIG_OF_FLATTREE +#ifdef CONFIG_OF_EARLY_FLATTREE mov.l 8f, r0 ! Make flat device tree available early. jsr @r0 mov r12, r4 @@ -346,7 +346,7 @@ ENTRY(stack_start) 5: .long start_kernel 6: .long cpu_init 7: .long init_thread_union -#if defined(CONFIG_OF_FLATTREE) +#if defined(CONFIG_OF_EARLY_FLATTREE) 8: .long sh_fdt_init #endif From patchwork Mon Mar 6 04:00:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 64430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1649652wrd; Sun, 5 Mar 2023 20:11:18 -0800 (PST) X-Google-Smtp-Source: AK7set+0Jvhh6nDDvIDj+wC7ry0S12lGpEBy+YnfN1vJ8cynVpiUx0ZzBOFtQvwhS7ycUsXK797/ X-Received: by 2002:a17:906:135a:b0:8b1:3038:e81f with SMTP id x26-20020a170906135a00b008b13038e81fmr9916839ejb.50.1678075878459; Sun, 05 Mar 2023 20:11:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075878; cv=none; d=google.com; s=arc-20160816; b=QV+9nNLMXWmDgcIkgHuspz/0ne69GRX6ulUqhnVUoa1CIkQH4ueErQYAMdhkv9PGMl CV9vUtEMVu4tu0o7pYbpu0iVAu/IyjIE4E6b2sHsDdATJHk0lCTOs/fD/Gs8XCThIp/F Q/UaNFEkw6fBT+NrCK801e8rL4+GKZ6Elq+d1fGp7DW6YTmQo0yHq+UFQnggoBO2cAi3 RHBKSA3a1rpk6aet/LjVB63M8TD8LL2f1Maf4O3TWorqTOF1v42P1CSUwor06i9EEVCC RvT4nPSTCpCS3wTgTP80Ge6Syto/ozVDymC6ZF+ZhBfNE5UlZw82FSNIED6Z1XPUkFE4 CREQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iULMFTYSH9RAAYP5rn6cyfg7kS6emYH4OKw5O1Q8kv0=; b=S4s5mzhtNrdDJUwjmiHVHpn2wwIPnP4JC4/XcezbkxlqIypBEZWn+t22AYzZVh0zqL I4AZISLFgodvKOvRl6iGG7CFWZYbr+d2VNVVlYrrW4Hq0vmYw6fHTdhsogX4A9Gmtcvb +s9TrihcrjDw3qfhf/pW4D0ELpD/UT/cVGCsBM3hHlVgZ1YxgJB55IP1Uqqhcu70W/qE nXWeJzF6Cm9SWbZ32joWptNVbTsihdr0firoOVnyLgf19k50r42hxsSCOzmjkJLL3p8g 35ss1fI/3PZucIhLjBlKYD7bvkSiE2039snv9c5tnFFK3XZhutUqw9COEsgmbcz90aja 1/gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=tXQ2PYqn; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rp14-20020a170906d96e00b008dc4d55dda4si7729475ejb.705.2023.03.05.20.10.55; Sun, 05 Mar 2023 20:11:18 -0800 (PST) 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=@infradead.org header.s=bombadil.20210309 header.b=tXQ2PYqn; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229794AbjCFEBI (ORCPT + 99 others); Sun, 5 Mar 2023 23:01:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229789AbjCFEAp (ORCPT ); Sun, 5 Mar 2023 23:00:45 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D00D6F973; Sun, 5 Mar 2023 20:00:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=iULMFTYSH9RAAYP5rn6cyfg7kS6emYH4OKw5O1Q8kv0=; b=tXQ2PYqnaJJHdEPBsIxRpo2kTn +GVFOASIP3wlTp2RkxdVE5mcCluSIuVMCfq8w4CfXLaieoO1bEAaOXvBy3kZ7NUbHiOhMWZb98mEr xyIKotXVsh5JjZgbzNffAoqIWXOLAGRQ2+EkG8bwTQe9ejfAGEPePbe90MhvZFFvAnOTI+ENw8XJY PdZvIJ+lTr+QH3F6/0tBR15CHkpxFNKMz++puKItRP8LkzV9Y2OJNxX6vq1885u5B+dGHTT4XGl4u XSf4AsPB/YB/oPZ0EHVL8INakKA+csPIy61+K2o9oIeteubd0TMFHHr5HrrW+SXtzq5xPvuXaa33y YQ0GUwSg==; Received: from [2601:1c2:980:9ec0::df2f] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZ21h-00B9yD-Ji; Mon, 06 Mar 2023 04:00:41 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , kernel test robot , John Paul Adrian Glaubitz , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org, Geert Uytterhoeven , stable@vger.kernel.org Subject: [PATCH 4/7 v4] sh: math-emu: fix macro redefined warning Date: Sun, 5 Mar 2023 20:00:34 -0800 Message-Id: <20230306040037.20350-5-rdunlap@infradead.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230306040037.20350-1-rdunlap@infradead.org> References: <20230306040037.20350-1-rdunlap@infradead.org> MIME-Version: 1.0 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_NONE 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?1759590092393336713?= X-GMAIL-MSGID: =?utf-8?q?1759590092393336713?= Fix a warning that was reported by the kernel test robot: In file included from ../include/math-emu/soft-fp.h:27, from ../arch/sh/math-emu/math.c:22: ../arch/sh/include/asm/sfp-machine.h:17: warning: "__BYTE_ORDER" redefined 17 | #define __BYTE_ORDER __BIG_ENDIAN In file included from ../arch/sh/math-emu/math.c:21: ../arch/sh/math-emu/sfp-util.h:71: note: this is the location of the previous definition 71 | #define __BYTE_ORDER __LITTLE_ENDIAN Fixes: b929926f01f2 ("sh: define __BIG_ENDIAN for math-emu") Signed-off-by: Randy Dunlap Reported-by: kernel test robot Link: lore.kernel.org/r/202111121827.6v6SXtVv-lkp@intel.com Cc: John Paul Adrian Glaubitz Cc: Yoshinori Sato Cc: Rich Felker Cc: linux-sh@vger.kernel.org Reviewed-by: Geert Uytterhoeven Cc: stable@vger.kernel.org Reviewed-by: John Paul Adrian Glaubitz --- v2: add Reviewed-by Geert, rebase to linux-next-20211115 v3: skipped v4: refresh & resend arch/sh/math-emu/sfp-util.h | 4 ---- 1 file changed, 4 deletions(-) diff -- a/arch/sh/math-emu/sfp-util.h b/arch/sh/math-emu/sfp-util.h --- a/arch/sh/math-emu/sfp-util.h +++ b/arch/sh/math-emu/sfp-util.h @@ -67,7 +67,3 @@ } while (0) #define abort() return 0 - -#define __BYTE_ORDER __LITTLE_ENDIAN - - From patchwork Mon Mar 6 04:00:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 64426 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1647828wrd; Sun, 5 Mar 2023 20:04:20 -0800 (PST) X-Google-Smtp-Source: AK7set/HrFSEU+WqfX64msq6RWHP+MIUqiqnFLYY7KwLMkdQZaKVJahCloynn/n2vXjuCzt3PeCc X-Received: by 2002:a05:6a20:160c:b0:cd:1cce:d892 with SMTP id l12-20020a056a20160c00b000cd1cced892mr11533772pzj.9.1678075460583; Sun, 05 Mar 2023 20:04:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075460; cv=none; d=google.com; s=arc-20160816; b=s/pefo1noprM4a41RFB1mjKNubg0leVXneg8vaH/FI2udN9stwgSUaXcdqe3QYDO9l NVOdCdq/sFViy0Kkdx2cafBztJiu8mj0T6kfRwCTGgUTCzbnJ98XYzNytCVL0k0J68+t Yf1QjzXZ0YfoR3aOBcSO3FsVj2K1oYJ2fk5T9DaKN+zvXxHxMYUpoj3LmBcn7DrJxZn6 4rLSObDp/ZrFidYD5lDyXQo3FdleRsFu4SPdNMrzB3Qf4Oi+IAzo8ypaT4Kbj7jolBdE Qoumwh4WttOlxyOqtsVAGk8PX5ZhGhmEtUHA/TSBvVkNQimOe6C0ibf/briuS9WtXXLK aZEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=M92hecT3X/bcNNKtMijVpnARHRKJzwee5XeX6ujHiXI=; b=0Yem5zQaPIwlrhpRNM4uvSAg4Rg3sRd6O4sGCyxkAxg6jVvpYADpuKsUR4emoppPlh onBbHTM+c8JfiXgZzEhqc6dTMUd5SAl8gzkPqLkG3T4m6fb22ugAlN8M44pWpLkHnrmT a3rITbDZqzBTYZrOezJpkyJlAet/vWfTIcjslpjxzsMRTMo7BNam5pLSMiqrmBzwl8UH He3rEtBaJr8XlH6C8ZsJGOKdLlvxFy8/9vti53TeIFk1jq2DG9chOvKJqz5hgzDVdvNV MqRPbf+HaSNDMqF4IDL4O/nSdzZsAZJPNiL0+uM2KhAFyo3wzGSNQpozFivfQuEheG79 pLnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=zldEoKhu; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v10-20020a63610a000000b00503015b772asi8428847pgb.743.2023.03.05.20.04.08; Sun, 05 Mar 2023 20:04:20 -0800 (PST) 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=@infradead.org header.s=bombadil.20210309 header.b=zldEoKhu; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229816AbjCFEAy (ORCPT + 99 others); Sun, 5 Mar 2023 23:00:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229718AbjCFEAo (ORCPT ); Sun, 5 Mar 2023 23:00:44 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22AE0F94E; Sun, 5 Mar 2023 20:00:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=M92hecT3X/bcNNKtMijVpnARHRKJzwee5XeX6ujHiXI=; b=zldEoKhuNQMsRoTg4EU4F7CabF tnGTA1U6Ksh2HJm0AYJyCun3JtWkTIYWOIv02Hw/tAASegg4WsL0+nEQ1rMJ8fqhxAo16Gxy9nD83 Ash8mkxdSXYFZjWycU1RjQ+aqVbEe4IctWmBVEGVRGqrVhJnKTUKkb9kPIDyBslkLDvgf2fyrzS6p ee7viG16yDIh779VGDq5BYA/a+VwPOMM+cx+oJnCiT2/T4FvmA7Vk9BDHV5IdxlhC4QWH7Cw1ioJB RVJi3DM+jRU08Kx0JobOC7/lds2zcS70P1GVXUWEAJlR4JZdvZjzjjB90qTnGwF6P5tX9SGDUPQ1t n6fxxoiA==; Received: from [2601:1c2:980:9ec0::df2f] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZ21i-00B9yD-6o; Mon, 06 Mar 2023 04:00:42 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Geert Uytterhoeven , Arnd Bergmann , Rich Felker , Yoshinori Sato , John Paul Adrian Glaubitz , linux-sh@vger.kernel.org Subject: [PATCH 5/7 v4] sh: remove sh5/sh64 last fragments Date: Sun, 5 Mar 2023 20:00:35 -0800 Message-Id: <20230306040037.20350-6-rdunlap@infradead.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230306040037.20350-1-rdunlap@infradead.org> References: <20230306040037.20350-1-rdunlap@infradead.org> MIME-Version: 1.0 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_NONE 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?1759589654013966603?= X-GMAIL-MSGID: =?utf-8?q?1759589654013966603?= A previous patch removed most of the sh5 (sh64) support from the kernel tree. Now remove the last stragglers. Fixes: 37744feebc08 ("sh: remove sh5 support") Signed-off-by: Randy Dunlap Cc: Geert Uytterhoeven Cc: Arnd Bergmann Cc: Rich Felker Cc: Yoshinori Sato Cc: John Paul Adrian Glaubitz Cc: linux-sh@vger.kernel.org Acked-by: John Paul Adrian Glaubitz Reviewed-by: John Paul Adrian Glaubitz --- v2: update after adding the parisc64 alias to kbuild.rst v3: skipped v4: refresh & resend Documentation/kbuild/kbuild.rst | 1 - Documentation/scheduler/sched-arch.rst | 2 -- Documentation/translations/zh_CN/scheduler/sched-arch.rst | 2 -- scripts/checkstack.pl | 7 ------- tools/perf/arch/common.c | 2 -- tools/scripts/Makefile.arch | 5 ----- tools/testing/selftests/mm/Makefile | 2 +- tools/testing/selftests/mm/run_vmtests.sh | 2 +- 8 files changed, 2 insertions(+), 21 deletions(-) diff -- a/Documentation/kbuild/kbuild.rst b/Documentation/kbuild/kbuild.rst --- a/Documentation/kbuild/kbuild.rst +++ b/Documentation/kbuild/kbuild.rst @@ -161,7 +161,6 @@ But some architectures such as x86 and s - x86: i386 for 32 bit, x86_64 for 64 bit - parisc: parisc64 for 64 bit -- sh: sh for 32 bit, sh64 for 64 bit - sparc: sparc32 for 32 bit, sparc64 for 64 bit CROSS_COMPILE diff -- a/Documentation/scheduler/sched-arch.rst b/Documentation/scheduler/sched-arch.rst --- a/Documentation/scheduler/sched-arch.rst +++ b/Documentation/scheduler/sched-arch.rst @@ -70,7 +70,5 @@ Possible arch problems I found (and eith ia64 - is safe_halt call racy vs interrupts? (does it sleep?) (See #4a) -sh64 - Is sleeping racy vs interrupts? (See #4a) - sparc - IRQs on at this point(?), change local_irq_save to _disable. - TODO: needs secondary CPUs to disable preempt (See #1) diff -- a/Documentation/translations/zh_CN/scheduler/sched-arch.rst b/Documentation/translations/zh_CN/scheduler/sched-arch.rst --- a/Documentation/translations/zh_CN/scheduler/sched-arch.rst +++ b/Documentation/translations/zh_CN/scheduler/sched-arch.rst @@ -70,7 +70,5 @@ 我发现的可能的arch问题（并试 ia64 - safe_halt的调用与中断相比，是否很荒谬？ (它睡眠了吗) (参考 #4a) -sh64 - 睡眠与中断相比，是否很荒谬？ (参考 #4a) - sparc - 在这一点上，IRQ是开着的（？），把local_irq_save改为_disable。 - 待办事项: 需要第二个CPU来禁用抢占 (参考 #1) diff -- a/scripts/checkstack.pl b/scripts/checkstack.pl --- a/scripts/checkstack.pl +++ b/scripts/checkstack.pl @@ -10,7 +10,6 @@ # Mips port by Juan Quintela # IA64 port via Andreas Dilger # Arm port by Holger Schurig -# sh64 port by Paul Mundt # Random bits by Matt Mackall # M68k port by Geert Uytterhoeven and Andreas Schwab # AArch64, PARISC ports by Kyle McMartin @@ -100,12 +99,6 @@ my (@stack, $re, $dre, $sub, $x, $xs, $f # 100092: e3 f0 ff c8 ff 71 lay %r15,-56(%r15) $re = qr/.*(?:lay|ag?hi).*\%r15,-(([0-9]{2}|[3-9])[0-9]{2}) (?:\(\%r15\))?$/ox; - } elsif ($arch =~ /^sh64$/) { - #XXX: we only check for the immediate case presently, - # though we will want to check for the movi/sub - # pair for larger users. -- PFM. - #a00048e0: d4fc40f0 addi.l r15,-240,r15 - $re = qr/.*addi\.l.*r15,-(([0-9]{2}|[3-9])[0-9]{2}),r15/o; } elsif ($arch eq 'sparc' || $arch eq 'sparc64') { # f0019d10: 9d e3 bf 90 save %sp, -112, %sp $re = qr/.*save.*%sp, -(([0-9]{2}|[3-9])[0-9]{2}), %sp/o; diff -- a/tools/perf/arch/common.c b/tools/perf/arch/common.c --- a/tools/perf/arch/common.c +++ b/tools/perf/arch/common.c @@ -51,9 +51,7 @@ const char *const s390_triplets[] = { const char *const sh_triplets[] = { "sh-unknown-linux-gnu-", - "sh64-unknown-linux-gnu-", "sh-linux-gnu-", - "sh64-linux-gnu-", NULL }; diff -- a/tools/scripts/Makefile.arch b/tools/scripts/Makefile.arch --- a/tools/scripts/Makefile.arch +++ b/tools/scripts/Makefile.arch @@ -29,11 +29,6 @@ ifeq ($(ARCH),sparc64) SRCARCH := sparc endif -# Additional ARCH settings for sh -ifeq ($(ARCH),sh64) - SRCARCH := sh -endif - # Additional ARCH settings for loongarch ifeq ($(ARCH),loongarch32) SRCARCH := loongarch diff -- a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -90,7 +90,7 @@ endif endif -ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64)) +ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sparc64 x86_64)) TEST_GEN_FILES += va_128TBswitch TEST_GEN_FILES += virtual_address_range TEST_GEN_FILES += write_to_hugetlbfs diff -- a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -132,7 +132,7 @@ else fi # filter 64bit architectures -ARCH64STR="arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sh64 sparc64 x86_64" +ARCH64STR="arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sparc64 x86_64" if [ -z "$ARCH" ]; then ARCH=$(uname -m 2>/dev/null | sed -e 's/aarch64.*/arm64/') fi From patchwork Mon Mar 6 04:00:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 64429 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1649568wrd; Sun, 5 Mar 2023 20:10:54 -0800 (PST) X-Google-Smtp-Source: AK7set8Y8JaPWl/zZDb8Mkj+x73whMe2zzr/eE++edkSmHBtCl7lQWNcwYA5/ylTTSk7Ean+W23a X-Received: by 2002:a17:907:7e87:b0:8b2:e81:df2b with SMTP id qb7-20020a1709077e8700b008b20e81df2bmr12196848ejc.44.1678075853959; Sun, 05 Mar 2023 20:10:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075853; cv=none; d=google.com; s=arc-20160816; b=ogmURkzbM0oC22aRJ+HpUiWyWrY3nQ9q/DEYnrG+bJK8m1C2Y65I3E0dytFqGlnIsv /Hd49u/5b9Ab5Y6vAyzUprF7wMP7kSPdFEwxG/Y89ZNfOJ/Zgg+ap1rm5lEHbkWNMYLK Jxvainma+S50yRijGxC9E1VvQEdmjoan+yfRRoeVLGoA0sBVZQFVKcD6f1DsSfGBUAev hsD52t9P+otINfMwAluQ2g2ttVWftHGxYGYaFWUlw6dLk75Fe1OtHycW0QwAgMMYIVH7 IA9o78ES0X1c9pYQ+Tp4FlSqZqmVWzhdBRcgzMwHtyPS7IN7FbVfT3wyIpoit2NE1j/b tweA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4aGYejjB597mgiQZIbHKlJkYyDrDVt5t4jYswvUz7/M=; b=kLNy86PJ2OI+vIjO31rXa0TmnHUkH49ASJNIqtcObxkjoHUPrYK2DQthx1hRvBx5YZ V2o6C/IM8Qa7rZR39GtvYVgtnqjIyw98//kxQFcBKp13XHnPx8QkxDpryn2vbImRYg9g fvj0IiMxp5Q5oVrP9+j0v6P2nYaWfitb71tpQeo2gByZ4+l5MbXebx2uHSKkVYii60w4 9zvOZUZ3XMa8O35yvWOS9YkOxw6gVnJSKKFSFxoX4fLbbBUye3fFABxCXGiOpocInbD/ BuxNfb7R44/4owrociO7hYD6ix99+e4BSvKC5c3baIYcGWQYmW9X9GYh5wFtnmILqrDm yx6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=OGEUSvE1; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q3-20020a17090676c300b008e23e890059si5942180ejn.268.2023.03.05.20.10.29; Sun, 05 Mar 2023 20:10:53 -0800 (PST) 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=@infradead.org header.s=bombadil.20210309 header.b=OGEUSvE1; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229870AbjCFEBQ (ORCPT + 99 others); Sun, 5 Mar 2023 23:01:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229780AbjCFEAp (ORCPT ); Sun, 5 Mar 2023 23:00:45 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DC51F74B; Sun, 5 Mar 2023 20:00:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=4aGYejjB597mgiQZIbHKlJkYyDrDVt5t4jYswvUz7/M=; b=OGEUSvE17nE6gU+pUUq4hEqpoa Ludgfh7fJs61WUf5u/2uSYLU+lQ/wyKkfoyDx0FifHJhGiXPghTR7cbmPai7MVZOU9xOGp998pGma ro3fYBGeqoHPjxb0p7JKxpK2fPceIlBcp91CzdL1tKJHrp7aF2Nbpu45KnS8elOfWMQt+Jm4TiHjq vtySjfLRKe+E6dK5LIpyOBdHnMTEF63qYOsdak60oa3JiSkrLmoBUhXVpmDeu68E0Iuck5MV+RT6j sBhy/PWK6yiDgzPS6CmhtG1++1gu79FgwUWQRcjFDFVX23gFmmvbzIFlGUyQ5rYZ494EIP0mwqiWX Ilm8HaJg==; Received: from [2601:1c2:980:9ec0::df2f] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZ21i-00B9yD-Oc; Mon, 06 Mar 2023 04:00:42 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Geert Uytterhoeven , John Paul Adrian Glaubitz , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 6/7 v4] sh: fix Kconfig entry for NUMA => SMP Date: Sun, 5 Mar 2023 20:00:36 -0800 Message-Id: <20230306040037.20350-7-rdunlap@infradead.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230306040037.20350-1-rdunlap@infradead.org> References: <20230306040037.20350-1-rdunlap@infradead.org> MIME-Version: 1.0 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_NONE 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?1759590066753344676?= X-GMAIL-MSGID: =?utf-8?q?1759590066753344676?= Fix SUPERH builds that select SYS_SUPPORTS_NUMA but do not select SYS_SUPPORTS_SMP and SMP. kernel/sched/topology.c is only built for CONFIG_SMP and then the NUMA code + data inside topology.c is only built when CONFIG_NUMA is set/enabled, so these arch/sh/ configs need to select SMP and SYS_SUPPORTS_SMP to build the NUMA support. Fixes this build error in multiple SUPERH configs: mm/page_alloc.o: In function `get_page_from_freelist': page_alloc.c:(.text+0x2ca8): undefined reference to `node_reclaim_distance' Fixes: 357d59469c11 ("sh: Tidy up dependencies for SH-2 build.") Fixes: 9109a30e5a54 ("sh: add support for sh7366 processor") Signed-off-by: Randy Dunlap Reported-by: Geert Uytterhoeven Cc: John Paul Adrian Glaubitz Cc: Yoshinori Sato Cc: Rich Felker Cc: linux-sh@vger.kernel.org Cc: stable@vger.kernel.org --- v2: skipped v3: skipped v4: refresh & resend arch/sh/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff -- a/arch/sh/Kconfig b/arch/sh/Kconfig --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -477,6 +477,8 @@ config CPU_SUBTYPE_SH7722 select CPU_SHX2 select ARCH_SHMOBILE select ARCH_SPARSEMEM_ENABLE + select SYS_SUPPORTS_SMP + select SMP select SYS_SUPPORTS_NUMA select SYS_SUPPORTS_SH_CMT select PINCTRL @@ -487,6 +489,8 @@ config CPU_SUBTYPE_SH7366 select CPU_SHX2 select ARCH_SHMOBILE select ARCH_SPARSEMEM_ENABLE + select SYS_SUPPORTS_SMP + select SMP select SYS_SUPPORTS_NUMA select SYS_SUPPORTS_SH_CMT From patchwork Mon Mar 6 04:00:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 64427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1649104wrd; Sun, 5 Mar 2023 20:09:04 -0800 (PST) X-Google-Smtp-Source: AK7set97ut40oeYlnluWmu112iWEMYAv5ltm/0klPmQAxKPTm2BsFKDwGKgNJ66bP7N7wC4Bh+nx X-Received: by 2002:a17:906:8a64:b0:8b1:bafe:6135 with SMTP id hy4-20020a1709068a6400b008b1bafe6135mr8274432ejc.60.1678075744686; Sun, 05 Mar 2023 20:09:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075744; cv=none; d=google.com; s=arc-20160816; b=Zdnhu992n1s5WyLBdIF1SrrqepSO+iRvdmheI7xDoMvZnMZyh/yKQqPM4gGxuFqtrM 0SXj8Cy41D7a5Pl7oU/knhDzIn8Bf5YNwvrsle74Tr7sRM0Q9rcV8QfaXlNAuyV46KmT WiPzq09nE1YVHu6qgBG3aI4YJ34RC6P5WcSYQdwswQ6vdbPqfJ9VD8UPW9nd0QFIIT76 wzhiqw4MQ2hQZwNME1EChrXboXmhvfKdgbDYFa00FO5dYs6sBEKO3fC3eyOlbbqb9NKy HqYOzoW1/r9BCrjxN8SJkvMGz6e6TMjrkTlxIOCsEPVcsbXj4FdFY3IiLta9gTejbkhs ihTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4t2RLEMOsre3ySkVA5U3MuOSvkfzSwor9mXcBDVP6m8=; b=VziX2F589jXdkDqw/z0yj6EaDA+goBdIVsG24Xgb17VoLJK2zqA0LUEXNvn5VBqXNb Wn9A/X+S9FDy5OLfk7Kl2GKK5aOiQgumpr9nnnzJipcplh3Xg9GUqTH8GB2gU+tdlG1a GEX0gVfsagUunqZdoSWuUH/t8OAYzpuMmRAOFgkFQRp6DwcDU93SJVgAcvNWtFckXZYG XJNlknjNDUWPpvS8fY11NCdR2lfiDXBMmoDj4p7W7YA2NZZOAcG9f4PknWGYIO6OU92I Y6iDBz9Ud6o/l67kssAermV9D9CUGii+51HYqUV9rA4IbEUgmK7bdAQHLzdob7qUGHGc V6yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b="5GRK/yLB"; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z5-20020a1709060ac500b008e1cbdcd3d1si7176177ejf.97.2023.03.05.20.08.41; Sun, 05 Mar 2023 20:09:04 -0800 (PST) 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=@infradead.org header.s=bombadil.20210309 header.b="5GRK/yLB"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229745AbjCFEBD (ORCPT + 99 others); Sun, 5 Mar 2023 23:01:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229794AbjCFEAp (ORCPT ); Sun, 5 Mar 2023 23:00:45 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABDACF96B; Sun, 5 Mar 2023 20:00:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=4t2RLEMOsre3ySkVA5U3MuOSvkfzSwor9mXcBDVP6m8=; b=5GRK/yLBS4EPjws3juTTRzDRhv dAuhi0vmDk9xa6gXodg55Ao2NH+REXeVtDSM42qVtc8KRFxRInZuwQdfjzIlQuwEfhuIp8DWbOAX9 ONpVxumYj7x+7V1kbxIrzm4qMR3Zszep1/nkMrpOVL9B/EyxiC6n1cbQZhYzN6FpZRypK7dFEQcgC WTIqUll/wOUdNHP0Hm0O6WiGC+WdZV9Rnn577rwvpicwfJ9DFfVfLA2k4/6ycGJenU3T431WUthEB X9G4TlfEPOJMCptTuWc7ogINplSUtpOkKtxS8d1cK03RjhotwJSQ9P2l6CTkhuvXssUbTGyJFJeo4 3cqJF0lw==; Received: from [2601:1c2:980:9ec0::df2f] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZ21j-00B9yD-3q; Mon, 06 Mar 2023 04:00:43 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , John Paul Adrian Glaubitz , Yoshinori Sato , Rich Felker , Geert Uytterhoeven , stable@vger.kernel.org Subject: [PATCH 7/7 v4] sh: mcount.S: fix build error when PRINTK is not enabled Date: Sun, 5 Mar 2023 20:00:37 -0800 Message-Id: <20230306040037.20350-8-rdunlap@infradead.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230306040037.20350-1-rdunlap@infradead.org> References: <20230306040037.20350-1-rdunlap@infradead.org> MIME-Version: 1.0 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_NONE 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?1759589952097921531?= X-GMAIL-MSGID: =?utf-8?q?1759589952097921531?= Fix a build error in mcount.S when CONFIG_PRINTK is not enabled. Fixes this build error: sh2-linux-ld: arch/sh/lib/mcount.o: in function `stack_panic': (.text+0xec): undefined reference to `dump_stack' Fixes: e460ab27b6c3 ("sh: Fix up stack overflow check with ftrace disabled.") Signed-off-by: Randy Dunlap Cc: John Paul Adrian Glaubitz Cc: Yoshinori Sato Cc: Rich Felker Suggested-by: Geert Uytterhoeven Cc: stable@vger.kernel.org Reviewed-by: John Paul Adrian Glaubitz --- v2: add PRINTK to STACK_DEBUG dependency (thanks, Geert) v3: skipped v4: refresh & resend arch/sh/Kconfig.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -- a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug --- a/arch/sh/Kconfig.debug +++ b/arch/sh/Kconfig.debug @@ -15,7 +15,7 @@ config SH_STANDARD_BIOS config STACK_DEBUG bool "Check for stack overflows" - depends on DEBUG_KERNEL + depends on DEBUG_KERNEL && PRINTK help This option will cause messages to be printed if free stack space drops below a certain limit. Saying Y here will add overhead to