Received: by 2002:a19:c345:0:0:0:0:0 with SMTP id t66csp1176959lff; Fri, 10 Jan 2020 12:43:07 -0800 (PST) X-Google-Smtp-Source: APXvYqzLxWp2LVSC8R36mPcnzFFCQnoRRHkLUKeaRgG/wkwJKwpBFmJGrdjqCxmV0bkOsG9uBhz4 X-Received: by 2002:a17:906:27d3:: with SMTP id k19mr4976969ejc.290.1578688987622; Fri, 10 Jan 2020 12:43:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578688987; cv=none; d=google.com; s=arc-20160816; b=uEwGzegSLO1ko3D2f6B0InerBsV6jEywEftvLzEb3FA6pb3n1NqtfqX8xYQ3tuZOVp 2etAZALD59Utmv+XrtQnaq4luGiHfeA4z+BaSCMSvd9dGRTHtTfizDEgHDHyqOhU4+02 3sYtwhugz1EmXtaahZbO1YcdxjFY8PORYfu46Vszy6ym1aMXJ3bfrjEL6C4IPGHbHLvS zgoDz/OprIbAelp8Dj3/D+g6q6G4Z9eSfOafCd/GOsME5aAN9mPx6ZmQiijfJFdhj2wR hdXJHAqWjnUh7vntI/LRqC8KrrMR9DxHrervWOuyg1k8Rf0fYIOfC7CsyL8dVjiX4Dvi +RsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=kFcujy5Zx7eAN8ANMQIMiKXRM7AFrv0aiyTTDTv0DLU=; b=tj2Ohzs/JetGz8oWuwoJflDfbXlLQPZcRXmPBB6Tqa3jbpZRUZShKA/xntzO8yS1Ma DSjHaaiZlLbqRkclQpMi4/+ukn8/YIBoBArww9jmHRt6kF3e6I8HYUNwMwAXdArh0NkK mUzoOlYZkgzYyg+E+Fjcgw9jPffIv7h1lYy3mU8DzfDaAKaK98a3OASlfjelbJJSs+iw FFqWbGUGcbV8rmCu8YA76MEIL092Aw6i/wuiZHXDsGYvwDzySZC2HSmB+FEaoAcA7KDl IlporzOHCMSGsxYFWwQ85S0GnVau55IdPUadNBVDzsgXJipfXoDhGiKHowJYXLxFUsZ1 /Vnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b="QvDvKQ8/"; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id cb5si2588423edb.252.2020.01.10.12.43.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Jan 2020 12:43:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b="QvDvKQ8/"; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:51536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iq17a-00055E-1L for alex.bennee@linaro.org; Fri, 10 Jan 2020 15:43:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33745) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iq14U-0000Zp-U9 for qemu-arm@nongnu.org; Fri, 10 Jan 2020 15:39:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iq14T-00074K-NM for qemu-arm@nongnu.org; Fri, 10 Jan 2020 15:39:54 -0500 Received: from mail-pj1-x1044.google.com ([2607:f8b0:4864:20::1044]:55008) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iq14T-00072A-H9; Fri, 10 Jan 2020 15:39:53 -0500 Received: by mail-pj1-x1044.google.com with SMTP id kx11so1422669pjb.4; Fri, 10 Jan 2020 12:39:53 -0800 (PST) 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; bh=kFcujy5Zx7eAN8ANMQIMiKXRM7AFrv0aiyTTDTv0DLU=; b=QvDvKQ8/BM0nJbYud/2NJPBkiA2ey9H06quY9d54iyPwLKEpMos+p/HpgCmMXH0zvC jsfm4sIGo8eX/lp64nK6fWyUa+gwbweEG1BGwtmppT9YiZky0EJCsMgeHXJa8Ouc9QZ+ ZZPzNq0sFc6DBInHIvRy8MsGfVF8ZVomGoIKVPtKzInSzPG1rJ4SEM2+Qufvq6mYfbuO oy2cQpHVsy4/fFHpNoI+T0DaBkUIyuNuuqrHiV1VLT8Ulpt2SRZrDKto7SkJVRc+7ruL 9m5NQ799VP83XLrO3H/MMoP4UtYEEFp4T0Jn+z6bKe5Rt+/tGaMtn5KhvBJDpdxC9rKh 6aHg== 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; bh=kFcujy5Zx7eAN8ANMQIMiKXRM7AFrv0aiyTTDTv0DLU=; b=NdO58mKYKWOqR5fV3I/hjvq64T0YWrqYjiKnmdxeJ5kyqetVrVpBXoyw4YEHckaQFf w1+NNmMmok62Ox4vMp5n98ql0DxuoiBwCvBSPcZdtT15fGfzWgfYrtLE2P/UcyXJrpm7 XBOgDuicH+/oDnwTwm/qoPgfQzxsRaSiWJeXB/v49eqThClIKEkwSX868iiAv/+rE2AZ JUWhv6FQPLadMX4RYzACLcrfa+MwDC05h9JPVVT0VrAB0o2ezwtm84mb0AA13Qcjd02/ umHDWkDlzhPULQE0GVyM60ZR2bYNoUiRGUTyX3LuxJg/VY2KqpfwLPlHM26C/iEzvsaZ 5UyQ== X-Gm-Message-State: APjAAAVglz7d5lcDYvmygmKHEcs8HqQaL8jMt2VBOjDbs8WrKoHF5Zu7 8gHkhVwCWBAW+s9vkAcjGFM= X-Received: by 2002:a17:90a:fa10:: with SMTP id cm16mr7284493pjb.129.1578688792599; Fri, 10 Jan 2020 12:39:52 -0800 (PST) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id r8sm3604335pjo.22.2020.01.10.12.39.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Jan 2020 12:39:52 -0800 (PST) From: Guenter Roeck To: Igor Mitsyanko Subject: [PATCH 5/6] hw/char/exynos4210_uart: Add receive DMA support Date: Fri, 10 Jan 2020 12:39:41 -0800 Message-Id: <20200110203942.5745-6-linux@roeck-us.net> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200110203942.5745-1-linux@roeck-us.net> References: <20200110203942.5745-1-linux@roeck-us.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::1044 X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm@nongnu.org, qemu-devel@nongnu.org, Guenter Roeck , Paolo Bonzini Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: nW8JNsiFzB2Q To support receive DMA, we need to inform the DMA controller if receive data is available. Otherwise the DMA controller keeps requesting data, causing receive errors. Implement this using an interrupt line. The instantiating code then needs to connect the interrupt with the matching DMA controller GPIO pin. Signed-off-by: Guenter Roeck --- hw/char/exynos4210_uart.c | 24 ++++++++++++++++++++++++ hw/char/trace-events | 2 ++ 2 files changed, 26 insertions(+) diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c index 61134a7bdc..e23799f93b 100644 --- a/hw/char/exynos4210_uart.c +++ b/hw/char/exynos4210_uart.c @@ -154,6 +154,7 @@ typedef struct Exynos4210UartState { CharBackend chr; qemu_irq irq; + qemu_irq dmairq; uint32_t channel; @@ -261,6 +262,24 @@ exynos4210_uart_Rx_FIFO_trigger_level(const Exynos4210UartState *s) return exynos4210_uart_FIFO_trigger_level(s->channel, reg); } +/* + * Update Rx DMA busy signal if Rx DMA is enabled. For simplicity, + * mark DMA as busy if DMA is enabled and the receive buffer is empty. + */ +static void exynos4210_uart_update_dmabusy(Exynos4210UartState *s) +{ + bool rx_dma_enabled = (s->reg[I_(UCON)] & 0x03) == 0x02; + uint32_t count = fifo_elements_number(&s->rx); + + if (rx_dma_enabled && !count) { + qemu_irq_raise(s->dmairq); + trace_exynos_uart_dmabusy(s->channel); + } else { + qemu_irq_lower(s->dmairq); + trace_exynos_uart_dmaready(s->channel); + } +} + static void exynos4210_uart_update_irq(Exynos4210UartState *s) { /* @@ -282,10 +301,12 @@ static void exynos4210_uart_update_irq(Exynos4210UartState *s) count = fifo_elements_number(&s->rx); if ((count && !(s->reg[I_(UCON)] & 0x80)) || count >= exynos4210_uart_Rx_FIFO_trigger_level(s)) { + exynos4210_uart_update_dmabusy(s); s->reg[I_(UINTSP)] |= UINTSP_RXD; timer_del(s->fifo_timeout_timer); } } else if (s->reg[I_(UTRSTAT)] & UTRSTAT_Rx_BUFFER_DATA_READY) { + exynos4210_uart_update_dmabusy(s); s->reg[I_(UINTSP)] |= UINTSP_RXD; } @@ -311,6 +332,7 @@ static void exynos4210_uart_timeout_int(void *opaque) (s->reg[I_(UCON)] & (1 << 11))) { s->reg[I_(UINTSP)] |= UINTSP_RXD; s->reg[I_(UTRSTAT)] |= UTRSTAT_Rx_TIMEOUT; + exynos4210_uart_update_dmabusy(s); exynos4210_uart_update_irq(s); } } @@ -499,6 +521,7 @@ static uint64_t exynos4210_uart_read(void *opaque, hwaddr offset, s->reg[I_(UTRSTAT)] &= ~UTRSTAT_Rx_BUFFER_DATA_READY; res = s->reg[I_(URXH)]; } + exynos4210_uart_update_dmabusy(s); trace_exynos_uart_read(s->channel, offset, exynos4210_uart_regname(offset), res); return res; @@ -654,6 +677,7 @@ static void exynos4210_uart_init(Object *obj) sysbus_init_mmio(dev, &s->iomem); sysbus_init_irq(dev, &s->irq); + sysbus_init_irq(dev, &s->dmairq); } static void exynos4210_uart_realize(DeviceState *dev, Error **errp) diff --git a/hw/char/trace-events b/hw/char/trace-events index cb73fee6a9..6f938301d9 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -79,6 +79,8 @@ nrf51_uart_read(uint64_t addr, uint64_t r, unsigned int size) "addr 0x%" PRIx64 nrf51_uart_write(uint64_t addr, uint64_t value, unsigned int size) "addr 0x%" PRIx64 " value 0x%" PRIx64 " size %u" # exynos4210_uart.c +exynos_uart_dmabusy(uint32_t channel) "UART%d: DMA busy (Rx buffer empty)" +exynos_uart_dmaready(uint32_t channel) "UART%d: DMA ready" exynos_uart_irq_raised(uint32_t channel, uint32_t reg) "UART%d: IRQ raised: 0x%08"PRIx32 exynos_uart_irq_lowered(uint32_t channel) "UART%d: IRQ lowered" exynos_uart_update_params(uint32_t channel, int speed, uint8_t parity, int data, int stop, uint64_t wordtime) "UART%d: speed: %d, parity: %c, data bits: %d, stop bits: %d wordtime: %"PRId64"ns" -- 2.17.1