From nobody Tue Feb 10 06:27:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1579564429; cv=none; d=zohomail.com; s=zohoarc; b=TGCN/LfZ6Kd5BbzMTCFpO6YQlISMNKFji+Sroqpf41/3sQsdlhrCxXkn4WQ96F9rgWcHdWmdWqaxI9SjzU8Fes9vyIvNL2T7Bd8ObWEEdJlumKzH8dxH7JE9D3MAFkpXtbiULH4VqaQt2hhOqGi4X18f6sWlHi4wwOsD05a2J08= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579564429; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=s1igqKfCso4sFnyZZ3LURygk4ICU58gQAal/3CWVEAU=; b=AkbT7w37J7GkPHiralIu1JkXUI4QczTceR1LmZ8j5xJPzW4kI+Tic1Nd7Zg0pXAaSjbRs3lso9WEfjI+45ln88Bj9J3/gf8nmIseJ74s6zU36hgrYIyPI4ZmWeAsJ32XDhY6QT6OQjcKOfnqbQ19Cs2ck0Lajs0rNgFS2FB3eD0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579564429223469.553204367622; Mon, 20 Jan 2020 15:53:49 -0800 (PST) Received: from localhost ([::1]:45928 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itgrZ-0002Ku-IF for importer@patchew.org; Mon, 20 Jan 2020 18:53:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35707) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itgpy-0000my-RN for qemu-devel@nongnu.org; Mon, 20 Jan 2020 18:52:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itgpx-0007Wg-Ed for qemu-devel@nongnu.org; Mon, 20 Jan 2020 18:52:06 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:45202) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1itgpx-0007WR-8X; Mon, 20 Jan 2020 18:52:05 -0500 Received: by mail-wr1-x443.google.com with SMTP id j42so1262906wrj.12; Mon, 20 Jan 2020 15:52:05 -0800 (PST) Received: from x1w.redhat.com (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id d8sm48655269wrx.71.2020.01.20.15.52.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 15:52:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s1igqKfCso4sFnyZZ3LURygk4ICU58gQAal/3CWVEAU=; b=Tnf1IWH0vEnqN+foKGOhpWul2mMrZGPXm+xrATws3uESCw3hBk8aUaSkAwrF1/DE3/ ofOm6Q9QhSjkobenwWkGO5ZY2zF8u+a+lVsVv08fWWhgiaM38XSDzoNTm+EQHv9lBJVG HNKbmCZ/8OX94sBHY/tF0G1gy0mRgjjKgUJnPh8VCRULTpIkPUIvsFYXKtBERwjbwT01 Qj0WJoi9ZZXXhrCK7VP0+dThzOtPjtEm769LKJmWY7R1UtaTIY6Ys47ONBexVsiwVXPr IxQ3zRiCbOiWpiwdJZ38nEyvET6QEycbvpyoR2UdyI0O08Xd/oKhBRM/4K9yMVCXRr9k wvlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=s1igqKfCso4sFnyZZ3LURygk4ICU58gQAal/3CWVEAU=; b=kS9Qv6PihO2oTkLx9K8knItip6SLupU+lP6GzYJec7pPxyVI5zvFxZwkwl+Y9Ro+cZ +SpkM487f3I37jcr54wWWWtvHZ9bdzcT8Ej+gpUQrpuKmdQI7JChghXrjf09bwnhR7W/ Ri8IYayZzFZOgglI1hTUWMgd9sCKX4hC7tCH8zkgWDRk4P4DMSy2ZPTMiuVAgZYZGSOI piCOIbMBIJzmGkRNiP2BTaSzpHnhoZa+gFrklcLG6nr6geBMlcrrB3f/7kXUW/6tSzls l6DfXHvBKSClqXZceQbC/g6xujm/rtGq2tPevWXA4pr76rHUtNrcoz425oHXiZoqeq9d uLoQ== X-Gm-Message-State: APjAAAUDr+Cgnk7AfQW8JI9Wt5BSgSYYDSgAXwKkGn2r0pnQeqH1L19X nupDK1ZgUIf7U+GkUAX3yp3fRgmk X-Google-Smtp-Source: APXvYqw9JyDJc4GbeC6oCGMjB22taeNI2Xms40fwXS0CF5oAoXKRO8RpAOFjeNgk9HIICMLC2/VOUw== X-Received: by 2002:adf:f64b:: with SMTP id x11mr1806117wrp.355.1579564323829; Mon, 20 Jan 2020 15:52:03 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v4 1/7] hw/arm/raspi: Remove obsolete use of -smp to set the soc 'enabled-cpus' Date: Tue, 21 Jan 2020 00:51:53 +0100 Message-Id: <20200120235159.18510-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200120235159.18510-1-f4bug@amsat.org> References: <20200120235159.18510-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 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: Peter Maydell , Eduardo Habkost , Alistair Francis , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Baumann , qemu-arm@nongnu.org, "Emilio G . Cota" , Cleber Rosa , Laurent Bonnans , Cheng Xiang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Since we enabled parallel TCG code generation for softmmu (see commit 3468b59 "tcg: enable multiple TCG contexts in softmmu") and its subsequent fix (commit 72649619 "add .min_cpus and .default_cpus fields to machine_class"), the raspi machines are restricted to always use their 4 cores: See in hw/arm/raspi2 (with BCM283X_NCPUS set to 4): 222 static void raspi2_machine_init(MachineClass *mc) 223 { 224 mc->desc =3D "Raspberry Pi 2"; 230 mc->max_cpus =3D BCM283X_NCPUS; 231 mc->min_cpus =3D BCM283X_NCPUS; 232 mc->default_cpus =3D BCM283X_NCPUS; 235 }; 236 DEFINE_MACHINE("raspi2", raspi2_machine_init) We can no longer use the -smp option, as we get: $ qemu-system-arm -M raspi2 -smp 1 qemu-system-arm: Invalid SMP CPUs 1. The min CPUs supported by machine 'r= aspi2' is 4 Since we can not set the TYPE_BCM283x SOC "enabled-cpus" with -smp, remove the unuseful code. We can achieve the same by using the '-global bcm2836.enabled-cpus=3D1' option. Reported-by: Laurent Bonnans Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- Cc: Emilio G. Cota Cc: Richard Henderson Cc: Andrew Baumann Cc: Eduardo Habkost --- hw/arm/raspi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 6a510aafc1..3996f6c63a 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -192,8 +192,6 @@ static void raspi_init(MachineState *machine, int versi= on) /* Setup the SOC */ object_property_add_const_link(OBJECT(&s->soc), "ram", OBJECT(&s->ram), &error_abort); - object_property_set_int(OBJECT(&s->soc), machine->smp.cpus, "enabled-c= pus", - &error_abort); int board_rev =3D version =3D=3D 3 ? 0xa02082 : 0xa21041; object_property_set_int(OBJECT(&s->soc), board_rev, "board-rev", &error_abort); --=20 2.21.1