From patchwork Mon Feb 26 11:14:12 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: 775860 Delivered-To: patch@linaro.org Received: by 2002:a5d:6103:0:b0:33d:da16:65b6 with SMTP id v3csp272631wrt; Mon, 26 Feb 2024 03:17:12 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVbyNLLE6HMuhLE5JCKo0Xlkbkhe0uFzmesBnW7OQJEENt8JeOm6DB5kJvIWzqbQr1jh3rNhPbRPsM8wWN4APCo X-Google-Smtp-Source: AGHT+IGYqVNmIWXN7NggMyh2VNo0Vztff3Z+dg9g1Ys6akXUfjg9tus5TIQlDwFV8mW8GoIvH9Mz X-Received: by 2002:a05:6902:1b13:b0:dcc:6894:4ad4 with SMTP id eh19-20020a0569021b1300b00dcc68944ad4mr4006950ybb.56.1708946232411; Mon, 26 Feb 2024 03:17:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708946232; cv=none; d=google.com; s=arc-20160816; b=Qr/0pGzjQXOj30tZPPSrCE6S6/SRVNEGwRGbOwsEg+J+cZvN/C9YiRPZgBDsm7AA9B XA4H8A9/K7nGPBTtLH35dUwSfQNPGJ0e3StCbyk16iUNyRTTjm7w1qzVRA8MI7KTDV85 WhQpNeicM0m6avywD9Iii4HU01ioQKr5R0fI0srewo1ALiWB+mnHT5G+S0KMFsaSrK/F 6s09soYHnLCVk8Gb+1dFXjnx0f0xbAyglZiKE1LM0pcpy7nMYrWRu81J5wD27JLhMSax x+JpJp//n20CBNjS4lMnYerR2U0btpy/GQzP7sbPPhq7xrZYKv6Hhirufk4cKU71R0wj 96+w== 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=bdxrKQw56OGQ9Tcr1roIQBogyoJhaQPIfliNFvvMZPA=; fh=j4MxUKsQnom9H3Srwq13mMegTaYVxToeDvl/PNa+M5c=; b=JMRlsGH/If4mvhdmuYfcsOjVwgPOmI3JSikf0TeZCsh2QoEWMl1TKLgngCo8jNJXzx A4bfX8CFUbpVxYqIKApp08HpaZTRijAwapQkaCLkJJZPglsE9M+zS+oTBZ17dI8jwnkv +4xCz6JJ3iCuKgxCbnDmNyJ/mTCvXic2Gh0dTLp676Po3DpnUDzEamEtXZ5l651JYrhb XdBRUUKF7xH1tGso52gnelXbqZoPBDY0lrxZfbFJRyyGM/941LEPOuhXkOSCogDZoIbQ uV2nufrjyOtQbDfFf89idS59vKRDUluEfcI5Z/+E0SD3Ijx5Tjl9KKV3PNVqC+D3jC09 aEVQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gkYus16r; 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 s3-20020ac85283000000b0042e4b1c5ccesi4755001qtn.399.2024.02.26.03.17.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Feb 2024 03:17:12 -0800 (PST) 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=gkYus16r; 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 1reYyI-0003Uy-EW; Mon, 26 Feb 2024 06:16:37 -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 1reYxW-0002bI-1h for qemu-devel@nongnu.org; Mon, 26 Feb 2024 06:15:48 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1reYxS-0000QF-Iq for qemu-devel@nongnu.org; Mon, 26 Feb 2024 06:15:44 -0500 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-33d153254b7so2299698f8f.0 for ; Mon, 26 Feb 2024 03:15:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708946139; x=1709550939; 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=bdxrKQw56OGQ9Tcr1roIQBogyoJhaQPIfliNFvvMZPA=; b=gkYus16rAuureH0NQKJ34MFlj3/P3R+pI0TtYpWcVYJ7sEP0umQcWvabx7Bwveg3cz JOKjkzej1W62XrhLiPItp1pX5ni9wO1A91ub2tCP162sIi0ImBYMHA2OQ5YQkB0Ukcn0 O+Mu7TEQJCle8nDI48O6AK8B+8yG0kGVHZb+aUh0KfI6i8oWJ630QuqvR2DSm4G08IuY cTMIG/wkz/DkXCAAhmJsRgyPxMDeTgzl9CR5BD+BD4HWxVr2u9vIEpqsJA2kcgfADAV/ nEeYmTpwRVhBPM7lEJYVZawsBymLDT8U53GUpBdzFJ07FhZ2R7KbkaRioD4PRhcbXv0i GjcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708946139; x=1709550939; 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=bdxrKQw56OGQ9Tcr1roIQBogyoJhaQPIfliNFvvMZPA=; b=Jq/aTBx6E17FqVdVnEsK2DHxMDxwstc2y0sAWH8SziaTG7sU8seRyXmV5ve9mAsjY8 t3g5dZJDpMoPoEiQt5dXCD9Vc2eQnqWh5a2x/jrvj/wSoBmQIYgnsY4WYHKlSTjhrwQX nw7AsrZ0yIsGbsH2ri5LbdMmj/+F3YdZ/TRX/6CyVpwIdppI46JToPQzVGwW1oLWTEGI VUwD4xBWPPYO7609KFCI4QjXJgQ5IrhJlSAJVAARqMP15k3QZxEdtgPOtWTdCiw9eFfO uP1JTie4eFCwgUrdF5U7bVsSkr95oT98fLMwCUF7fzWo+CagbtCHVwAJK1FrOGXZe3CL JmQg== X-Gm-Message-State: AOJu0YwVBpDNa4XLy34yUoPIsk2lsdIjYQwGfCo3uWWkxvBHS8O/dsd/ fBrwxJUDXPgiKT710wA0Hof83jMuoKlJbHVGyyoLECqaKAwdZdHbEf0erF1C3NMDLsZyrLEvBPe g X-Received: by 2002:a5d:6086:0:b0:33d:3ad2:67ae with SMTP id w6-20020a5d6086000000b0033d3ad267aemr4218921wrt.57.1708946139679; Mon, 26 Feb 2024 03:15:39 -0800 (PST) Received: from m1x-phil.lan ([176.176.164.69]) by smtp.gmail.com with ESMTPSA id e13-20020a5d594d000000b0033dd53c8f15sm3800971wri.13.2024.02.26.03.15.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 26 Feb 2024 03:15:39 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Bernhard Beschow Cc: Laurent Vivier , Thomas Huth , BALATON Zoltan , Ani Sinha , qemu-block@nongnu.org, Marcel Apfelbaum , Eduardo Habkost , John Snow , Paolo Bonzini , "Michael S. Tsirkin" , Igor Mammedov , Richard Henderson , Mark Cave-Ayland , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 13/15] hw/southbridge/ich9: Add the USB EHCI/UHCI functions Date: Mon, 26 Feb 2024 12:14:12 +0100 Message-ID: <20240226111416.39217-14-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240226111416.39217-1-philmd@linaro.org> References: <20240226111416.39217-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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 Instantiate EHCI and UHCI in TYPE_ICH9_SOUTHBRIDGE. Since machines can disable USB, add the 'ehci-count' property. Machine can disable USB functions by setting ehci-count=0. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/southbridge/ich9.h | 5 --- hw/i386/pc_q35.c | 62 ++--------------------------------- hw/southbridge/ich9.c | 54 ++++++++++++++++++++++++++++++ hw/southbridge/Kconfig | 2 ++ 4 files changed, 58 insertions(+), 65 deletions(-) diff --git a/include/hw/southbridge/ich9.h b/include/hw/southbridge/ich9.h index d4b299bf3c..7e75496b0b 100644 --- a/include/hw/southbridge/ich9.h +++ b/include/hw/southbridge/ich9.h @@ -103,11 +103,6 @@ struct ICH9LPCState { #define ICH9_PCIE_DEV 28 #define ICH9_PCIE_FUNC_MAX 6 - -/* D29:F0 USB UHCI Controller #1 */ -#define ICH9_USB_UHCI1_DEV 29 -#define ICH9_USB_UHCI1_FUNC 0 - /* D31:F0 LPC Processor Interface */ #define ICH9_RST_CNT_IOPORT 0xCF9 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 0ff94b7afd..63fec8b439 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -50,8 +50,6 @@ #include "hw/ide/ahci-pci.h" #include "hw/intc/ioapic.h" #include "hw/southbridge/ich9.h" -#include "hw/usb.h" -#include "hw/usb/hcd-uhci.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/numa.h" @@ -60,59 +58,6 @@ #include "hw/i386/acpi-build.h" #include "target/i386/cpu.h" -struct ehci_companions { - const char *name; - int func; - int port; -}; - -static const struct ehci_companions ich9_1d[] = { - { .name = TYPE_ICH9_USB_UHCI(1), .func = 0, .port = 0 }, - { .name = TYPE_ICH9_USB_UHCI(2), .func = 1, .port = 2 }, - { .name = TYPE_ICH9_USB_UHCI(3), .func = 2, .port = 4 }, -}; - -static const struct ehci_companions ich9_1a[] = { - { .name = TYPE_ICH9_USB_UHCI(4), .func = 0, .port = 0 }, - { .name = TYPE_ICH9_USB_UHCI(5), .func = 1, .port = 2 }, - { .name = TYPE_ICH9_USB_UHCI(6), .func = 2, .port = 4 }, -}; - -static int ehci_create_ich9_with_companions(PCIBus *bus, int slot) -{ - const struct ehci_companions *comp; - PCIDevice *ehci, *uhci; - BusState *usbbus; - const char *name; - int i; - - switch (slot) { - case 0x1d: - name = "ich9-usb-ehci1"; - comp = ich9_1d; - break; - case 0x1a: - name = "ich9-usb-ehci2"; - comp = ich9_1a; - break; - default: - return -1; - } - - ehci = pci_new_multifunction(PCI_DEVFN(slot, 7), name); - pci_realize_and_unref(ehci, bus, &error_fatal); - usbbus = QLIST_FIRST(&ehci->qdev.child_bus); - - for (i = 0; i < 3; i++) { - uhci = pci_new_multifunction(PCI_DEVFN(slot, comp[i].func), - comp[i].name); - qdev_prop_set_string(&uhci->qdev, "masterbus", usbbus->name); - qdev_prop_set_uint32(&uhci->qdev, "firstport", comp[i].port); - pci_realize_and_unref(uhci, bus, &error_fatal); - } - return 0; -} - /* PC hardware initialisation */ static void pc_q35_init(MachineState *machine) { @@ -225,6 +170,8 @@ static void pc_q35_init(MachineState *machine) qdev_prop_set_bit(ich9, "d2p-enabled", false); qdev_prop_set_bit(ich9, "sata-enabled", pcms->sata_enabled); qdev_prop_set_bit(ich9, "smbus-enabled", pcms->smbus_enabled); + /* Should we create 6 UHCI according to ich9 spec? */ + qdev_prop_set_uint8(ich9, "ehci-count", machine_usb(machine) ? 1 : 0); qdev_realize_and_unref(ich9, NULL, &error_fatal); /* create ISA bus */ @@ -289,11 +236,6 @@ static void pc_q35_init(MachineState *machine) pcms->idebus[1] = qdev_get_child_bus(ich9, "ide.1"); } - if (machine_usb(machine)) { - /* Should we create 6 UHCI according to ich9 spec? */ - ehci_create_ich9_with_companions(pcms->pcibus, 0x1d); - } - if (pcms->smbus_enabled) { pcms->smbus = I2C_BUS(qdev_get_child_bus(ich9, "i2c")); /* TODO: Populate SPD eeprom data. */ diff --git a/hw/southbridge/ich9.c b/hw/southbridge/ich9.c index 413e9187e4..f05012959d 100644 --- a/hw/southbridge/ich9.c +++ b/hw/southbridge/ich9.c @@ -16,12 +16,18 @@ #include "hw/ide/ahci-pci.h" #include "hw/ide/ide-dev.h" #include "hw/i2c/ich9_smbus.h" +#include "hw/usb.h" +#include "hw/usb/hcd-ehci.h" +#include "hw/usb/hcd-uhci.h" #define ICH9_D2P_DEVFN PCI_DEVFN(30, 0) #define ICH9_SATA1_DEVFN PCI_DEVFN(31, 2) #define ICH9_SMB_DEVFN PCI_DEVFN(31, 3) +#define ICH9_EHCI_FUNC 7 #define SATA_PORTS 6 +#define EHCI_PER_FN 2 +#define UHCI_PER_FN 3 struct ICH9State { DeviceState parent_obj; @@ -29,11 +35,14 @@ struct ICH9State { I82801b11Bridge d2p; AHCIPCIState sata0; ICH9SMBState smb; + EHCIPCIState ehci[EHCI_PER_FN]; + UHCIState uhci[EHCI_PER_FN * UHCI_PER_FN]; PCIBus *pci_bus; bool d2p_enabled; bool sata_enabled; bool smbus_enabled; + uint8_t ehci_count; }; static Property ich9_props[] = { @@ -42,6 +51,7 @@ static Property ich9_props[] = { DEFINE_PROP_BOOL("d2p-enabled", ICH9State, d2p_enabled, true), DEFINE_PROP_BOOL("sata-enabled", ICH9State, sata_enabled, true), DEFINE_PROP_BOOL("smbus-enabled", ICH9State, smbus_enabled, true), + DEFINE_PROP_UINT8("ehci-count", ICH9State, ehci_count, 2), DEFINE_PROP_END_OF_LIST(), }; @@ -100,6 +110,46 @@ static bool ich9_realize_smbus(ICH9State *s, Error **errp) return true; } +static bool ich9_realize_usb(ICH9State *s, Error **errp) +{ + if (!module_object_class_by_name(TYPE_ICH9_USB_UHCI(1)) + || !module_object_class_by_name("ich9-usb-ehci1")) { + error_setg(errp, "USB functions not available in this build"); + return false; + } + for (unsigned e = 0; e < s->ehci_count; e++) { + g_autofree gchar *ename = g_strdup_printf("ich9-usb-ehci%u", e + 1); + EHCIPCIState *ehci = &s->ehci[e]; + const unsigned devid = e ? 0x1a : 0x1d; + BusState *masterbus; + + object_initialize_child(OBJECT(s), "ehci[*]", ehci, ename); + qdev_prop_set_int32(DEVICE(ehci), "addr", PCI_DEVFN(devid, + ICH9_EHCI_FUNC)); + if (!qdev_realize(DEVICE(ehci), BUS(s->pci_bus), errp)) { + return false; + } + masterbus = QLIST_FIRST(&DEVICE(ehci)->child_bus); + + for (unsigned u = 0; u < UHCI_PER_FN; u++) { + unsigned c = UHCI_PER_FN * e + u; + UHCIState *uhci = &s->uhci[c]; + g_autofree gchar *cname = g_strdup_printf("ich9-usb-uhci%u", c + 1); + + object_initialize_child(OBJECT(s), "uhci[*]", uhci, cname); + qdev_prop_set_bit(DEVICE(uhci), "multifunction", true); + qdev_prop_set_int32(DEVICE(uhci), "addr", PCI_DEVFN(devid, u)); + qdev_prop_set_string(DEVICE(uhci), "masterbus", masterbus->name); + qdev_prop_set_uint32(DEVICE(uhci), "firstport", 2 * u); + if (!qdev_realize(DEVICE(uhci), BUS(s->pci_bus), errp)) { + return false; + } + } + } + + return true; +} + static void ich9_realize(DeviceState *dev, Error **errp) { ICH9State *s = ICH9_SOUTHBRIDGE(dev); @@ -120,6 +170,10 @@ static void ich9_realize(DeviceState *dev, Error **errp) if (s->smbus_enabled && !ich9_realize_smbus(s, errp)) { return; } + + if (!ich9_realize_usb(s, errp)) { + return; + } } static void ich9_class_init(ObjectClass *klass, void *data) diff --git a/hw/southbridge/Kconfig b/hw/southbridge/Kconfig index 03e89a55d1..31eb125bf7 100644 --- a/hw/southbridge/Kconfig +++ b/hw/southbridge/Kconfig @@ -6,3 +6,5 @@ config ICH9 imply I82801B11 select AHCI_ICH9 select ACPI_ICH9 + imply USB_EHCI_PCI + imply USB_UHCI