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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 36265C48BD5 for ; Tue, 25 Jun 2019 12:53:04 +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 0E5D62085A for ; Tue, 25 Jun 2019 12:53:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0E5D62085A 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]:59924 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfkwZ-00017L-Bi for qemu-devel@archiver.kernel.org; Tue, 25 Jun 2019 08:53:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45510) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfkpE-0004Ky-UQ for qemu-devel@nongnu.org; Tue, 25 Jun 2019 08:45:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfkpC-00088S-Un for qemu-devel@nongnu.org; Tue, 25 Jun 2019 08:45:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfkpB-0007wX-Aj for qemu-devel@nongnu.org; Tue, 25 Jun 2019 08:45:26 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 213927EBBD for ; Tue, 25 Jun 2019 12:45:19 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71F9719728; Tue, 25 Jun 2019 12:45:15 +0000 (UTC) Date: Tue, 25 Jun 2019 14:45:11 +0200 From: Igor Mammedov To: "Michael S. Tsirkin" Message-ID: <20190625144511.239e112a@redhat.com> In-Reply-To: <20190621064615.20099-3-mst@redhat.com> References: <20190621064615.20099-1-mst@redhat.com> <20190621064615.20099-3-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 25 Jun 2019 12:45:19 +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: Re: [Qemu-devel] [PATCH 2/3] pcie: check that slt ctrl changed before deleting 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: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 21 Jun 2019 02:46:48 -0400 "Michael S. Tsirkin" wrote: > During boot, linux would sometimes overwrites control of a powered off > slot before powering it on. Unfortunately QEMU interprets that as a > power off request and ejects the device. > > For example: > > /x86_64-softmmu/qemu-system-x86_64 -enable-kvm -S -machine q35 \ > -device pcie-root-port,id=pcie_root_port_0,slot=2,chassis=2,addr=0x2,bus=pcie.0 \ > -monitor stdio disk.qcow2 > (qemu)device_add virtio-balloon-pci,id=balloon,bus=pcie_root_port_0 > (qemu)cont > > Balloon is deleted during guest boot. > > To fix, save control beforehand and check that power > or led state actually change before ejecting. > > Note: this is more a hack than a solution, ideally we'd > find a better way to detect ejects, or move away > from ejects completely and instead monitor whether > it's safe to delete device due to e.g. its power state. > > Signed-off-by: Michael S. Tsirkin > --- > include/hw/pci/pcie.h | 3 ++- > hw/pci-bridge/pcie_root_port.c | 5 ++++- > hw/pci-bridge/xio3130_downstream.c | 5 ++++- > hw/pci/pcie.c | 14 ++++++++++++-- > 4 files changed, 22 insertions(+), 5 deletions(-) > > diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h > index e30334d74d..8d90c0e193 100644 > --- a/include/hw/pci/pcie.h > +++ b/include/hw/pci/pcie.h > @@ -107,7 +107,8 @@ void pcie_cap_lnkctl_reset(PCIDevice *dev); > > void pcie_cap_slot_init(PCIDevice *dev, uint16_t slot); > void pcie_cap_slot_reset(PCIDevice *dev); > -void pcie_cap_slot_write_config(PCIDevice *dev, > +void pcie_cap_slot_get(PCIDevice *dev, uint16_t *slot_ctl, uint16_t *slt_sta); > +void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slot_ctl, uint16_t slt_sta, > uint32_t addr, uint32_t val, int len); > int pcie_cap_slot_post_load(void *opaque, int version_id); > void pcie_cap_slot_push_attention_button(PCIDevice *dev); > diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c > index 92f253c924..09019ca05d 100644 > --- a/hw/pci-bridge/pcie_root_port.c > +++ b/hw/pci-bridge/pcie_root_port.c > @@ -31,10 +31,13 @@ static void rp_write_config(PCIDevice *d, uint32_t address, > { > uint32_t root_cmd = > pci_get_long(d->config + d->exp.aer_cap + PCI_ERR_ROOT_COMMAND); > + uint16_t slt_ctl, slt_sta; > + > + pcie_cap_slot_get(d, &slt_ctl, &slt_sta); > > pci_bridge_write_config(d, address, val, len); > rp_aer_vector_update(d); > - pcie_cap_slot_write_config(d, address, val, len); > + pcie_cap_slot_write_config(d, slt_ctl, slt_sta, address, val, len); > pcie_aer_write_config(d, address, val, len); > pcie_aer_root_write_config(d, address, val, len, root_cmd); > } > diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c > index 264e37d6a6..899b0fd6c9 100644 > --- a/hw/pci-bridge/xio3130_downstream.c > +++ b/hw/pci-bridge/xio3130_downstream.c > @@ -41,9 +41,12 @@ > static void xio3130_downstream_write_config(PCIDevice *d, uint32_t address, > uint32_t val, int len) > { > + uint16_t slt_ctl, slt_sta; > + > + pcie_cap_slot_get(d, &slt_sta, &slt_ctl); > pci_bridge_write_config(d, address, val, len); > pcie_cap_flr_write_config(d, address, val, len); > - pcie_cap_slot_write_config(d, address, val, len); > + pcie_cap_slot_write_config(d, slt_ctl, slt_sta, address, val, len); > pcie_aer_write_config(d, address, val, len); > } > > diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c > index b22527000d..f8490a00de 100644 > --- a/hw/pci/pcie.c > +++ b/hw/pci/pcie.c > @@ -594,7 +594,15 @@ void pcie_cap_slot_reset(PCIDevice *dev) > hotplug_event_update_event_status(dev); > } > > -void pcie_cap_slot_write_config(PCIDevice *dev, > +void pcie_cap_slot_get(PCIDevice *dev, uint16_t *slt_ctl, uint16_t *slt_sta) > +{ > + uint32_t pos = dev->exp.exp_cap; > + uint8_t *exp_cap = dev->config + pos; > + *slt_ctl = pci_get_word(exp_cap + PCI_EXP_SLTCTL); > + *slt_sta = pci_get_word(exp_cap + PCI_EXP_SLTSTA); > +} > + > +void pcie_cap_slot_write_config(PCIDevice *dev, uint16_t slt_ctl, uint16_t slt_sta, > uint32_t addr, uint32_t val, int len) > { > uint32_t pos = dev->exp.exp_cap; > @@ -623,7 +631,9 @@ void pcie_cap_slot_write_config(PCIDevice *dev, > * controller is off, it is safe to detach the devices. > */ comment above probably should be updated to account for new conditions > if ((sltsta & PCI_EXP_SLTSTA_PDS) && (val & PCI_EXP_SLTCTL_PCC) && > - ((val & PCI_EXP_SLTCTL_PIC_OFF) == PCI_EXP_SLTCTL_PIC_OFF)) { > + (val & PCI_EXP_SLTCTL_PIC_OFF) == PCI_EXP_SLTCTL_PIC_OFF && > + (!(slt_ctl & PCI_EXP_SLTCTL_PCC) || > + (slt_ctl & PCI_EXP_SLTCTL_PIC_OFF) != PCI_EXP_SLTCTL_PIC_OFF)) { > PCIBus *sec_bus = pci_bridge_get_sec_bus(PCI_BRIDGE(dev)); > pci_for_each_device(sec_bus, pci_bus_num(sec_bus), > pcie_unplug_device, NULL);