From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1C902185A8 for ; Tue, 15 Apr 2025 17:11:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744737120; cv=none; b=jGrSJRRuFxOLvmwxA8hCClUvE6riG37WzWD7OcyAqPA2ijVsf9ALHNm1KReus+EOuNCJiG4j/VPm1L376TQ96b5YlucCJNqted6L8M4JGfHeFRiAnkLG3RJYpEq1CaHrgFntpiCuiPAXmjZjSGipt333+sEmB9BPXHm0qhUKN/8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744737120; c=relaxed/simple; bh=bSf+8q+0tWGyLow2FlL0byyEBGTzi+RQNMFqsQYOag0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Qqw4lUU89/KdAplY6tuFDso+DxbSdC0IhzaKDhfmXZ49x7nrmzsE3uOW19jV/aqTUWRtskA18ZMhy9dis9aU12AxyDe34PwMb6qvf2BjhgR2XMV3ACbDKkmHZbKwlfzfeP/BCOy9aInpbp90lh/BWTZHiYd1lD2bt3NAqTJDKLk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=rosenzweig.io; spf=pass smtp.mailfrom=rosenzweig.io; dkim=pass (2048-bit key) header.d=rosenzweig.io header.i=@rosenzweig.io header.b=oFlrKFE4; arc=none smtp.client-ip=91.218.175.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=rosenzweig.io Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rosenzweig.io Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rosenzweig.io header.i=@rosenzweig.io header.b="oFlrKFE4" Date: Tue, 15 Apr 2025 13:11:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rosenzweig.io; s=key1; t=1744737116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TZ5TeuXVlqIBcTKnyUPN6n6PTqhb3E+xVpAkmmqWBI8=; b=oFlrKFE4LAVCgIG+lnbBcjPxf379TP8S57q7VeZGqKPSLoMsXkqz8/bW4DFZwGljq48SIS 5JGRUASghmHz8I2DS3FnnTTUgSbCY0OVjCB44yrdsBbb6gaQTdplmXNS7Pr3MbmMic8/il u/gK8rVWZGtJCJgA9lA6cPzx7TsCgtf3DtsLBSv1Gcjmtj3lA+cWhzUf/0ySFFQGq0uivf 3+nDtOlNfKhzPEd1yBjoNewkC6tThMgDjJvj06zeuH71hXyaGylesqRmtdzFBQtaBWdSW/ xuR/GbERtUk8S47AzQ2lxF5NDnBA447wq2R7byXt74R3ZcoszoXceD0TmqeMaQ== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Alyssa Rosenzweig To: sven@svenpeter.dev Cc: Janne Grunau , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Andi Shyti , Neal Gompa , Hector Martin , linuxppc-dev@lists.ozlabs.org, asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 3/6] i2c: pasemi: Improve timeout handling Message-ID: References: <20250415-pasemi-fixes-v2-0-c543bf53151a@svenpeter.dev> <20250415-pasemi-fixes-v2-3-c543bf53151a@svenpeter.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20250415-pasemi-fixes-v2-3-c543bf53151a@svenpeter.dev> X-Migadu-Flow: FLOW_OUT Reviewed-by: Alyssa Rosenzweig Le Tue , Apr 15, 2025 at 03:36:57PM +0000, Sven Peter via B4 Relay a écrit : > From: Sven Peter > > Add proper timeout handling for the interrupt path. > Previously, this was only correctly done for the polling path. > Note that we drop reg_write(smbus, REG_SMSTA, status) here which > will be done anyway whenever the next transaction starts via > pasemi_smb_clear. > > Signed-off-by: Sven Peter > --- > drivers/i2c/busses/i2c-pasemi-core.c | 24 +++++++++++++++++------- > 1 file changed, 17 insertions(+), 7 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-pasemi-core.c b/drivers/i2c/busses/i2c-pasemi-core.c > index df1b0087dcacb0a3b94196368137d5e20b0e6d7e..9b611dbdfef23e78a4ea75ac0311938d52b6ba96 100644 > --- a/drivers/i2c/busses/i2c-pasemi-core.c > +++ b/drivers/i2c/busses/i2c-pasemi-core.c > @@ -91,32 +91,42 @@ static void pasemi_smb_clear(struct pasemi_smbus *smbus) > static int pasemi_smb_waitready(struct pasemi_smbus *smbus) > { > int timeout = 100; > + int ret; > unsigned int status; > > if (smbus->use_irq) { > reinit_completion(&smbus->irq_completion); > reg_write(smbus, REG_IMASK, SMSTA_XEN | SMSTA_MTN); > - wait_for_completion_timeout(&smbus->irq_completion, msecs_to_jiffies(100)); > + ret = wait_for_completion_timeout(&smbus->irq_completion, msecs_to_jiffies(100)); > reg_write(smbus, REG_IMASK, 0); > status = reg_read(smbus, REG_SMSTA); > + > + if (ret < 0) { > + dev_err(smbus->dev, > + "Completion wait failed with %d, status 0x%08x\n", > + ret, status); > + return ret; > + } else if (ret == 0) { > + dev_warn(smbus->dev, "Timeout, status 0x%08x\n", status); > + return -ETIME; > + } > } else { > status = reg_read(smbus, REG_SMSTA); > while (!(status & SMSTA_XEN) && timeout--) { > msleep(1); > status = reg_read(smbus, REG_SMSTA); > } > + > + if (timeout < 0) { > + dev_warn(smbus->dev, "Timeout, status 0x%08x\n", status); > + return -ETIME; > + } > } > > /* Got NACK? */ > if (status & SMSTA_MTN) > return -ENXIO; > > - if (timeout < 0) { > - dev_warn(smbus->dev, "Timeout, status 0x%08x\n", status); > - reg_write(smbus, REG_SMSTA, status); > - return -ETIME; > - } > - > /* Clear XEN */ > reg_write(smbus, REG_SMSTA, SMSTA_XEN); > > > -- > 2.34.1 > >