From patchwork Wed Mar 20 01:42:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Edwards X-Patchwork-Id: 1913823 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=turingpi.com header.i=@turingpi.com header.a=rsa-sha256 header.s=google header.b=k1F/4DvN; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:4601:e00::3; helo=am.mirrors.kernel.org; envelope-from=linux-i2c+bounces-2420-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Tzrtm3mRVz1yWy for ; Wed, 20 Mar 2024 12:42:24 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id C1D741F2409D for ; Wed, 20 Mar 2024 01:42:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 026401426D; Wed, 20 Mar 2024 01:42:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=turingpi.com header.i=@turingpi.com header.b="k1F/4DvN" X-Original-To: linux-i2c@vger.kernel.org Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19D9713AC4 for ; Wed, 20 Mar 2024 01:42:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710898934; cv=none; b=BU8ZnUoA0YSJomx1XUeFflW/9qK4V6D8p8OR37+n0lxCyzUmAxHVVck9JymN9KJ/AZfkGrOkqcvDeFi4Rm1bRyCCZj5jNHESYPoEqSlz0q0strdeaOYW5Q4dTnE5MSp8OY9dQp2+GzjJ6Q568RCmmsDhtrTTnQtEgEHo2KuJh50= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710898934; c=relaxed/simple; bh=JJp5BjVgwceJSsUFmj642CkDTMAZWthXZgqfDWfpTHI=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:Content-Type; b=dQXvJDqAKHthP66seh5nAKtD8SvA2eWGa6yv3AMt2HFAFRwHogbSGgaMCJOYgGZsBSnWVctifOGY/wxnWzq/v1NEEeGWboQPv6n3dWmsgimB+ohFGIyXTe+FUXaCvwP7kkeEKEp7pQ2dzUv0NiqPIb/zLUTWWZSZH/onANuPmbM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=turingpi.com; spf=pass smtp.mailfrom=turingpi.com; dkim=pass (2048-bit key) header.d=turingpi.com header.i=@turingpi.com header.b=k1F/4DvN; arc=none smtp.client-ip=209.85.166.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=turingpi.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=turingpi.com Received: by mail-io1-f44.google.com with SMTP id ca18e2360f4ac-7cef30fbc5aso52520639f.0 for ; Tue, 19 Mar 2024 18:42:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=turingpi.com; s=google; t=1710898932; x=1711503732; darn=vger.kernel.org; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=dJzgiStFUlr1nxSqxAj64/hVS0Fow/+7dcCq3KkYmS0=; b=k1F/4DvNTb72BXfwjGLhVPkv/9DOklOCCJY7H+/PN9eq98k0dkzZJuiaWu3Z2cq10u L8euZ0KTFwY4jqRsgdWkOBYQ246oIF9IFxLReYXCBbIrqW/Mn3MCym6DGOlC9tBiAkgH W6oJtFGuOTYELD5hU+jJbAw9mNhMrGc+PWiAz5qKDSMq52bmJWfpbYBZLqKYklcEk3Ug ww+0BNXs4JvToGPK6XLuQlq8sEXoMkfU/M0q3QPuh2T8cTwB4C3FtEM7noqDTpSraF+1 xhvkFUXbkkRSC+HAC43/udqmIihFNt9HW83yAm4/4HdNapApDcigzeKMTOSMcoLJ9dLt 8n5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710898932; x=1711503732; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=dJzgiStFUlr1nxSqxAj64/hVS0Fow/+7dcCq3KkYmS0=; b=gEv4nM5AZVuycfyrKftWYUYnBmHMrB6QeYH2VlUGlf4B90eB9GnBQ8Yhkpp5Ic2B2E j3V8ersIPH2cFdyOw1yR4a7neH0YtbLu+Q4v8phw1mDLpi2IeMAy24QfXDQm92m/jcUz 4ydGTh5RD+o/cV5WrQhMsrHcXK+a1jj+DUXH1SUnBRM4xk5o/wrhCRaDkiJ+dHGUrmTi m98YGUOtpzoCFN8SDxIKK34jxWwr+FZ9YGfjBvurY+CLGEVcmUa7dfK2t0wx5z1xOXuS dsRj4TdsF195WrTobhNAjdsjb9+EQOU68fMXP82T6SemN7Ai3v4qNhqF5BcwfF5ASY0L 3HFw== X-Gm-Message-State: AOJu0Yy0Bg6wI/+p8CqKjSi8QBlRRYGGC4veEan8VNiasr70FlVMZ2d9 S00Mni19acNHaHaC6WTI//6TCRQ/MPwOC5vwVWyH32qGrLcfo7kTvejHJNiQw1KCA5/5THJQTlM oDSQ= X-Google-Smtp-Source: AGHT+IHZ0Akvv10k6gATwoQFeaRxwKlPggp2ClvESjcX3me4odqczTr69IWhpdbBDKqUg1TmNabmWg== X-Received: by 2002:a5d:8491:0:b0:7c8:b7ac:23b with SMTP id t17-20020a5d8491000000b007c8b7ac023bmr19469582iom.4.1710898932311; Tue, 19 Mar 2024 18:42:12 -0700 (PDT) Received: from ?IPV6:2001:470:42c4:101:9af9:b18f:3f69:51be? ([2001:470:42c4:101:9af9:b18f:3f69:51be]) by smtp.gmail.com with ESMTPSA id y19-20020a6bc813000000b007cc028ce258sm2632845iof.36.2024.03.19.18.42.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Mar 2024 18:42:12 -0700 (PDT) Message-ID: <26aa2bec-8d60-4b01-a6a3-013a50d70330@turingpi.com> Date: Tue, 19 Mar 2024 19:42:11 -0600 Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Sam Edwards Subject: [RFC PATCH 4/5] i2c: mv64xxx: Allow continuing after read To: Gregory CLEMENT , Andi Shyti Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Content-Language: en-US The current FSM does not check the `send_stop` flag when completing a read message; it just assumes any read message is always the end of the transfer. This means subsequent messages go unprocessed, with no error code to indicate otherwise. Fixing this requires that the FSM check the `send_stop` flag and issue the `SEND_RESTART` action instead of stop, but there are only two RCV_* variants, one for receive-and-continue and one for receive-and-stop. We could add another variant, however, the new FSM from the previous patch makes it pretty clear that the RCV_* variants aren't really full actions in their own respect, since they both implement the same observable functionality as another action, just with an added read from the data register first. Therefore, convert the receive actions to a flag that can be set, allowing any action to have an "...and also read" variant. The FSM can then just use the plain SEND_RESTART action, but OR-in the flag, to represent "read a byte, finish this message, go to the next message." Signed-off-by: Sam Edwards --- drivers/i2c/busses/i2c-mv64xxx.c | 47 +++++++++++--------------------- 1 file changed, 16 insertions(+), 31 deletions(-) u32 status) case MV64XXX_I2C_STATE_READ: if (drv_data->bytes_left == 0) { - if (prev_state == MV64XXX_I2C_STATE_READ) - drv_data->action = MV64XXX_I2C_ACTION_RCV_DATA_STOP; - else + if (drv_data->send_stop || drv_data->aborting) { drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP; - drv_data->state = MV64XXX_I2C_STATE_IDLE; + drv_data->state = MV64XXX_I2C_STATE_IDLE; + } else { + drv_data->action = MV64XXX_I2C_ACTION_SEND_RESTART; + drv_data->state = MV64XXX_I2C_STATE_RESTART; + } } else { - if (prev_state == MV64XXX_I2C_STATE_READ) - drv_data->action = MV64XXX_I2C_ACTION_RCV_DATA; - else - drv_data->action = MV64XXX_I2C_ACTION_CONTINUE; + drv_data->action = MV64XXX_I2C_ACTION_CONTINUE; /* * bytes_left counts the remaining read actions to send @@ -419,6 +418,8 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status) if (drv_data->bytes_left == 0) drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_ACK; } + if (prev_state == MV64XXX_I2C_STATE_READ) + drv_data->action |= MV64XXX_I2C_ACTION_RECEIVE; break; case MV64XXX_I2C_STATE_WRITE: @@ -457,6 +458,11 @@ static void mv64xxx_i2c_send_start(struct mv64xxx_i2c_data *drv_data) static void mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) { + if (drv_data->action & MV64XXX_I2C_ACTION_RECEIVE) + drv_data->msg->buf[drv_data->byte_posn++] = + readl(drv_data->reg_base + drv_data->reg_offsets.data); + drv_data->action &= ~MV64XXX_I2C_ACTION_RECEIVE; + switch(drv_data->action) { case MV64XXX_I2C_ACTION_SEND_RESTART: /* We should only get here if we have further messages */ @@ -503,27 +509,6 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data) drv_data->reg_base + drv_data->reg_offsets.control); break; - case MV64XXX_I2C_ACTION_RCV_DATA: - drv_data->msg->buf[drv_data->byte_posn++] = - readl(drv_data->reg_base + drv_data->reg_offsets.data); - writel(drv_data->cntl_bits, - drv_data->reg_base + drv_data->reg_offsets.control); - break; - - case MV64XXX_I2C_ACTION_RCV_DATA_STOP: - drv_data->msg->buf[drv_data->byte_posn++] = - readl(drv_data->reg_base + drv_data->reg_offsets.data); - if (!drv_data->atomic) - drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_INTEN; - writel(drv_data->cntl_bits | MV64XXX_I2C_REG_CONTROL_STOP, - drv_data->reg_base + drv_data->reg_offsets.control); - drv_data->block = 0; - if (drv_data->errata_delay) - udelay(5); - - wake_up(&drv_data->waitq); - break; - case MV64XXX_I2C_ACTION_INVALID: default: dev_err(&drv_data->adapter.dev, diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 3ae74160001d..6a205cca603a 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -116,9 +116,9 @@ enum mv64xxx_i2c_action { MV64XXX_I2C_ACTION_SEND_ADDR_1, MV64XXX_I2C_ACTION_SEND_ADDR_2, MV64XXX_I2C_ACTION_SEND_DATA, - MV64XXX_I2C_ACTION_RCV_DATA, - MV64XXX_I2C_ACTION_RCV_DATA_STOP, MV64XXX_I2C_ACTION_SEND_STOP, + + MV64XXX_I2C_ACTION_RECEIVE = 0x80, }; struct mv64xxx_i2c_regs { @@ -395,16 +395,15 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data,