From patchwork Tue Mar 9 13:16:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 395986 Delivered-To: patch@linaro.org Received: by 2002:a17:906:a383:0:0:0:0 with SMTP id k3csp2718961ejz; Tue, 9 Mar 2021 05:18:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJy1NLRJcNyziHuLIla698JdPL0vw5Qesf0jBQ56BNx2u7KfjJdM8USD2gYUM+SjdrfONs5A X-Received: by 2002:a5d:9459:: with SMTP id x25mr23144928ior.176.1615295880671; Tue, 09 Mar 2021 05:18:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615295880; cv=none; d=google.com; s=arc-20160816; b=gFK1HUqsqqgHdglqM2mmcwWxYJZ/YgVbJvL0ssxfMWSVolwVyvomzaZ0cr7NLsrZ3I CYXdq118969LjEkfUIOQkFFl1jkkLy2aaIVswJzFPPMxyrT+r7ooQjSzqBjjOSKb+o9Q yI/KlwH2jeVGsg7AsmV3RuwaUO5a65RA1RCvu9uZVDb6KnsyRCV+blAwg1Zt+07NeJ7d 79Sxn15lJiiqvZBIPIayebZciJBBnp4n8H9a2/sjhMNSP1EV8z5Q0X00H3JNtx6YT/Kn wN9n7enxLVZ+EDH7ZJl1rDgDJjXfcfHsYtg6qYUxiGQqX7Xa7TiXVptZWBL1NO6B1sag eDVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=fna6enZXAYFfcesA62niTMHmMfq8+njy85nCkvdbQ8Q=; b=ixvxwiW7yURALtnSKctSbW5G9zVWdbIrtpgs7X+M7E4ECmv4gOUXg/sNPXP4E2lzV+ AzvaCuYOJ9O8VCF0AGsrPTQ3lXKqvjDIFYjWiBgeb3/8LOEVQ2eW9vmYL6ZDChjO5g+6 B6WQ+jgF2odx6wWYtZh2OL0lYBIGjZ3p1bMYKEoSpXVlaIK8vjCvp3b7V7+ofP3R8xpx zJqqikr17FuNSgmfaRQAF8PkppqTP1lB0jjgEz+aQyy/Px3FvpGTAMyQhyPZHXk+T9/m G5V7HFoP/qijQiI6HCfYA8vy5HoYtkSZEp7NqRoeyYggPKWQ1FejFhfaD5cGV0o3LjzB 8wmA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u8si5356419iop.38.2021.03.09.05.18.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Mar 2021 05:18:00 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:44702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJcFL-00027B-VL for patch@linaro.org; Tue, 09 Mar 2021 08:17:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJcEW-00025v-QS; Tue, 09 Mar 2021 08:17:09 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:37838) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJcER-0007AZ-Qj; Tue, 09 Mar 2021 08:17:08 -0500 Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 129D3WFe117548; Tue, 9 Mar 2021 08:16:48 -0500 Received: from ppma04fra.de.ibm.com (6a.4a.5195.ip4.static.sl-reverse.com [149.81.74.106]) by mx0a-001b2d01.pphosted.com with ESMTP id 375wcm9ca6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Mar 2021 08:16:47 -0500 Received: from pps.filterd (ppma04fra.de.ibm.com [127.0.0.1]) by ppma04fra.de.ibm.com (8.16.0.43/8.16.0.43) with SMTP id 129DBeCl023362; Tue, 9 Mar 2021 13:16:46 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma04fra.de.ibm.com with ESMTP id 3768v0r0w9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Mar 2021 13:16:46 +0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 129DGhSW55247346 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 9 Mar 2021 13:16:43 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C842642047; Tue, 9 Mar 2021 13:16:43 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8C94D42045; Tue, 9 Mar 2021 13:16:43 +0000 (GMT) Received: from smtp.tlslab.ibm.com (unknown [9.101.4.1]) by d06av24.portsmouth.uk.ibm.com (Postfix) with SMTP; Tue, 9 Mar 2021 13:16:43 +0000 (GMT) Received: from yukon.ibmuc.com (unknown [9.171.48.251]) by smtp.tlslab.ibm.com (Postfix) with ESMTP id E9B8C220270; Tue, 9 Mar 2021 14:16:42 +0100 (CET) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: Peter Maydell Subject: [PULL 1/7] arm/ast2600: Fix SMP booting with -kernel Date: Tue, 9 Mar 2021 14:16:35 +0100 Message-Id: <20210309131641.2709380-2-clg@kaod.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210309131641.2709380-1-clg@kaod.org> References: <20210309131641.2709380-1-clg@kaod.org> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369, 18.0.761 definitions=2021-03-09_11:2021-03-08, 2021-03-09 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 mlxscore=0 clxscore=1034 priorityscore=1501 mlxlogscore=856 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103090064 Received-SPF: softfail client-ip=148.163.158.5; envelope-from=clg@kaod.org; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Joel Stanley Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Joel Stanley The ast2600 machines do not have PSCI firmware, so this property should have never been set. Removing this node fixes SMP booting Linux kernels that have PSCI enabled, as Linux fails to find PSCI in the device tree and falls back to the soc-specific method for enabling secondary CPUs. The comment is out of date as Qemu has supported -kernel booting since 9bb6d14081ce ("aspeed: Add boot stub for smp booting"), in v5.1. Fixes: f25c0ae1079d ("aspeed/soc: Add AST2600 support") Signed-off-by: Joel Stanley Reviewed-by: Cédric Le Goater Tested-by: Cédric Le Goater Message-Id: <20210303010505.635621-1-joel@jms.id.au> Signed-off-by: Cédric Le Goater --- hw/arm/aspeed_ast2600.c | 7 ------- 1 file changed, 7 deletions(-) -- 2.26.2 diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index bf31ca351feb..49b00763864c 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -241,8 +241,6 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) /* CPU */ for (i = 0; i < sc->num_cpus; i++) { - object_property_set_int(OBJECT(&s->cpu[i]), "psci-conduit", - QEMU_PSCI_CONDUIT_SMC, &error_abort); if (sc->num_cpus > 1) { object_property_set_int(OBJECT(&s->cpu[i]), "reset-cbar", ASPEED_A7MPCORE_ADDR, &error_abort); @@ -253,11 +251,6 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) object_property_set_int(OBJECT(&s->cpu[i]), "cntfrq", 1125000000, &error_abort); - /* - * TODO: the secondary CPUs are started and a boot helper - * is needed when using -kernel - */ - if (!qdev_realize(DEVICE(&s->cpu[i]), NULL, errp)) { return; }