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 60AE2C433FF for ; Tue, 30 Jul 2019 12:04:41 +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 357D220693 for ; Tue, 30 Jul 2019 12:04:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 357D220693 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]:60436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsQrw-00042A-Be for qemu-devel@archiver.kernel.org; Tue, 30 Jul 2019 08:04:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59083) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsQqt-0003ZV-Ex for qemu-devel@nongnu.org; Tue, 30 Jul 2019 08:03:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsQqs-0000RJ-At for qemu-devel@nongnu.org; Tue, 30 Jul 2019 08:03:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4465) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hsQqs-0000Qv-1S for qemu-devel@nongnu.org; Tue, 30 Jul 2019 08:03:34 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F3D0430860C6; Tue, 30 Jul 2019 12:03:32 +0000 (UTC) Received: from Igors-MacBook-Pro (ovpn-204-67.brq.redhat.com [10.40.204.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 191B75D96F; Tue, 30 Jul 2019 12:03:28 +0000 (UTC) Date: Tue, 30 Jul 2019 14:03:25 +0200 From: Igor Mammedov To: "Dr. David Alan Gilbert" Message-ID: <20190730140325.3e8a02df@Igors-MacBook-Pro> In-Reply-To: <20190730111306.GC2678@work-vm> References: <20190730093719.12958-1-dgilbert@redhat.com> <20190730093719.12958-2-dgilbert@redhat.com> <20190730122545.7c08dd58@Igors-MacBook-Pro> <20190730111306.GC2678@work-vm> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 30 Jul 2019 12:03:33 +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 1/2] pcie_root_port: Allow ACS to be disabled 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@linaro.org, quintela@redhat.com, qemu-devel@nongnu.org, ehabkost@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 30 Jul 2019 12:13:06 +0100 "Dr. David Alan Gilbert" wrote: > * Igor Mammedov (imammedo@redhat.com) wrote: > > On Tue, 30 Jul 2019 10:37:18 +0100 > > "Dr. David Alan Gilbert (git)" wrote: > > > > > From: "Dr. David Alan Gilbert" > > > > > > ACS was added in 4.0 unconditionally, this breaks migration > > > compatibility. > > > Allow ACS to be disabled by adding a property that's > > > checked by pcie_root_port. > > > > > > Unfortunately pcie-root-port doesn't have any instance data, > > > so there's no where for that flag to live, so stuff it into > > > PCIESlot. > > > > > > Signed-off-by: Dr. David Alan Gilbert > > > --- > > > hw/pci-bridge/pcie_root_port.c | 3 ++- > > > include/hw/pci/pcie_port.h | 2 ++ > > > 2 files changed, 4 insertions(+), 1 deletion(-) > > > > > > diff --git a/hw/pci-bridge/pcie_root_port.c b/hw/pci-bridge/pcie_root_port.c > > > index 09019ca05d..1d8a778709 100644 > > > --- a/hw/pci-bridge/pcie_root_port.c > > > +++ b/hw/pci-bridge/pcie_root_port.c > > > @@ -111,7 +111,7 @@ static void rp_realize(PCIDevice *d, Error **errp) > > > pcie_aer_root_init(d); > > > rp_aer_vector_update(d); > > > > > > - if (rpc->acs_offset) { > > > + if (rpc->acs_offset && !s->disable_acs) { > > > > it's not like it would be used per instance, > > so could we use class property and with rpc->disable_acs instead of PCIESlot? > > I'm not clear I understand how class properties help; > object_class_property_add_bool > takes a getter/setter that takes an Object * parameter; > my reading of that is that it's the instance data so has the same > problem. it's possible to reach class data from setter/getter, for example s390_cpu_model_class_register_props(). But it will be a bit more code than here and considering that it's only field in parent type which is reachable through root port specific property only it is also ok as is as a fix to 4.1, so if you prefer to keep it like now Reviewed-by: Igor Mammedov > Dave > > > > pcie_acs_init(d, rpc->acs_offset); > > > } > > > return; > > > @@ -145,6 +145,7 @@ static void rp_exit(PCIDevice *d) > > > static Property rp_props[] = { > > > DEFINE_PROP_BIT(COMPAT_PROP_PCP, PCIDevice, cap_present, > > > QEMU_PCIE_SLTCAP_PCP_BITNR, true), > > > + DEFINE_PROP_BOOL("disable-acs", PCIESlot, disable_acs, false), > > > DEFINE_PROP_END_OF_LIST() > > > }; > > > > > > diff --git a/include/hw/pci/pcie_port.h b/include/hw/pci/pcie_port.h > > > index 09586f4641..7515430087 100644 > > > --- a/include/hw/pci/pcie_port.h > > > +++ b/include/hw/pci/pcie_port.h > > > @@ -53,6 +53,8 @@ struct PCIESlot { > > > PCIExpLinkSpeed speed; > > > PCIExpLinkWidth width; > > > > > > + /* Disable ACS (really for a pcie_root_port) */ > > > + bool disable_acs; > > > QLIST_ENTRY(PCIESlot) next; > > > }; > > > > > > -- > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK