From patchwork Fri Mar 18 13:23:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 552613 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp2080939mag; Fri, 18 Mar 2022 06:35:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2cSjZjObMv4gW/mCUqMWt15yOykTfCpk5m7AdMJIUsbeIXboK+ub4/3HqJb4k9LLETRxf X-Received: by 2002:ac8:7d49:0:b0:2e1:bdb9:ef6c with SMTP id h9-20020ac87d49000000b002e1bdb9ef6cmr7504112qtb.400.1647610552840; Fri, 18 Mar 2022 06:35:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647610552; cv=none; d=google.com; s=arc-20160816; b=UYlKlRHU67CoahMvXSEMisJL8c+DewkMh/4n1DtohYOk3a90053y3rhPfEUJ9GqqQd lgvV3d8gDD17RmkQZ27hZfSPD711SzM93dMEbrHcCw3Bgu9bArJK25uWZgrlXbX7ugHm dHobjaYHR9QlGs9rKbQvREXVimJYY0CrWsUIuPSLBP7w3JndnqNAr0qMAB74YWkDAjUQ Aop/wuJ7extT0zjiIPwPE+krzAhP1fM6wG5I44aaeNn1mV2af7mB7YLhCq95FXoMAAyN 6YdmpY2Zi7vw3XX9CR2uc9RSPzFwbf3vKqo5Eb68qRn/ur7w0DGAFEXrW16pkTlyEI2q ZQlQ== 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=HLJWVvq9CCKmxGDjWnVnU7AY6BAVBA1hCTJywpbZHwM=; b=aO+4FkfwLEWbEJP4oTWtl6kby1ipdnCUwloiWJJFLhBxD1qmsVnCFNn+1ArQFWrFIP pZeZtucVSisScsziYytq3E15mmyAw2jPSWiyYoq3hMj2ED4x7ssLBzulHCgYu66e8UPK wa0dUnC5FbhmzDVhniTd4q5RdHDWz2oatCTSC5nEy278LN4F2r6YXmY0121m0bwbpC5G VxKW0wPZ5qrVxZnUIq+r+4Y93x3JhVAsNGD7O+9C74me3LzWByYBoG4sfFp2uoIAGU3H A6tjy0F1w7M9cGyUwW+rIyVPIFKXCN60eUBGvpezdhQX1TeiX+C+J1DZyEZmtjsuVTB6 refQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UBVYksNg; 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 ey9-20020a0562140b6900b004410817c97fsi89207qvb.105.2022.03.18.06.35.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Mar 2022 06:35:52 -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=UBVYksNg; 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]:48728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVClk-0000RH-EG for patch@linaro.org; Fri, 18 Mar 2022 09:35:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVCZm-0006w2-By for qemu-devel@nongnu.org; Fri, 18 Mar 2022 09:23:30 -0400 Received: from [2a00:1450:4864:20::432] (port=45983 helo=mail-wr1-x432.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nVCZk-0002DM-Nd for qemu-devel@nongnu.org; Fri, 18 Mar 2022 09:23:30 -0400 Received: by mail-wr1-x432.google.com with SMTP id p9so11694447wra.12 for ; Fri, 18 Mar 2022 06:23:28 -0700 (PDT) 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=HLJWVvq9CCKmxGDjWnVnU7AY6BAVBA1hCTJywpbZHwM=; b=UBVYksNgR3PMz3fawOf0gvcbMRIrZrrylzHREWsfJFQLSK5HJ1H2UQLuElJdbkltWo g7CsofrjmXQV1UAaIosXCULEHk+kJgGpvtkIUcSzPHGiCf75r6g2SksqhDwg8u3nl5pV vyU59dYsJ9G8bzlxNr6jdfTsBV8O/sqrh+OYKND/bi4dsC4XCRx5b0WhV/06uhrXpogh ESc1Pkzw+NEe0nCqfpgJ//5yqtLcTgAXiqEbjw8yY1N2lpYrAJL/wG39KDnyd0NXEeyP w73soOUGeEVJGQi+wRsArRq9t63IhqCTij6OYaBJH3qZQP1O4B2FVgFUOaIXp4/JuVdj bFog== 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=HLJWVvq9CCKmxGDjWnVnU7AY6BAVBA1hCTJywpbZHwM=; b=Hr4sIpJWvaEzSerrv8twXD5ECnQkrznVuYcNoLfl4LP8tkuWm+/liVYEowGCrZkr/T 6+r6cRcEyD8Xk6aivHycvZTyvwJwSP5QrmgPn2dvvyDnIjbvEvsC7PX0iG8go2jnO8tR Nrswk0aX81vSkwjoaOVVShD/UOpApF3csQiBHMtYHnHmMKKQkSH5fo2FpajfVPrQR9FH ew1eH6ZniMs4fvNTwE68BW99RnU5Kg3QapcXS2mn//gk4Tjbz75p9pZtAPtO8+u8OCUz I3YbT8JsZxoW7al6ll01B+AfvmU6EyLmHx9KQ35vSkZ53EJHh0Ie9tG1nmuehq24YTjx apAA== X-Gm-Message-State: AOAM533k5ICnkT7kgw/w19ACIqRZGZYio47/O1MrvMYfKhRFzDFq7ley VIwv2SzmaBfjACXf/N3KXBIUclu7SXzmeQ== X-Received: by 2002:a5d:4245:0:b0:203:dc49:2604 with SMTP id s5-20020a5d4245000000b00203dc492604mr8259811wrr.32.1647609807367; Fri, 18 Mar 2022 06:23:27 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id y15-20020a05600015cf00b00203e324347bsm6316599wry.102.2022.03.18.06.23.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Mar 2022 06:23:26 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 18/21] hw/arm/xlnx-zynqmp: Connect the ZynqMP APU Control Date: Fri, 18 Mar 2022 13:23:03 +0000 Message-Id: <20220318132306.3254960-19-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220318132306.3254960-1-peter.maydell@linaro.org> References: <20220318132306.3254960-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::432 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: "Edgar E. Iglesias" Connect the ZynqMP APU Control device. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Francisco Iglesias Reviewed-by: Luc Michel Signed-off-by: Edgar E. Iglesias Message-id: 20220316164645.2303510-7-edgar.iglesias@gmail.com Signed-off-by: Peter Maydell --- include/hw/arm/xlnx-zynqmp.h | 4 +++- hw/arm/xlnx-zynqmp.c | 25 +++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 7938f223a4a..9d9a9d0bf9d 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -39,6 +39,7 @@ #include "hw/nvram/xlnx-bbram.h" #include "hw/nvram/xlnx-zynqmp-efuse.h" #include "hw/or-irq.h" +#include "hw/misc/xlnx-zynqmp-apu-ctrl.h" #include "hw/misc/xlnx-zynqmp-crf.h" #define TYPE_XLNX_ZYNQMP "xlnx-zynqmp" @@ -86,7 +87,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP) /* * Unimplemented mmio regions needed to boot some images. */ -#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 2 +#define XLNX_ZYNQMP_NUM_UNIMP_AREAS 1 struct XlnxZynqMPState { /*< private >*/ @@ -125,6 +126,7 @@ struct XlnxZynqMPState { XlnxZDMA adma[XLNX_ZYNQMP_NUM_ADMA_CH]; XlnxCSUDMA qspi_dma; qemu_or_irq qspi_irq_orgate; + XlnxZynqMPAPUCtrl apu_ctrl; XlnxZynqMPCRF crf; char *boot_cpu; diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index f4575eea7fa..5bfe285a191 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -66,7 +66,7 @@ #define DPDMA_IRQ 116 #define APU_ADDR 0xfd5c0000 -#define APU_SIZE 0x100 +#define APU_IRQ 153 #define IPI_ADDR 0xFF300000 #define IPI_IRQ 64 @@ -283,6 +283,27 @@ static void xlnx_zynqmp_create_efuse(XlnxZynqMPState *s, qemu_irq *gic) sysbus_connect_irq(sbd, 0, gic[EFUSE_IRQ]); } +static void xlnx_zynqmp_create_apu_ctrl(XlnxZynqMPState *s, qemu_irq *gic) +{ + SysBusDevice *sbd; + int i; + + object_initialize_child(OBJECT(s), "apu-ctrl", &s->apu_ctrl, + TYPE_XLNX_ZYNQMP_APU_CTRL); + sbd = SYS_BUS_DEVICE(&s->apu_ctrl); + + for (i = 0; i < XLNX_ZYNQMP_NUM_APU_CPUS; i++) { + g_autofree gchar *name = g_strdup_printf("cpu%d", i); + + object_property_set_link(OBJECT(&s->apu_ctrl), name, + OBJECT(&s->apu_cpu[i]), &error_abort); + } + + sysbus_realize(sbd, &error_fatal); + sysbus_mmio_map(sbd, 0, APU_ADDR); + sysbus_connect_irq(sbd, 0, gic[APU_IRQ]); +} + static void xlnx_zynqmp_create_crf(XlnxZynqMPState *s, qemu_irq *gic) { SysBusDevice *sbd; @@ -302,7 +323,6 @@ static void xlnx_zynqmp_create_unimp_mmio(XlnxZynqMPState *s) hwaddr base; hwaddr size; } unimp_areas[ARRAY_SIZE(s->mr_unimp)] = { - { .name = "apu", APU_ADDR, APU_SIZE }, { .name = "serdes", SERDES_ADDR, SERDES_SIZE }, }; unsigned int nr; @@ -699,6 +719,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) xlnx_zynqmp_create_bbram(s, gic_spi); xlnx_zynqmp_create_efuse(s, gic_spi); + xlnx_zynqmp_create_apu_ctrl(s, gic_spi); xlnx_zynqmp_create_crf(s, gic_spi); xlnx_zynqmp_create_unimp_mmio(s);