From patchwork Fri Oct 13 10:40:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhupinder Thakur X-Patchwork-Id: 10004083 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DCAF860360 for ; Fri, 13 Oct 2017 10:42:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE25D29023 for ; Fri, 13 Oct 2017 10:42:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C303329025; Fri, 13 Oct 2017 10:42:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0032629023 for ; Fri, 13 Oct 2017 10:42:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2xOW-0000Ye-EM; Fri, 13 Oct 2017 10:40:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2xOU-0000Y6-VZ for xen-devel@lists.xenproject.org; Fri, 13 Oct 2017 10:40:43 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id B7/9D-15990-A2890E95; Fri, 13 Oct 2017 10:40:42 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrOIsWRWlGSWpSXmKPExsVyMfTAOl3NGQ8 iDbp3aFh83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBm7Fj5jLljmXrH41lLGBsanJl2MXBxCAjMY JU69v8gE4rAIzGOWWHtuNxuIIyHQzyqx/vFzoAwnkJMnse7vMqAEB5CdJrH/MlS4XGLvkhWMI LaQgJbE0VOzWSGmbmeSmDf9NiNIPZuAicSsDgmQGhEBJYl7qyaDLWMWWMwocfr2DVaQhLBAvs S1x61gNouAqsS0f6fYQWxeAS+J87dPs0Esk5O4ea6TGcTmFPCW6Jo2mQ1isZfExOa37BMYBRc wMqxiVC9OLSpLLdI11EsqykzPKMlNzMzRNTQw1ctNLS5OTE/NSUwq1kvOz93ECAy4egYGxh2M Tb3OhxglOZiURHnVIh9ECvEl5adUZiQWZ8QXleakFh9ilOHgUJLg/TwNKCdYlJqeWpGWmQMMf Zi0BAePkgjvdpA0b3FBYm5xZjpE6hSjJceFO5f+MHEc2HMLSHbcvPuHSYglLz8vVUqc9xBIgw BIQ0ZpHtw4WHxeYpSVEuZlZGBgEOIpSC3KzSxBlX/FKM7BqCTM6zodaApPZl4J3NZXQAcxAR3 0LgLsoJJEhJRUA2NZqu1n9uQdkk/ij2fueTLrkvZci3WV/QvOrb13ds0OR3ffF5JXwrVr3p77 OG1HQKtBopBEjpbB86thobomEhcFuyKE5B8rxUX5OveblzG+LGc99jN9t88tc6s7nLF70rJYj BWavCbUKpw9uEn85u+X0y/6fZP/svXT7JSVTHe1EjW3aj1936bEUpyRaKjFXFScCABVVp0Hyg IAAA== X-Env-Sender: bhupinder.thakur@linaro.org X-Msg-Ref: server-2.tower-206.messagelabs.com!1507891240!86215787!1 X-Originating-IP: [209.85.192.174] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 65455 invoked from network); 13 Oct 2017 10:40:41 -0000 Received: from mail-pf0-f174.google.com (HELO mail-pf0-f174.google.com) (209.85.192.174) by server-2.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 13 Oct 2017 10:40:41 -0000 Received: by mail-pf0-f174.google.com with SMTP id n14so9588354pfh.8 for ; Fri, 13 Oct 2017 03:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JjfDA9Z0IAzgfoM3KXCf+ZyC9QpteTNOiRzj2LrTV+E=; b=e0+9QwOufwdkZZJBrUi4wuDlel3cTUDpsmuhDvNlyu7TbV6mrIuNUR/8o9Q7vnFjdT iZ9hK0KIWvkx05IgQwVXreUfSCvz7vYj05S8NErkQc+khORVRdQYsWIIfdjUoeTk6Jdc pfCXrb5FG/SYUtC1NNGTdgvkUhYKJXmCivjpc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JjfDA9Z0IAzgfoM3KXCf+ZyC9QpteTNOiRzj2LrTV+E=; b=LkZ/jeq5sHGUKUWOUOLI/BqHMBxcBSnTYrihpVY8m9rlTOrFbBbtA9p3VOcr/g+s1L u2t4L077PYxE/3HBImzkF82B2jLZ6kGRe0aPOBSstc1LN2dKKvE0b7zKVv8umtlRod9K zHb7GvvmdYgaNcfRUluOdBMMPVb9BJ8C53e0+QhROmAG3VF2TGtwDEmLiwf98XlssDRY ZbUdR65o9ZQbORx0RrX8CNv9GcjqWyBeTO6S5XzQtOYLVFTqGo4opF95sjvUg+nH7Xz6 fq9Qxp4ftkailbZv9dyNbBsb47EAIN9hvltxYuf85rtsOq/Hq1lnW9AY/MlD0hd62RQ4 k9zQ== X-Gm-Message-State: AMCzsaVmmaFrl0Q/g0lC57Ue90WCnXGwFJP3tL1bHIYIB9fFitNDXhRz uBFKp4sS8f0bJAlJLJ/nGmBz9+NQbnw= X-Google-Smtp-Source: AOwi7QDANl7gPf31c/m9PpEZs31ZgJ5SqiKX7WtIr/sxwNfUaoK4oVJhhTpgC07SdWtRyAH0xPeUxQ== X-Received: by 10.84.215.9 with SMTP id k9mr1006052pli.284.1507891239811; Fri, 13 Oct 2017 03:40:39 -0700 (PDT) Received: from blr-ubuntu-linaro.qualcomm.com (blr-bdr-fw-01_globalnat_allzones-outside.qualcomm.com. [103.229.18.19]) by smtp.gmail.com with ESMTPSA id a7sm1626682pgt.39.2017.10.13.03.40.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Oct 2017 03:40:39 -0700 (PDT) From: Bhupinder Thakur To: xen-devel@lists.xenproject.org Date: Fri, 13 Oct 2017 16:10:31 +0530 Message-Id: <1507891231-4386-2-git-send-email-bhupinder.thakur@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507891231-4386-1-git-send-email-bhupinder.thakur@linaro.org> References: <1507891231-4386-1-git-send-email-bhupinder.thakur@linaro.org> Cc: Andre Przywara , Julien Grall , Stefano Stabellini , Dave Martin Subject: [Xen-devel] [PATCH 27/27 v12] arm/xen: vpl011: Correct the logic for asserting/de-asserting SBSA UART TX interrupt X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes the issue observed when pl011 patches were tested on the junos hardware by Andre/Julien. It was observed that when large output is generated such as on running 'find /', output was getting truncated intermittently due to OUT ring buffer getting full. This issue was due to the fact that the SBSA UART driver expects that when a TX interrupt is asserted then the FIFO queue should be atleast half empty and that it can write N bytes in the FIFO, where N is half the FIFO queue size, without the bytes getting dropped due to FIFO getting full. The SBSA UART emulation logic was asserting the TX interrupt as soon as any space became available in the FIFO and the SBSA UART driver tried to write more data (upto 16 bytes) in the FIFO expecting that there is enough space available leading to dropped bytes. The SBSA spec [1] does not specify when the TX interrupt should be asserted or de-asserted. Due to lack of clarity on the expected behavior, it is assumed for now that TX interrupt should be asserted only when the FIFO goes half empty. TBD: Once the SBSA spec is updated with the expected behavior, the implementation will be modified to align with the spec requirement. [1] http://infocenter.arm.com/help/topic/com.arm.doc.ddi0183f/DDI0183.pdf Signed-off-by: Bhupinder Thakur --- CC: Julien Grall CC: Andre Przywara CC: Stefano Stabellini CC: Dave Martin Changes since v11: - Add a build assert to check that ring buffer size is more than minimum rx fif size of 32 - Added a comment to explain why threshold based logic is not implemented for rx fifo - Moved calls to vpl011_update_interrupt_status() near where TXI/RXI status bit is set Changes since v8: - Used variables fifo_level/fifo_threshold for more clarity - Added a new macro SBSA_UART_FIFO_SIZE instead of using a magic number - Renamed ring_qsize variables to fifo_level for consistency xen/arch/arm/vpl011.c | 113 ++++++++++++++++++++++++++++++------------- xen/include/asm-arm/vpl011.h | 2 + 2 files changed, 82 insertions(+), 33 deletions(-) diff --git a/xen/arch/arm/vpl011.c b/xen/arch/arm/vpl011.c index 0b07436..adf1711 100644 --- a/xen/arch/arm/vpl011.c +++ b/xen/arch/arm/vpl011.c @@ -93,24 +93,27 @@ static uint8_t vpl011_read_data(struct domain *d) */ if ( xencons_queued(in_prod, in_cons, sizeof(intf->in)) > 0 ) { + unsigned int fifo_level; + data = intf->in[xencons_mask(in_cons, sizeof(intf->in))]; in_cons += 1; smp_mb(); intf->in_cons = in_cons; + + fifo_level = xencons_queued(in_prod, in_cons, sizeof(intf->in)); + + if ( fifo_level == 0 ) + { + vpl011->uartfr |= RXFE; + vpl011->uartris &= ~RXI; + vpl011_update_interrupt_status(d); + } } else gprintk(XENLOG_ERR, "vpl011: Unexpected IN ring buffer empty\n"); - if ( xencons_queued(in_prod, in_cons, sizeof(intf->in)) == 0 ) - { - vpl011->uartfr |= RXFE; - vpl011->uartris &= ~RXI; - } - vpl011->uartfr &= ~RXFF; - vpl011_update_interrupt_status(d); - VPL011_UNLOCK(d, flags); /* @@ -122,6 +125,26 @@ static uint8_t vpl011_read_data(struct domain *d) return data; } +static void vpl011_update_tx_fifo_status(struct vpl011 *vpl011, + unsigned int fifo_level) +{ + struct xencons_interface *intf = vpl011->ring_buf; + unsigned int fifo_threshold; + + BUILD_BUG_ON(sizeof (intf->out) < SBSA_UART_FIFO_SIZE); + + /* + * Set the TXI bit only when there is space for fifo_size/2 bytes which + * is the trigger level for asserting/de-assterting the TX interrupt. + */ + fifo_threshold = sizeof(intf->out) - SBSA_UART_FIFO_SIZE/2; + + if ( fifo_level <= fifo_threshold ) + vpl011->uartris |= TXI; + else + vpl011->uartris &= ~TXI; +} + static void vpl011_write_data(struct domain *d, uint8_t data) { unsigned long flags; @@ -146,33 +169,37 @@ static void vpl011_write_data(struct domain *d, uint8_t data) if ( xencons_queued(out_prod, out_cons, sizeof(intf->out)) != sizeof (intf->out) ) { + unsigned int fifo_level; + intf->out[xencons_mask(out_prod, sizeof(intf->out))] = data; out_prod += 1; smp_wmb(); intf->out_prod = out_prod; - } - else - gprintk(XENLOG_ERR, "vpl011: Unexpected OUT ring buffer full\n"); - if ( xencons_queued(out_prod, out_cons, sizeof(intf->out)) == - sizeof (intf->out) ) - { - vpl011->uartfr |= TXFF; - vpl011->uartris &= ~TXI; + fifo_level = xencons_queued(out_prod, out_cons, sizeof(intf->out)); - /* - * This bit is set only when FIFO becomes full. This ensures that - * the SBSA UART driver can write the early console data as fast as - * possible, without waiting for the BUSY bit to get cleared before - * writing each byte. - */ - vpl011->uartfr |= BUSY; + if ( fifo_level == sizeof (intf->out) ) + { + vpl011->uartfr |= TXFF; + + /* + * This bit is set only when FIFO becomes full. This ensures that + * the SBSA UART driver can write the early console data as fast as + * possible, without waiting for the BUSY bit to get cleared before + * writing each byte. + */ + vpl011->uartfr |= BUSY; + } + + vpl011_update_tx_fifo_status(vpl011, fifo_level); + + vpl011_update_interrupt_status(d); } + else + gprintk(XENLOG_ERR, "vpl011: Unexpected OUT ring buffer full\n"); vpl011->uartfr &= ~TXFE; - vpl011_update_interrupt_status(d); - VPL011_UNLOCK(d, flags); /* @@ -344,7 +371,7 @@ static void vpl011_data_avail(struct domain *d) struct vpl011 *vpl011 = &d->arch.vpl011; struct xencons_interface *intf = vpl011->ring_buf; XENCONS_RING_IDX in_cons, in_prod, out_cons, out_prod; - XENCONS_RING_IDX in_ring_qsize, out_ring_qsize; + XENCONS_RING_IDX in_fifo_level, out_fifo_level; VPL011_LOCK(d, flags); @@ -355,28 +382,46 @@ static void vpl011_data_avail(struct domain *d) smp_rmb(); - in_ring_qsize = xencons_queued(in_prod, + in_fifo_level = xencons_queued(in_prod, in_cons, sizeof(intf->in)); - out_ring_qsize = xencons_queued(out_prod, + out_fifo_level = xencons_queued(out_prod, out_cons, sizeof(intf->out)); /* Update the uart rx state if the buffer is not empty. */ - if ( in_ring_qsize != 0 ) + if ( in_fifo_level != 0 ) { vpl011->uartfr &= ~RXFE; - if ( in_ring_qsize == sizeof(intf->in) ) + + if ( in_fifo_level == sizeof(intf->in) ) vpl011->uartfr |= RXFF; + + /* + * Currently, the RXI bit is getting set even if there is a single + * byte of data in the rx fifo. Ideally, the RXI bit should be set + * only if the rx fifo level reaches the threshold. + * + * However, since currently RX timeout interrupt is not + * implemented as there is not enough clarity in the SBSA spec, + * the guest may keep waiting for an interrupt to read more + * data. To ensure that guest reads all the data without + * any delay, the RXI interrupt is raised if there is RX data + * available without checking whether fifo level has reached + * the threshold. + * + * TBD: Once there is more clarity in the SBSA spec on whether RX + * timeout interrupt needs to be implemented, the RXI interrupt + * will be raised only when rx fifo level reaches the threshold. + */ vpl011->uartris |= RXI; } /* Update the uart tx state if the buffer is not full. */ - if ( out_ring_qsize != sizeof(intf->out) ) + if ( out_fifo_level != sizeof(intf->out) ) { vpl011->uartfr &= ~TXFF; - vpl011->uartris |= TXI; /* * Clear the BUSY bit as soon as space becomes available @@ -385,7 +430,9 @@ static void vpl011_data_avail(struct domain *d) */ vpl011->uartfr &= ~BUSY; - if ( out_ring_qsize == 0 ) + vpl011_update_tx_fifo_status(vpl011, out_fifo_level); + + if ( out_fifo_level == 0 ) vpl011->uartfr |= TXFE; } diff --git a/xen/include/asm-arm/vpl011.h b/xen/include/asm-arm/vpl011.h index 1b583da..db95ff8 100644 --- a/xen/include/asm-arm/vpl011.h +++ b/xen/include/asm-arm/vpl011.h @@ -28,6 +28,8 @@ #define VPL011_LOCK(d,flags) spin_lock_irqsave(&(d)->arch.vpl011.lock, flags) #define VPL011_UNLOCK(d,flags) spin_unlock_irqrestore(&(d)->arch.vpl011.lock, flags) +#define SBSA_UART_FIFO_SIZE 32 + struct vpl011 { void *ring_buf; struct page_info *ring_page;