From nobody Sun Jun 23 02:26:52 2024 Delivered-To: importer@patchew.org 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583828824; cv=none; d=zohomail.com; s=zohoarc; b=ZJR7wHubHRk5sL8SmfRrXOfI7eAre24YNhvByqtzRB1CNHpKhtowy61jaKqhLEl4EYxT10yB5OWaQURe4MgWfj8UoJt3VnAhQUGIU6/8eC2b9Dh1ndMZeKthhGjAs+bTXw3IZnUAq6Z2tMI8J0odheZWQFCnYTUS2UeM5Vmo7no= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583828824; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=U6HPKAeSkHD4ZWtar2rKi2M8k92l3FoWWhgkRdAHs9I=; b=LZcHFW/sCqN1Er3N3fF+smN3WCR+3Nke/hH3REzR28yK5Bz2nZYbC4YMFsKjR0OmvY6vsgXtxc7T8FgPEeaPpNrO1v8XTesUj+svDYJXQkTvikCs6PgtnJhlxMmDopfEa2uqA3uA1u6RHi7C3/ZeRN9PVqG66ab7mgP0Z2lJbsY= 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 1583828824195798.7061935346691; Tue, 10 Mar 2020 01:27:04 -0700 (PDT) Received: from localhost ([::1]:55192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBaEB-0000iq-5H for importer@patchew.org; Tue, 10 Mar 2020 04:27:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54787) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBaBO-00052J-V1 for qemu-devel@nongnu.org; Tue, 10 Mar 2020 04:24:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBaBN-0002V7-Te for qemu-devel@nongnu.org; Tue, 10 Mar 2020 04:24:10 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54739 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jBaBN-0002Tl-PN for qemu-devel@nongnu.org; Tue, 10 Mar 2020 04:24:09 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-274--duWB2tmNNCJfzyMQhzFsA-1; Tue, 10 Mar 2020 04:24:07 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 00A7218C8C02; Tue, 10 Mar 2020 08:24:06 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-117.ams2.redhat.com [10.36.116.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC967388; Tue, 10 Mar 2020 08:24:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 16C199D6B; Tue, 10 Mar 2020 09:24:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583828649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U6HPKAeSkHD4ZWtar2rKi2M8k92l3FoWWhgkRdAHs9I=; b=JPA7yIcj/0AMAUxChUwqx7JuJn0fNvFsYAXTpZjQ7d1HJLYO2wx96ORihHPaDHyQo1Udll MwG068YCV8Mi9RgbHOdxIqvYe123akJruTu1JVmfp550tOgZz8cUJRyPEjs8VzI/+9wTlU ErFvo1px00yP68djMD5nzcqZwMgyyoc= X-MC-Unique: -duWB2tmNNCJfzyMQhzFsA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 1/2] usb-serial: wakeup device on input Date: Tue, 10 Mar 2020 09:24:01 +0100 Message-Id: <20200310082402.22839-2-kraxel@redhat.com> In-Reply-To: <20200310082402.22839-1-kraxel@redhat.com> References: <20200310082402.22839-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Samuel Thibault , Gerd Hoffmann , Jason Andryuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Jason Andryuk Currently usb-serial devices are unable to send data into guests with the xhci controller. Data is copied into the usb-serial's buffer, but it is not sent into the guest. Data coming out of the guest works properly. usb-serial devices work properly with ehci. Have usb-serial call usb_wakeup() when receiving data from the chardev. This seems to notify the xhci controller and fix inbound data flow. Also add USB_CFG_ATT_WAKEUP to the device's bmAttributes. This matches a real FTDI serial adapter's bmAttributes. Signed-off-by: Jason Andryuk Message-id: 20200306140917.26726-1-jandryuk@gmail.com Signed-off-by: Gerd Hoffmann --- hw/usb/dev-serial.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 98465990ef6b..daac75b7aec2 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -98,6 +98,7 @@ do { printf("usb-serial: " fmt , ## __VA_ARGS__); } while= (0) =20 typedef struct { USBDevice dev; + USBEndpoint *intr; uint8_t recv_buf[RECV_BUF]; uint16_t recv_ptr; uint16_t recv_used; @@ -153,7 +154,7 @@ static const USBDescDevice desc_device =3D { { .bNumInterfaces =3D 1, .bConfigurationValue =3D 1, - .bmAttributes =3D USB_CFG_ATT_ONE, + .bmAttributes =3D USB_CFG_ATT_ONE | USB_CFG_ATT_WAKEU= P, .bMaxPower =3D 50, .nif =3D 1, .ifs =3D &desc_iface0, @@ -459,6 +460,8 @@ static void usb_serial_read(void *opaque, const uint8_t= *buf, int size) memcpy(s->recv_buf + start, buf, size); } s->recv_used +=3D size; + + usb_wakeup(s->intr, 0); } =20 static void usb_serial_event(void *opaque, QEMUChrEvent event) @@ -513,6 +516,7 @@ static void usb_serial_realize(USBDevice *dev, Error **= errp) if (qemu_chr_fe_backend_open(&s->cs) && !dev->attached) { usb_device_attach(dev, &error_abort); } + s->intr =3D usb_ep_get(dev, USB_TOKEN_IN, 1); } =20 static USBDevice *usb_braille_init(USBBus *bus, const char *unused) --=20 2.18.2 From nobody Sun Jun 23 02:26:52 2024 Delivered-To: importer@patchew.org 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; 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583828712; cv=none; d=zohomail.com; s=zohoarc; b=V7i2i4/ixjQCOeLf/aDKAGJr7YaNSDgcpappYI9AxIbN6oLyAwpczxkRTv4JbiPO/xwdcW+UHcbPbmXmEEjvPpoQGmwY2+Y5c+qGyhKBYPunAAhY38YRrzMVIzWxb8ED9lPSgRQq1nwpAy3+imBTSxO7qgkHIrIqxrwCRCK4RDU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583828712; 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=KnhJs1Qv5CJ2LifBUYIlnTyitzEv0YQIGzR5BcCJIhw=; b=ScSA/PqKjtLZNzUi3zvwair7fTqZChuLRIDSnljRtUKxQnoURJND8G7/vaBYPMPQkPmFFA1ywhWKoyedtIwR6HA3luy+iEFOahNlCH929K5tqWwNFQuPlPOqQ1FbVwsDp/qU2Ozxod9PaefxvHo3J7ueypYlN7IwR9wenL/K8Xc= 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 1583828712759613.4474959130888; Tue, 10 Mar 2020 01:25:12 -0700 (PDT) Received: from localhost ([::1]:55156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBaCN-0006Og-LR for importer@patchew.org; Tue, 10 Mar 2020 04:25:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54774) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBaBO-00051m-HB for qemu-devel@nongnu.org; Tue, 10 Mar 2020 04:24:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBaBN-0002Tx-IC for qemu-devel@nongnu.org; Tue, 10 Mar 2020 04:24:10 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57684 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jBaBN-0002St-Dv for qemu-devel@nongnu.org; Tue, 10 Mar 2020 04:24:09 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-274-ML854L6eOFWeCGX5_YsnRQ-1; Tue, 10 Mar 2020 04:24:06 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDA3F18C8C01; Tue, 10 Mar 2020 08:24:05 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-117.ams2.redhat.com [10.36.116.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id C962060BF3; Tue, 10 Mar 2020 08:24:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1F0A49D1F; Tue, 10 Mar 2020 09:24:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583828649; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KnhJs1Qv5CJ2LifBUYIlnTyitzEv0YQIGzR5BcCJIhw=; b=e8Qp/qLgumo6llwOcKwvJ/FwwvtzOA3kYVR64VzFhInNx9sbI0HFMg8dCtWxBqXxdPjcJx 3CRuzlbZhVcmqas7INPhyqZcMrQ6a7i9euBW7+kfgJcFexzs5h+k/TPK8mt/Fk2mLLEuWJ biR2B7t5Xffn353ak2GKl+R+t6HK5NI= X-MC-Unique: ML854L6eOFWeCGX5_YsnRQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 2/2] usb/hcd-ehci: Remove redundant statements Date: Tue, 10 Mar 2020 09:24:02 +0100 Message-Id: <20200310082402.22839-3-kraxel@redhat.com> In-Reply-To: <20200310082402.22839-1-kraxel@redhat.com> References: <20200310082402.22839-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: Samuel Thibault , Gerd Hoffmann , Chen Qun Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Chen Qun The "again" assignment is meaningless before g_assert_not_reached. In addition, the break statements no longer needs to be after g_assert_not_reached. Clang static code analyzer show warning: hw/usb/hcd-ehci.c:2108:13: warning: Value stored to 'again' is never read again =3D -1; ^ ~~ Reported-by: Euler Robot Signed-off-by: Chen Qun Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200226084647.20636-13-kuhn.chenqun@huawei.com> Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-ehci.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 56ab2f457f4c..29d49c2d7e68 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1301,7 +1301,6 @@ static void ehci_execute_complete(EHCIQueue *q) /* should not be triggerable */ fprintf(stderr, "USB invalid response %d\n", p->packet.status); g_assert_not_reached(); - break; } =20 /* TODO check 4.12 for splits */ @@ -2105,9 +2104,7 @@ static void ehci_advance_state(EHCIState *ehci, int a= sync) =20 default: fprintf(stderr, "Bad state!\n"); - again =3D -1; g_assert_not_reached(); - break; } =20 if (again < 0 || itd_count > 16) { --=20 2.18.2