Received: by 2002:a17:906:18b1:b0:a2e:1324:ea5c with SMTP id c17csp365838ejf; Mon, 15 Jan 2024 08:56:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/iakb/8htX2v0j3f+Qe+c0Upjc0/+mmCnLRzUkYl3uUfzLiF2dQ8v0rxkVYRe3FigRDUm X-Received: by 2002:a05:6808:144a:b0:3bd:4add:8d8c with SMTP id x10-20020a056808144a00b003bd4add8d8cmr7660564oiv.20.1705337810759; Mon, 15 Jan 2024 08:56:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705337810; cv=none; d=google.com; s=arc-20160816; b=qsnH36jN0VqK/9kzJTkiiMjmWpk3yEYHA4FxiASMBQrvcx4im3YlttVRPa/Ade7tQA C3olujklhp3uV0lVf+AkKLs6o3gwGMN+mBqOOweuSak1R4AqQ2G28XgTVH+fS9LYCsFc nOvjhLa/acApv28LP8BJsWrEZFfRfCeX/jVZb1d0Wt2908mnFqnon7AAWagrJdjjc+x2 TSCPkT5YXgsZl24YoNmie9XVGvYh45L4yk7i6tvNcyH9GhabQhiUidLXnDL0jISOAKwh 288/pvH0AXrzOTCnFEMOyrtUdW9fyuktxr5K2dw0NrYjBYwRHiGSFWiKoOtFfrbnpWZW KFkw== 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=tp5kXRZIwxQA5ZiZbQiX86tGc9m7nGG30xQAkxSTGS8=; fh=lfuYXVtC1uxUzJXcx1BLjy5YFppJmZ2782Wl5dyoqHg=; b=ZfPI50As9uHtffN3xEhANMLgA2GJniomwUoIyz0W1tr3U1QcekrkUxN10hlC+1jyn8 RWputs1aAOBN41Lp959rjzqOc9CDl5aiHH/0T/m6lHbkOXFZtWwbZhEXc1xCmtOd2xJC kuX0CtfDE8GnLByuYn6Zf2Vxw9ryU1GvXKYu5zjiVBRk/8YqX0KIeYxVODZhonyF7job EvoUNMWPi6ryGxv63vN4QV/XA8BLubZWDnpa5VlV+frI/KnSb/Dz9Lw17uvQx3tHoL68 ZxumFttkX0gIj+U0tisFLG6tjEbydKNRHa5Da/pwdhaWuwhIQZX2GUd2fIsxPu57Aae0 PYUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZOmbvnue; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=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 b5-20020a05620a04e500b007831de73c06si8335296qkh.118.2024.01.15.08.56.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Jan 2024 08:56:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+alex.bennee=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=ZOmbvnue; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=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 1rPQGF-0006Gf-2w; Mon, 15 Jan 2024 11:56:31 -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 1rPQGA-0006FM-U3 for qemu-devel@nongnu.org; Mon, 15 Jan 2024 11:56:27 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rPQG9-0001Wt-BL for qemu-devel@nongnu.org; Mon, 15 Jan 2024 11:56:26 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40e80046246so3684525e9.1 for ; Mon, 15 Jan 2024 08:56:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705337783; x=1705942583; 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=tp5kXRZIwxQA5ZiZbQiX86tGc9m7nGG30xQAkxSTGS8=; b=ZOmbvnuemk7mmLA6u/WBpzJC8XVuTV/H64E/GnLppA8Pqtfd8xSlNsRuGMNk7zgAMv HOrBgibTOFB/dL7Gd4zwMGlupQbA9lUrsYiBICtkBuUQLIZ4nMOYyYc1hm1oECZNmRVV GAwFqK3pRPOYcV66glOvVDUIrTMY1+Q9Zy8KZLvMN9teNFdhKxmvZCD9j4rc0Im6HTiP 0mabU9wxaedwEeIK0JH2crJkRv6Cq4IqGwUAsNEsOJK8Qu8qJhymo8TQJ6wRA7azJWpV MJbn8pcFBR+E15ErKSvehan1ji1k9qk5+GwoZaJXAQjB1JyF2tSAgVdjNI77k4OcUJpq dcSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705337783; x=1705942583; 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=tp5kXRZIwxQA5ZiZbQiX86tGc9m7nGG30xQAkxSTGS8=; b=aRnr9q6PVJ51iAr8rqHNc59m2hk128Ev648vZPnI09KBX86rcw1ypUEcGHED5dyP2W TMbS8D4ittokJepQMF0VemOL6tCgrr/mv344YiF7w+0oZJu/qpCEzxdPbLfu/8z9XS3M b3NzNCE3M+vupQwy5Jr8BnJXdu7rnW4hu7uYJEnLCal6nFNltEX5O24pSXPRM8D5KZxS ixJ822XYbIrQNsnUrXmh3eMTd66vRdC9kHvvDLq3K3qeExjTd+zys+r60kzODTCEv/Yn MsglHcIwEkZedbFT8Jr1cwtdeCe4pPJMya3a0Ag3M4R4od4rzsbNiSXAIy5HYyEyxFsA pMoQ== X-Gm-Message-State: AOJu0YxNd6d2qDVOjR3I+lzDvC1wPdK7W1d5zEAku/gw3bgY7jMSOpyj N2lQcp8Afi8/qlEwBW4XtykVMO+mkQrbyQI/7RNOlr40qec= X-Received: by 2002:a05:600c:4b10:b0:40e:7114:e42d with SMTP id i16-20020a05600c4b1000b0040e7114e42dmr1490467wmp.17.1705337783189; Mon, 15 Jan 2024 08:56:23 -0800 (PST) Received: from m1x-phil.lan ([176.187.209.30]) by smtp.gmail.com with ESMTPSA id v2-20020a5d5902000000b00337a6feab88sm4035876wrd.100.2024.01.15.08.56.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 15 Jan 2024 08:56:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Beniamino Galvani , qemu-arm@nongnu.org, Strahinja Jankovic , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Guenter Roeck Subject: [PATCH 1/2] hw/arm/allwinner-a10: Unconditionally map the USB Host controllers Date: Mon, 15 Jan 2024 17:56:14 +0100 Message-ID: <20240115165615.78323-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240115165615.78323-1-philmd@linaro.org> References: <20240115165615.78323-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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=unavailable 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+alex.bennee=linaro.org@nongnu.org Sender: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: /5NHoAH3wD3q The USB Controllers are part of the chipset, thus are always present and mapped in memory. Reported-by: Guenter Roeck Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/allwinner-a10.c | 49 +++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index b0ea3f7f66..0135632996 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -79,15 +79,10 @@ static void aw_a10_init(Object *obj) object_initialize_child(obj, "i2c0", &s->i2c0, TYPE_AW_I2C); - if (machine_usb(current_machine)) { - int i; - - for (i = 0; i < AW_A10_NUM_USB; i++) { - object_initialize_child(obj, "ehci[*]", &s->ehci[i], - TYPE_PLATFORM_EHCI); - object_initialize_child(obj, "ohci[*]", &s->ohci[i], - TYPE_SYSBUS_OHCI); - } + for (size_t i = 0; i < AW_A10_NUM_USB; i++) { + object_initialize_child(obj, "ehci[*]", &s->ehci[i], + TYPE_PLATFORM_EHCI); + object_initialize_child(obj, "ohci[*]", &s->ohci[i], TYPE_SYSBUS_OHCI); } object_initialize_child(obj, "mmc0", &s->mmc0, TYPE_AW_SDHOST_SUN4I); @@ -165,28 +160,24 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) qdev_get_gpio_in(dev, 1), 115200, serial_hd(0), DEVICE_NATIVE_ENDIAN); - if (machine_usb(current_machine)) { - int i; + for (size_t i = 0; i < AW_A10_NUM_USB; i++) { + g_autofree char *bus = g_strdup_printf("usb-bus.%zu", i); - for (i = 0; i < AW_A10_NUM_USB; i++) { - g_autofree char *bus = g_strdup_printf("usb-bus.%d", i); + object_property_set_bool(OBJECT(&s->ehci[i]), "companion-enable", + true, &error_fatal); + sysbus_realize(SYS_BUS_DEVICE(&s->ehci[i]), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->ehci[i]), 0, + AW_A10_EHCI_BASE + i * 0x8000); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ehci[i]), 0, + qdev_get_gpio_in(dev, 39 + i)); - object_property_set_bool(OBJECT(&s->ehci[i]), "companion-enable", - true, &error_fatal); - sysbus_realize(SYS_BUS_DEVICE(&s->ehci[i]), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->ehci[i]), 0, - AW_A10_EHCI_BASE + i * 0x8000); - sysbus_connect_irq(SYS_BUS_DEVICE(&s->ehci[i]), 0, - qdev_get_gpio_in(dev, 39 + i)); - - object_property_set_str(OBJECT(&s->ohci[i]), "masterbus", bus, - &error_fatal); - sysbus_realize(SYS_BUS_DEVICE(&s->ohci[i]), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->ohci[i]), 0, - AW_A10_OHCI_BASE + i * 0x8000); - sysbus_connect_irq(SYS_BUS_DEVICE(&s->ohci[i]), 0, - qdev_get_gpio_in(dev, 64 + i)); - } + object_property_set_str(OBJECT(&s->ohci[i]), "masterbus", bus, + &error_fatal); + sysbus_realize(SYS_BUS_DEVICE(&s->ohci[i]), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->ohci[i]), 0, + AW_A10_OHCI_BASE + i * 0x8000); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ohci[i]), 0, + qdev_get_gpio_in(dev, 64 + i)); } /* SD/MMC */ -- 2.41.0