From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 369ACCA9EAF for ; Thu, 24 Oct 2019 16:13:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0C20920659 for ; Thu, 24 Oct 2019 16:13:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C20920659 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNfkM-0003ix-01 for qemu-devel@archiver.kernel.org; Thu, 24 Oct 2019 12:13:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45303) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNeiH-0001N8-1l for qemu-devel@nongnu.org; Thu, 24 Oct 2019 11:07:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNeiF-0005SL-Dp for qemu-devel@nongnu.org; Thu, 24 Oct 2019 11:07:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55010) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNeiF-0005S1-4d for qemu-devel@nongnu.org; Thu, 24 Oct 2019 11:07:43 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CA5BCA705 for ; Thu, 24 Oct 2019 15:07:41 +0000 (UTC) Received: by mail-wr1-f72.google.com with SMTP id f15so9410664wrs.13 for ; Thu, 24 Oct 2019 08:07:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=qTyjiJwQL7sj7gFZIpB0Qz7YwwY9V+Rt8aR+YW5JeAg=; b=WTGpBbGDyz8Ep1+GTvvTsESxpXU3JXOzxPrbd6KJbMg1dD1juUTEhmp9znT6h3vEIc DiWVP4uPKxLDigyLclJshTaSHiECigirpCSTmBYCnL7EIgvRwXJzCms+44S+d1tfa8xu kDJqB4O+qX7xg1yfwiHDynY9eNYwnUZk9PY40Zsw9pF9OWDKMJzlxTueYwTvtKEd0l0P ULie8HFtuclRZVgD5d+I7o/Jv4VHbVN/Sw1nBSq0KRrWSHn7aTSIvat7KTTzRhmsP6up Me+L0ulItqxKbisPz9AYn8K3FgrCTura5tXoy+f49D/kQo/BTudw+Xpos76MV24pp0JM 7CmQ== X-Gm-Message-State: APjAAAX2G7sOWCLfHYSJ/6qMTWwZiH2O7IwZT6NQeDzOKtffq5QOb13h fcwhYYV2UjCTP2XEAP89LWNNuAv99Z0SkMw14QOAJt+1hCfADEghHIABYfJaDqCPa4sgzUYYFYj 8MsRjHl8RdjUEXYc= X-Received: by 2002:a1c:49c2:: with SMTP id w185mr5198965wma.16.1571929659348; Thu, 24 Oct 2019 08:07:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqxVohNvEbilfVtsAx2tk+/oev8nfF4GKNoL1dVQz6VMhFV4E7VjmrdGEZ3xCMjjUTCn1E8heA== X-Received: by 2002:a1c:49c2:: with SMTP id w185mr5198945wma.16.1571929659066; Thu, 24 Oct 2019 08:07:39 -0700 (PDT) Received: from [192.168.1.115] (129.red-83-57-174.dynamicip.rima-tde.net. [83.57.174.129]) by smtp.gmail.com with ESMTPSA id v10sm19003915wrm.26.2019.10.24.08.07.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Oct 2019 08:07:38 -0700 (PDT) Subject: Re: [RFC 3/3] acpi: cpuhp: add CPHP_GET_CPU_ID_CMD command To: Igor Mammedov , qemu-devel@nongnu.org References: <20191009132252.17860-1-imammedo@redhat.com> <20191009132252.17860-4-imammedo@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Thu, 24 Oct 2019 17:07:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20191009132252.17860-4-imammedo@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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: Eduardo Habkost , "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , Laszlo Ersek , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Igor, On 10/9/19 3:22 PM, Igor Mammedov wrote: > Extend CPU hotplug interface to return architecture specific > identifier for current CPU (in case of x86, it's APIC ID). > > Signed-off-by: Igor Mammedov > --- > TODO: > * cripple it to behave old way on old machine types so that > new firmware started on new QEMU won't see a difference > when migrated to an old QEMU (i.e. QEMU that doesn't support > this command) > --- > docs/specs/acpi_cpu_hotplug.txt | 10 +++++++++- > hw/acpi/cpu.c | 15 +++++++++++++++ > hw/acpi/trace-events | 1 + > 3 files changed, 25 insertions(+), 1 deletion(-) > > diff --git a/docs/specs/acpi_cpu_hotplug.txt b/docs/specs/acpi_cpu_hotplug.txt > index 43c5a193f0..0438678249 100644 > --- a/docs/specs/acpi_cpu_hotplug.txt > +++ b/docs/specs/acpi_cpu_hotplug.txt > @@ -32,7 +32,9 @@ Register block size: > > read access: > offset: > - [0x0-0x3] reserved > + [0x0-0x3] Command data 2: (DWORD access) > + upper 32 bit of 'Command data' if returned data value is 64 bit. > + in case of error or unsupported command reads is 0x0 > [0x4] CPU device status fields: (1 byte access) > bits: > 0: Device is enabled and may be used by guest > @@ -87,6 +89,8 @@ write access: > 2: stores value into OST status register, triggers > ACPI_DEVICE_OST QMP event from QEMU to external applications > with current values of OST event and status registers. > + 3: OSPM reads architecture specific value identifying CPU > + (x86: APIC ID) > other values: reserved > > Selecting CPU device beyond possible range has no effect on platform: > @@ -115,3 +119,7 @@ Typical usecases: > 5.2 if 'Command data' register has not changed, there is not CPU > corresponding to iterator value and the last valid iterator value > equals to 'max_cpus' + 1 > + - Get architecture specific id for a CPU > + 1. pick a CPU to read from using 'CPU selector' register > + 2. write 0x3 int0 'Command field' register > + 3. read architecture specific id from 'Command data' register > diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c > index 87f30a31d7..701542d860 100644 > --- a/hw/acpi/cpu.c > +++ b/hw/acpi/cpu.c > @@ -12,11 +12,13 @@ > #define ACPI_CPU_FLAGS_OFFSET_RW 4 > #define ACPI_CPU_CMD_OFFSET_WR 5 > #define ACPI_CPU_CMD_DATA_OFFSET_RW 8 > +#define ACPI_CPU_CMD_DATA2_OFFSET_RW 0 This part confuses me: #define ACPI_CPU_SELECTOR_OFFSET_WR 0 #define ACPI_CPU_CMD_DATA2_OFFSET_RW 0 What about: #define ACPI_CPU_SELECTOR_OFFSET_W 0 #define ACPI_CPU_CMD_DATA2_OFFSET_R 0 > > enum { > CPHP_GET_NEXT_CPU_WITH_EVENT_CMD = 0, > CPHP_OST_EVENT_CMD = 1, > CPHP_OST_STATUS_CMD = 2, > + CPHP_GET_CPU_ID_CMD = 3, > CPHP_CMD_MAX > }; > > @@ -74,11 +76,24 @@ static uint64_t cpu_hotplug_rd(void *opaque, hwaddr addr, unsigned size) > case CPHP_GET_NEXT_CPU_WITH_EVENT_CMD: > val = cpu_st->selector; > break; > + case CPHP_GET_CPU_ID_CMD: > + val = cpu_to_le64(cdev->arch_id) & 0xFFFFFFFF; > + break; > default: > break; > } > trace_cpuhp_acpi_read_cmd_data(cpu_st->selector, val); > break; > + case ACPI_CPU_CMD_DATA2_OFFSET_RW: > + switch (cpu_st->command) { > + case CPHP_GET_CPU_ID_CMD: > + val = cpu_to_le64(cdev->arch_id) >> 32; > + break; > + default: > + break; > + } > + trace_cpuhp_acpi_read_cmd_data2(cpu_st->selector, val); > + break; > default: > break; > } > diff --git a/hw/acpi/trace-events b/hw/acpi/trace-events > index 96b8273297..afbc77de1c 100644 > --- a/hw/acpi/trace-events > +++ b/hw/acpi/trace-events > @@ -23,6 +23,7 @@ cpuhp_acpi_read_flags(uint32_t idx, uint8_t flags) "idx[0x%"PRIx32"] flags: 0x%" > cpuhp_acpi_write_idx(uint32_t idx) "set active cpu idx: 0x%"PRIx32 > cpuhp_acpi_write_cmd(uint32_t idx, uint8_t cmd) "idx[0x%"PRIx32"] cmd: 0x%"PRIx8 > cpuhp_acpi_read_cmd_data(uint32_t idx, uint32_t data) "idx[0x%"PRIx32"] data: 0x%"PRIx32 > +cpuhp_acpi_read_cmd_data2(uint32_t idx, uint32_t data) "idx[0x%"PRIx32"] data: 0x%"PRIx32 > cpuhp_acpi_cpu_has_events(uint32_t idx, bool ins, bool rm) "idx[0x%"PRIx32"] inserting: %d, removing: %d" > cpuhp_acpi_clear_inserting_evt(uint32_t idx) "idx[0x%"PRIx32"]" > cpuhp_acpi_clear_remove_evt(uint32_t idx) "idx[0x%"PRIx32"]" >