From nobody Fri Dec 19 04:28:48 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1598607159; cv=none; d=zohomail.com; s=zohoarc; b=IBIqTf8fjYHqfDKHo9kFiMkGTs2PEG/6m8bp+RZiDjCmFaUr3i3bklXvZEWg8FJp3EYU9ILrQBLpfOkjZf2X/DwPy/bGwp2lMgLDbiTr60vdtONvA5ijNGR2e86IHLsJRxIDY9MJl1H7ZiI+Dk0dOj05fs6LT1O1ZCPddNOwANA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598607159; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QneDUKNU30eWTVWkf0ncfUwv6iQnAySEq2QxFphzkOo=; b=a4zlbfFX+9ys1BlkZvSfVK+YoB7WY94t7oG/n1RFtnWnR+UyctIpL2w0Qx/F5J+ehMwUMDGXXbWKxrXzZWy2VDKL5StpNVgztPfRdQ45nl2LEDdnksuGe2fhgwTbOPMLJw6bwHjd2Qo7tp6pfPO0rDhT7wz0VrQl6pfBk6Bn7sU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598607159272947.2475790372993; Fri, 28 Aug 2020 02:32:39 -0700 (PDT) Received: from localhost ([::1]:60320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBakP-0002Ex-V2 for importer@patchew.org; Fri, 28 Aug 2020 05:32:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBacZ-0004Cm-H0 for qemu-devel@nongnu.org; Fri, 28 Aug 2020 05:24:31 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40899) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBacX-0004GD-Pw for qemu-devel@nongnu.org; Fri, 28 Aug 2020 05:24:31 -0400 Received: by mail-wr1-x441.google.com with SMTP id b18so625817wrs.7 for ; Fri, 28 Aug 2020 02:24:29 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id t13sm912304wru.65.2020.08.28.02.24.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2020 02:24:27 -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=QneDUKNU30eWTVWkf0ncfUwv6iQnAySEq2QxFphzkOo=; b=It5A2zsinTjHvdeXlGShWPDOWvd0w1b4qX411g0Qc92zEqEEoDRXbffXvzcWgcGc4j Gq0SkcupAyWp6/lbnFQrdI6IksTVCxjWW/FURMp5B461mzgS14RL7qLoX8n1b/gF9lHM ctfwf4F1ZOZaOI2JOcA+fhMYa3Q5C82/wttVGVr2UKudttiKL52lIhzMFgMwYlIdk2/T Pa7O+4nCOOtFdxXvBV5aLtqBpcPhV5gn0GwGLhF7RJau05s2nKn1dfYfyO/tda2UpSga nKpxNPJgaj9GO0/134PkPDeonr55XKX4Fx4+KeBz3AyNYXEgl4OqOjptOU32LBkxNEEJ LBCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QneDUKNU30eWTVWkf0ncfUwv6iQnAySEq2QxFphzkOo=; b=gfe5Ori2BQXNxwYDC20APoRgiAv1fI/H3vFYQ3WIXXnjwV2zCCj5eGZbi6a3aZecS6 Jd6bySPyWvzvBo40ZngxrCIFM+i5jsIAWLPntt7HUVyiXMLxCks+2T8T7oL63uzvGHkx 7fZO6KTeOXShP0H4lmYw7FPZ9DDF1EBr+adO19c/XTYsEr1k2T4UOhqnd+r89UOuzyea 5pTCSUdX8NdEMDKT4c/9Xw4JCcfeBRth1/VUp+fh05N9xPIuX+QUvrcsyHvQ9me24lQO wHfCrKY4j+f/NF6zYFlQXzU0G+UsEc6PtiXcUcQP+3Ck3o2ppsQdunwSvfuPKcwgtmr0 QHMg== X-Gm-Message-State: AOAM530PAQWOZBHES0lbIpvFj9HOundjZu5buYoGqM+JzFupTpoHQLDC C0UwoG7FBZGZ5HcOlHipMZ1Hc7Rty3fxlMNl X-Google-Smtp-Source: ABdhPJyPMOemvPdmxwKbXLLLcbBgPXRltWmXOGHAg7PVGVfJPS+VXA7pb3cyQ9LJrBxlJpZTzj9Txw== X-Received: by 2002:a5d:6910:: with SMTP id t16mr691788wru.178.1598606668153; Fri, 28 Aug 2020 02:24:28 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/35] hw/arm/xilinx_zynq: Uninline cadence_uart_create() Date: Fri, 28 Aug 2020 10:23:49 +0100 Message-Id: <20200828092413.22206-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200828092413.22206-1-peter.maydell@linaro.org> References: <20200828092413.22206-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 As we want to call qdev_connect_clock_in() before the device is realized, we need to uninline cadence_uart_create() first. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Message-id: 20200803105647.22223-2-f4bug@amsat.org Signed-off-by: Peter Maydell --- include/hw/char/cadence_uart.h | 17 ----------------- hw/arm/xilinx_zynq.c | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/include/hw/char/cadence_uart.h b/include/hw/char/cadence_uart.h index ed7b58d31d4..dabc49ea4fe 100644 --- a/include/hw/char/cadence_uart.h +++ b/include/hw/char/cadence_uart.h @@ -53,21 +53,4 @@ typedef struct { Clock *refclk; } CadenceUARTState; =20 -static inline DeviceState *cadence_uart_create(hwaddr addr, - qemu_irq irq, - Chardev *chr) -{ - DeviceState *dev; - SysBusDevice *s; - - dev =3D qdev_new(TYPE_CADENCE_UART); - s =3D SYS_BUS_DEVICE(dev); - qdev_prop_set_chr(dev, "chardev", chr); - sysbus_realize_and_unref(s, &error_fatal); - sysbus_mmio_map(s, 0, addr); - sysbus_connect_irq(s, 0, irq); - - return dev; -} - #endif diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 32aa7323d9a..cf6d9757b57 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -254,10 +254,20 @@ static void zynq_init(MachineState *machine) sysbus_create_simple(TYPE_CHIPIDEA, 0xE0002000, pic[53 - IRQ_OFFSET]); sysbus_create_simple(TYPE_CHIPIDEA, 0xE0003000, pic[76 - IRQ_OFFSET]); =20 - dev =3D cadence_uart_create(0xE0000000, pic[59 - IRQ_OFFSET], serial_h= d(0)); + dev =3D qdev_new(TYPE_CADENCE_UART); + busdev =3D SYS_BUS_DEVICE(dev); + qdev_prop_set_chr(dev, "chardev", serial_hd(0)); + sysbus_realize_and_unref(busdev, &error_fatal); + sysbus_mmio_map(busdev, 0, 0xE0000000); + sysbus_connect_irq(busdev, 0, pic[59 - IRQ_OFFSET]); qdev_connect_clock_in(dev, "refclk", qdev_get_clock_out(slcr, "uart0_ref_clk")); - dev =3D cadence_uart_create(0xE0001000, pic[82 - IRQ_OFFSET], serial_h= d(1)); + dev =3D qdev_new(TYPE_CADENCE_UART); + busdev =3D SYS_BUS_DEVICE(dev); + qdev_prop_set_chr(dev, "chardev", serial_hd(1)); + sysbus_realize_and_unref(busdev, &error_fatal); + sysbus_mmio_map(busdev, 0, 0xE0001000); + sysbus_connect_irq(busdev, 0, pic[82 - IRQ_OFFSET]); qdev_connect_clock_in(dev, "refclk", qdev_get_clock_out(slcr, "uart1_ref_clk")); =20 --=20 2.20.1