From patchwork Fri Aug 5 09:46:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 9265151 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A845960839 for ; Fri, 5 Aug 2016 10:11:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94B8E283E6 for ; Fri, 5 Aug 2016 10:11:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 847242842D; Fri, 5 Aug 2016 10:11:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 07234283E6 for ; Fri, 5 Aug 2016 10:11:02 +0000 (UTC) Received: from localhost ([::1]:44114 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVc5l-000645-Jg for patchwork-qemu-devel@patchwork.kernel.org; Fri, 05 Aug 2016 06:11:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVbiQ-00071d-9Y for qemu-devel@nongnu.org; Fri, 05 Aug 2016 05:46:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVbiO-0007w0-Fq for qemu-devel@nongnu.org; Fri, 05 Aug 2016 05:46:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54516) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVbiO-0007vp-9o for qemu-devel@nongnu.org; Fri, 05 Aug 2016 05:46:52 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D1CD861E40; Fri, 5 Aug 2016 09:46:51 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u759kIwG002176; Fri, 5 Aug 2016 05:46:50 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Fri, 5 Aug 2016 11:46:15 +0200 Message-Id: <1470390377-228219-17-git-send-email-imammedo@redhat.com> In-Reply-To: <1470390377-228219-1-git-send-email-imammedo@redhat.com> References: <1470390377-228219-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 05 Aug 2016 09:46:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.8 16/18] pc: add 'etc/boot-cpus' fw_cfg file for machine with more than 255 CPUs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: rkrcmar@redhat.com, ehabkost@redhat.com, mst@redhat.com, mtosatti@redhat.com, kevin@koconnor.net, pbonzini@redhat.com, lersek@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Currently firmware uses 1 byte at 0x5F offset in RTC CMOS to get number of CPUs present at boot. However 1 byte is not enough to handle more than 255 CPUs. So add a new fw_cfg file that would allow QEMU to tell it. For compat reasons add file only for machine types that support more than 255 CPUs. Signed-off-by: Igor Mammedov --- hw/i386/pc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c2cd5bd..2b5581a 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1235,9 +1235,11 @@ void pc_machine_done(Notifier *notifier, void *data) PCMachineState *pcms = container_of(notifier, PCMachineState, machine_done); PCIBus *bus = pcms->bus; + static uint16_t boot_cpus; /* set the number of CPUs */ - rtc_set_memory(pcms->rtc, 0x5f, pc_present_cpus_count(pcms) - 1); + boot_cpus = pc_present_cpus_count(pcms); + rtc_set_memory(pcms->rtc, 0x5f, boot_cpus - 1); if (bus) { int extra_hosts = 0; @@ -1258,8 +1260,16 @@ void pc_machine_done(Notifier *notifier, void *data) acpi_setup(); if (pcms->fw_cfg) { + MachineClass *mc = MACHINE_GET_CLASS(pcms); + pc_build_smbios(pcms->fw_cfg); pc_build_feature_control_file(pcms); + + if (mc->max_cpus > 255) { + boot_cpus = cpu_to_le16(boot_cpus); + fw_cfg_add_file(pcms->fw_cfg, "etc/boot-cpus", &boot_cpus, + sizeof(boot_cpus)); + } } }