From patchwork Thu Jan 20 12:36:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 533592 Delivered-To: patch@linaro.org Received: by 2002:ac0:f7d2:0:0:0:0:0 with SMTP id i18csp82026imr; Thu, 20 Jan 2022 11:09:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjt/ba/PIdmEhci5PRGLlmqx8BiWok4Py/QvmwEpvvXqAvmdEqDRIdZXORwx5KKtZApErx X-Received: by 2002:ac8:5fcd:: with SMTP id k13mr422724qta.394.1642705777821; Thu, 20 Jan 2022 11:09:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642705777; cv=none; d=google.com; s=arc-20160816; b=1Ipf4VObd1WqHE4XsGyu7IItiGUkOX9gB444ywokgne8nzJ6pGWfKC64mV/hcF2huz XHK8XynaXUzS5jEJXUG9i0PXC12krNi/5vZ4OrkdUCsRJkzgFecXievQQh/qxu+1LShV /QcWluz70Z3ZZlJpxmc9GZ97OxndHTcUhGM49IuZfPqtCzihVq32cECU0DVvHka/Hm9P zfbV1LVXL1qqTbXUbGZNFgYRAm6IKl6R/OHo1cQ8dhxXBWKqthfezLuImAy+zOHP2qyC axoOEMuh6CklJkAznKDb7xU2djACQ/46UaddgoHt9EFet/sKo0PkWrT21YCblgWC7FMU fAbg== 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:to:from :dkim-signature; bh=TVpyhUb/uqMHor++qPKwohsK4EfXn5eG3Z8q9ZVcGMk=; b=OBA3BRz4MKJIatD28RsBBddsA/V5f/iggIbe9Hm6Ivwyl2Rn2+ha2ZaPRB9Cfm1yWQ 3CDYBOjLrDc9EsvPsnb0f6kD5Xbwc1DDqjUg50UgnLtUylzMw1l64F1CQ4dO+OemsX5i hHLK5Fk6xbtGJUNyFQxDo6DLyRz4tWQ0VEwb382mDHWb84Sk4pP79J9Z6m9dp8ydsE0S a9GOUMCrjpDnEWHahwzIoAW2nHRU193QipM4QMDRw1vPLzVyaxsxbcqPxu6qojeBY5QR g6guDbY1LieMRBdEeXMa5tbXbAjgorntTcqfJLIcyU1eEWGrzMkhI2s+i18rHOSrEFVT FXLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="J9f/B6uR"; 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 b6si222097ywc.317.2022.01.20.11.09.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Jan 2022 11:09:37 -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="J9f/B6uR"; 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]:50560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAcoS-0002jv-0b for patch@linaro.org; Thu, 20 Jan 2022 14:09:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAWgi-0004JI-MY for qemu-devel@nongnu.org; Thu, 20 Jan 2022 07:37:14 -0500 Received: from [2a00:1450:4864:20::32b] (port=40952 helo=mail-wm1-x32b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAWgZ-0003IX-Ab for qemu-devel@nongnu.org; Thu, 20 Jan 2022 07:37:06 -0500 Received: by mail-wm1-x32b.google.com with SMTP id r9-20020a1c4409000000b0034e043aaac7so477796wma.5 for ; Thu, 20 Jan 2022 04:37:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=TVpyhUb/uqMHor++qPKwohsK4EfXn5eG3Z8q9ZVcGMk=; b=J9f/B6uRKTN4HtXgVYgvVmL6u4oGVSk6Zo6mMn/bRHq86zAOWp164JDJfrlaimI2m6 JvhCS8dnYeT0jq2TSxAoYPKQ5HgHyBlIOWwb8A3tFzGSlEgyKzOG0wzReDwS2fdxltcG R6CR5iVoYe7dE/VtRL33Itb3obtybfPpi5dyVfS1CKuSAan2q4C+P4dsRDgWXmcQI3uA MOeR84ULbb0CHKAPIXDbBj29kPfKxvuyepTGUYNRmXMyqFteN4wiER3R7OJzyz7Ylo4R 4TNc68DdS49paOfggmYErFI6BrAF1gFtpkP65hNd7GHal1e3FDRq7hNclgQLvGgCrvIx UytA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TVpyhUb/uqMHor++qPKwohsK4EfXn5eG3Z8q9ZVcGMk=; b=kezpMdHMqRsPWkkKFCKC+J911h8wXPo0CVrj8RySY/bUk+6i3e29HWW3o7Jostcl0B DagB/ocjA7Rpz4Qc+a+eS6c7QpJ4Ik/7NXXSvIPwbU0YTF9po8om7bXRiUH7EWTMrroJ P7y5KoRiH0aepZOugr/dQ6uE2h1XxZQA20X6vfGyiRj98cJwcKv61HjyGWgtqpjUcqmp A7XVOsLun/tEMVg62eOyP0LKM69zccDkoDVxRuIzBBBihUK8x+DV2gGot+VDyr6kobze c6ign2S8T/6oC26ZvsybQKDMadXmOeqDI3mNZHVqN6f8ZOpHGo8OlaqUltgaOR7JL069 j1BQ== X-Gm-Message-State: AOAM531XdLP8LDa0qYn39ldanvFwa3VcX3VLa9Em3IL0m4gvQedIn6nl OEX4RXJ1OUSyTvOgZIJ/HA+ci7GABav39g== X-Received: by 2002:a05:6000:1862:: with SMTP id d2mr32983476wri.211.1642682221131; Thu, 20 Jan 2022 04:37:01 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id t8sm7993324wmq.43.2022.01.20.04.37.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 04:37:00 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 24/38] hw/arm/aspeed: Add the i3c device to the AST2600 SoC Date: Thu, 20 Jan 2022 12:36:16 +0000 Message-Id: <20220120123630.267975-25-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220120123630.267975-1-peter.maydell@linaro.org> References: <20220120123630.267975-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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" From: Troy Lee Add the new i3c device to the AST2600 SoC. Signed-off-by: Troy Lee Reviewed-by: Graeme Gregory Reviewed-by: Cédric Le Goater Tested-by: Graeme Gregory Message-id: 20220111084546.4145785-3-troy_lee@aspeedtech.com [PMM: tidied commit message] Signed-off-by: Peter Maydell --- include/hw/arm/aspeed_soc.h | 3 +++ hw/arm/aspeed_ast2600.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index 18fb7eed461..cae9906684c 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -21,6 +21,7 @@ #include "hw/timer/aspeed_timer.h" #include "hw/rtc/aspeed_rtc.h" #include "hw/i2c/aspeed_i2c.h" +#include "hw/misc/aspeed_i3c.h" #include "hw/ssi/aspeed_smc.h" #include "hw/misc/aspeed_hace.h" #include "hw/watchdog/wdt_aspeed.h" @@ -51,6 +52,7 @@ struct AspeedSoCState { AspeedRtcState rtc; AspeedTimerCtrlState timerctrl; AspeedI2CState i2c; + AspeedI3CState i3c; AspeedSCUState scu; AspeedHACEState hace; AspeedXDMAState xdma; @@ -141,6 +143,7 @@ enum { ASPEED_DEV_HACE, ASPEED_DEV_DPMCU, ASPEED_DEV_DP, + ASPEED_DEV_I3C, }; #endif /* ASPEED_SOC_H */ diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index e33483fb5dd..8f37bdb1d87 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -61,6 +61,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = { [ASPEED_DEV_UART1] = 0x1E783000, [ASPEED_DEV_UART5] = 0x1E784000, [ASPEED_DEV_VUART] = 0x1E787000, + [ASPEED_DEV_I3C] = 0x1E7A0000, [ASPEED_DEV_SDRAM] = 0x80000000, }; @@ -108,6 +109,7 @@ static const int aspeed_soc_ast2600_irqmap[] = { [ASPEED_DEV_ETH4] = 33, [ASPEED_DEV_KCS] = 138, /* 138 -> 142 */ [ASPEED_DEV_DP] = 62, + [ASPEED_DEV_I3C] = 102, /* 102 -> 107 */ }; static qemu_irq aspeed_soc_get_irq(AspeedSoCState *s, int ctrl) @@ -223,6 +225,8 @@ static void aspeed_soc_ast2600_init(Object *obj) snprintf(typename, sizeof(typename), "aspeed.hace-%s", socname); object_initialize_child(obj, "hace", &s->hace, typename); + + object_initialize_child(obj, "i3c", &s->i3c, TYPE_ASPEED_I3C); } /* @@ -523,6 +527,18 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->hace), 0, sc->memmap[ASPEED_DEV_HACE]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->hace), 0, aspeed_soc_get_irq(s, ASPEED_DEV_HACE)); + + /* I3C */ + if (!sysbus_realize(SYS_BUS_DEVICE(&s->i3c), errp)) { + return; + } + sysbus_mmio_map(SYS_BUS_DEVICE(&s->i3c), 0, sc->memmap[ASPEED_DEV_I3C]); + for (i = 0; i < ASPEED_I3C_NR_DEVICES; i++) { + qemu_irq irq = qdev_get_gpio_in(DEVICE(&s->a7mpcore), + sc->irqmap[ASPEED_DEV_I3C] + i); + /* The AST2600 I3C controller has one IRQ per bus. */ + sysbus_connect_irq(SYS_BUS_DEVICE(&s->i3c.devices[i]), 0, irq); + } } static void aspeed_soc_ast2600_class_init(ObjectClass *oc, void *data)