From patchwork Tue Jun 18 15:59:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 13702564 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id BE130C27C4F for ; Tue, 18 Jun 2024 16:04:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJbGb-0003OC-9Q; Tue, 18 Jun 2024 12:01:05 -0400 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 1sJbGZ-0003MC-8d for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:01:03 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJbGX-0006kD-Jh for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:01:03 -0400 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a6ef8bf500dso636675366b.0 for ; Tue, 18 Jun 2024 09:01:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718726459; x=1719331259; 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=LOG7Q1advPZZqyRZ93ugLO8dtsxdIWVJ2ikNItPvt4U=; b=HU91M5IEkIVB2QmgmMoUunm+3f+8KtyF5nI11KWpIv6vghsMobam9Y12+6kwFajLzW 3+wVP6+191U4blcNuxdBrFFPNeLVZ92e5Slnk2GGtFu9SlLRPbfKbTOgcXzQnYvgwyUr d+rP5t3UCZHVsKaIEQY/4IebixoTKHnizdpKNXspTMJVrgMMBZ0SZwzZM8uzMlL08P3M H2M1eyaxrK1XOUKGYSUBe8WiS1/F6EXgbKUMe2spuylvZ6d8EfxBLGlEQ6NiVlRJel2u D0lWbEI6KIw5ExWcOC39v1kzfQfYt7Ic/N6w/SsPhyLoLM7Zrrbk4ue1VutT9dAlAYk/ qCIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718726459; x=1719331259; 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=LOG7Q1advPZZqyRZ93ugLO8dtsxdIWVJ2ikNItPvt4U=; b=wP8tzSrjj3Mn5BDe6I8Hw19a6U7+wYvsF3UA6ul6QTh4B9X7YG0qTOXBbg409LBbf+ NA0U6ea5hatXsqfWhgRqNUbHPmUjVlDaOT1ROCe8l2jPKuKhMf3ab04d8F6oPuqgK7UP xOorSJejywI4S4GwIbg/6sr5Z6HX3zTXuhG54kx1PK0BLgO+9Cp90cEXGFXCZZ1IMz7w ZboreuuH8zNiPHwv4WF+s1pvrcMd26E0cxFuQfIAUNQelNSgxHwhbbF4q4mw3dXLmCaC e93KK7MWtxb5AeFXrXHlou8QKB4LYpOH4D6WpGPpE3a/hTmNKyjjxBY9/cy3G5hwpess l3Jg== X-Gm-Message-State: AOJu0YzZE/7prxAs24tAHXazn4y51I298BVKeawU0SL3J8B2l2sqw+jL E6urkRlr87oB9TtWQafMsUdAP4b2gg92/QjM4VPs1IlfZQv7ZbfqEYugmw/EqdGMxxfG3zuiYqI T X-Google-Smtp-Source: AGHT+IENuU80d+9DAX1EYYkYVpeOpJoWtqP7He8grXC4AvTm0xIbKkG6GPStFo/yFlk59Cm7/4Pm6Q== X-Received: by 2002:a17:907:bb94:b0:a6f:2a43:e956 with SMTP id a640c23a62f3a-a6f60de6a0emr832989766b.74.1718726459399; Tue, 18 Jun 2024 09:00:59 -0700 (PDT) Received: from m1x-phil.lan ([176.187.212.55]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6f56fa67ecsm621213766b.215.2024.06.18.09.00.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Jun 2024 09:00:59 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Zhao Liu , Igor Mammedov Subject: [PULL 03/76] hw/usb/hcd-xhci: Remove XHCI_FLAG_FORCE_PCIE_ENDCAP flag Date: Tue, 18 Jun 2024 17:59:25 +0200 Message-ID: <20240618160039.36108-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240618160039.36108-1-philmd@linaro.org> References: <20240618160039.36108-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=philmd@linaro.org; helo=mail-ej1-x631.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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(). Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov Message-Id: <20240617071118.60464-4-philmd@linaro.org> --- 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 98f598382a..1efa4858fb 100644 --- a/hw/usb/hcd-xhci.h +++ b/hw/usb/hcd-xhci.h @@ -37,7 +37,6 @@ typedef struct XHCIEPContext XHCIEPContext; enum xhci_flags { XHCI_FLAG_SS_FIRST = 1, - XHCI_FLAG_FORCE_PCIE_ENDCAP, XHCI_FLAG_ENABLE_STREAMS, }; 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[] = { 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); - 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 = pcie_endpoint_cap_init(dev, 0xa0); assert(ret > 0); }