From nobody Mon Feb 9 16:16:57 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1709646403; cv=none; d=zohomail.com; s=zohoarc; b=KswvXdUTb/hxd4EsIhlSXMvEiT3ibEkzHYZ6Q3DbhNqGKmrRRKbYWYmSEMftmYk/PK9SX3dpwmb/FgQRzmEENar08/lC5yF6YUVWFlVLjQ3TIIS+Kank94DBIx0BX9tYU65qpwKT4XOUlqc3faqKW+12Kx36BVa+q8IXnh1wbdE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709646403; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=puZvfwYJmiovgLIksxQYRb4sHK5AG83t9xnfOfq3iqY=; b=XJlW7WFo90EuqUltJ3CSPaof4lXB01q0eKp7FoiX7AoVoCBh9hwO3YukwXKp/raRkc6fpe0XM6LeQMMqMn/iPopfy3+YAH/FnmqZpN0cRpH/+SnlzMyGDZvuZnLg7QiB9w6xmYEsIkVU5+O23xEnnZsgy+rx/Cw65aDXB7mVnJM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17096464031651000.4292235358286; Tue, 5 Mar 2024 05:46:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhV4I-0002IE-F3; Tue, 05 Mar 2024 08:42:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rhV4D-0002Hc-44 for qemu-devel@nongnu.org; Tue, 05 Mar 2024 08:42:49 -0500 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhV4B-0003xW-KY for qemu-devel@nongnu.org; Tue, 05 Mar 2024 08:42:48 -0500 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5672afabb86so2435137a12.3 for ; Tue, 05 Mar 2024 05:42:47 -0800 (PST) Received: from m1x-phil.lan ([176.176.177.70]) by smtp.gmail.com with ESMTPSA id z42-20020a509e2d000000b005669d904871sm6107335ede.49.2024.03.05.05.42.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 05 Mar 2024 05:42:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709646165; x=1710250965; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=puZvfwYJmiovgLIksxQYRb4sHK5AG83t9xnfOfq3iqY=; b=HSpWkdqyGFJKHINUIW7eFXs7a66cMOiEOPPy84vFPRtBbgduO99yYNxn21plDKluQc vemnaMFR5hM6X6oHdgajtbBt5Cra5UULw7AoLB+lTUANdoOEE42SM92irlV65zV3Vo9s /yLWANlqM4MjJGIcu8krpD+IWJoNmxCXl1m/RmNx71m0aHT+m2IKO/wsEn+dr5OVhmha kzKg4RQVvRlDOX+U7DyXh7qZq0fkzSRS6C2d5ZzfZOBKD5Y6MlYAM4lQcEnnnNYk2fjR i/FdzM4EAagqAk5S3La10L03LhT6DnRsrX2XFPKMVyGhc1KkdIHvdyQYUhY2SuFihb+d YLRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709646165; x=1710250965; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=puZvfwYJmiovgLIksxQYRb4sHK5AG83t9xnfOfq3iqY=; b=Hovz0/llDDIh/BOWPquh8D1qKHtWjSYf0B7BA6jv1MH9i7DtVtmK6Iu3hm5i+Xl9IK w9j5yJmLkQQ7VVffDK2/kQtbLbHnrT4s2wtLn/+nPPCcnlerYQrs8360BjdN3iU3acb5 FsdCEdAbQKcSVqPi8k8BbC3C0kLRI0rw2jV74QehfZpeFLiRTuDVNeBk3+MZK8vMrTAZ wdzqew4s5BSUvksh+EbLdyqyLUbK8czlwS2o78JDyoUV0y6CleqRw/FUFvClZUPKQMXn WqCK9ZlaNySSleSclwTW/lnmgKy1+OHBleDUS2pfcZH9xeAA9TyXHzR+Gg7zmeA/HPL9 8pvw== X-Gm-Message-State: AOJu0YxS6L+5jeksRcSuEtLmM3lWJlZ2AKKrxv3x0rzdhUR3yDFg0Wd4 +W84/KV9T7Iionf90xdqJmGjAi0F2+opsl020lhGadvD+n3o1mfr/cBJ7J91ki5bVXoMyh+6L5N o X-Google-Smtp-Source: AGHT+IGoQLz3vb/hw5i2C2mEhP7oyJ2WOykEYWfKelOzXGkQ9Oyr76XV3KVkqIMUEC1WspvOGAtlkw== X-Received: by 2002:aa7:cb0b:0:b0:564:dd13:56e9 with SMTP id s11-20020aa7cb0b000000b00564dd1356e9mr8683560edt.29.1709646165626; Tue, 05 Mar 2024 05:42:45 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Thomas Huth Cc: Igor Mammedov , Richard Henderson , kvm@vger.kernel.org, Marcelo Tosatti , devel@lists.libvirt.org, David Hildenbrand , Ani Sinha , Paolo Bonzini , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-9.1 03/18] hw/usb/hcd-xhci: Remove XHCI_FLAG_FORCE_PCIE_ENDCAP flag Date: Tue, 5 Mar 2024 14:42:05 +0100 Message-ID: <20240305134221.30924-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240305134221.30924-1-philmd@linaro.org> References: <20240305134221.30924-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=philmd@linaro.org; helo=mail-ed1-x52f.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1709646403701100001 XHCI_FLAG_FORCE_PCIE_ENDCAP was only used by the pc-i440fx-2.0 machine, which got removed. Remove it and simplify usb_xhci_pci_realize(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/usb/hcd-xhci.h | 1 - hw/usb/hcd-xhci-nec.c | 2 -- hw/usb/hcd-xhci-pci.c | 3 +-- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h index 37f0d2e43b..7dcab8b8db 100644 --- a/hw/usb/hcd-xhci.h +++ b/hw/usb/hcd-xhci.h @@ -37,7 +37,6 @@ typedef struct XHCIEPContext XHCIEPContext; =20 enum xhci_flags { XHCI_FLAG_SS_FIRST =3D 1, - XHCI_FLAG_FORCE_PCIE_ENDCAP =3D 2, XHCI_FLAG_ENABLE_STREAMS =3D 3, }; =20 diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c index 328e5bfe7c..5d5b069cf9 100644 --- a/hw/usb/hcd-xhci-nec.c +++ b/hw/usb/hcd-xhci-nec.c @@ -43,8 +43,6 @@ static Property nec_xhci_properties[] =3D { DEFINE_PROP_ON_OFF_AUTO("msix", XHCIPciState, msix, ON_OFF_AUTO_AUTO), DEFINE_PROP_BIT("superspeed-ports-first", XHCINecState, flags, XHCI_FLAG_SS_FIRST, true), - DEFINE_PROP_BIT("force-pcie-endcap", XHCINecState, flags, - XHCI_FLAG_FORCE_PCIE_ENDCAP, false), DEFINE_PROP_UINT32("intrs", XHCINecState, intrs, XHCI_MAXINTRS), DEFINE_PROP_UINT32("slots", XHCINecState, slots, XHCI_MAXSLOTS), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c index 4423983308..cbad96f393 100644 --- a/hw/usb/hcd-xhci-pci.c +++ b/hw/usb/hcd-xhci-pci.c @@ -148,8 +148,7 @@ static void usb_xhci_pci_realize(struct PCIDevice *dev,= Error **errp) PCI_BASE_ADDRESS_MEM_TYPE_64, &s->xhci.mem); =20 - if (pci_bus_is_express(pci_get_bus(dev)) || - xhci_get_flag(&s->xhci, XHCI_FLAG_FORCE_PCIE_ENDCAP)) { + if (pci_bus_is_express(pci_get_bus(dev))) { ret =3D pcie_endpoint_cap_init(dev, 0xa0); assert(ret > 0); } --=20 2.41.0