From patchwork Mon Feb 10 15:49:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 863777 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e42:0:b0:385:e875:8a9e with SMTP id r2csp1661314wrt; Mon, 10 Feb 2025 07:51:04 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVx+yv8s/fk9mWv343ofeVON7z/LhVvlOFy6Fky+ih5csVt8T/H0K+z8g8PUKsgzTRDqqvtyA==@linaro.org X-Google-Smtp-Source: AGHT+IEVoJx9VrV5RjBA7QAdpeQmYryU/dy8Q+W+x14qQVROR6QOpN7eodmad7eDbnbDXAEBNbsP X-Received: by 2002:a05:620a:438f:b0:7b6:ed18:fe2 with SMTP id af79cd13be357-7c047bc6f17mr2099521285a.30.1739202663991; Mon, 10 Feb 2025 07:51:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1739202663; cv=none; d=google.com; s=arc-20240605; b=WNl29dfvHQOmqFmYHtsuBt8w5baeNWSpxZNdndcHM7uzzfqh/wD2e90UbksJHMbaFt IFs73Fjvf0VrKTCUdqzHREsVCHjrPOe8ur7//gTxpXfVj1B740WP77wu8hdF/dmbBcVA fwauke346FcwZwt9Yg9yoYWSnLem8hwqhevGY2kMduA2SwX+YKNX+8IhBv4q43j2XiEc MPEOsW03TUQz4Aiyl/3jX9zfFwXG0SPZX0K+6sugVbkENsz8UCTlTRJbmg469kC22lvq ZDiNYqNi6st+oscGLHB1qxU9Y+8tKxeZrDG8FnvfF/XWjEGcMRB736iLkgT2eDoc756r W14A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=P1zTV046GvXS18jMcMjoDQaPzFuj/OqreJqi8vNtLao=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=d8dgCvb/g+PFPLExY4YCb+JBBbsbwQJ2tkYpz8v+cTiis50k7T2qLQtk4PLWe1BRls i1ZUASjJkbYpAY0tG0ayJzR9MmgV7z5Rj2lwShzZuR76jrzMYWwEivkOWRAV1jT5LM/u UT2WBnzaqs0dgj/Cb1fOws0FfWLp+JCGLWYDpAniVvQjAizoxvw6yCSxpnDy3W9BjvIn fyHrvJpPetzJlkW+roouBHz9ezN+2Fth6LAKFZadmbphgd6c57srQlaUwuh5/AIzBJdD xNVNL+V6+klvrg8DQF3kSnep5qK0vv1I4KOLMQ8TRPXKkO9/PkyyNCqieUz/Ol0IZ2n7 fPwQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S3SZvcFY; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c05c495bb3si273648485a.499.2025.02.10.07.51.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Feb 2025 07:51:03 -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=S3SZvcFY; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1thW3a-0007n3-2f; Mon, 10 Feb 2025 10:50:46 -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 1thW2k-0007Dt-Ag for qemu-devel@nongnu.org; Mon, 10 Feb 2025 10:49:55 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1thW2i-0004hb-IY for qemu-devel@nongnu.org; Mon, 10 Feb 2025 10:49:54 -0500 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-38dd91c313bso947061f8f.3 for ; Mon, 10 Feb 2025 07:49:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739202591; x=1739807391; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=P1zTV046GvXS18jMcMjoDQaPzFuj/OqreJqi8vNtLao=; b=S3SZvcFYxyUvL0hYIKOsSvE3R6gtVNv9TZwiq2IHwQz6iCgu3Rb4JEyeX6rreheoek 2ntHhM6ICoGoa3A8Uu03GT02MHu5iMGyOk+g5AeDuj6L4n3crphhkkoFw894YpirCs/l jwHIRnmB2ezQUTQf4vHGxnsUYI9aAdUuLnNEfBttH4btTNcfr3z2GOQVm1aK1Tj+Fbb2 7usdJMloBTw0gKZ18InZKdYwq2pvbN3l6b7x7ImHh6cYLLYPo1CLXsFzKmfO9a5jjVOc BVD3OJoi2F6gLYVoqUNBJn7q/Iyzs2uso119JC8iSXkQ2JDF+zK+zNgwWuIhW9r5kIQP 4epw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739202591; x=1739807391; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P1zTV046GvXS18jMcMjoDQaPzFuj/OqreJqi8vNtLao=; b=ssClIrbtfBOrwl+JFhpP1MD/3CfsPDKGRifmrGU3toW/hW74UmLV5DbrQN6ZscnliX 4jgYEFXflLccr1itx9H7fXbiTF/nVhQnysgd2mwKETEPpJFF2X3Cbv1aP6PSNsvTwcHS IStO/wgPSvaBZLD8zUL5+3zwj2oTBC3BORfx95MoEDkH3KWnsUHNWvW2+vRoRZrLOrJM me44QZM/a1FkoBvVeo/VBxno+xOVvDTs8OE+7bs1lqplPIhfIoiTfee62qyE1NOvuIRQ YQXAQvESs0QI7biKdmeVA2epVcJohkfd08mCtrYmwLA6qQBLD3NvIJRagDXi+DpVTsLI zwqw== X-Gm-Message-State: AOJu0YxtyT7GJMoyyQ4PtTNzpNrfVJMxQTb7b1XmwXOs5CldYdaC/O6p 56sM9Uyu9csYj/wd9xG6u0kTiV4wvu+o1ACfPedNOecRWSLSEcOdAayMbC0HcqbQOzaMIbU/7Ay p X-Gm-Gg: ASbGnct/E+l4Z1nJdvBgtwkILd9qDzrXgHcCT1Yi08lLThaZRs0BAD9RI7a/rX+oAZR 7vO3wpZG0zaJb7MCtWExpYLN9oI+x5zYqJsk9ZuOhgFdoNr+xiva7olVxgxROoracAzaznuH9PQ kAgRPDbrWy7/B7UXFeHuoUm07vnAjhU/JP0ByyMn5YrHTeN/HPt5vTac9lPZOxi0Uao1b0wCydy JMFF2Jtm3xhcPnttFGyRKW1mHvZAI2FnnsKPfswEn2uWagFRyizEGvpfmp0gNC8zxPsMpNKvkEn t/kqitNE33tEt0JsnDxz X-Received: by 2002:a05:6000:178a:b0:38d:c771:1a21 with SMTP id ffacd0b85a97d-38de41c54cbmr40332f8f.50.1739202590731; Mon, 10 Feb 2025 07:49:50 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4391dfd8448sm150612845e9.38.2025.02.10.07.49.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 07:49:50 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/12] hw/arm/fsl-imx6: Add local 'mpcore/gic' variables Date: Mon, 10 Feb 2025 15:49:35 +0000 Message-Id: <20250210154942.3634878-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250210154942.3634878-1-peter.maydell@linaro.org> References: <20250210154942.3634878-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.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 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 From: Philippe Mathieu-Daudé The A9MPCore forward the IRQs from its internal GIC. To make the code clearer, add the 'mpcore' and 'gic' variables. Reviewed-by: Cédric Le Goater Signed-off-by: Philippe Mathieu-Daudé Message-id: 20250130112615.3219-3-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/arm/fsl-imx6.c | 52 +++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index 88b9ccff493..dc86338b3a5 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -117,6 +117,8 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) uint16_t i; qemu_irq irq; unsigned int smp_cpus = ms->smp.cpus; + DeviceState *mpcore = DEVICE(&s->a9mpcore); + DeviceState *gic; if (smp_cpus > FSL_IMX6_NUM_CPUS) { error_setg(errp, "%s: Only %d CPUs are supported (%d requested)", @@ -143,21 +145,21 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) } } - object_property_set_int(OBJECT(&s->a9mpcore), "num-cpu", smp_cpus, - &error_abort); + object_property_set_int(OBJECT(mpcore), "num-cpu", smp_cpus, &error_abort); - object_property_set_int(OBJECT(&s->a9mpcore), "num-irq", + object_property_set_int(OBJECT(mpcore), "num-irq", FSL_IMX6_MAX_IRQ + GIC_INTERNAL, &error_abort); - if (!sysbus_realize(SYS_BUS_DEVICE(&s->a9mpcore), errp)) { + if (!sysbus_realize(SYS_BUS_DEVICE(mpcore), errp)) { return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->a9mpcore), 0, FSL_IMX6_A9MPCORE_ADDR); + sysbus_mmio_map(SYS_BUS_DEVICE(mpcore), 0, FSL_IMX6_A9MPCORE_ADDR); + gic = mpcore; for (i = 0; i < smp_cpus; i++) { - sysbus_connect_irq(SYS_BUS_DEVICE(&s->a9mpcore), i, + sysbus_connect_irq(SYS_BUS_DEVICE(gic), i, qdev_get_gpio_in(DEVICE(&s->cpu[i]), ARM_CPU_IRQ)); - sysbus_connect_irq(SYS_BUS_DEVICE(&s->a9mpcore), i + smp_cpus, + sysbus_connect_irq(SYS_BUS_DEVICE(gic), i + smp_cpus, qdev_get_gpio_in(DEVICE(&s->cpu[i]), ARM_CPU_FIQ)); } @@ -195,8 +197,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart[i]), 0, serial_table[i].addr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart[i]), 0, - qdev_get_gpio_in(DEVICE(&s->a9mpcore), - serial_table[i].irq)); + qdev_get_gpio_in(gic, serial_table[i].irq)); } s->gpt.ccm = IMX_CCM(&s->ccm); @@ -207,8 +208,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpt), 0, FSL_IMX6_GPT_ADDR); sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpt), 0, - qdev_get_gpio_in(DEVICE(&s->a9mpcore), - FSL_IMX6_GPT_IRQ)); + qdev_get_gpio_in(gic, FSL_IMX6_GPT_IRQ)); /* Initialize all EPIT timers */ for (i = 0; i < FSL_IMX6_NUM_EPITS; i++) { @@ -228,8 +228,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->epit[i]), 0, epit_table[i].addr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->epit[i]), 0, - qdev_get_gpio_in(DEVICE(&s->a9mpcore), - epit_table[i].irq)); + qdev_get_gpio_in(gic, epit_table[i].irq)); } /* Initialize all I2C */ @@ -249,8 +248,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c[i]), 0, i2c_table[i].addr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c[i]), 0, - qdev_get_gpio_in(DEVICE(&s->a9mpcore), - i2c_table[i].irq)); + qdev_get_gpio_in(gic, i2c_table[i].irq)); } /* Initialize all GPIOs */ @@ -307,11 +305,9 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio[i]), 0, gpio_table[i].addr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpio[i]), 0, - qdev_get_gpio_in(DEVICE(&s->a9mpcore), - gpio_table[i].irq_low)); + qdev_get_gpio_in(gic, gpio_table[i].irq_low)); sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpio[i]), 1, - qdev_get_gpio_in(DEVICE(&s->a9mpcore), - gpio_table[i].irq_high)); + qdev_get_gpio_in(gic, gpio_table[i].irq_high)); } /* Initialize all SDHC */ @@ -338,8 +334,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) } sysbus_mmio_map(SYS_BUS_DEVICE(&s->esdhc[i]), 0, esdhc_table[i].addr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->esdhc[i]), 0, - qdev_get_gpio_in(DEVICE(&s->a9mpcore), - esdhc_table[i].irq)); + qdev_get_gpio_in(gic, esdhc_table[i].irq)); } /* USB */ @@ -360,8 +355,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->usb[i]), 0, FSL_IMX6_USBOH3_USB_ADDR + i * 0x200); sysbus_connect_irq(SYS_BUS_DEVICE(&s->usb[i]), 0, - qdev_get_gpio_in(DEVICE(&s->a9mpcore), - FSL_IMX6_USBn_IRQ[i])); + qdev_get_gpio_in(gic, FSL_IMX6_USBn_IRQ[i])); } /* Initialize all ECSPI */ @@ -384,8 +378,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->spi[i]), 0, spi_table[i].addr); sysbus_connect_irq(SYS_BUS_DEVICE(&s->spi[i]), 0, - qdev_get_gpio_in(DEVICE(&s->a9mpcore), - spi_table[i].irq)); + qdev_get_gpio_in(gic, spi_table[i].irq)); } object_property_set_uint(OBJECT(&s->eth), "phy-num", s->phy_num, @@ -396,11 +389,9 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) } sysbus_mmio_map(SYS_BUS_DEVICE(&s->eth), 0, FSL_IMX6_ENET_ADDR); sysbus_connect_irq(SYS_BUS_DEVICE(&s->eth), 0, - qdev_get_gpio_in(DEVICE(&s->a9mpcore), - FSL_IMX6_ENET_MAC_IRQ)); + qdev_get_gpio_in(gic, FSL_IMX6_ENET_MAC_IRQ)); sysbus_connect_irq(SYS_BUS_DEVICE(&s->eth), 1, - qdev_get_gpio_in(DEVICE(&s->a9mpcore), - FSL_IMX6_ENET_MAC_1588_IRQ)); + qdev_get_gpio_in(gic, FSL_IMX6_ENET_MAC_1588_IRQ)); /* * SNVS @@ -427,8 +418,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp) sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0, FSL_IMX6_WDOGn_ADDR[i]); sysbus_connect_irq(SYS_BUS_DEVICE(&s->wdt[i]), 0, - qdev_get_gpio_in(DEVICE(&s->a9mpcore), - FSL_IMX6_WDOGn_IRQ[i])); + qdev_get_gpio_in(gic, FSL_IMX6_WDOGn_IRQ[i])); } /*