From patchwork Tue Jun 18 15:59:26 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: 805210 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:144:b0:362:4979:7f74 with SMTP id r4csp270208wrx; Tue, 18 Jun 2024 09:02:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVsTaHFMyN0oAyFnom2JBS2Ul3Z/AfvzpY4moEFcFSJ+BWgL/YUYmfxvCxKmRTHs0abeNlELNJGXdoik3QWb1Nj X-Google-Smtp-Source: AGHT+IHZDqEFPitdTJsFp7D+IIdyo3IMNS1QKyovKIqSAJnofYAW0VNpsdNb7CqJ7mqHIL67TGJ1 X-Received: by 2002:a05:6122:3c46:b0:4e4:e6e5:aea with SMTP id 71dfb90a1353d-4ef276c85f7mr355713e0c.1.1718726525985; Tue, 18 Jun 2024 09:02:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718726525; cv=none; d=google.com; s=arc-20160816; b=0H/iN690TQnq3g5wckMCHzDXMYJORuBNLLfkK8rJMtksZ5qVucgi5+ZZaxV1Fd7sBD S8AkVsg2FWtAmK/+JjXkNZwfX2GS07LTarduvsWmm1EhV8mPwMsJ/W8dTjF4QAn9TI68 47lFbVt3BrNgxwxmGwQFob8iH8rFe8KS8/Oe3ZIUlpS4KtobbUF00ln00G8PxepDZCTY ra4OIKHWJoC5RxcEkQgtfsmrFc1XMMB/KbUfIsCDqZ/zF1M/6acZ1RPFlNCKGgvQ34cY h7j1CHXNJXh48LOKTtsz9m1HkXCb7ZJxTQasnMGxLJITixw8SafaYXPkDE+qB0P3wXLj FNdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jacREMpFLEylsnLt1SjYSrC7USbVG4MmfPDnE6kQE/g=; fh=QeIS5kb1Uh2g1z6dWJxoYMIPD1Pl4adL6YUWYeE5yJk=; b=zk/6M+PDbzcTUPX1JaH6uFTAj6qgY4uNaWhJOwphBgPDDSvD4X2CzxX6936KwbOIxt IFdYt5izGJdEV/sMyQqaRS9DmyRWyiwyQE/Es7VaFUg4oslGG3aw5OqMzldiDngjlr6w TEZpRC+F/eLbGWbhxy7Ee0Tc3aKPTBkrajU7Dh8J4LnQhPsjag2bnMdVGEAyr2Wa3PkV eQu3d2fUFJR9wR1aOW7l5cxOU2YaI4DF7VIXCsR/FuUPyD+ME0pHsvD0ANxLqDJzqKD1 tbk3IrR1svFyVULAvyCPpWK8LawRjsk6prWtwxM5svW5hiH9J2a98dRujj1/n8yIhvFP uAqg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SC30VAQG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 71dfb90a1353d-4ed41b20256si2022191e0c.311.2024.06.18.09.02.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Jun 2024 09:02:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SC30VAQG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJbGm-0003V6-EC; Tue, 18 Jun 2024 12:01:17 -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 1sJbGe-0003Pw-R5 for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:01:08 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJbGd-0006kZ-1A for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:01:08 -0400 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-57c73a3b3d7so6403015a12.1 for ; Tue, 18 Jun 2024 09:01:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718726465; x=1719331265; 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=jacREMpFLEylsnLt1SjYSrC7USbVG4MmfPDnE6kQE/g=; b=SC30VAQG/c1xg+Ml+nT8mtGUTrPuPIrS+t23pJBOKql4Pc1LpMc2Y350/Pmt40dPRI CNm+YORA9Omja63W4Um/UdOrLwhFEUFgjA4Ka+UyGwjCb3YbL97QJdhQzJaRgzaHuDZG ldAeIShRS5jTUtzqq73kEdLCq4/IY0gNFW6i9T+/Io9irVaclhIepwrlPHx9HbfcdHe1 M0yfbV+++hDodjuC5iUSg4ACp7FKrXMdfG97Za7Of6rYO4yUayw90QtWu9Zs+R1c8SBi REZluql9nfUiwtinhPGlubT+nWPBumyy/+C5B7QSXUBrq6t+A6QQ0TjHmKH9UTw8B19u IjOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718726465; x=1719331265; 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=jacREMpFLEylsnLt1SjYSrC7USbVG4MmfPDnE6kQE/g=; b=IopyBg8jjZOh6ll4df7J3lPmTVv/72n0gzsAzzpcBqV1qE8oNqNNU0x/IMsPP1rB5c mijvmhg4akvivzIjWXPKLpeRq4fGlWl8Hc5V8KYnG3JkcYGgt0lJ57uYxBVgYcaojuad x0ueXEnYP/36xllgEtx9KCWLJeOitxQZoKbadiXZ+PNNTG8khHpkeRLbDuWyXqA9Gp6Y SY6g2S2l3bUckGrH3L4MkWXbHnAbjEkux8aMlVOrFwaJoHPfx0vvb35RI+0XyfySVgQB RtLa4wFazfT+k+P8IIDfzxm706wroVL5BEeWiDqe2Qr0NNxCxDTEcUI+4WNzW5rI8Ifh GC+w== X-Gm-Message-State: AOJu0Yw1Dc0RjlipvR0DO/NjWMbEjRaM4zRn+6Y0EhVDlGnl5ktQgQ+X mC8ra2H4Ffd7SFqhwRAmx3d8ZsbOYK9HOm57dq0SNeGGaPTlwB5IMn+Trc7Y9LqQ2KHZAN6+yCX p X-Received: by 2002:a50:c349:0:b0:57c:5eeb:b543 with SMTP id 4fb4d7f45d1cf-57cbd663fbbmr8168255a12.13.1718726465303; Tue, 18 Jun 2024 09:01:05 -0700 (PDT) Received: from m1x-phil.lan ([176.187.212.55]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57cb72e9dd7sm7820991a12.57.2024.06.18.09.01.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Jun 2024 09:01:04 -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 04/76] hw/usb/hcd-xhci: Remove XHCI_FLAG_SS_FIRST flag Date: Tue, 18 Jun 2024 17:59:26 +0200 Message-ID: <20240618160039.36108-5-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::529; envelope-from=philmd@linaro.org; helo=mail-ed1-x529.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org XHCI_FLAG_SS_FIRST was only used by the pc-i440fx-2.0 machine, which got removed. Remove it and simplify various functions in hcd-xhci.c. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov Message-Id: <20240617071118.60464-5-philmd@linaro.org> --- hw/usb/hcd-xhci.h | 3 +-- hw/usb/hcd-xhci-nec.c | 2 -- hw/usb/hcd-xhci-pci.c | 1 - hw/usb/hcd-xhci.c | 42 ++++++++---------------------------------- 4 files changed, 9 insertions(+), 39 deletions(-) diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h index 1efa4858fb..fe16d7ad05 100644 --- a/hw/usb/hcd-xhci.h +++ b/hw/usb/hcd-xhci.h @@ -36,8 +36,7 @@ typedef struct XHCIStreamContext XHCIStreamContext; typedef struct XHCIEPContext XHCIEPContext; enum xhci_flags { - XHCI_FLAG_SS_FIRST = 1, - XHCI_FLAG_ENABLE_STREAMS, + XHCI_FLAG_ENABLE_STREAMS = 1, }; typedef enum TRBType { diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c index 5d5b069cf9..0c063b3697 100644 --- a/hw/usb/hcd-xhci-nec.c +++ b/hw/usb/hcd-xhci-nec.c @@ -41,8 +41,6 @@ struct XHCINecState { static Property nec_xhci_properties[] = { DEFINE_PROP_ON_OFF_AUTO("msi", XHCIPciState, msi, ON_OFF_AUTO_AUTO), 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_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 cbad96f393..264d7ebb77 100644 --- a/hw/usb/hcd-xhci-pci.c +++ b/hw/usb/hcd-xhci-pci.c @@ -242,7 +242,6 @@ static void qemu_xhci_instance_init(Object *obj) s->msix = ON_OFF_AUTO_AUTO; xhci->numintrs = XHCI_MAXINTRS; xhci->numslots = XHCI_MAXSLOTS; - xhci_set_flag(xhci, XHCI_FLAG_SS_FIRST); } static const TypeInfo qemu_xhci_info = { diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index ad40232eb6..b6411f0bda 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -541,18 +541,10 @@ static XHCIPort *xhci_lookup_port(XHCIState *xhci, struct USBPort *uport) case USB_SPEED_LOW: case USB_SPEED_FULL: case USB_SPEED_HIGH: - if (xhci_get_flag(xhci, XHCI_FLAG_SS_FIRST)) { - index = uport->index + xhci->numports_3; - } else { - index = uport->index; - } + index = uport->index + xhci->numports_3; break; case USB_SPEED_SUPER: - if (xhci_get_flag(xhci, XHCI_FLAG_SS_FIRST)) { - index = uport->index; - } else { - index = uport->index + xhci->numports_2; - } + index = uport->index; break; default: return NULL; @@ -2779,11 +2771,7 @@ static uint64_t xhci_cap_read(void *ptr, hwaddr reg, unsigned size) ret = 0x20425355; /* "USB " */ break; case 0x28: /* Supported Protocol:08 */ - if (xhci_get_flag(xhci, XHCI_FLAG_SS_FIRST)) { - ret = (xhci->numports_2<<8) | (xhci->numports_3+1); - } else { - ret = (xhci->numports_2<<8) | 1; - } + ret = (xhci->numports_2 << 8) | (xhci->numports_3 + 1); break; case 0x2c: /* Supported Protocol:0c */ ret = 0x00000000; /* reserved */ @@ -2795,11 +2783,7 @@ static uint64_t xhci_cap_read(void *ptr, hwaddr reg, unsigned size) ret = 0x20425355; /* "USB " */ break; case 0x38: /* Supported Protocol:08 */ - if (xhci_get_flag(xhci, XHCI_FLAG_SS_FIRST)) { - ret = (xhci->numports_3<<8) | 1; - } else { - ret = (xhci->numports_3<<8) | (xhci->numports_2+1); - } + ret = (xhci->numports_3 << 8) | 1; break; case 0x3c: /* Supported Protocol:0c */ ret = 0x00000000; /* reserved */ @@ -3349,13 +3333,8 @@ static void usb_xhci_init(XHCIState *xhci) for (i = 0; i < usbports; i++) { speedmask = 0; if (i < xhci->numports_2) { - if (xhci_get_flag(xhci, XHCI_FLAG_SS_FIRST)) { - port = &xhci->ports[i + xhci->numports_3]; - port->portnr = i + 1 + xhci->numports_3; - } else { - port = &xhci->ports[i]; - port->portnr = i + 1; - } + port = &xhci->ports[i + xhci->numports_3]; + port->portnr = i + 1 + xhci->numports_3; port->uport = &xhci->uports[i]; port->speedmask = USB_SPEED_MASK_LOW | @@ -3366,13 +3345,8 @@ static void usb_xhci_init(XHCIState *xhci) speedmask |= port->speedmask; } if (i < xhci->numports_3) { - if (xhci_get_flag(xhci, XHCI_FLAG_SS_FIRST)) { - port = &xhci->ports[i]; - port->portnr = i + 1; - } else { - port = &xhci->ports[i + xhci->numports_2]; - port->portnr = i + 1 + xhci->numports_2; - } + port = &xhci->ports[i]; + port->portnr = i + 1; port->uport = &xhci->uports[i]; port->speedmask = USB_SPEED_MASK_SUPER; assert(i < XHCI_MAXPORTS);