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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 697FDC1B0D9 for ; Mon, 7 Dec 2020 13:09:27 +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 E177522B37 for ; Mon, 7 Dec 2020 13:09:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E177522B37 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]:45650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmGGb-0000ZZ-Rh for qemu-devel@archiver.kernel.org; Mon, 07 Dec 2020 08:09:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmFqm-0005K7-Ie for qemu-devel@nongnu.org; Mon, 07 Dec 2020 07:42:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47282) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kmFqi-0008Tt-G8 for qemu-devel@nongnu.org; Mon, 07 Dec 2020 07:42:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607344957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2nSlWpLUr35+GY3rmbuoMyV0SkHYyMWnNvrk3E5M2DE=; b=epdcByJ+xHF46HVUlj4i63NXM3RxTFM5FsLk7lOqfwZ/52jOZ3tvjjtStWQaTSRVAlIIew A9p0wg9kEufrh8ykrEeMOYCCbDizcJS3dQ6GlNe//Q0hmpLIgSj0VJ5PKokFI6Eg8qxySy KC12ttecezSgMTDKU2GRNHVfHDzh1f4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-44-I7zxtj0bN7el0lpvyWiUyA-1; Mon, 07 Dec 2020 07:42:35 -0500 X-MC-Unique: I7zxtj0bN7el0lpvyWiUyA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 857F31007466; Mon, 7 Dec 2020 12:42:34 +0000 (UTC) Received: from localhost (unknown [10.40.208.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DC726B8DF; Mon, 7 Dec 2020 12:42:29 +0000 (UTC) Date: Mon, 7 Dec 2020 13:42:28 +0100 From: Igor Mammedov To: Ankur Arora Subject: Re: [PATCH 2/8] acpi: cpuhp: introduce 'firmware performs eject' status/control bits Message-ID: <20201207134228.4bfc6873@redhat.com> In-Reply-To: <891d22af-617c-7962-4fe8-e60cd18f4df3@oracle.com> References: <20201204170939.1815522-1-imammedo@redhat.com> <20201204170939.1815522-3-imammedo@redhat.com> <891d22af-617c-7962-4fe8-e60cd18f4df3@oracle.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: lersek@redhat.com, qemu-devel@nongnu.org, mst@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Sun, 6 Dec 2020 22:31:50 -0800 Ankur Arora wrote: > On 2020-12-04 9:09 a.m., Igor Mammedov wrote: > > Adds bit #4 to status/control field of CPU hotplug MMIO interface. > > New bit will be used OSPM to mark CPUs as pending for removal by firmware, > > when it calls _EJ0 method on CPU device node. Later on, when firmware > > sees this bit set, it will perform CPU eject which will clear bit #4 > > as well. > > > > Signed-off-by: Igor Mammedov > > --- > > v1: > > - rearrange status/control bits description (Laszlo) > > - add clear bit #4 on eject > > - drop toggling logic from bit #4, it can be only set by guest > > and clear as part of cpu eject > > - exclude boot CPU from remove request > > - add trace events for new bit > > --- > > include/hw/acpi/cpu.h | 1 + > > docs/specs/acpi_cpu_hotplug.txt | 19 ++++++++++++++----- > > hw/acpi/cpu.c | 9 +++++++++ > > hw/acpi/trace-events | 2 ++ > > 4 files changed, 26 insertions(+), 5 deletions(-) > > > > diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h > > index 0eeedaa491..d71edde456 100644 > > --- a/include/hw/acpi/cpu.h > > +++ b/include/hw/acpi/cpu.h > > @@ -22,6 +22,7 @@ typedef struct AcpiCpuStatus { > > uint64_t arch_id; > > bool is_inserting; > > bool is_removing; > > + bool fw_remove; > > uint32_t ost_event; > > uint32_t ost_status; > > } AcpiCpuStatus; > > diff --git a/docs/specs/acpi_cpu_hotplug.txt b/docs/specs/acpi_cpu_hotplug.txt > > index 9bb22d1270..9bd59ae0da 100644 > > --- a/docs/specs/acpi_cpu_hotplug.txt > > +++ b/docs/specs/acpi_cpu_hotplug.txt > > @@ -56,8 +56,11 @@ read access: > > no device check event to OSPM was issued. > > It's valid only when bit 0 is set. > > 2: Device remove event, used to distinguish device for which > > - no device eject request to OSPM was issued. > > - 3-7: reserved and should be ignored by OSPM > > + no device eject request to OSPM was issued. Firmware must > > + ignore this bit. > > + 3: reserved and should be ignored by OSPM > > + 4: if set to 1, OSPM requests firmware to perform device eject. > > + 5-7: reserved and should be ignored by OSPM > > [0x5-0x7] reserved > > [0x8] Command data: (DWORD access) > > contains 0 unless value last stored in 'Command field' is one of: > > @@ -79,10 +82,16 @@ write access: > > selected CPU device > > 2: if set to 1 clears device remove event, set by OSPM > > after it has emitted device eject request for the > > - selected CPU device > > + selected CPU device. > > 3: if set to 1 initiates device eject, set by OSPM when it > > - triggers CPU device removal and calls _EJ0 method > > - 4-7: reserved, OSPM must clear them before writing to register > > + triggers CPU device removal and calls _EJ0 method or by firmware > > + when bit #4 is set. In case bit #4 were set, it's cleared as > > + part of device eject. > > + 4: if set to 1, OSPM hands over device eject to firmware. > > + Firmware shall issue device eject request as described above > > + (bit #3) and OSPM should not touch device eject bit (#3) in case > > + it's asked firmware to perform CPU device eject. > > + 5-7: reserved, OSPM must clear them before writing to register > > [0x5] Command field: (1 byte access) > > value: > > 0: selects a CPU device with inserting/removing events and > > diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c > > index f099b50927..811218f673 100644 > > --- a/hw/acpi/cpu.c > > +++ b/hw/acpi/cpu.c > > @@ -71,6 +71,7 @@ static uint64_t cpu_hotplug_rd(void *opaque, hwaddr addr, unsigned size) > > val |= cdev->cpu ? 1 : 0; > > val |= cdev->is_inserting ? 2 : 0; > > val |= cdev->is_removing ? 4 : 0; > > + val |= cdev->fw_remove ? 16 : 0; > > trace_cpuhp_acpi_read_flags(cpu_st->selector, val); > > break; > > case ACPI_CPU_CMD_DATA_OFFSET_RW: > > @@ -148,6 +149,14 @@ static void cpu_hotplug_wr(void *opaque, hwaddr addr, uint64_t data, > > hotplug_ctrl = qdev_get_hotplug_handler(dev); > > hotplug_handler_unplug(hotplug_ctrl, dev, NULL); > > object_unparent(OBJECT(dev)); > > + cdev->fw_remove = false; > > + } else if (data & 16) { > > + if (!cdev->cpu || cdev->cpu == first_cpu) { > > + trace_cpuhp_acpi_fw_remove_invalid_cpu(cpu_st->selector); > > + break; > > + } > > + trace_cpuhp_acpi_fw_remove_cpu(cpu_st->selector); > > + cdev->fw_remove = true; > > } > > break; > > By the time the firmware gets the MMI, cdev->is_removing == 0. So we probably > need the cdev->fw_remove clause as well. indeed, I'll fix in in v2 > > @@ -168,7 +193,7 @@ static void cpu_hotplug_wr(void *opaque, hwaddr addr, uint64_t data, > > do { > cdev = &cpu_st->devs[iter]; > - if (cdev->is_inserting || cdev->is_removing) { > + if (cdev->is_inserting || cdev->is_removing || cdev->fw_remove) { > cpu_st->selector = iter; > trace_cpuhp_acpi_cpu_has_events(cpu_st->selector, > cdev->is_inserting, cdev->is_removing); > > > Ankur > > > case ACPI_CPU_CMD_OFFSET_WR: > > diff --git a/hw/acpi/trace-events b/hw/acpi/trace-events > > index afbc77de1c..f91ced477d 100644 > > --- a/hw/acpi/trace-events > > +++ b/hw/acpi/trace-events > > @@ -29,6 +29,8 @@ cpuhp_acpi_clear_inserting_evt(uint32_t idx) "idx[0x%"PRIx32"]" > > cpuhp_acpi_clear_remove_evt(uint32_t idx) "idx[0x%"PRIx32"]" > > cpuhp_acpi_ejecting_invalid_cpu(uint32_t idx) "0x%"PRIx32 > > cpuhp_acpi_ejecting_cpu(uint32_t idx) "0x%"PRIx32 > > +cpuhp_acpi_fw_remove_invalid_cpu(uint32_t idx) "0x%"PRIx32 > > +cpuhp_acpi_fw_remove_cpu(uint32_t idx) "0x%"PRIx32 > > cpuhp_acpi_write_ost_ev(uint32_t slot, uint32_t ev) "idx[0x%"PRIx32"] OST EVENT: 0x%"PRIx32 > > cpuhp_acpi_write_ost_status(uint32_t slot, uint32_t st) "idx[0x%"PRIx32"] OST STATUS: 0x%"PRIx32 > > > > >