From patchwork Sat Nov 26 06:15:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 26192 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4487066wrr; Fri, 25 Nov 2022 22:34:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf5qaMlA/iluVLN1oCqcnVZRf4Wf/nU8GNkoPVHc/KZFbu0deTkSSKAmXw4avrEnA15coc6C X-Received: by 2002:aa7:cb03:0:b0:46a:a12a:4dcd with SMTP id s3-20020aa7cb03000000b0046aa12a4dcdmr9444611edt.338.1669444451957; Fri, 25 Nov 2022 22:34:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669444451; cv=none; d=google.com; s=arc-20160816; b=Z9PYXybwHFKXIG/DEtBfrr3Se39aIxRZj9vUpCHA2VKgtUJoL0pwgsZDqRohpNE0JV VJ41C43jbYYX7Zn6nxxnEat/l2u9G6LzLXqwCDoERHF8ytOkQuRbzdX+1lRSqIEVD2FH ljohvC5ZiD2I7u4xi+Q4RlD0JuRQvM3KUbGJKX8tSwQoIG7UgX6YsjmOTStA/0KAtObu a1fqtqLPnmqGRMMcGSQeoAUEEOtMwtQzN7DEg+Q4lSLDIXPccwNf3RojYBa/SKbImmq7 1OgTxjlVEyGemvMdcr/EsbUWob22I3amigqWyph8cuzqkwFmp56cc1peTodFN9xRqHoI PvTg== 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 :message-id:date:subject:cc:to:from:feedback-id:dkim-signature :dkim-signature; bh=hLJUpZI/f7CpelvMplO2oQQt3hxU+GpZrdXUTH/HZis=; b=fh4HSFC2rTgYlD3XaBhp01UBuWapr2U4xcrGx4h60WoA40AbzMSsvvoX+DMrNxMlYD PD6R7mPQVGpG+GYgO67eMEwYK9i+Dr5iUY+rrWBTUeyLP1CBHcC1OgnMAG0n0eNWZv5m KeVAycKvBtEZAn8XxZJntOnYi7F8YogacjSuaFcpnSTQQhJPvEOcPh2I/xSlqMbqWg5/ EHP9UyUrjZyc1KvjVbOVLpkqupH0BQ8bbBsfJ7/x9r1ftiGR3Id1p0/PM/8JNDS6emvZ 8I12YiMFfy/XhAduEYGCYwnpHNgqDRBfQp8ynDbz4Act9qSZo+oT3Fp5baAtepFGPml9 LUTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sholland.org header.s=fm2 header.b=oK3G74Mh; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=YjSv9StU; 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=NONE dis=NONE) header.from=sholland.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e13-20020a17090658cd00b007adbc807ca8si6614330ejs.137.2022.11.25.22.33.37; Fri, 25 Nov 2022 22:34:11 -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=@sholland.org header.s=fm2 header.b=oK3G74Mh; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=YjSv9StU; 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=NONE dis=NONE) header.from=sholland.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230089AbiKZGQB (ORCPT + 99 others); Sat, 26 Nov 2022 01:16:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229551AbiKZGP7 (ORCPT ); Sat, 26 Nov 2022 01:15:59 -0500 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CC02201A1 for ; Fri, 25 Nov 2022 22:15:59 -0800 (PST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id B10075C00BC; Sat, 26 Nov 2022 01:15:58 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sat, 26 Nov 2022 01:15:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to; s=fm2; t=1669443358; x=1669529758; bh=hLJUpZI/f7CpelvMplO2oQQt3 hxU+GpZrdXUTH/HZis=; b=oK3G74Mh1+qwvqE8Jcp19vt9rSZediknoMzlwigqV NgAhattWRXTqTb05nFF6I0HTMVS9l5TACIM+WLaN/XE1seaoRnXzOmTViYHPtLY8 VNFXyHaVOmUkath/fAySUAd99SCSX90LzoYrKXbEqiN3yLjMMAfphD+R3gneKeMk WpeRn8efsMd2rcLggV/Espx+b4kSy0fsRZpWN5nJTujh+iBgYfARAVcmMHHbpHY7 w/boQXEQ984IwBKjrInfXYl/VqLH82dmFheuaJ8vkhOGJfRwrgEgwYaX7ruVEO1G VafT6R4A6lNTsg9rCYr/pMHh+6dz5N9I25eaZOUjQcUVw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1669443358; x=1669529758; bh=hLJUpZI/f7CpelvMplO2oQQt3hxU+GpZrdX UTH/HZis=; b=YjSv9StU6p9jBx6hNQEX9xloESK42X7RLve5kT4VRiXX8rINBz/ 5V5mPerP/s+hYqVOaXcs7ePX5TJ1HUJYfRu43C8rvi2YeUr9Uk5+YuqjYfeSuWVD Vtz6ww0Kcp4eDQsnSMEKYuGi8M6/+iXF++EkzUz8Xu8O+IgkpddcleZaove/kjXD auJqd+0VWS7aanSAVOXQevXWvXhRe8KEwsJjUAQVQkY+6JcDJXfjA9wbvS4Wwuzc wkm5KWzgPet02XKFvuDHpH4TlQnQpvC1RHi6c+pIvQ+6upDi8vmKEUr7+xmScaZV JoRNfhPJ3vHW75wdxJ06wA7Jvl8DLrbnpyw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrieeigdeludcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgvlhcu jfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtffrrg htthgvrhhnpeekveelhfejueelleetvdejvdeffeetgeelheeujeffhefgffefkeehhffh keekgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hsrghmuhgvlhesshhhohhllhgrnhgurdhorhhg X-ME-Proxy: Feedback-ID: i0ad843c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 26 Nov 2022 01:15:57 -0500 (EST) From: Samuel Holland To: Palmer Dabbelt Cc: Samuel Holland , Albert Ou , Anup Patel , Heinrich Schuchardt , Paul Walmsley , linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: [PATCH] riscv: Fix NR_CPUS range conditions Date: Sat, 26 Nov 2022 00:15:56 -0600 Message-Id: <20221126061557.3541-1-samuel@sholland.org> X-Mailer: git-send-email 2.37.4 MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, SPF_PASS 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?1750539385983961298?= X-GMAIL-MSGID: =?utf-8?q?1750539385983961298?= The conditions reference the symbol SBI_V01, which does not exist. The correct symbol is RISCV_SBI_V01. Fixes: e623715f3d67 ("RISC-V: Increase range and default value of NR_CPUS") Signed-off-by: Samuel Holland Reviewed-by: Conor Dooley Reviewed-by: Andrew Jones --- arch/riscv/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index fec54872ab45..acbfe34c6a00 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -319,9 +319,9 @@ config SMP config NR_CPUS int "Maximum number of CPUs (2-512)" depends on SMP - range 2 512 if !SBI_V01 - range 2 32 if SBI_V01 && 32BIT - range 2 64 if SBI_V01 && 64BIT + range 2 512 if !RISCV_SBI_V01 + range 2 32 if RISCV_SBI_V01 && 32BIT + range 2 64 if RISCV_SBI_V01 && 64BIT default "32" if 32BIT default "64" if 64BIT