From patchwork Fri Jul 19 18:10:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1962600 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=mDIRd1HL; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WQd9w2XsBz1xpQ for ; Sat, 20 Jul 2024 04:14:44 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sUs51-0003Ww-76; Fri, 19 Jul 2024 14:11:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sUs4p-0002sW-2a for qemu-devel@nongnu.org; Fri, 19 Jul 2024 14:11:32 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sUs4m-0003r6-V5 for qemu-devel@nongnu.org; Fri, 19 Jul 2024 14:11:30 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-427b1d4da32so10126915e9.0 for ; Fri, 19 Jul 2024 11:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721412687; x=1722017487; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DMaUbmKJbBglpDupXq1EpryBjAO9Dx7J7NA5WWzmpPw=; b=mDIRd1HLnzN3H1mIfCrSmtcXIWAFBcZs1dNcYbTGm9qpPh70h3uuHpZrfyqf4HF96n 77yS+/N9SGZ0Q36xEyKyDyBXk4slP9R8yN/fhlfiiYFY3AH/XK9xErnVQ8Zm27sgdDCG oDARJIq2QiElOoPO/L5cjUW36OcXF0MhUk23kcNqTiwyp8H3D9ZWNbBaq01byIlezkq1 o4IP8NTnZGHldSduG2tkPnjDfLyyxtHABTEgtVT1nxMVAmPh6ka1MECVHJALQE2+Q9LS sf/m6TYvkNAiVOo8OPXRKaQXT18ghcTtrMi7cO7ahCu7SViA1OYhK2hmPHDcCLH8eIbz Gj8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721412687; x=1722017487; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DMaUbmKJbBglpDupXq1EpryBjAO9Dx7J7NA5WWzmpPw=; b=tR/F6M2+OAjpJ7gtHuI2VXKz8JLkm8gl7RibN2wMHZY6I+p7J1cpIYcgi77eDEdJbo PE5e8VCUmMDvuYoSzAPMhRZJYtmZTCU//K/+egOVJn99hCCuX5rV8mZ4wQYmO4z5Q+xF xe0keaEWat5cWQAeYrAkGaEaaaktIBA6e+xRBhTvn5bmNHSXhg+Vl4+bCwAj7FSjhsnb 9rOrLuUhCgFWwwM203jRSuNoS8Z4d80yeKgp8VFwNqws6hMDEcghh93dF4656lOA8bEs eMc7yczMGgLzEwicEilRd5vIgoPPCa1xXE/xAM/pdOpETEYkEO4MlK8vzr5r/7e7JrAV a73w== X-Gm-Message-State: AOJu0Yy2aV0STi7ZeLw4FVzR0QfsIorXvVsNSpJP0XBtD9GA26pCZeTR oowJx9UyYaaZzhALbSUNo45u9mZZIMBIlCCrBmmmiu7qDD+MC2h7AMoWX8aX6H2IdlsO1zCnfxb m X-Google-Smtp-Source: AGHT+IHVhPZBltdNb5U19GKKsLFLqnLr+nLG4pavFd4q5Bf7ToAHBrItgl88M6VjcmZTDPKOzL9Caw== X-Received: by 2002:adf:a3c8:0:b0:368:4488:66f8 with SMTP id ffacd0b85a97d-36873f18f12mr2144385f8f.23.1721412686920; Fri, 19 Jul 2024 11:11:26 -0700 (PDT) Received: from localhost.localdomain (52.170.88.92.rev.sfr.net. [92.88.170.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-368787cedabsm2217831f8f.84.2024.07.19.11.11.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 19 Jul 2024 11:11:26 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-arm@nongnu.org, Mark Cave-Ayland , Tong Ho , Manos Pitsidianakis , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson Subject: [PATCH v5 07/16] hw/char/pl011: Extract pl011_read_rxdata() from pl011_read() Date: Fri, 19 Jul 2024 20:10:32 +0200 Message-ID: <20240719181041.49545-8-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240719181041.49545-1-philmd@linaro.org> References: <20240719181041.49545-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To keep MemoryRegionOps read/write handlers with similar logic, factor pl011_read_txdata() out of pl011_read(), similar to what the previous commit did to pl011_write(). No functional change intended. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- hw/char/pl011.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/hw/char/pl011.c b/hw/char/pl011.c index c2ee9b0321..5e44837206 100644 --- a/hw/char/pl011.c +++ b/hw/char/pl011.c @@ -233,31 +233,38 @@ static void pl011_write_txdata(PL011State *s, uint8_t data) pl011_update(s); } +static uint32_t pl011_read_rxdata(PL011State *s) +{ + uint32_t c; + + s->flags &= ~PL011_FLAG_RXFF; + c = s->read_fifo[s->read_pos]; + if (s->read_count > 0) { + s->read_count--; + s->read_pos = (s->read_pos + 1) & (pl011_get_fifo_depth(s) - 1); + } + if (s->read_count == 0) { + s->flags |= PL011_FLAG_RXFE; + } + if (s->read_count == s->read_trigger - 1) { + s->int_level &= ~ INT_RX; + } + trace_pl011_read_fifo(s->read_count); + s->rsr = c >> 8; + pl011_update(s); + qemu_chr_fe_accept_input(&s->chr); + return c; +} + static uint64_t pl011_read(void *opaque, hwaddr offset, unsigned size) { PL011State *s = (PL011State *)opaque; - uint32_t c; uint64_t r; switch (offset >> 2) { case 0: /* UARTDR */ - s->flags &= ~PL011_FLAG_RXFF; - c = s->read_fifo[s->read_pos]; - if (s->read_count > 0) { - s->read_count--; - s->read_pos = (s->read_pos + 1) & (pl011_get_fifo_depth(s) - 1); - } - if (s->read_count == 0) { - s->flags |= PL011_FLAG_RXFE; - } - if (s->read_count == s->read_trigger - 1) - s->int_level &= ~ INT_RX; - trace_pl011_read_fifo(s->read_count); - s->rsr = c >> 8; - pl011_update(s); - qemu_chr_fe_accept_input(&s->chr); - r = c; + r = pl011_read_rxdata(s); break; case 1: /* UARTRSR */ r = s->rsr;