From patchwork Fri Feb 3 13:50:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 52509 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp850887wrn; Fri, 3 Feb 2023 05:57:56 -0800 (PST) X-Google-Smtp-Source: AK7set8pIQ3kVkH3A3OKExoy8ejK0q95j4GKgdgQD4y2QX0VcjL2iv91aNYsPqpB2u0Z+OCkBGKe X-Received: by 2002:a17:906:a045:b0:88e:2ff5:85d2 with SMTP id bg5-20020a170906a04500b0088e2ff585d2mr8812649ejb.25.1675432675924; Fri, 03 Feb 2023 05:57:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675432675; cv=none; d=google.com; s=arc-20160816; b=clCwWXtequ27RQciNJYfPbCs+Rmj40zV13gKAa6WxucnIxx8LBBOOpZz+B+vkMdJI7 A0MrHp4N5igrsVcIfNflEu/jAvtx4OW2u5ju8+TttHQDQnd6p7tGqz8y7t+88hnYmP+Q RkUu71To7Zw4Yv8zt9CS7t7k28YyoCSL/QRU7kuTRLxODQkpvpkUegTt53rCF1ug9JL8 sTHQgV254fS4pIqqWsP8tOsbvH5RReIqWWj2QwMQFV7JrZeUeRip8JZTVRUmCy3PNJgA oUKvtcz9idmkbM+YjmQSaEcjtODzh5y9bK+3hfWYZzetSd1xDCPW+DEmCUpJODYjZ6wX wgGQ== 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; bh=YgLcs9RScl9DGKNSCBP/SG0RJ/0aDP5wcX1MLKozDP0=; b=CxMUON6BHQIKvuoRcJi6Ra2HfhzyExyHnAw6AqnFiQhtYCpCdo8Ncfmr6WIfMOYroT cRSDt//krAMelHi8yGvJNWZ2p7OdxET8OFRuqJAilegmHutqR+IFedfwqxZsoHIGB2Lk yk2RHtqCBerw5xxL/x5oxmQrY4jhX8p2JokihEo+OnCtXogTyv7ckLokunzZXYNE8rLy zXMuhV03wU2DlkrVWur3sohcUXVepEVxn4cmQYG5vJlddW5q441ggRnEM8GuD1u89gur FfWqwvfM5fdky0Fb4y4kMUUw4y17eZ5w8HXONiQh4yrvYUYTmc5Y9q3HRgjvenmjP6BO bH2Q== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c16-20020a17090620d000b008893db9590fsi3589698ejc.856.2023.02.03.05.57.32; Fri, 03 Feb 2023 05:57:55 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232970AbjBCN4p (ORCPT + 99 others); Fri, 3 Feb 2023 08:56:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233272AbjBCN4H (ORCPT ); Fri, 3 Feb 2023 08:56:07 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C4924A77AD; Fri, 3 Feb 2023 05:54:00 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 790DF175D; Fri, 3 Feb 2023 05:54:33 -0800 (PST) Received: from eglon.cambridge.arm.com (eglon.cambridge.arm.com [10.1.196.177]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AB7923F71E; Fri, 3 Feb 2023 05:53:47 -0800 (PST) From: James Morse To: linux-pm@vger.kernel.org, loongarch@lists.linux.dev, kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arch@vger.kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org Cc: Marc Zyngier , Thomas Gleixner , Lorenzo Pieralisi , Mark Rutland , Sudeep Holla , Borislav Petkov , H Peter Anvin , Dave Hansen , Ingo Molnar , Will Deacon , Catalin Marinas , Huacai Chen , James Morse , Suzuki K Poulose , Oliver Upton , Len Brown , Rafael Wysocki , WANG Xuerui , Salil Mehta , Russell King , Jean-Philippe Brucker Subject: [RFC PATCH 27/32] arm64: psci: Ignore DENIED CPUs Date: Fri, 3 Feb 2023 13:50:38 +0000 Message-Id: <20230203135043.409192-28-james.morse@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230203135043.409192-1-james.morse@arm.com> References: <20230203135043.409192-1-james.morse@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,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?1756818493601469520?= X-GMAIL-MSGID: =?utf-8?q?1756818493601469520?= From: Jean-Philippe Brucker When a CPU is marked as disabled, but online capable in the MADT, PSCI applies some firmware policy to control when it can be brought online. PSCI returns DENIED to a CPU_ON request if this is not currently permitted. The OS can learn the current policy from the _STA enabled bit. Handle the PSCI DENIED return code gracefully instead of printing an error. Signed-off-by: Jean-Philippe Brucker [ morse: Rewrote commit message ] Signed-off-by: James Morse --- arch/arm64/kernel/psci.c | 2 +- arch/arm64/kernel/smp.c | 3 ++- drivers/firmware/psci/psci.c | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index 29a8e444db83..4fcc0cdd757b 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -40,7 +40,7 @@ static int cpu_psci_cpu_boot(unsigned int cpu) { phys_addr_t pa_secondary_entry = __pa_symbol(secondary_entry); int err = psci_ops.cpu_on(cpu_logical_map(cpu), pa_secondary_entry); - if (err) + if (err && err != -EPROBE_DEFER) pr_err("failed to boot CPU%d (%d)\n", cpu, err); return err; diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 5669b013c2b7..ea031641545d 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -125,7 +125,8 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) /* Now bring the CPU into our world */ ret = boot_secondary(cpu, idle); if (ret) { - pr_err("CPU%u: failed to boot: %d\n", cpu, ret); + if (ret != -EPROBE_DEFER) + pr_err("CPU%u: failed to boot: %d\n", cpu, ret); return ret; } diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c index e7bcfca4159f..3389c913b2ea 100644 --- a/drivers/firmware/psci/psci.c +++ b/drivers/firmware/psci/psci.c @@ -212,6 +212,8 @@ static int __psci_cpu_on(u32 fn, unsigned long cpuid, unsigned long entry_point) int err; err = invoke_psci_fn(fn, cpuid, entry_point, 0); + if (err == PSCI_RET_DENIED) + return -EPROBE_DEFER; return psci_to_linux_errno(err); }