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=-9.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 D79E1C433E2 for ; Fri, 28 Aug 2020 19:03:33 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE3EE20776 for ; Fri, 28 Aug 2020 19:03:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FeCsnKYM"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N1NWfxnh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE3EE20776 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Z/Py0Q6VVUGeb+9iZM8wdJdOuSp0PLbBDFuqnQsaiLQ=; b=FeCsnKYMBvMfaaRgOyJg7HYr3 3MaqtVc+NUjBZDYO7kY5tQHQ0EvZxZrWdBH0s8tQpv2oK3v6JlZomT12DBIEPxuSSR4lkFzbHDnha Qkpk2bwVF5yoECIINTGcDD7xwdzH9R5bFL4ipOCdPyXiNpI+J5cQh7PZnRBnCMkQxHVkGWD+9jb0E Rjl1JxH4hJlvlQVp0OJjAujMGqh2yUnuPuCjsguhzwN9Bd2YOf9AuA2wBqllevqX6iFzawn+1sE8U 6M1OzjrCqDa3ls6+xp8cVPu/kerFwJ8AVdsSlAS1lvYf7i/hyUesqr+5H6isjxWjk/AeT16CrUZLw utdcpWSTg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kBjdE-0004qX-3z; Fri, 28 Aug 2020 19:01:48 +0000 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kBjdB-0004nZ-E4; Fri, 28 Aug 2020 19:01:46 +0000 Received: by mail-ed1-x542.google.com with SMTP id ba12so67727edb.2; Fri, 28 Aug 2020 12:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=spC9lTnsRljSoai893DjFjRCs6gaK6sA3q4tyRdTCgA=; b=N1NWfxnhbGcLD4pR4yA55lHO0YJGf/zxalK02BOdgVZyfsDxXGNJ3FdRovhTeXJHrf s766/nmYckGGFYNWyqQTR71E+Jr+XrcVF6ZDwIBfMv2oQOifzRY0n2bFmD3GVkCSs1df aSEQcbnCXOwt+Nc3iKBVOB1pp7/6qg/XcWJ1TAFnuV6q/yi/790PNmISe0euOyVx4u7L Pfv2oFq1uabD6aNCCogM8PcLLUEeeZCO8/z+RZSIrafNFOSy7yqHqZEBP63sVsysj67e 3AhupqM8ASDoVH6HInIcCWmvzUqQ40BT76yNMUGGlaanMvy5+0U02A++6Km5W8aoLS+9 r0Tw== 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=spC9lTnsRljSoai893DjFjRCs6gaK6sA3q4tyRdTCgA=; b=tygR1/L8jfllL+iawuoy1i/Ia7StLLxWQbwYFc4Yqh5OevpBrsCd6Zlt01y/1lN2Li 6FGUJnFzDDNNX4nP3zkVe5+Fud6O+3vDs2Ha7od+QVxi1Nz2haSL5St80j1aegycA6Az a3L+WXIrnlI2lB4lARx8lBiec8nZxo3HcPezECbC9e36p5QvXm68Uu4p4YRsIcELT+Wm FdsSfE6P6uoFXKfc4JJpfLe2gxr+OeZ5rTDCBUiSKtZVbjcmJDo+q7U4xV7FA4WFlwm0 hSQJhIR1+oGO55OxuH4C2PN0C2hY7heMnieKTPNUW3w/G3FxcHgd8iHq3pztCaDgJeXl nrZw== X-Gm-Message-State: AOAM532fYm9evdM1FnafqUupgrxyU7rdyMS39HNsVJQIbyIdVO2NbuP7 TwQYBl0qxJO2DzdnbB/sdBE= X-Google-Smtp-Source: ABdhPJzKP7TG5o7eM5x+7uCrtE23tSZ+l1ym6nzP4vIZ6PmMK3nIejdMg2Zw6Pd+gybOP+GMu8fwCg== X-Received: by 2002:a50:fb99:: with SMTP id e25mr117126edq.281.1598641303994; Fri, 28 Aug 2020 12:01:43 -0700 (PDT) Received: from BV030612LT ([188.24.159.61]) by smtp.gmail.com with ESMTPSA id r26sm74168eds.79.2020.08.28.12.01.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2020 12:01:42 -0700 (PDT) Date: Fri, 28 Aug 2020 22:01:40 +0300 From: Cristian Ciocaltea To: Manivannan Sadhasivam Subject: Re: [PATCH 1/1] i2c: busses: Add support for atomic transfers in Actions Semi Owl driver Message-ID: <20200828190140.GA2545846@BV030612LT> References: <20200828130404.GB17309@mani> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200828130404.GB17309@mani> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200828_150145_560622_A6367CF6 X-CRM114-Status: GOOD ( 31.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-actions@lists.infradead.org, Andreas =?iso-8859-1?Q?F=E4rber?= , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Mani, Thanks for the review! On Fri, Aug 28, 2020 at 06:34:04PM +0530, Manivannan Sadhasivam wrote: > On 0803, Cristian Ciocaltea wrote: > > Atomic transfers are required to properly power off a machine through > > an I2C controlled PMIC, such as the Actions Semi ATC260x series. > > > > System shutdown may happen with interrupts being disabled and, as a > > consequence, the kernel may hang if the driver does not support atomic > > transfers. > > > > This functionality is essentially implemented by polling the FIFO > > Status register until either Command Execute Completed or NACK Error > > bits are set. > > > > Signed-off-by: Cristian Ciocaltea > > --- > > drivers/i2c/busses/i2c-owl.c | 80 ++++++++++++++++++++++++++---------- > > 1 file changed, 59 insertions(+), 21 deletions(-) > > > > diff --git a/drivers/i2c/busses/i2c-owl.c b/drivers/i2c/busses/i2c-owl.c > > index 672f1f239bd6..90dd2e814313 100644 > > --- a/drivers/i2c/busses/i2c-owl.c > > +++ b/drivers/i2c/busses/i2c-owl.c > > @@ -14,6 +14,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > > > @@ -76,6 +77,7 @@ > > #define OWL_I2C_FIFOCTL_TFR BIT(2) > > > > /* I2Cc_FIFOSTAT Bit Mask */ > > +#define OWL_I2C_FIFOSTAT_CECB BIT(0) > > #define OWL_I2C_FIFOSTAT_RNB BIT(1) > > #define OWL_I2C_FIFOSTAT_RFE BIT(2) > > #define OWL_I2C_FIFOSTAT_TFF BIT(5) > > @@ -83,7 +85,8 @@ > > #define OWL_I2C_FIFOSTAT_RFD GENMASK(15, 8) > > > > /* I2C bus timeout */ > > -#define OWL_I2C_TIMEOUT msecs_to_jiffies(4 * 1000) > > +#define OWL_I2C_TIMEOUT_MS (4 * 1000) > > +#define OWL_I2C_TIMEOUT msecs_to_jiffies(OWL_I2C_TIMEOUT_MS) > > > > #define OWL_I2C_MAX_RETRIES 50 > > > > @@ -161,29 +164,25 @@ static void owl_i2c_set_freq(struct owl_i2c_dev *i2c_dev) > > writel(OWL_I2C_DIV_FACTOR(val), i2c_dev->base + OWL_I2C_REG_CLKDIV); > > } > > > > -static irqreturn_t owl_i2c_interrupt(int irq, void *_dev) > > +static int owl_i2c_xfer_data(struct owl_i2c_dev *i2c_dev) > > { > > - struct owl_i2c_dev *i2c_dev = _dev; > > struct i2c_msg *msg = i2c_dev->msg; > > - unsigned long flags; > > unsigned int stat, fifostat; > > > > - spin_lock_irqsave(&i2c_dev->lock, flags); > > - > > i2c_dev->err = 0; > > > > /* Handle NACK from slave */ > > fifostat = readl(i2c_dev->base + OWL_I2C_REG_FIFOSTAT); > > if (fifostat & OWL_I2C_FIFOSTAT_RNB) { > > i2c_dev->err = -ENXIO; > > - goto stop; > > + return 1; > > This looks odd! And moreover you're not making use of this return value > anywhere. You are right, that's just a leftover from my initial implementation and I totally missed it when I did the final cleanup. Thanks for spotting it! > Thanks, > Mani If there is nothing else, I can submit the revised patch. Regards, Cristi > > } > > > > /* Handle bus error */ > > stat = readl(i2c_dev->base + OWL_I2C_REG_STAT); > > if (stat & OWL_I2C_STAT_BEB) { > > i2c_dev->err = -EIO; > > - goto stop; > > + return 1; > > } > > > > /* Handle FIFO read */ > > @@ -196,18 +195,30 @@ static irqreturn_t owl_i2c_interrupt(int irq, void *_dev) > > } else { > > /* Handle the remaining bytes which were not sent */ > > while (!(readl(i2c_dev->base + OWL_I2C_REG_FIFOSTAT) & > > - OWL_I2C_FIFOSTAT_TFF) && i2c_dev->msg_ptr < msg->len) { > > + OWL_I2C_FIFOSTAT_TFF) && i2c_dev->msg_ptr < msg->len) { > > writel(msg->buf[i2c_dev->msg_ptr++], > > i2c_dev->base + OWL_I2C_REG_TXDAT); > > } > > } > > > > -stop: > > + return 0; > > +} > > + > > +static irqreturn_t owl_i2c_interrupt(int irq, void *_dev) > > +{ > > + struct owl_i2c_dev *i2c_dev = _dev; > > + unsigned long flags; > > + > > + spin_lock_irqsave(&i2c_dev->lock, flags); > > + > > + owl_i2c_xfer_data(i2c_dev); > > + > > /* Clear pending interrupts */ > > owl_i2c_update_reg(i2c_dev->base + OWL_I2C_REG_STAT, > > OWL_I2C_STAT_IRQP, true); > > > > complete_all(&i2c_dev->msg_complete); > > + > > spin_unlock_irqrestore(&i2c_dev->lock, flags); > > > > return IRQ_HANDLED; > > @@ -235,8 +246,8 @@ static int owl_i2c_check_bus_busy(struct i2c_adapter *adap) > > return 0; > > } > > > > -static int owl_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, > > - int num) > > +static int owl_i2c_xfer_common(struct i2c_adapter *adap, struct i2c_msg *msgs, > > + int num, bool atomic) > > { > > struct owl_i2c_dev *i2c_dev = i2c_get_adapdata(adap); > > struct i2c_msg *msg; > > @@ -280,11 +291,12 @@ static int owl_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, > > goto err_exit; > > } > > > > - reinit_completion(&i2c_dev->msg_complete); > > + if (!atomic) > > + reinit_completion(&i2c_dev->msg_complete); > > > > - /* Enable I2C controller interrupt */ > > + /* Enable/disable I2C controller interrupt */ > > owl_i2c_update_reg(i2c_dev->base + OWL_I2C_REG_CTL, > > - OWL_I2C_CTL_IRQE, true); > > + OWL_I2C_CTL_IRQE, !atomic); > > > > /* > > * Select: FIFO enable, Master mode, Stop enable, Data count enable, > > @@ -352,20 +364,33 @@ static int owl_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, > > > > spin_unlock_irqrestore(&i2c_dev->lock, flags); > > > > - time_left = wait_for_completion_timeout(&i2c_dev->msg_complete, > > - adap->timeout); > > + if (atomic) { > > + /* Wait for Command Execute Completed or NACK Error bits */ > > + ret = readl_poll_timeout_atomic(i2c_dev->base + OWL_I2C_REG_FIFOSTAT, > > + val, val & (OWL_I2C_FIFOSTAT_CECB | > > + OWL_I2C_FIFOSTAT_RNB), > > + 10, OWL_I2C_TIMEOUT_MS * 1000); > > + } else { > > + time_left = wait_for_completion_timeout(&i2c_dev->msg_complete, > > + adap->timeout); > > + if (!time_left) > > + ret = -ETIMEDOUT; > > + } > > > > spin_lock_irqsave(&i2c_dev->lock, flags); > > - if (time_left == 0) { > > + > > + if (ret) { > > dev_err(&adap->dev, "Transaction timed out\n"); > > /* Send stop condition and release the bus */ > > owl_i2c_update_reg(i2c_dev->base + OWL_I2C_REG_CTL, > > OWL_I2C_CTL_GBCC_STOP | OWL_I2C_CTL_RB, > > true); > > - ret = -ETIMEDOUT; > > goto err_exit; > > } > > > > + if (atomic) > > + owl_i2c_xfer_data(i2c_dev); > > + > > ret = i2c_dev->err < 0 ? i2c_dev->err : num; > > > > err_exit: > > @@ -379,9 +404,22 @@ static int owl_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, > > return ret; > > } > > > > +static int owl_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, > > + int num) > > +{ > > + return owl_i2c_xfer_common(adap, msgs, num, false); > > +} > > + > > +static int owl_i2c_xfer_atomic(struct i2c_adapter *adap, > > + struct i2c_msg *msgs, int num) > > +{ > > + return owl_i2c_xfer_common(adap, msgs, num, true); > > +} > > + > > static const struct i2c_algorithm owl_i2c_algorithm = { > > - .master_xfer = owl_i2c_master_xfer, > > - .functionality = owl_i2c_func, > > + .master_xfer = owl_i2c_xfer, > > + .master_xfer_atomic = owl_i2c_xfer_atomic, > > + .functionality = owl_i2c_func, > > }; > > > > static const struct i2c_adapter_quirks owl_i2c_quirks = { > > -- > > 2.28.0 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel