From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6A8AC4332B for ; Mon, 11 Jan 2021 18:15:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A7F0F22ADF for ; Mon, 11 Jan 2021 18:15:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390188AbhAKSPR (ORCPT ); Mon, 11 Jan 2021 13:15:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730788AbhAKSPQ (ORCPT ); Mon, 11 Jan 2021 13:15:16 -0500 Received: from mail-oo1-xc2b.google.com (mail-oo1-xc2b.google.com [IPv6:2607:f8b0:4864:20::c2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBE3DC0617A3 for ; Mon, 11 Jan 2021 10:14:20 -0800 (PST) Received: by mail-oo1-xc2b.google.com with SMTP id y14so64918oom.10 for ; Mon, 11 Jan 2021 10:14:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=F8DpYx4Rvc8IfW6iPXUioxHLnnhF0Acl+tlJ1bYkC3w=; b=ZyzdUWClIbmcjOx8seICDu0ip+n7AFLIK74VzQ5K6wZG4zErZoLb7VteTQYmvGIzK5 /uxyf1P4hXKdQ4iSOFtLAVumoRVYw7eD+JUD3bOx+O0yMigHnKxijb4kNTJCqkWmbH6c W2Lb6dhD7Yc/hhJ3ElkmMhp/IUoZJ5Bh+a1c7aOXCBivK68+8PtNQ2X3gFpJx0+IKOfh aheEjOaWJKh/Gq4SzLC0Sg44EllwdkEFBPYVobc0kYiGw0lsQbFfdRONBUEjIQjA20MA vdLEdFwuMOJAKOA7cYxI+2ke4PMFvA+UltxslvtEc0MHmIRmoq+rOOvF/sIbeqnmS7uT 7tgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=F8DpYx4Rvc8IfW6iPXUioxHLnnhF0Acl+tlJ1bYkC3w=; b=OqHYtQLBZDzbipgDcB4B5VEJS6QaQ3MXS9TYJyKOWxJ2DF220pdhstgnQWMNGP7DyU GLwqBurVt7SD7i8rrp2TJzJRD3FfPVBAcifQg1SM89Ovlxw8ARDnEIeaW1sJdFMClJmj i2qeHmZcCt/AjoXPmEalAw2bItPCmemFAja68Xn8SUuBk/qnxXsf07Cc8iD9eHYnEQc6 /NBIOdq3zvVkxxy2FPpq4Yn/kd28vQJHSHdGI9M/AJOJJ8767GHKE2Ce4YmDZoo5/F2S 68jxnDIRLX3ChQxwmCUzIg3EQMv2PKuZP24F7y9xgr2xr/lGjgAciv+x8h5DEEIuM1v1 MTFg== X-Gm-Message-State: AOAM530hRSuTwfhTw0pkFtKIGjDew8tCzaqNCp893BAGkYaxfy5EA5M7 NyqupErJ4d/KyemZR78xmcDcOw== X-Google-Smtp-Source: ABdhPJzqo1/kWD1gAbh5afYoPyZpxfmvnDuJORlJWpKeeljxmiSniAjZsZKcifD5sbUIsxX1GlTWUw== X-Received: by 2002:a4a:896e:: with SMTP id g43mr372446ooi.24.1610388860012; Mon, 11 Jan 2021 10:14:20 -0800 (PST) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id 11sm100742oty.65.2021.01.11.10.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jan 2021 10:14:19 -0800 (PST) Date: Mon, 11 Jan 2021 12:14:17 -0600 From: Bjorn Andersson To: Vinod Koul Cc: Mark Brown , Wolfram Sang , linux-arm-msm@vger.kernel.org, Andy Gross , Matthias Kaehlcke , Douglas Anderson , Sumit Semwal , Amit Pundir , linux-spi@vger.kernel.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 5/7] i2c: qcom-geni: Add support for GPI DMA Message-ID: References: <20210111151651.1616813-1-vkoul@kernel.org> <20210111151651.1616813-6-vkoul@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210111151651.1616813-6-vkoul@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon 11 Jan 09:16 CST 2021, Vinod Koul wrote: > This adds capability to use GSI DMA for I2C transfers > > Signed-off-by: Vinod Koul > --- > drivers/i2c/busses/i2c-qcom-geni.c | 246 ++++++++++++++++++++++++++++- > 1 file changed, 244 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c > index 046d241183c5..6978480fb4d1 100644 > --- a/drivers/i2c/busses/i2c-qcom-geni.c > +++ b/drivers/i2c/busses/i2c-qcom-geni.c > @@ -12,7 +12,9 @@ > #include > #include > #include > +#include > #include > +#include > #include > > #define SE_I2C_TX_TRANS_LEN 0x26c > @@ -48,6 +50,8 @@ > #define LOW_COUNTER_SHFT 10 > #define CYCLE_COUNTER_MSK GENMASK(9, 0) > > +#define I2C_PACK_EN (BIT(0) | BIT(1)) > + > enum geni_i2c_err_code { > GP_IRQ0, > NACK, > @@ -72,6 +76,12 @@ enum geni_i2c_err_code { > #define XFER_TIMEOUT HZ > #define RST_TIMEOUT HZ > > +enum i2c_se_mode { > + UNINITIALIZED, > + FIFO_SE_DMA, > + GSI_ONLY, > +}; > + > struct geni_i2c_dev { > struct geni_se se; > u32 tx_wm; > @@ -86,6 +96,17 @@ struct geni_i2c_dev { > u32 clk_freq_out; > const struct geni_i2c_clk_fld *clk_fld; > int suspended; > + struct dma_chan *tx_c; > + struct dma_chan *rx_c; > + dma_cookie_t rx_cookie, tx_cookie; > + dma_addr_t tx_ph; > + dma_addr_t rx_ph; > + int cfg_sent; bool? > + struct dma_async_tx_descriptor *tx_desc; > + struct dma_async_tx_descriptor *rx_desc; > + enum i2c_se_mode se_mode; bool gsi_only; > + bool cmd_done; Unused? > + bool is_shared; Used but meaningless? > }; > > struct geni_i2c_err_log { > @@ -429,6 +450,183 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, > return gi2c->err; > } > > +static void i2c_gsi_cb_result(void *cb, const struct dmaengine_result *result) > +{ > + struct geni_i2c_dev *gi2c = cb; > + > + if (result->result != DMA_TRANS_NOERROR) { > + dev_err(gi2c->se.dev, "DMA txn failed:%d\n", result->result); > + return; > + } > + > + if (result->residue) > + dev_dbg(gi2c->se.dev, "DMA xfer has pending: %d\n", result->residue); > + > + complete(&gi2c->done); > +} > + > +static int geni_i2c_gsi_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], > + int num) > +{ > + struct geni_i2c_dev *gi2c = i2c_get_adapdata(adap); > + struct dma_slave_config config; > + struct gpi_i2c_config peripheral; > + int i, ret = 0, timeout = 0; > + > + memset(&config, 0, sizeof(config)); Assign {} to config during declaration. > + memset(&peripheral, 0, sizeof(peripheral)); > + config.peripheral_config = &peripheral; > + config.peripheral_size = sizeof(peripheral); > + > + if (!gi2c->tx_c) { > + gi2c->tx_c = dma_request_slave_channel(gi2c->se.dev, "tx"); So object is reused for all future transfers as well? Seems reasonable, but it should be released on driver removal? Could it be requested at probe time instead? > + if (!gi2c->tx_c) { > + dev_err(gi2c->se.dev, "tx dma_request_slave_channel fail\n"); > + ret = -EIO; > + goto geni_i2c_gsi_xfer_out; > + } > + } > + > + if (!gi2c->rx_c) { > + gi2c->rx_c = dma_request_slave_channel(gi2c->se.dev, "rx"); > + if (!gi2c->rx_c) { > + dev_err(gi2c->se.dev, "rx dma_request_slave_channel fail\n"); > + ret = -EIO; > + goto geni_i2c_gsi_xfer_out; > + } > + } > + > + if (!gi2c->cfg_sent) { > + const struct geni_i2c_clk_fld *itr = gi2c->clk_fld; > + > + peripheral.pack_enable = I2C_PACK_EN; > + peripheral.cycle_count = itr->t_cycle_cnt; > + peripheral.high_count = itr->t_high_cnt; > + peripheral.low_count = itr->t_low_cnt; > + peripheral.clk_div = itr->clk_div; > + gi2c->cfg_sent = true; Is this a bool or an int? > + peripheral.set_config = true; I find this somewhat ugly, you will always dmaengine_slave_config(&config), but in the case of cfg_sent this will point to an all-zero peripheral and hence will have set_config = false, which will cause the skipping of setting up a configuration TRE. I would prefer that the value of peripheral.set_config related to cfg_sent in a more explicit fashion. > + } > + > + peripheral.multi_msg = false; > + for (i = 0; i < num; i++) { > + struct device *rx_dev = gi2c->se.wrapper->dev; > + struct device *tx_dev = gi2c->se.wrapper->dev; > + int stretch = (i < (num - 1)); > + u8 *dma_buf = NULL; No need to initialize this, first use is an assignment. > + unsigned int flags; > + > + gi2c->cur = &msgs[i]; > + > + peripheral.addr = msgs[i].addr; > + peripheral.stretch = stretch; > + if (msgs[i].flags & I2C_M_RD) > + peripheral.op = I2C_READ; > + else > + peripheral.op = I2C_WRITE; > + > + dma_buf = i2c_get_dma_safe_msg_buf(&msgs[i], 1); > + if (!dma_buf) { > + ret = -ENOMEM; > + goto geni_i2c_gsi_xfer_out; > + } > + > + if (msgs[i].flags & I2C_M_RD) { > + gi2c->rx_ph = dma_map_single(rx_dev, dma_buf, > + msgs[i].len, DMA_FROM_DEVICE); > + if (dma_mapping_error(rx_dev, gi2c->rx_ph)) { > + dev_err(gi2c->se.dev, "dma_map_single for rx failed :%d\n", ret); > + i2c_put_dma_safe_msg_buf(dma_buf, &msgs[i], false); > + goto geni_i2c_gsi_xfer_out; > + } > + > + peripheral.op = I2C_READ; > + peripheral.stretch = stretch; > + ret = dmaengine_slave_config(gi2c->rx_c, &config); > + if (ret) { > + dev_err(gi2c->se.dev, "rx dma config error:%d\n", ret); > + goto geni_i2c_gsi_xfer_out; Need to unmap rx_ph? > + } > + peripheral.set_config = false; > + peripheral.multi_msg = true; > + peripheral.rx_len = msgs[i].len; > + > + flags = DMA_PREP_INTERRUPT | DMA_CTRL_ACK; > + gi2c->rx_desc = dmaengine_prep_slave_single(gi2c->rx_c, gi2c->rx_ph, > + msgs[i].len, > + DMA_DEV_TO_MEM, flags); Is the rx_desc freed by the dmaengine core when dma_async_issue_pending() finishes it's job? If so, why do you need to keep this pointer in gi2c? Wouldn't a local variable suffice? > + if (!gi2c->rx_desc) { > + dev_err(gi2c->se.dev, "prep_slave_sg for rx failed\n"); > + gi2c->err = -EIO; > + goto geni_i2c_err_prep_sg; > + } > + > + gi2c->rx_desc->callback_result = i2c_gsi_cb_result; > + gi2c->rx_desc->callback_param = gi2c; > + > + /* Issue RX */ > + gi2c->rx_cookie = dmaengine_submit(gi2c->rx_desc); > + dma_async_issue_pending(gi2c->rx_c); > + } > + > + dev_dbg(gi2c->se.dev, "msg[%d].len:%d W\n", i, gi2c->cur->len); > + gi2c->tx_ph = dma_map_single(tx_dev, dma_buf, msgs[i].len, DMA_TO_DEVICE); Maybe I've forgotten something important about I2C, but why do we always TX (even if it's a RX transfer)? > + if (dma_mapping_error(tx_dev, gi2c->tx_ph)) { > + dev_err(gi2c->se.dev, "dma_map_single for tx failed :%d\n", ret); > + i2c_put_dma_safe_msg_buf(dma_buf, &msgs[i], false); Need to unmap rx_ph? > + goto geni_i2c_gsi_xfer_out; > + } > + > + peripheral.stretch = stretch; > + peripheral.op = I2C_WRITE; > + ret = dmaengine_slave_config(gi2c->tx_c, &config); > + if (ret) { > + dev_err(gi2c->se.dev, "tx dma config error:%d\n", ret); Need to unmap rx_ph and tx_ph? > + goto geni_i2c_gsi_xfer_out; > + } > + peripheral.set_config = false; > + peripheral.multi_msg = true; > + gi2c->tx_desc = dmaengine_prep_slave_single(gi2c->tx_c, gi2c->tx_ph, msgs[i].len, > + DMA_MEM_TO_DEV, > + (DMA_PREP_INTERRUPT | DMA_CTRL_ACK)); > + if (!gi2c->tx_desc) { > + dev_err(gi2c->se.dev, "prep_slave_sg for tx failed\n"); > + gi2c->err = -ENOMEM; > + goto geni_i2c_err_prep_sg; > + } > + gi2c->tx_desc->callback_result = i2c_gsi_cb_result; > + gi2c->tx_desc->callback_param = gi2c; > + > + /* Issue TX */ > + gi2c->tx_cookie = dmaengine_submit(gi2c->tx_desc); > + dma_async_issue_pending(gi2c->tx_c); > + > + timeout = wait_for_completion_timeout(&gi2c->done, XFER_TIMEOUT); > + if (!timeout) { > + dev_err(gi2c->se.dev, "I2C timeout gsi flags:%d addr:0x%x\n", > + gi2c->cur->flags, gi2c->cur->addr); > + gi2c->err = -ETIMEDOUT; > + } > +geni_i2c_err_prep_sg: Perhaps you can break the body of this loop out to a separate function and thereby avoid the goto within the block? > + if (gi2c->err) { > + dmaengine_terminate_all(gi2c->tx_c); > + gi2c->cfg_sent = 0; Is this a bool or an int? > + } > + if (msgs[i].flags & I2C_M_RD) > + dma_unmap_single(rx_dev, gi2c->rx_ph, msgs[i].len, DMA_FROM_DEVICE); You unconditionally map tx_ph, but you only unmap it on ~I2C_M_RD. This fits better with my expectation, but would mean that the whole tx block above should be in an else. > + else > + dma_unmap_single(tx_dev, gi2c->tx_ph, msgs[i].len, DMA_TO_DEVICE); > + i2c_put_dma_safe_msg_buf(dma_buf, &msgs[i], !gi2c->err); > + if (gi2c->err) > + goto geni_i2c_gsi_xfer_out; This goto is just a "break" in disguise. > + } > + > +geni_i2c_gsi_xfer_out: > + if (!ret && gi2c->err) > + ret = gi2c->err; > + return ret; > +} > + > static int geni_i2c_xfer(struct i2c_adapter *adap, > struct i2c_msg msgs[], > int num) > @@ -448,6 +646,15 @@ static int geni_i2c_xfer(struct i2c_adapter *adap, > } > > qcom_geni_i2c_conf(gi2c); > + > + if (gi2c->se_mode == GSI_ONLY) { > + ret = geni_i2c_gsi_xfer(adap, msgs, num); > + goto geni_i2c_txn_ret; Rather than goto skip_non_gsi_code; I think you should move the non-gsi part of this function into a separate fifo function and make this if (GSI_ONLY) ret = geni_i2c_gsi_xfer(); else ret = geni_i2c_fifo_xfer(); > + } else { > + /* Don't set shared flag in non-GSI mode */ > + gi2c->is_shared = false; I don't see this flag being looked at elsewhere. > + } > + > for (i = 0; i < num; i++) { > u32 m_param = i < (num - 1) ? STOP_STRETCH : 0; > > @@ -462,6 +669,7 @@ static int geni_i2c_xfer(struct i2c_adapter *adap, > if (ret) > break; > } > +geni_i2c_txn_ret: > if (ret == 0) > ret = num; > > @@ -628,7 +836,8 @@ static int __maybe_unused geni_i2c_runtime_suspend(struct device *dev) > int ret; > struct geni_i2c_dev *gi2c = dev_get_drvdata(dev); > > - disable_irq(gi2c->irq); > + if (gi2c->se_mode == FIFO_SE_DMA) > + disable_irq(gi2c->irq); > ret = geni_se_resources_off(&gi2c->se); > if (ret) { > enable_irq(gi2c->irq); > @@ -653,8 +862,41 @@ static int __maybe_unused geni_i2c_runtime_resume(struct device *dev) > ret = geni_se_resources_on(&gi2c->se); > if (ret) > return ret; > + if (gi2c->se_mode == UNINITIALIZED) { > + int proto = geni_se_read_proto(&gi2c->se); > + u32 se_mode; Please declare your variables at the top of the function. > + > + if (unlikely(proto != GENI_SE_I2C)) { If this was the case at probe time the driver would never have probed, why has it changed? This is not a fastpath, so skip the unlikely() > + dev_err(gi2c->se.dev, "Invalid proto %d\n", proto); > + geni_se_resources_off(&gi2c->se); > + return -ENXIO; > + } > + > + se_mode = readl_relaxed(gi2c->se.base + GENI_IF_DISABLE_RO) & > + FIFO_IF_DISABLE; se_mode would better be called "fifo_disabled" or perhaps logically suited "gsi_only"? Please skip the _relaxed > + if (se_mode) { > + gi2c->se_mode = GSI_ONLY; > + geni_se_select_mode(&gi2c->se, GENI_GPI_DMA); > + dev_dbg(gi2c->se.dev, "i2c GSI mode\n"); > + } else { > + int gi2c_tx_depth = geni_se_get_tx_fifo_depth(&gi2c->se); This variable has an unnecessarily long name. > + > + gi2c->se_mode = FIFO_SE_DMA; > + gi2c->tx_wm = gi2c_tx_depth - 1; > + geni_se_init(&gi2c->se, gi2c->tx_wm, gi2c_tx_depth); > + geni_se_config_packing(&gi2c->se, BITS_PER_BYTE, > + PACKING_BYTES_PW, true, true, true); > + qcom_geni_i2c_conf(gi2c); > + dev_dbg(gi2c->se.dev, > + "i2c fifo/se-dma mode. fifo depth:%d\n", gi2c_tx_depth); > + } > + dev_dbg(gi2c->se.dev, "i2c-%d: %s\n", > + gi2c->adap.nr, dev_name(gi2c->se.dev)); dev_dbg() already provides dev_name. What information does this debug print actually try to communicate? Regards, Bjorn > + } > + > + if (gi2c->se_mode == FIFO_SE_DMA) > + enable_irq(gi2c->irq); > > - enable_irq(gi2c->irq); > gi2c->suspended = 0; > return 0; > } > -- > 2.26.2 >