From nobody Mon May 6 12:38:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1596452305; cv=none; d=zohomail.com; s=zohoarc; b=aA7WrobEF+nBwSO6g4e9dq23ydZ0dcNG6wRKCCQnvJbIToIYb0qxx857yYwYGvgglsAmpD7U++FbovYiWC2WUuROrd6MyW944fQY4sf3dyWZs2wCVF9dFtWLuedUCm0gdzfpBODHB7S1hCUtMoveeelRRKPkgqM1yPSRH9nXdUM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596452305; h=Content-Type:Content-Transfer-Encoding:Cc: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=rLG/x8mbNkoq7Pzqyxv/hJikq7GouZqBJQ9UCtSxoPM=; b=ax9C02FB4ECv6Q35IyKPaHoPFjwvEiaFVpkfzVJd73LfVmeccufjHXjdRibjBEopb+DvJ1w9Nk4seRbU/egUhz/vsuHjXKZxtc5sEPcZWcEkhMw6mGxobdUdcln5FOYOnv+rFacUBfvC/uMSSbkQKlSvyekakxVps3IMm97arGc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1596452305328153.48010246209822; Mon, 3 Aug 2020 03:58:25 -0700 (PDT) Received: from localhost ([::1]:55760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2YAh-00049Z-Cp for importer@patchew.org; Mon, 03 Aug 2020 06:58:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2Y9H-0002VV-GM; Mon, 03 Aug 2020 06:56:56 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:52270) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k2Y9F-00026p-Uc; Mon, 03 Aug 2020 06:56:55 -0400 Received: by mail-wm1-x341.google.com with SMTP id x5so13929572wmi.2; Mon, 03 Aug 2020 03:56:53 -0700 (PDT) Received: from localhost.localdomain (214.red-88-21-68.staticip.rima-tde.net. [88.21.68.214]) by smtp.gmail.com with ESMTPSA id z11sm23103477wrw.93.2020.08.03.03.56.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 03:56:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rLG/x8mbNkoq7Pzqyxv/hJikq7GouZqBJQ9UCtSxoPM=; b=o70KvnZX4yukxiVxICU/P/dfzO8ZsXwekvhpkgrfzbRCMAMaoo1VK2b20ghRFQGugG TH3k3cFEr/JGQiPUQMm/YYQEQIVSohtg1pgVo0+alFzLoioKNrStKONXBUuWgxbXMaCM 4osMaOhkWBuVSlx9i3EHZ69Q+oYoO326f6aEs0aC3b5++qaFIIJRWBUm11QhK6kIBSE4 nZZZdOYFY6j4knOvnqfCvuPZTBJwb1IX5Q+YvgQuDmXhhRt4akLscwBqf1FcrqeI8v87 S/ieMcQcU/ZS4ON7G2PNhUiQmUdIBQFrZAA0XKj94bxiv4h6RM7ydVMX9Z5UbomE7q7M BRhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rLG/x8mbNkoq7Pzqyxv/hJikq7GouZqBJQ9UCtSxoPM=; b=Pscd3vV+Z87oOo+KDJnILKJENCVtZgP8rapXer9GUvdtlJbUsi+zWgVf3SoqwPWya6 sZQeX3lz39eoEq+Go4CsJmW9bBSy7FgNmhJ8igTnOSmFUqQpNKhGEKTW9g/2vtyPHKj4 ip4ZAJyMKOBatTTmJAOYIFB9ciTytZhNshnLdQo2AJq4S+ZBlAyg4PnYD838M04HMpyw 6qydGCquJtK8AsWhaztW+nI4EgXMguHpZTV1hkoDAuPCM9xyiPGXLBkt/Ou9jNRP5shO ReuzRcIEjMqaLhb/SencyvsQjC33vz9qYfJOjT79C70bbz/lBlTjQC8srQifbw0HmIG/ sibA== X-Gm-Message-State: AOAM530UDHiaY3SggNquLwzFBEDcmksR14BdX3VeBG4yyLaDHAtPnc/F CNETokYqf5vvA+XcdPLyGdEXN/7d X-Google-Smtp-Source: ABdhPJy6fB+/taddXcu1aSrCeDNpRralQfS+Hj5Vgg5ceeq3Cid0JqZlD+svQ2tn33z/cHkBN15L2g== X-Received: by 2002:a1c:1f8b:: with SMTP id f133mr15302286wmf.65.1596452211611; Mon, 03 Aug 2020 03:56:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1? 1/4] hw/arm/xilinx_zynq: Uninline cadence_uart_create() Date: Mon, 3 Aug 2020 12:56:44 +0200 Message-Id: <20200803105647.22223-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200803105647.22223-1-f4bug@amsat.org> References: <20200803105647.22223-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::341; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x341.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: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Damien Hedde , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, "Edgar E. Iglesias" , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 --- 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 ed7b58d31d..dabc49ea4f 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 32aa7323d9..cf6d9757b5 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.21.3 From nobody Mon May 6 12:38:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1596452315; cv=none; d=zohomail.com; s=zohoarc; b=CrpbTpkDt+6eOnOIz1EDTvrC2FZ97G77wNmAOr3ZYxdv2/eLrWb6dJhz5c4uI8mSvmMb7PqQYOnMb484rsTebMDUbzw8vrXXwydVuRZkqcUZ60n5Zen83q1y+S+jt2iQQci/S7S1zhM7Fo4pTPUBCL3wYju6iOE92riK7EtArUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596452315; h=Content-Type:Content-Transfer-Encoding:Cc: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=g3DyF6kevoJjleeMCTdWs3EQHtJ+0mrixjxdzUsE41I=; b=LeYEssKRyrdx8Jtv1kh7FtAxdjB1AfrcZsY7/EPsdcA8zvIYNbOYaYeNz9N91gqpa7RGvMPmCJ/t9DGn69xkI69BPd5RQq7pSZFuFQHfRro90NfwT7jn63sTA4qzuzn22z5HaNSVLWMO6w8FiVpqd8C0LMeBcGrQ/MAD/ueFl6A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596452315853950.8981252330626; Mon, 3 Aug 2020 03:58:35 -0700 (PDT) Received: from localhost ([::1]:56834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2YAs-0004a7-Gc for importer@patchew.org; Mon, 03 Aug 2020 06:58:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2Y9I-0002Vf-OJ; Mon, 03 Aug 2020 06:56:56 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:41697) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k2Y9H-000271-3f; Mon, 03 Aug 2020 06:56:56 -0400 Received: by mail-wr1-x441.google.com with SMTP id r2so28687911wrs.8; Mon, 03 Aug 2020 03:56:54 -0700 (PDT) Received: from localhost.localdomain (214.red-88-21-68.staticip.rima-tde.net. [88.21.68.214]) by smtp.gmail.com with ESMTPSA id z11sm23103477wrw.93.2020.08.03.03.56.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 03:56:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g3DyF6kevoJjleeMCTdWs3EQHtJ+0mrixjxdzUsE41I=; b=V/N5clIh/9GQ2oVuu4ZfmxUKRHvWV5zfqJmnHJW0O4cQqR2Az4CkEbgxAqSZIXQ9CJ oPojMbd7Nx7wdjLZxI0hauMwQz2TbbYOR3DTIsNqDbWFx1QmBktVymFOQGhojZDOPoSV nLT3njdKyqDWkKNopRDP9HZ4HlvemtOg8Q3NJClHEcwNuCd23CHlLPiQiFKkM15BRyUA oz0LXWDd2T0mCmKsOMqfkkEGTv728Z4zrUWLRKPJqq71WoMYm3DXxdlPxzx/WYZMq6Ty iFQ0OvycigAW2F5o8deg+IdB2VZPqh79ge201xforVpJ8zuPaYAI+5XBomeqqxRYeNT5 vlgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=g3DyF6kevoJjleeMCTdWs3EQHtJ+0mrixjxdzUsE41I=; b=q/AupQFdNAP3ZV5V2TZ00jZHh/e/x9HH6a6l+nmkz+MqkSqLQPLBsHol/Cv6qLZPNK qy2jzs+d1LTUQ0CnI5d3/MQkrK/IbiFRkBd7iM1SYiqf8dAytgSUYL6L5YnqFx3QjDYW qp7anx3CgyLnXJPFB9EUseArzysUYI/LaM0F23wDA0dw1hC6p9HqeqKQwH45vaK64MA+ f6TejjdmkIiE91dednUpZN9FwK/uztkNiRcKw02CqzRrDZHgU2wFWFwKesDQob5MMW0S V2Qw6vshd+hiXHPWwOBQ53U6p6fia0VHE5eIrxPQDmaSQd9i+tUU8A2RJIdBNvEXEpeG GTrQ== X-Gm-Message-State: AOAM532pLavVlEhZmPywQKkE6PhkZGMIYVP6027VccB2koB+qPmq6Xqv AegV3+WTmgwi2tZjTasJn58Z03hw X-Google-Smtp-Source: ABdhPJyocIobe2jyOD/98PsIhsEsK+M18uvpiRyQArLj3jqiakyn1LXLwk9MLuXhVqdvjOARgAJeBA== X-Received: by 2002:a5d:6910:: with SMTP id t16mr15577591wru.178.1596452212964; Mon, 03 Aug 2020 03:56:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1? 2/4] hw/arm/xilinx_zynq: Call qdev_connect_clock_in() before DeviceRealize Date: Mon, 3 Aug 2020 12:56:45 +0200 Message-Id: <20200803105647.22223-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200803105647.22223-1-f4bug@amsat.org> References: <20200803105647.22223-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=philippe.mathieu.daude@gmail.com; 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: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Damien Hedde , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, "Edgar E. Iglesias" , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Clock canonical name is set in device_set_realized (see the block added to hw/core/qdev.c in commit 0e6934f264). If we connect a clock after the device is realized, this code is not executed. This is currently not a problem as this name is only used for trace events, however this disrupt tracing. Fix by calling qdev_connect_clock_in() before realizing. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/arm/xilinx_zynq.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index cf6d9757b5..969ef0727c 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -222,18 +222,18 @@ static void zynq_init(MachineState *machine) 1, 0x0066, 0x0022, 0x0000, 0x0000, 0x0555, 0x2aa, 0); =20 - /* Create slcr, keep a pointer to connect clocks */ - slcr =3D qdev_new("xilinx,zynq_slcr"); - sysbus_realize_and_unref(SYS_BUS_DEVICE(slcr), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(slcr), 0, 0xF8000000); - /* Create the main clock source, and feed slcr with it */ zynq_machine->ps_clk =3D CLOCK(object_new(TYPE_CLOCK)); object_property_add_child(OBJECT(zynq_machine), "ps_clk", OBJECT(zynq_machine->ps_clk)); object_unref(OBJECT(zynq_machine->ps_clk)); clock_set_hz(zynq_machine->ps_clk, PS_CLK_FREQUENCY); + + /* Create slcr, keep a pointer to connect clocks */ + slcr =3D qdev_new("xilinx,zynq_slcr"); qdev_connect_clock_in(slcr, "ps_clk", zynq_machine->ps_clk); + sysbus_realize_and_unref(SYS_BUS_DEVICE(slcr), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(slcr), 0, 0xF8000000); =20 dev =3D qdev_new(TYPE_A9MPCORE_PRIV); qdev_prop_set_uint32(dev, "num-cpu", 1); @@ -257,19 +257,19 @@ static void zynq_init(MachineState *machine) dev =3D qdev_new(TYPE_CADENCE_UART); busdev =3D SYS_BUS_DEVICE(dev); qdev_prop_set_chr(dev, "chardev", serial_hd(0)); + qdev_connect_clock_in(dev, "refclk", + qdev_get_clock_out(slcr, "uart0_ref_clk")); 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 qdev_new(TYPE_CADENCE_UART); busdev =3D SYS_BUS_DEVICE(dev); qdev_prop_set_chr(dev, "chardev", serial_hd(1)); + qdev_connect_clock_in(dev, "refclk", + qdev_get_clock_out(slcr, "uart1_ref_clk")); 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 sysbus_create_varargs("cadence_ttc", 0xF8001000, pic[42-IRQ_OFFSET], pic[43-IRQ_OFFSET], pic[44-IRQ_OFFSET], NU= LL); --=20 2.21.3 From nobody Mon May 6 12:38:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1596452307; cv=none; d=zohomail.com; s=zohoarc; b=bSBKYnXeo5KhexxpxuSpRXEgGUPTmx/GGVwcrqwzM+1UM5dAx+a1FhwbP8W5+zvQmyifqtX24I9PU66iHe0ZphpVBrQVYDk/EgLAipRmXqm5uAUX7IzDrrgolKBs1ec3mhuCB6rQpNO38F3YGBJpNzPuAbFlo300QwNs2VIquV4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596452307; h=Content-Type:Content-Transfer-Encoding:Cc: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=QRLqvjPZM5QRNmLQDr+tXQzUft3WjflEMoWeAB3UDPs=; b=cKmO2tvxXJZE4kM7BiJUmP2ptN680I4LgtLqG9VuyQd3U1JgunaiR5A84c9/PCCALrB4+AyhdZwUhgQ5SuyFTeIT0DUFOq9ZUfACO4seO86230SqgmAcOGCx8hiVUKLGDJk0f+bn6o/JgdFy4L0IDtwJT+f1T+0oyvIvZ4QA7dg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596452307600797.5312750174294; Mon, 3 Aug 2020 03:58:27 -0700 (PDT) Received: from localhost ([::1]:55990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2YAk-0004FM-2H for importer@patchew.org; Mon, 03 Aug 2020 06:58:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2Y9K-0002WB-1u; Mon, 03 Aug 2020 06:56:58 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:52273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k2Y9I-00027E-JG; Mon, 03 Aug 2020 06:56:57 -0400 Received: by mail-wm1-x343.google.com with SMTP id x5so13929680wmi.2; Mon, 03 Aug 2020 03:56:55 -0700 (PDT) Received: from localhost.localdomain (214.red-88-21-68.staticip.rima-tde.net. [88.21.68.214]) by smtp.gmail.com with ESMTPSA id z11sm23103477wrw.93.2020.08.03.03.56.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 03:56:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QRLqvjPZM5QRNmLQDr+tXQzUft3WjflEMoWeAB3UDPs=; b=YDofVzda85ykr9fEJEFK62BXHj0/IjkOZ8OHZt2reET5+RD7ncQT8JApdFDmsKKlA5 4cq4MupOP+lV+rmLY0PNugvyCt1WxIhuN34XbBM9SDqT6fKXx8eRTZXyqO61SLErJpwo HnNZTNqvfmf9x0CGZs2KA17Txq8fxZeaWUue2Xm3Leb8AGzCDBuhuKtK+UDAK8uNGAwX MHfYZvZLLgnH+pun9QBdGEVT5AqSkN8su9TodvfBdRzB3ekTFu7K6TXS7ZMYREmTXyvf uXtTzPysqsvz7EzsfOMTY+qAFGGbEIaaGaNUa56BSz1sJIWoxTRsT6ZSmKI2w9SjDGr0 3h7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QRLqvjPZM5QRNmLQDr+tXQzUft3WjflEMoWeAB3UDPs=; b=DCUV8I6H6frMMvqNA52j/zHQ40xgbfDPZCHkZO4wF6+ifM4aAU1dGzZcKfk/9g11e5 /FoIxq2O4EqT6tFJbP3OVK6u+D9tZ3/NOI668iQloxG6Hvc1jyGkJDsye8ZwanNrJY9H iCfb2EKG4r8UmpOpkanCzY6OfOUu0FGCLkWcC7YcNjtc1ZNJyAufILiweGPhYZmlRTou 6zlWIQiX/IBHLJydH8PiZcWeLWHP0G3CxbBMR165PcTwibKmGnhYlp7edkGZyNgOzTPU aTyXOmggyC37DNzzdelV3P0i/AgR4Qe9VK7jnfbSLUvZyCplvgzkiSNcXMyZQmiGlVPa XRYw== X-Gm-Message-State: AOAM530t/JPzkZi3xBPKdKf0hg1vt88zB27tG7lEb1l/0FdlGjEkwwJO ORWGSf9dof9Y3iKdXBWcUnR503d+ X-Google-Smtp-Source: ABdhPJx6zGQZar9ofhQ/mvLKknS+8r+z7D7iqFeYIjdk8JriGACujcinh18/aR3CtMeojPTuqs07mA== X-Received: by 2002:a7b:cc8e:: with SMTP id p14mr4931821wma.111.1596452214171; Mon, 03 Aug 2020 03:56:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1? 3/4] hw/qdev-clock: Uninline qdev_connect_clock_in() Date: Mon, 3 Aug 2020 12:56:46 +0200 Message-Id: <20200803105647.22223-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200803105647.22223-1-f4bug@amsat.org> References: <20200803105647.22223-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.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: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Damien Hedde , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, "Edgar E. Iglesias" , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We want to assert the device is not realized. To avoid overloading this header including "hw/qdev-core.h", uninline the function first. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- include/hw/qdev-clock.h | 6 +----- hw/core/qdev-clock.c | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/hw/qdev-clock.h b/include/hw/qdev-clock.h index a340f65ff9..a897f7c9d0 100644 --- a/include/hw/qdev-clock.h +++ b/include/hw/qdev-clock.h @@ -71,11 +71,7 @@ Clock *qdev_get_clock_out(DeviceState *dev, const char *= name); * Set the source clock of input clock @name of device @dev to @source. * @source period update will be propagated to @name clock. */ -static inline void qdev_connect_clock_in(DeviceState *dev, const char *nam= e, - Clock *source) -{ - clock_set_source(qdev_get_clock_in(dev, name), source); -} +void qdev_connect_clock_in(DeviceState *dev, const char *name, Clock *sour= ce); =20 /** * qdev_alias_clock: diff --git a/hw/core/qdev-clock.c b/hw/core/qdev-clock.c index 5cc1e82e51..f139b68b88 100644 --- a/hw/core/qdev-clock.c +++ b/hw/core/qdev-clock.c @@ -183,3 +183,8 @@ Clock *qdev_alias_clock(DeviceState *dev, const char *n= ame, =20 return ncl->clock; } + +void qdev_connect_clock_in(DeviceState *dev, const char *name, Clock *sour= ce) +{ + clock_set_source(qdev_get_clock_in(dev, name), source); +} --=20 2.21.3 From nobody Mon May 6 12:38:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1596452386; cv=none; d=zohomail.com; s=zohoarc; b=mnOpT0mUXIdiePVWhN1pU8oVWMps1BZYj6O4KKYZQgi4n78rhUKtmhCRh/XVohmBdC8t1yZLuZbBNkR6BhF7GPdFiML3h0FIPWtOVxKDwhovbhYTK02nSrl9s+VPYJQ7iOFIJOBxLVa30SOM0hnQx87r11bbaJb61RRO0CCbW6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596452386; h=Content-Type:Content-Transfer-Encoding:Cc: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=XHiU5GmBcdXr23pohS4D4pPIDt+/4V6rIKN0OFbqJDw=; b=Y49yDAk6c0esxQROx6cDhnefiFVSv+tZSyR9pfICKhUg4OYuqA9mOFFpB4xCqh8Zl9JJzo4zevaFYPj2rnpA9z/uMKcU3npV1nyrmYUTEEKngFRDUeAYbay8wkOTiH+BKbnyj/MV1OjfKuDcY8revXlFXPePnk840pF/cIetHdI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159645238627486.26851014222188; Mon, 3 Aug 2020 03:59:46 -0700 (PDT) Received: from localhost ([::1]:34856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2YC0-00076f-RZ for importer@patchew.org; Mon, 03 Aug 2020 06:59:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2Y9K-0002Wk-SP; Mon, 03 Aug 2020 06:56:59 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:50652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k2Y9J-00027R-ES; Mon, 03 Aug 2020 06:56:58 -0400 Received: by mail-wm1-x335.google.com with SMTP id c80so13926411wme.0; Mon, 03 Aug 2020 03:56:56 -0700 (PDT) Received: from localhost.localdomain (214.red-88-21-68.staticip.rima-tde.net. [88.21.68.214]) by smtp.gmail.com with ESMTPSA id z11sm23103477wrw.93.2020.08.03.03.56.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 03:56:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XHiU5GmBcdXr23pohS4D4pPIDt+/4V6rIKN0OFbqJDw=; b=KkFjxpKUK0u3KIKvxKYk6uVXB55kQ0Q5bBCKz25HyoB/Wzw/Lv23RsHRiFe/pbVgDT zDNfHU1sCeMKtKmSwixabV4h2vdHRUTW7CbS7THkVN2UI5sJp/r2POpLhwH14K2JDHNC Hpzfc0AMJHjuNvWH2UiX+CjcExK0fSbpKmxRb2rudsM2oAe2i0W8WayXtg4Ik0+EDycf X3uSSMqtzSPtQzoVDT1PrMezuYmSLW7VM/BKnWGCoiBx+wZvxSm1f3UYv9PYRO06Vzgv hgYgijh0Ki/wbopCdwLwAUNuersh5bfoGMnksROGSd9pQ5YtAbqYcCbqaDwD6xAJqoQ8 MAXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XHiU5GmBcdXr23pohS4D4pPIDt+/4V6rIKN0OFbqJDw=; b=evk1VG7ghFbmVB6gRZr9VhQgqpkIYJnb0BuMiWmAxK78hcWW7U75MaIM2fjof197kf dCxm88YlsX/mNhmObQGTlnK5gffjYGRb1P6ZtJRsrgXKHGhI+VKKhsbHgg8HL9xMg/HM yS7Rb5NknlsC3XNVSnMSYj16Kmk7cV6iyrkb5KeOhbPY8SsIpX8JhRDXsI0/WUTidgh8 EUKd9ZaFtpgg1OgMQFGaAInhbk8tjj8ModWDRXMrAQQalyEm1TsMlDM2JH2oMiQdFUuE /ou8fkxcS52vg3/nXlhYXHqmUUKA3DzI6w/FW2PJI6gYViuATbokuFjcBW1uoRZ264VI S6Jw== X-Gm-Message-State: AOAM530j5wV+tMuMpwcy/82iJ/MQyQezWrgbpir+KKGbbX9DUUV2xrF3 FJ9Xe95Fue9gimn41ui7JHDgfeNw X-Google-Smtp-Source: ABdhPJz8WY0kh6Ov2rDiyPr3pBQwj0/g2n8VvoQGND9N0Hu5mkNvHU2wB+LV8/74aTxNwiVj/nIbMQ== X-Received: by 2002:a1c:770c:: with SMTP id t12mr16440255wmi.65.1596452215388; Mon, 03 Aug 2020 03:56:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1? 4/4] hw/qdev-clock: Avoid calling qdev_connect_clock_in after DeviceRealize Date: Mon, 3 Aug 2020 12:56:47 +0200 Message-Id: <20200803105647.22223-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200803105647.22223-1-f4bug@amsat.org> References: <20200803105647.22223-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::335; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x335.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: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Damien Hedde , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, "Edgar E. Iglesias" , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Clock canonical name is set in device_set_realized (see the block added to hw/core/qdev.c in commit 0e6934f264). If we connect a clock after the device is realized, this code is not executed. This is currently not a problem as this name is only used for trace events, however this disrupt tracing. Add a comment to document qdev_connect_clock_in() must be called before the device is realized, and assert this condition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- include/hw/qdev-clock.h | 2 ++ hw/core/qdev-clock.c | 1 + 2 files changed, 3 insertions(+) diff --git a/include/hw/qdev-clock.h b/include/hw/qdev-clock.h index a897f7c9d0..64ca4d266f 100644 --- a/include/hw/qdev-clock.h +++ b/include/hw/qdev-clock.h @@ -70,6 +70,8 @@ Clock *qdev_get_clock_out(DeviceState *dev, const char *n= ame); * * Set the source clock of input clock @name of device @dev to @source. * @source period update will be propagated to @name clock. + * + * Must be called before @dev is realized. */ void qdev_connect_clock_in(DeviceState *dev, const char *name, Clock *sour= ce); =20 diff --git a/hw/core/qdev-clock.c b/hw/core/qdev-clock.c index f139b68b88..47ecb5b4fa 100644 --- a/hw/core/qdev-clock.c +++ b/hw/core/qdev-clock.c @@ -186,5 +186,6 @@ Clock *qdev_alias_clock(DeviceState *dev, const char *n= ame, =20 void qdev_connect_clock_in(DeviceState *dev, const char *name, Clock *sour= ce) { + assert(!dev->realized); clock_set_source(qdev_get_clock_in(dev, name), source); } --=20 2.21.3