From nobody Mon Feb 9 08:48:43 2026 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=1596719123; cv=none; d=zohomail.com; s=zohoarc; b=DYBpszXrrCEao33xLcg6XvcJ1HZZH+LfH+V3dE9ZbJxbdp5AcddY7dqYzA+/HcoXo4bEZyrhPesMTMoEYZiKHcvOcDzV8bKsCwTXnDhqo4QYAvoy30Scw8AwZYpg7Ka3fkNNZ3XSBj1Rk7UDVeO4ZFJPWbPkmnstLSww8hgy1vM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596719123; 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=JPJZIC6+INx85XXFh6H5vaAGpImRMQUrGLjtvHHxslE=; b=mivLT7t3Eaw6IZVNfsQpwnjQQ2AFmXprSJM+XOHF2fhWDdMxNHGse6MOz7Ain6OS9giMJGvN6kNo6ik6vcQgZcXWUK8jqkicJfDH0hDy57k5OGZvEOHVLXr+CaBXubwILDgTRg5s9EKG/rlzNMJgE4RnLhAsrIvSkXC9vcgQxMA= 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 1596719123185103.54229531922704; Thu, 6 Aug 2020 06:05:23 -0700 (PDT) Received: from localhost ([::1]:43396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3faE-0003ZF-0P for importer@patchew.org; Thu, 06 Aug 2020 09:05:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3fYh-0001yp-EC for qemu-devel@nongnu.org; Thu, 06 Aug 2020 09:03:47 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:33543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3fYf-00075Y-Ig for qemu-devel@nongnu.org; Thu, 06 Aug 2020 09:03:47 -0400 Received: by mail-wr1-x42e.google.com with SMTP id p20so9025367wrf.0 for ; Thu, 06 Aug 2020 06:03:45 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id e16sm6409113wrx.30.2020.08.06.06.03.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 06:03:42 -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=JPJZIC6+INx85XXFh6H5vaAGpImRMQUrGLjtvHHxslE=; b=TGCvQOZ6YusWMBPtoYADDGjSpGqoa4CDAUITpXH6clMirt8oDFkD1FyuwVD9K0jiQ4 7ci7FlWkTnUoAPix3e0A07HGkFaBWp8E5ie1rlwO5PZZL1WqgWpuF+zUufDxp3zehJJ1 S6TkLIhHtF5x2agTSMgSLiChxoQxp0LkMs89w7Elfmv3ZF2rLr05OdLfVkV2cDyg+vk5 OARGhDJ8nNbTZlazPuPGijDBUqnfCKqPqU7vyRj7ZVRdFamZb5QCdY5l/HAE96qks/wb VFi7VAzZAMM4qcd7bXOaygG1ncU61tUIn4B7JJhSl2pcSglt5s5ChFzgBHje45f+2JCp M/hA== 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=JPJZIC6+INx85XXFh6H5vaAGpImRMQUrGLjtvHHxslE=; b=BWe3dCgeo6KBEZ96RXGIbyooUFta7Jkp62YKuamfz7vwH2NtMDeHXSvWXz7M+LAgKB ca77dLxrTwZp3knOHs7QypFzT/ST3d3i/Vb51M1+lztXoS9gmv02W2gdW+qtFTOBFJFx w6Pn83etUl4OLFQILbO0aH5zD42VAXRaidmdvrLbst+BZxcOKT3dTCb3HleUrKNJvlWu FJ0eXzUy8dy+6BUeb+y3D33egcS9bZiCCp4320jphPFrm8XZlHOgnsRJnrZEyLlQJsK1 K/6SwgJKZ4hOpr7HR/B6UOjg7zheYcVo+HQnej/E+Qn+n+gx5IWo5ccMSwa1f0Zmx9Xn NFJw== X-Gm-Message-State: AOAM532CAvaH4xyD8Pe55MnHVsoLycP5P2IHetcGadyEWvC8Hn+gnSoI e2rPq6t123sKPREicdPFQwHeFNY7 X-Google-Smtp-Source: ABdhPJywascbo0wAyURK6AAbrMrxXY2lymgjZsX+QRFMzK/wnml+VUqfPAq8eCu8Cw5waFxvEFTyiA== X-Received: by 2002:adf:f488:: with SMTP id l8mr7184330wro.123.1596719023478; Thu, 06 Aug 2020 06:03:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 1/4] hw/char/serial: Replace commented DPRINTF() by trace event Date: Thu, 6 Aug 2020 15:03:37 +0200 Message-Id: <20200806130340.17316-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200806130340.17316-1-f4bug@amsat.org> References: <20200806130340.17316-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::42e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42e.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 , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Convert the old debug PRINTF() call to display the UART baudrate to a trace event. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini Reviewed-by: Richard Henderson --- hw/char/serial.c | 4 +--- hw/char/trace-events | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index fd80ae5592..3e903d5fad 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -187,9 +187,7 @@ static void serial_update_parameters(SerialState *s) ssp.stop_bits =3D stop_bits; s->char_transmit_time =3D (NANOSECONDS_PER_SECOND / speed) * frame_si= ze; qemu_chr_fe_ioctl(&s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp); - - DPRINTF("speed=3D%.2f parity=3D%c data=3D%d stop=3D%d\n", - speed, parity, data_bits, stop_bits); + trace_serial_update_parameters(speed, parity, data_bits, stop_bits); } =20 static void serial_update_msl(SerialState *s) diff --git a/hw/char/trace-events b/hw/char/trace-events index d20eafd56f..85e39d9d62 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -7,6 +7,7 @@ parallel_ioport_write(const char *desc, uint16_t addr, uint= 8_t value) "write [%s # serial.c serial_ioport_read(uint16_t addr, uint8_t value) "read addr 0x%02x val 0x%= 02x" serial_ioport_write(uint16_t addr, uint8_t value) "write addr 0x%02x val 0= x%02x" +serial_update_parameters(uint64_t baudrate, char parity, int data_bits, in= t stop_bits) "baudrate=3D%"PRIu64" parity=3D'%c' data=3D%d stop=3D%d" =20 # virtio-serial-bus.c virtio_serial_send_control_event(unsigned int port, uint16_t event, uint16= _t value) "port %u, event %u, value %u" --=20 2.21.3 From nobody Mon Feb 9 08:48:43 2026 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=1596719126; cv=none; d=zohomail.com; s=zohoarc; b=P+XE/o6E+aSSfTX+iaxkJU8hDbnXEpVBybhmFDPxhMQq9uq2+jvTdTSbEhgDSq78+RAyQta7LXat8n2dEADSeI9ln36Jex+k7Yc7csPR9zOTfk+EihAMWtfI1BNaePdBxoWsdRqKsQ75L/tMtkmnZoT+PUmEiQGRxcJ5U4SEatc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596719126; 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=5MyJt4saRNOH+wyZ/PYBkEhqoYePEqFCcALpsJUGNbo=; b=MJntFGxoSS0UFHeIOJzIUZhVb7X6ksJOvc7qS/UJ895Trn9t63kEigbklGFgCOZZEhwDv/CWl3kCDmyieqHwnHJKxGeNELEqQPsIOYadwmXE9cnxe66NxGDdOJ3AT5PmveW4fUKD47N92r4N9ebHJlhP+7VrR+z2ppweTHV1WaM= 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 1596719126529844.439488353457; Thu, 6 Aug 2020 06:05:26 -0700 (PDT) Received: from localhost ([::1]:43694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3faH-0003gt-6a for importer@patchew.org; Thu, 06 Aug 2020 09:05:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3fYj-00020z-IQ for qemu-devel@nongnu.org; Thu, 06 Aug 2020 09:03:49 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:34926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3fYi-00075f-29 for qemu-devel@nongnu.org; Thu, 06 Aug 2020 09:03:49 -0400 Received: by mail-wr1-x434.google.com with SMTP id f1so43384799wro.2 for ; Thu, 06 Aug 2020 06:03:47 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id e16sm6409113wrx.30.2020.08.06.06.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 06:03:44 -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=5MyJt4saRNOH+wyZ/PYBkEhqoYePEqFCcALpsJUGNbo=; b=dP7xjfYYT2X081rx02yrllcPZZKmM8Zcb4kmIqwXlwUoJ9txzNh93JFg5uC3a0wGO6 f79jDzGsCI5/ieC++aAiwfOHYyjfypz8MnAK7hny3oGNsunzcS2u4GiifPjCeftKdaOh 6BzkbLIfn2SsTZUe2XgWHAEqFV6N32WxFcZpxU1sOJi4mrdGFur5w1ncpegPT+tq33/0 jxTTRbWSWZc4QzCfuAFqVDeMY4F8hOw5aaK2EaV2ixwCaKQES3euCQ2NRBHmfUTAUSie trmIJsD1veNMC0JmllqIkKxszFrW2++qdQXEHXWlMA6hxpY3HmniZlItIZrjknWTm+GD ZPaQ== 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=5MyJt4saRNOH+wyZ/PYBkEhqoYePEqFCcALpsJUGNbo=; b=geyhuL2ZmpvoOofIfbejsr329LkSEG1I2nQPfPjht32YmCugiatoqgv4cB9sH5k2D0 zF+z2o5r/V3BzB+sjRDpzjbLKPWKgovldk1WmZNfuDuOC9gd1y7cfK3nPfNQndJLIfj1 ErlpCz2ZB2zAT6jw9IhRAQcHiJgR3JUWrXvMUJ+BMtg801FqZam35SGeKSjtN0eQqQj4 ZGyPv8p6wK9ABJDz12+W5+FM1577SY2vIetCDK1VTP/m3FfRT5BMV4yLWiZcexj3mOI5 dFp1WgKV8szeAu/TftOweiv/FTySjLdKVaInquvge1+Yq0iJR99dhPSTT2N3VivDZL0P f0ig== X-Gm-Message-State: AOAM531Lwuehnq4rp9t0r8LfzTPZk0VT4W/ZeL5MNEzAmdVVOWzIQyqO DFuXfCZkAutIT2eJS2yjFi4zetZP X-Google-Smtp-Source: ABdhPJwZsWhlDzTpVb/LMW/RsMjOZcjFewMMoRexCAZ2wW8m+gXxAH/Fmw341YKtp+1s5t9nly9/iw== X-Received: by 2002:adf:e98c:: with SMTP id h12mr7197919wrm.3.1596719024786; Thu, 06 Aug 2020 06:03:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 2/4] hw/char/serial: Remove old DEBUG_SERIAL commented code Date: Thu, 6 Aug 2020 15:03:38 +0200 Message-Id: <20200806130340.17316-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200806130340.17316-1-f4bug@amsat.org> References: <20200806130340.17316-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::434; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x434.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 , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) All useful DPRINTF() calls have been converted to trace events. Remove a pointless one in the IOEventHandler, and drop the DEBUG_SERIAL ifdef'ry. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini Reviewed-by: Richard Henderson --- hw/char/serial.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 3e903d5fad..758a3aa49b 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -36,8 +36,6 @@ #include "trace.h" #include "hw/qdev-properties.h" =20 -//#define DEBUG_SERIAL - #define UART_LCR_DLAB 0x80 /* Divisor latch access bit */ =20 #define UART_IER_MSI 0x08 /* Enable Modem status interrupt */ @@ -102,14 +100,6 @@ =20 #define MAX_XMIT_RETRY 4 =20 -#ifdef DEBUG_SERIAL -#define DPRINTF(fmt, ...) \ -do { fprintf(stderr, "serial: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) \ -do {} while (0) -#endif - static void serial_receive1(void *opaque, const uint8_t *buf, int size); static void serial_xmit(SerialState *s); =20 @@ -636,7 +626,6 @@ static void serial_receive1(void *opaque, const uint8_t= *buf, int size) static void serial_event(void *opaque, QEMUChrEvent event) { SerialState *s =3D opaque; - DPRINTF("event %x\n", event); if (event =3D=3D CHR_EVENT_BREAK) serial_receive_break(s); } --=20 2.21.3 From nobody Mon Feb 9 08:48:43 2026 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=1596719126; cv=none; d=zohomail.com; s=zohoarc; b=V82YRy+maADhV/ZBImJobFUddKei4+wxTyZlfPFmGpDqSBZlpbhlD5RXBkjJ5CvHi1ePxL5IbD1vr41Q62iIiM/E4M2LLYtlrlf6i+RxwkCwRGKJVBg+8QfYeEwZ1hdMWbCQFTnsIUD10JExvP0+bGCujalnA4zskjLREtPoPII= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596719126; 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=jHazVKWFQG1I08UcXdjElA+M/Buk1PGFWVHhWqdyCtk=; b=CLjkcoPRMhzaOA0n5tDTwUQzKX1UyAxt7tk+juO0/U5Kvb28ZcY/7K88cPIZqNW+zRaMJSjPxl7VHoaBoRU8+XGV0ohGWrZYVLQzfOAjEWByYFtSGI3kzxYpDvUU2MWm6CWGdKyn6Kog/lVJ9aj6GdeWoZT+vbAvS9dJPtpxzmg= 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 1596719126368138.38046622056675; Thu, 6 Aug 2020 06:05:26 -0700 (PDT) Received: from localhost ([::1]:43662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3faH-0003g5-0E for importer@patchew.org; Thu, 06 Aug 2020 09:05:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3fYj-00021C-LN for qemu-devel@nongnu.org; Thu, 06 Aug 2020 09:03:49 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:55265) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3fYh-00075h-Vl for qemu-devel@nongnu.org; Thu, 06 Aug 2020 09:03:49 -0400 Received: by mail-wm1-x32f.google.com with SMTP id d190so8762232wmd.4 for ; Thu, 06 Aug 2020 06:03:47 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id e16sm6409113wrx.30.2020.08.06.06.03.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 06:03:45 -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=jHazVKWFQG1I08UcXdjElA+M/Buk1PGFWVHhWqdyCtk=; b=OxntN/frcBHNx9b5cwy3rKuCoSvXn51ubG8pstgF3YXZuBtISYwHoOLiVeUBGgse/q +cGh5xQ+lBm/yyw0Mh8BkfXuZYGn7E2cSQCvgBu83fTVGZFpEHG98dZerhGHYOANbUBR I4vfAPhkC9nowWg+qNOi0/7Jx6NANhTxkdOF/oCYYDmIHgOBpBDDoPx0GrAoWhLpd/iw v9avX52qYp5vR32Gl4R9tSP27xTYk87kQo0wK5tmdPv79b1V5TJi26mnsWTNGe5RJOg+ qMaH2z0c9oASXiCNBhUCQY0k9/JWjJGOy8EMcYTmG0gY+kexfzuT0biV4sG6p7pMftgL EtZw== 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=jHazVKWFQG1I08UcXdjElA+M/Buk1PGFWVHhWqdyCtk=; b=bhhWetnnKszTDiDbuRS9Vk8Z4k1176x+WQORKrBLQByPmakYbSLruM5WqXXZndWgg6 JDRebNKLsCaaAyhVL6CbE1kd9tynk1PIst4Gh0lGTUWvLLBq5fu6vvEkNdxCy0+RmL8d cN2QdBIunvpwftxt9X29abzJRBUPDposGuF6eTzwC9fpJy/cq5rU65aMO8PdcwTg1Nd1 x90V3ae1GlrG7fdv2KRB3X6SGgY8JZTUuYza7zxC3ZfuIuJCTt2KESiKz4LDWOW+SR0V HiVnCMYQNkf3QV3vCuDvrNEKCQYKVfXQskFeJuh2G+6l2HLtCWIC+GGripLV/7BAJxwd 6l1A== X-Gm-Message-State: AOAM530grizzBzW45AAmPndvvqWyNsOXReltkTwuxwiTHOHfvBUrIR8i aMgKgyvUhNcEugzAFmzdZCF6KtZ+ X-Google-Smtp-Source: ABdhPJxir/XrswmUGJUuuDpyr1NHomRH+s47nQon2K/yUgSexWCGRkT30fVaZb2nEi2s8QZq93TxMg== X-Received: by 2002:a7b:c4d3:: with SMTP id g19mr7657522wmk.29.1596719025811; Thu, 06 Aug 2020 06:03:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 3/4] hw/char/serial: Let SerialState have an 'id' field Date: Thu, 6 Aug 2020 15:03:39 +0200 Message-Id: <20200806130340.17316-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200806130340.17316-1-f4bug@amsat.org> References: <20200806130340.17316-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::32f; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32f.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 , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When a SoC has multiple UARTs (some configured differently), it is hard to associate events to their UART. To be able to distinct trace events between various instances, add an 'id' field. Update the trace format accordingly. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini Reviewed-by: Richard Henderson --- include/hw/char/serial.h | 1 + hw/char/serial.c | 7 ++++--- hw/char/trace-events | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index 81d7ba1917..75c71adfd2 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -75,6 +75,7 @@ typedef struct SerialState { uint64_t char_transmit_time; /* time to transmit a char in ticks */ int poll_msl; =20 + uint8_t id; QEMUTimer *modem_status_poll; MemoryRegion io; } SerialState; diff --git a/hw/char/serial.c b/hw/char/serial.c index 758a3aa49b..2ddc73f255 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -177,7 +177,7 @@ static void serial_update_parameters(SerialState *s) ssp.stop_bits =3D stop_bits; s->char_transmit_time =3D (NANOSECONDS_PER_SECOND / speed) * frame_si= ze; qemu_chr_fe_ioctl(&s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp); - trace_serial_update_parameters(speed, parity, data_bits, stop_bits); + trace_serial_update_parameters(s->id, speed, parity, data_bits, stop_b= its); } =20 static void serial_update_msl(SerialState *s) @@ -333,7 +333,7 @@ static void serial_ioport_write(void *opaque, hwaddr ad= dr, uint64_t val, SerialState *s =3D opaque; =20 addr &=3D 7; - trace_serial_ioport_write(addr, val); + trace_serial_ioport_write(s->id, addr, val); switch(addr) { default: case 0: @@ -550,7 +550,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr= addr, unsigned size) ret =3D s->scr; break; } - trace_serial_ioport_read(addr, ret); + trace_serial_ioport_read(s->id, addr, ret); return ret; } =20 @@ -973,6 +973,7 @@ const MemoryRegionOps serial_io_ops =3D { }; =20 static Property serial_properties[] =3D { + DEFINE_PROP_UINT8("id", SerialState, id, 0), DEFINE_PROP_CHR("chardev", SerialState, chr), DEFINE_PROP_UINT32("baudbase", SerialState, baudbase, 115200), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/char/trace-events b/hw/char/trace-events index 85e39d9d62..04a6fb4a15 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -5,9 +5,9 @@ parallel_ioport_read(const char *desc, uint16_t addr, uint8= _t value) "read [%s] parallel_ioport_write(const char *desc, uint16_t addr, uint8_t value) "wri= te [%s] addr 0x%02x val 0x%02x" =20 # serial.c -serial_ioport_read(uint16_t addr, uint8_t value) "read addr 0x%02x val 0x%= 02x" -serial_ioport_write(uint16_t addr, uint8_t value) "write addr 0x%02x val 0= x%02x" -serial_update_parameters(uint64_t baudrate, char parity, int data_bits, in= t stop_bits) "baudrate=3D%"PRIu64" parity=3D'%c' data=3D%d stop=3D%d" +serial_ioport_read(uint8_t id, uint16_t addr, uint8_t value) "id#%u read a= ddr 0x%02x val 0x%02x" +serial_ioport_write(uint8_t id, uint16_t addr, uint8_t value) "id#%u write= addr 0x%02x val 0x%02x" +serial_update_parameters(uint8_t id, uint64_t baudrate, char parity, int d= ata_bits, int stop_bits) "id#%u baudrate=3D%"PRIu64" parity=3D%c data=3D%d = stop=3D%d" =20 # virtio-serial-bus.c virtio_serial_send_control_event(unsigned int port, uint16_t event, uint16= _t value) "port %u, event %u, value %u" --=20 2.21.3 From nobody Mon Feb 9 08:48:43 2026 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=1596719213; cv=none; d=zohomail.com; s=zohoarc; b=kDl5sWifIx6WEuQl55fMpYm0XDdljrVh5gKkZU6OfwdpKRbvdJQlN2Gqe2cx1gfkfG06O7iJ1wxWv8mD6KkswHuRkv1wadjBfu40R+kPo5mt2FTcQlcd7D7MBF1MdG0+a67TG2b0kafT4RGz3/gIwopA5EWg5D0T5RJwy/rHYtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596719213; 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=VKIjvjXxKAYQqyFjcIUepKDvVOUEUs0KY6aFq2gyyVA=; b=IE75oKGvRtRLY7YpPhBCmyRJRfkaqUPtr86/ZFrAdkfl1+CYll8qewavIsVsnMLSyNlMgdaxcY3J8GBg5LJGjBHPIw4EpTZWN7KS8H7Sj8EJAxH73NRYetKhqFGKEsmplQ8D2JVeu/A7GjzyWtOYlPC+4QcjtAg0WqMxxvtenDY= 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 1596719213149491.48457801944255; Thu, 6 Aug 2020 06:06:53 -0700 (PDT) Received: from localhost ([::1]:50352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3fbf-0006RX-Mq for importer@patchew.org; Thu, 06 Aug 2020 09:06:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3fYl-00024E-5y for qemu-devel@nongnu.org; Thu, 06 Aug 2020 09:03:51 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:45862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3fYj-00075v-7N for qemu-devel@nongnu.org; Thu, 06 Aug 2020 09:03:50 -0400 Received: by mail-wr1-x42e.google.com with SMTP id z18so40361056wrm.12 for ; Thu, 06 Aug 2020 06:03:48 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id e16sm6409113wrx.30.2020.08.06.06.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 06:03:46 -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=VKIjvjXxKAYQqyFjcIUepKDvVOUEUs0KY6aFq2gyyVA=; b=gbj3uStao4kU5RsxlA4SV8e9NFbI0t8nO4s3NRVwAzuG6ezqHr7WxMaLlrW17O61AL GMfKMtHb9PXCXWGlNnZSVmOyGE/mqYIjNji9JrG2zPzdi9PWuLSOLromXQf7pr84cszX n8kEDCVCameEYBHAQ4WXkNumz7PaL9KIPW7NWFJ04cx9TG7q5OkIsKC4rNPaX9TriXdi DTD92D4typv02jwj/CNSeFvbHVHBUdpai61Qt8zABqsALP9qdNsdV4bcgnFmjLbzrp0y BfbFaAzxxHjcxQ4prX9WTR3ZAsnYAoQGgBWL9PLuqw5HCKo4HnXp1XKE56n4t60xDFUM k3sw== 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=VKIjvjXxKAYQqyFjcIUepKDvVOUEUs0KY6aFq2gyyVA=; b=hP5/BiRpXnFv4a0TrLCGSc92n1d1ZXJnzq3Nr5pZrFPSsYCeFHfSO7hBTff6I/VB05 +0/6v50WyTnFX6cALsijWj+bCYxtmv9b8WMMorxlOPNJek3S1brRfS2qk1/5pBn5tCm0 Ckg+xV5aOSrrmkcSy8M5kbb9AJNwbrhIhFhYiaGZ7a20D//q3jHOqTzRC4okCNMB5RTw JGVSkqaqcTdS2GTtxHY5R1iedH7Su+PHbAk1e4lin32xasLcJksbm4DcLXTKcNcZMzWx XFbvXh2yMKD5j/48LWmeJuyrUWLUaxjbvP1PKenrJRYWZ8hKVz5WmJlrMfCml75Mbwi0 4jNA== X-Gm-Message-State: AOAM5317HdWinHulTsbM+bw1V9g3UK5kmKTw2QplcyYyyy92l78QKkbV aB9c4jT5d8kYEo6o7QkF4BH7TlDB X-Google-Smtp-Source: ABdhPJybIO4Z+Ee+scM4SpveWUiz8MskSKIB9XhUuufJDnpgrElvvAz7WKaH0LtWxFWGyMHGJJYoWQ== X-Received: by 2002:adf:ca06:: with SMTP id o6mr7049091wrh.181.1596719027514; Thu, 06 Aug 2020 06:03:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 4/4] hw/char/serial: Use the Clock API to feed the UART reference clock Date: Thu, 6 Aug 2020 15:03:40 +0200 Message-Id: <20200806130340.17316-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200806130340.17316-1-f4bug@amsat.org> References: <20200806130340.17316-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::42e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42e.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 , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) In the same chipset, UARTs can be clocked at different rate, or the input clock can be changed at runtime. The Clock API allow us to propagate such clock rate change to the device. Let the SerialState have its reference input clock (called 'rclk') and if not clock is connected to the device, use the currently provided frequency, to not modify the current code behavior. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Paolo Bonzini Reviewed-by: Richard Henderson --- include/hw/char/serial.h | 3 +++ hw/char/serial.c | 35 ++++++++++++++++++++++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index 75c71adfd2..1c7a4df2ab 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -31,8 +31,10 @@ #include "qemu/fifo8.h" #include "chardev/char.h" #include "hw/sysbus.h" +#include "hw/clock.h" =20 #define UART_FIFO_LENGTH 16 /* 16550A Fifo Length */ +#define UART_CLOCK_DIVISOR 16 /* baudrate is input clock / 16 */ =20 typedef struct SerialState { DeviceState parent; @@ -57,6 +59,7 @@ typedef struct SerialState { qemu_irq irq; CharBackend chr; int last_break_enable; + Clock *rclk; /* ReceiverClock */ uint32_t baudbase; uint32_t tsr_retry; guint watch_tag; diff --git a/hw/char/serial.c b/hw/char/serial.c index 2ddc73f255..701c670fd5 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -35,6 +35,7 @@ #include "qemu/error-report.h" #include "trace.h" #include "hw/qdev-properties.h" +#include "hw/qdev-clock.h" =20 #define UART_LCR_DLAB 0x80 /* Divisor latch access bit */ =20 @@ -921,10 +922,36 @@ static int serial_be_change(void *opaque) return 0; } =20 +/* Change the main reference oscillator frequency. */ +void serial_set_frequency(SerialState *s, uint32_t frequency) +{ + s->baudbase =3D frequency; + serial_update_parameters(s); +} + +static void serial_rclk_update(void *opaque) +{ + SerialState *s =3D opaque; + + serial_set_frequency(s, clock_get_hz(s->rclk) / UART_CLOCK_DIVISOR); +} + +static void serial_init(Object *obj) +{ + SerialState *s =3D SERIAL(obj); + + s->rclk =3D qdev_init_clock_in(DEVICE(obj), "rclk", serial_rclk_update= , s); +} + static void serial_realize(DeviceState *dev, Error **errp) { SerialState *s =3D SERIAL(dev); =20 + /* initialize the frequency in case the clock remains unconnected */ + if (!clock_get(s->rclk)) { + clock_set_hz(s->rclk, s->baudbase); + } + s->modem_status_poll =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, (QEMUTimerCB= *) serial_update_msl, s); =20 s->fifo_timeout_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, (QEMUTimerC= B *) fifo_timeout_int, s); @@ -955,13 +982,6 @@ static void serial_unrealize(DeviceState *dev) qemu_unregister_reset(serial_reset, s); } =20 -/* Change the main reference oscillator frequency. */ -void serial_set_frequency(SerialState *s, uint32_t frequency) -{ - s->baudbase =3D frequency; - serial_update_parameters(s); -} - const MemoryRegionOps serial_io_ops =3D { .read =3D serial_ioport_read, .write =3D serial_ioport_write, @@ -994,6 +1014,7 @@ static const TypeInfo serial_info =3D { .name =3D TYPE_SERIAL, .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(SerialState), + .instance_init =3D serial_init, .class_init =3D serial_class_init, }; =20 --=20 2.21.3