From patchwork Wed Jul 17 07:29:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Rudolph X-Patchwork-Id: 13735180 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 EDE2614F6C for ; Wed, 17 Jul 2024 07:31:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721201465; cv=none; b=IjZtMpubYDih+X5GSQiZu7+EKAYtjYw5eWSIpNqwFx96VmjRj9u4L1auuX/+/IAGQIcyexRVVHo8MY7Bq2Y9Yn55asrW9Hx9YbSJbd7xMj59rVi85gV1u+S+4sqz8F1hYi4xvup+QAoip7LhX+SFJder4BbLem8jQp4PXRoPd5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721201465; c=relaxed/simple; bh=2AWDJ29/eZpQrMGz6us27l4ySjmwawxPrVQH8M1RMmk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=XI7gbSmEzQ59hdV38+8ippv5Y/9Y8auBlIn9NXs+Zc2xtpRxw7Ki/gDYDx1HjSZwyi+1MJ6mSU8IvC430ycZlAxJ3hTwEpLaPyw+clGnpRUL0x+T47Di+AjTmEbuF6k++HfacyE7G+J0sT4fq8SpdT9qSFZir0wZs6KjxcPu9xU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=9elements.com; spf=pass smtp.mailfrom=9elements.com; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b=fi3UzSJc; arc=none smtp.client-ip=209.85.167.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=9elements.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=9elements.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b="fi3UzSJc" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-52ea34ffcdaso6992860e87.1 for ; Wed, 17 Jul 2024 00:31:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1721201460; x=1721806260; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UjY2uYBPwkskN4yFFi5h7tCJfakT+MBEBO8/3c4UXEs=; b=fi3UzSJcl3c2mTwR1d8Rs98MVUp6ax8zqKQVbD9ncrsVb0YwjfwtkisJcy/VkthA38 KY54IzGmgVy66wV+/QNybgoo0yaivcPjuuMz2FMi4vQaJKcYzLfT6Y8MkM26X2Za5Fl4 Uw1/qUn4avOQcS3uDw5opmyS8uebL0D9Hd2kD7PLTKj3mimG6CIRAk+BKrIE7UUahStw VGyeLJ9wx7Hsl1ekg+1OabNmnWKzBU4j53eLDnVRtwU6EMKCpupNqZTi/JVQBA0P/6Ak ZLruXn9/fWsFlDXlVEF1DDJeuUBh6S3dDA3BkySgfa9J61OXmuJrtYNV1+m8mRi7HSdg E8bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721201460; x=1721806260; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UjY2uYBPwkskN4yFFi5h7tCJfakT+MBEBO8/3c4UXEs=; b=ojRRRelOm1ZCXJq2ktLCSCcm6Ju7rXDX08dhku1WUAfbVDtsq54gPIQmuDR0bCg/Hy 9n7Lr1ZTODY2rE2YXaECJbeLKXvjfMhbIYioD3wX/wqCWHqS+RTtii0CeiUAtVX4w/6V r1j5sC7+GoNV1HHz7RwD+eD55868NfDX0fJmWvblNWuLUDLXhN+s0YhXXpXDtoZg2O4m fZ8Dgl8h5kWESAMZCMw2gUMB2o6zxesyif+dMCs83f37cBdJiWRQ67a2IkrHdJpp1dHZ zND6DJSsFNSB7/k50NgNpvq3Ne83AKIToHGhmuvTCbE5wDYT5gymRos1jHqMkWr40o/D 0wzw== X-Forwarded-Encrypted: i=1; AJvYcCUtxR27xS/1ZXPVDaontNlq7xXZxCwqDCLFEEkwx5JGGHVLbrRLOh+WY4yqnEGD3WwXyPA37Aj7JvPN/Prl0mHS9rId1v4I+0/iDwA= X-Gm-Message-State: AOJu0YyHTnx4adalDcF8TC7IvGt26atuZ61cNq7m7jfzdpDuKAd+uDm0 lCehbNE4Mhi0dZrWgwhPYWVk2nTsjlripMY93yr5Wuc0RLCYdjvpmFm3fPxQpZs= X-Google-Smtp-Source: AGHT+IHeWtuGurVPdRGB70Fs9fzMflS8oagvjjxtdPigXpGltmnMTFk5PIPxKdHX/IEiLs1pWrYupg== X-Received: by 2002:a05:6512:32c5:b0:52e:9acf:b698 with SMTP id 2adb3069b0e04-52ee53f7c0emr569256e87.36.1721201459793; Wed, 17 Jul 2024 00:30:59 -0700 (PDT) Received: from fedora.sec.9e.network (ip-037-049-067-221.um09.pools.vodafone-ip.de. [37.49.67.221]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-59edba561e0sm2766841a12.50.2024.07.17.00.30.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jul 2024 00:30:59 -0700 (PDT) From: Patrick Rudolph To: linux-kernel@vger.kernel.org Cc: Patrick Rudolph , Jean Delvare , Guenter Roeck , linux-hwmon@vger.kernel.org Subject: [PATCH v2 1/5] hwmon: pmbus: Implement generic bus access delay Date: Wed, 17 Jul 2024 09:29:52 +0200 Message-ID: <20240717073000.786228-1-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Some drivers, like the max15301 or zl6100, are intentionally delaying SMBus communications, to prevent transmission errors. As this is necessary on additional PMBus compatible devices, implement a generic delay mechanism in the pmbus core. Introduces two delay settings in the pmbus_driver_info struct, one applies to every SMBus transaction and the other is for write transaction only. Once set by the driver the SMBus traffic, using the generic pmbus access helpers, is automatically delayed when necessary. The two settings are: access_delay: - Unit in microseconds - Stores the accessed timestamp after every SMBus access - Delays when necessary before the next SMBus access write_delay: - Unit in microseconds - Stores the written timestamp after a write SMBus access - Delays when necessary before the next SMBus access This allows to drop the custom delay code from the drivers and easily introduce this feature in additional pmbus drivers. Signed-off-by: Patrick Rudolph --- drivers/hwmon/pmbus/pmbus.h | 10 ++++ drivers/hwmon/pmbus/pmbus_core.c | 92 +++++++++++++++++++++++++++++--- 2 files changed, 96 insertions(+), 6 deletions(-) diff --git a/drivers/hwmon/pmbus/pmbus.h b/drivers/hwmon/pmbus/pmbus.h index fb442fae7b3e..5d5dc774187b 100644 --- a/drivers/hwmon/pmbus/pmbus.h +++ b/drivers/hwmon/pmbus/pmbus.h @@ -466,6 +466,16 @@ struct pmbus_driver_info { /* custom attributes */ const struct attribute_group **groups; + + /* + * Some chips need a little delay between SMBus communication. When + * set, the generic PMBus helper functions will wait if necessary + * to meet this requirement. The access delay is honored after + * every SMBus operation. The write delay is only honored after + * SMBus write operations. + */ + int access_delay; /* in microseconds */ + int write_delay; /* in microseconds */ }; /* Regulator ops */ diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c index cb4c65a7f288..0ea6fe7eb17c 100644 --- a/drivers/hwmon/pmbus/pmbus_core.c +++ b/drivers/hwmon/pmbus/pmbus_core.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -108,6 +109,8 @@ struct pmbus_data { int vout_low[PMBUS_PAGES]; /* voltage low margin */ int vout_high[PMBUS_PAGES]; /* voltage high margin */ + ktime_t write_time; /* Last SMBUS write timestamp */ + ktime_t access_time; /* Last SMBUS access timestamp */ }; struct pmbus_debugfs_entry { @@ -158,6 +161,39 @@ void pmbus_set_update(struct i2c_client *client, u8 reg, bool update) } EXPORT_SYMBOL_NS_GPL(pmbus_set_update, PMBUS); +/* Some chips need a delay between accesses. */ +static void pmbus_wait(struct i2c_client *client) +{ + struct pmbus_data *data = i2c_get_clientdata(client); + const struct pmbus_driver_info *info = data->info; + s64 delta; + + if (info->access_delay) { + delta = ktime_us_delta(ktime_get(), data->access_time); + + if (delta < info->access_delay) + fsleep(info->access_delay - delta); + } else if (info->write_delay) { + delta = ktime_us_delta(ktime_get(), data->write_time); + + if (delta < info->write_delay) + fsleep(info->write_delay - delta); + } +} + +/* Sets the last accessed timestamp for pmbus_wait */ +static void pmbus_update_ts(struct i2c_client *client, bool write_op) +{ + struct pmbus_data *data = i2c_get_clientdata(client); + const struct pmbus_driver_info *info = data->info; + + if (info->access_delay) { + data->access_time = ktime_get(); + } else if (info->write_delay && write_op) { + data->write_time = ktime_get(); + } +} + int pmbus_set_page(struct i2c_client *client, int page, int phase) { struct pmbus_data *data = i2c_get_clientdata(client); @@ -168,11 +204,15 @@ int pmbus_set_page(struct i2c_client *client, int page, int phase) if (!(data->info->func[page] & PMBUS_PAGE_VIRTUAL) && data->info->pages > 1 && page != data->currpage) { + pmbus_wait(client); rv = i2c_smbus_write_byte_data(client, PMBUS_PAGE, page); + pmbus_update_ts(client, true); if (rv < 0) return rv; + pmbus_wait(client); rv = i2c_smbus_read_byte_data(client, PMBUS_PAGE); + pmbus_update_ts(client, false); if (rv < 0) return rv; @@ -183,8 +223,10 @@ int pmbus_set_page(struct i2c_client *client, int page, int phase) if (data->info->phases[page] && data->currphase != phase && !(data->info->func[page] & PMBUS_PHASE_VIRTUAL)) { + pmbus_wait(client); rv = i2c_smbus_write_byte_data(client, PMBUS_PHASE, phase); + pmbus_update_ts(client, true); if (rv) return rv; } @@ -202,7 +244,11 @@ int pmbus_write_byte(struct i2c_client *client, int page, u8 value) if (rv < 0) return rv; - return i2c_smbus_write_byte(client, value); + pmbus_wait(client); + rv = i2c_smbus_write_byte(client, value); + pmbus_update_ts(client, true); + + return rv; } EXPORT_SYMBOL_NS_GPL(pmbus_write_byte, PMBUS); @@ -233,7 +279,11 @@ int pmbus_write_word_data(struct i2c_client *client, int page, u8 reg, if (rv < 0) return rv; - return i2c_smbus_write_word_data(client, reg, word); + pmbus_wait(client); + rv = i2c_smbus_write_word_data(client, reg, word); + pmbus_update_ts(client, true); + + return rv; } EXPORT_SYMBOL_NS_GPL(pmbus_write_word_data, PMBUS); @@ -351,7 +401,11 @@ int pmbus_read_word_data(struct i2c_client *client, int page, int phase, u8 reg) if (rv < 0) return rv; - return i2c_smbus_read_word_data(client, reg); + pmbus_wait(client); + rv = i2c_smbus_read_word_data(client, reg); + pmbus_update_ts(client, false); + + return rv; } EXPORT_SYMBOL_NS_GPL(pmbus_read_word_data, PMBUS); @@ -410,7 +464,11 @@ int pmbus_read_byte_data(struct i2c_client *client, int page, u8 reg) if (rv < 0) return rv; - return i2c_smbus_read_byte_data(client, reg); + pmbus_wait(client); + rv = i2c_smbus_read_byte_data(client, reg); + pmbus_update_ts(client, false); + + return rv; } EXPORT_SYMBOL_NS_GPL(pmbus_read_byte_data, PMBUS); @@ -422,7 +480,11 @@ int pmbus_write_byte_data(struct i2c_client *client, int page, u8 reg, u8 value) if (rv < 0) return rv; - return i2c_smbus_write_byte_data(client, reg, value); + pmbus_wait(client); + rv = i2c_smbus_write_byte_data(client, reg, value); + pmbus_update_ts(client, true); + + return rv; } EXPORT_SYMBOL_NS_GPL(pmbus_write_byte_data, PMBUS); @@ -454,7 +516,11 @@ static int pmbus_read_block_data(struct i2c_client *client, int page, u8 reg, if (rv < 0) return rv; - return i2c_smbus_read_block_data(client, reg, data_buf); + pmbus_wait(client); + rv = i2c_smbus_read_block_data(client, reg, data_buf); + pmbus_update_ts(client, false); + + return rv; } static struct pmbus_sensor *pmbus_find_sensor(struct pmbus_data *data, int page, @@ -2450,9 +2516,11 @@ static int pmbus_read_coefficients(struct i2c_client *client, data.block[1] = attr->reg; data.block[2] = 0x01; + pmbus_wait(client); rv = i2c_smbus_xfer(client->adapter, client->addr, client->flags, I2C_SMBUS_WRITE, PMBUS_COEFFICIENTS, I2C_SMBUS_BLOCK_PROC_CALL, &data); + pmbus_update_ts(client, true); if (rv < 0) return rv; @@ -2604,7 +2672,10 @@ static int pmbus_init_common(struct i2c_client *client, struct pmbus_data *data, /* Enable PEC if the controller and bus supports it */ if (!(data->flags & PMBUS_NO_CAPABILITY)) { + pmbus_wait(client); ret = i2c_smbus_read_byte_data(client, PMBUS_CAPABILITY); + pmbus_update_ts(client, false); + if (ret >= 0 && (ret & PB_CAPABILITY_ERROR_CHECK)) { if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_PEC)) client->flags |= I2C_CLIENT_PEC; @@ -2617,10 +2688,16 @@ static int pmbus_init_common(struct i2c_client *client, struct pmbus_data *data, * Bail out if both registers are not supported. */ data->read_status = pmbus_read_status_word; + pmbus_wait(client); ret = i2c_smbus_read_word_data(client, PMBUS_STATUS_WORD); + pmbus_update_ts(client, false); + if (ret < 0 || ret == 0xffff) { data->read_status = pmbus_read_status_byte; + pmbus_wait(client); ret = i2c_smbus_read_byte_data(client, PMBUS_STATUS_BYTE); + pmbus_update_ts(client, false); + if (ret < 0 || ret == 0xff) { dev_err(dev, "PMBus status register not found\n"); return -ENODEV; @@ -2635,7 +2712,10 @@ static int pmbus_init_common(struct i2c_client *client, struct pmbus_data *data, * limit registers need to be disabled. */ if (!(data->flags & PMBUS_NO_WRITE_PROTECT)) { + pmbus_wait(client); ret = i2c_smbus_read_byte_data(client, PMBUS_WRITE_PROTECT); + pmbus_update_ts(client, false); + if (ret > 0 && (ret & PB_WP_ANY)) data->flags |= PMBUS_WRITE_PROTECTED | PMBUS_SKIP_STATUS_CHECK; } From patchwork Wed Jul 17 07:29:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Rudolph X-Patchwork-Id: 13735181 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 CEE4017BDC for ; Wed, 17 Jul 2024 07:31:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721201465; cv=none; b=eSLRxTnA/MJS5rNxGDAw3bZmON1OBzU29UL7kB2fOjJ+jDbY0dT5NYpx8PBbjaU9IG5B8u3/ePl7v0virk+M/0PeWYiUxAVmOfue61XJclDEFZxjioVDj4lEwM+bSm1rfj2+fAgRAq23yW1xN8whxMlZBQz8vEY1PXntcwFbBKw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721201465; c=relaxed/simple; bh=tWz44zz6lM29PayvcPvj0KkLvjaLEEv6fqqBbA3P+WE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tlgYf9rYE+i7qBMVZSY65RBnVJCrVhQ41pUep1c1AUDn1NEn/oiEFftuMRW5oz9ZNHzYWzN8rOqtkTcHeT4/t2pmg22oGXxcgAoZOKnS/eMwwIPi10EJPgMgNSCBje8QTqnFSNVMoeB31D5XpiEwvRZ3q1K67PH07nKfOGWdn+c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=9elements.com; spf=pass smtp.mailfrom=9elements.com; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b=D72nay8j; arc=none smtp.client-ip=209.85.208.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=9elements.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=9elements.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b="D72nay8j" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-58ef19aa69dso7121484a12.3 for ; Wed, 17 Jul 2024 00:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1721201461; x=1721806261; darn=vger.kernel.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=MwpJFValDdiHcvaMz/RllZFXslcWnajiskOco8CbPLY=; b=D72nay8jTj6nxfsiitnt6n+lIbU7lk+4KwGipzZqZ1EEJhLhPPOAVxQ1aAuGRPYNI3 hQI3YAKvZsATLxHQfQ0Svra4UL4pxNywJivFosQk8SZkP7GILs1wmVh4BEbZK3JDCtKL khl0x9CF8+/vqRSTxxWqvLBzxWDlVWCiY+GjfUXlTRM/eLGBpz8JKoz08G0duy9GvHmD V+W8XWN/wa4SoEsZcRND6qUbnyLo3HcnrHc36bylKDb0f1tiOh9C5yOaqEVnU9PpbrdO LMJFTcW06vOfekoWHkzphAHjO31Xy4a4Xj8GMnXvrrlXOcQpoxXlcIbOVBi4ngcTEIdM q8sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721201461; x=1721806261; 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=MwpJFValDdiHcvaMz/RllZFXslcWnajiskOco8CbPLY=; b=F7h+NOpCaw1/2L+6mgLIarG3t6DZnRgA1+gG0IeWy9Xrx+bvBHXddFropGwx5QDppi KD9CcV37cdGWW3fbt29FTsKo24GR7zQb8BpuaUxgoAQ9Cg4XMGOKZ5kF9DMQ2DlAjVZ4 waN94kQX1rZdpdt5V3cTdu2Td6voXHVd6yoMIFchtq7dMH6zGlyyhdW+Pgsc0Rl1XGUJ zvIKlWswGSodauoNCUSVklaYclbuhW8ChddrBHqDYqCqVIF2s+O7Tv7jscnOKqMfkWC/ ha9zwyMjOhJ2lCIhC3tI3nDkuMbCFVEIg+TT+GduSUsebOFGvVMYMep+OzO8M15CnyXp 92mA== X-Forwarded-Encrypted: i=1; AJvYcCXC+F4xlQo1F5eu+8CfFNguBllrEuMzu07xkzOl1v3ZyCobx7okcsJo0AvzZWDGUj0/6QwYSypIt4RxHGfSCHXlCV36xiKK3QnDL/4= X-Gm-Message-State: AOJu0YyCrxV5mlC6topSvl7fEXI33YYdYeTPsJAF/HEmI6FtViIBbx9p oVrMV5XOdDpQqchqpOKCW2+0pt8TZjApvx5iFWu/TDvIiA9C8piF/9lVUvIITRg= X-Google-Smtp-Source: AGHT+IH8pf4aj4d8HfkV1sMHbhkF9N4nu7s+paZb7qKHHoUKawrXLPwgn9SaTYkP81LhTvL2lFsCbw== X-Received: by 2002:a05:6402:2792:b0:59e:9e6c:36c2 with SMTP id 4fb4d7f45d1cf-5a05d9a214emr784009a12.34.1721201461223; Wed, 17 Jul 2024 00:31:01 -0700 (PDT) Received: from fedora.sec.9e.network (ip-037-049-067-221.um09.pools.vodafone-ip.de. [37.49.67.221]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-59edba561e0sm2766841a12.50.2024.07.17.00.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jul 2024 00:31:00 -0700 (PDT) From: Patrick Rudolph To: Daniel Nilsson Cc: Patrick Rudolph , Jean Delvare , Guenter Roeck , linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] hwmon: pmbus: max15301: Use generic code Date: Wed, 17 Jul 2024 09:29:53 +0200 Message-ID: <20240717073000.786228-2-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240717073000.786228-1-patrick.rudolph@9elements.com> References: <20240717073000.786228-1-patrick.rudolph@9elements.com> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use the generic pmbus bus access delay. Signed-off-by: Patrick Rudolph --- drivers/hwmon/pmbus/max15301.c | 92 +--------------------------------- 1 file changed, 1 insertion(+), 91 deletions(-) diff --git a/drivers/hwmon/pmbus/max15301.c b/drivers/hwmon/pmbus/max15301.c index 986404fe6a31..f5367a7bc0f5 100644 --- a/drivers/hwmon/pmbus/max15301.c +++ b/drivers/hwmon/pmbus/max15301.c @@ -31,8 +31,6 @@ MODULE_DEVICE_TABLE(i2c, max15301_id); struct max15301_data { int id; - ktime_t access; /* Chip access time */ - int delay; /* Delay between chip accesses in us */ struct pmbus_driver_info info; }; @@ -55,89 +53,6 @@ static struct max15301_data max15301_data = { } }; -/* This chip needs a delay between accesses */ -static inline void max15301_wait(const struct max15301_data *data) -{ - if (data->delay) { - s64 delta = ktime_us_delta(ktime_get(), data->access); - - if (delta < data->delay) - udelay(data->delay - delta); - } -} - -static int max15301_read_word_data(struct i2c_client *client, int page, - int phase, int reg) -{ - const struct pmbus_driver_info *info = pmbus_get_driver_info(client); - struct max15301_data *data = to_max15301_data(info); - int ret; - - if (page > 0) - return -ENXIO; - - if (reg >= PMBUS_VIRT_BASE) - return -ENXIO; - - max15301_wait(data); - ret = pmbus_read_word_data(client, page, phase, reg); - data->access = ktime_get(); - - return ret; -} - -static int max15301_read_byte_data(struct i2c_client *client, int page, int reg) -{ - const struct pmbus_driver_info *info = pmbus_get_driver_info(client); - struct max15301_data *data = to_max15301_data(info); - int ret; - - if (page > 0) - return -ENXIO; - - max15301_wait(data); - ret = pmbus_read_byte_data(client, page, reg); - data->access = ktime_get(); - - return ret; -} - -static int max15301_write_word_data(struct i2c_client *client, int page, int reg, - u16 word) -{ - const struct pmbus_driver_info *info = pmbus_get_driver_info(client); - struct max15301_data *data = to_max15301_data(info); - int ret; - - if (page > 0) - return -ENXIO; - - if (reg >= PMBUS_VIRT_BASE) - return -ENXIO; - - max15301_wait(data); - ret = pmbus_write_word_data(client, page, reg, word); - data->access = ktime_get(); - - return ret; -} - -static int max15301_write_byte(struct i2c_client *client, int page, u8 value) -{ - const struct pmbus_driver_info *info = pmbus_get_driver_info(client); - struct max15301_data *data = to_max15301_data(info); - int ret; - - if (page > 0) - return -ENXIO; - - max15301_wait(data); - ret = pmbus_write_byte(client, page, value); - data->access = ktime_get(); - - return ret; -} - static int max15301_probe(struct i2c_client *client) { int status; @@ -164,12 +79,7 @@ static int max15301_probe(struct i2c_client *client) return -ENODEV; } - max15301_data.delay = delay; - - info->read_byte_data = max15301_read_byte_data; - info->read_word_data = max15301_read_word_data; - info->write_byte = max15301_write_byte; - info->write_word_data = max15301_write_word_data; + info->access_delay = delay; return pmbus_do_probe(client, info); } From patchwork Wed Jul 17 07:29:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Rudolph X-Patchwork-Id: 13735182 Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (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 ABA161BDD0 for ; Wed, 17 Jul 2024 07:31:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721201466; cv=none; b=U13jkOdFRshu2vW9JmgUT1zHYoRxWO1E7BM3D/2m/HeQ9ipN1i88+ZxAqg9lRunMa5gp/Ir2IQWpkK+pA5TZcwduE+RWgsHDyCgkHebBeYvbeXPq37Q10o7veAbeB2qoooKI1rZ4+vPWWkUAVorvvQoom+i8ID36KfX378IyrVo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721201466; c=relaxed/simple; bh=ELszuHUI2Sho29pe1aUjUExSj0Jd1K3H1CrC966SsaU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D6M9zShrAREARHQsv9UJ8W08gi3gPhHb9i0iE1eGNP2qNrr3mYYjsB/RrCUgTUb+GQYhL3tXvW1la8hhXWEa4s6UxZxHGp65dJU7VsAS7qi6XyOr45uNTCjYSwHMCD0svbrDHAkW1sXkKYw9UhrBF6HcdQ3Xu2nqhuQhClceHAI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=9elements.com; spf=pass smtp.mailfrom=9elements.com; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b=fwXbrQDS; arc=none smtp.client-ip=209.85.208.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=9elements.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=9elements.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b="fwXbrQDS" Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2eea8ea8c06so90728441fa.2 for ; Wed, 17 Jul 2024 00:31:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1721201463; x=1721806263; darn=vger.kernel.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=Rte73YBhPAaVfekdORAEqN2cWG8+g6DnTMOK+KE3CVI=; b=fwXbrQDSEGiOwxfFTBw2DqFOwfxEILLIo5DvmLSCz734XTgzCcaqtLfghcmdN2eO3+ CJze897THNwKmyRHUtTRsZcGBauxd8YF9D8iqri1H5iZZ+F8iaUWf7Kwu7wERIZBLoAO VthGjm6EcG1bsxG7oTVwvyHXp707CB4TZVHN/9SkvLQxN+p8TBebbXYNTvTCDXozjZhA mt5qXBXDAUc5sjIwWHsGbdGO39nCI5GQqDP0NW3kMXCs0m5jIjqbSBhuYmDQvXvoRJAy EgGW8pCV2anAY95bTxNLoOtWz816Gb7adbBcnb1vGo/yIOHJJUUqqAAoqLQo9RZ5QZCW wjaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721201463; x=1721806263; 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=Rte73YBhPAaVfekdORAEqN2cWG8+g6DnTMOK+KE3CVI=; b=b7mvRQrkntcls5Eoxau7xZF9zTtJ36ZbGZW1102AhKK1TbF28pK78pGHktHf0Lhjss kDSywg5nlkV3NqrPi3J3VhJruDOi3X7quWM0Uo9Kcbt1pUR8tMNlN/cO+YFjDyH7d94k GLboVewI+QbPfm3uckERLcj2LvFEpqThn17fp8wAON9RympFzgObbc/f/U720g57Nc0h BoH7nU6zGBZgZKWrDPj5hrUJasss1JE9pl0v2FYs/qE/y+5FK4Ogz0rA1tCf+HmtQe6x lf+lYUb1+ymIif4JCydYamtdayggEq69vjiIMlkdgaaF8lxwn8KS7lRk9GBEPTtBT0xr QHAA== X-Forwarded-Encrypted: i=1; AJvYcCUIulS6tvK4Bd3/pmD2gsfAZfvV0tWH8kvKf513/HzV1rFHHfrl9nJyZjJVYiZn9KQ+JIcENWMa+7Ty65f83TopNAtGbiz9hLV/8+A= X-Gm-Message-State: AOJu0Yx2US/gbZOrwgW9/iczcl1N4gOQMYkuVNjiORcIFJYrEKHSF4yf jAENAwWIMj+gRWI3h1XcJrSd3EgxDHuPmYOXNubq+z7ME8ez/KIWngey4VPzkEQ= X-Google-Smtp-Source: AGHT+IHAUxKWsN2wQo1Ub0U+chlJcOfcRk9v2hgilyZNE4e2HyBhCJ8wilT9OSwStcmENs7MUDIr9w== X-Received: by 2002:a2e:918f:0:b0:2ee:80f0:c220 with SMTP id 38308e7fff4ca-2eefd1d60b8mr5551501fa.40.1721201462589; Wed, 17 Jul 2024 00:31:02 -0700 (PDT) Received: from fedora.sec.9e.network (ip-037-049-067-221.um09.pools.vodafone-ip.de. [37.49.67.221]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-59edba561e0sm2766841a12.50.2024.07.17.00.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jul 2024 00:31:02 -0700 (PDT) From: Patrick Rudolph To: linux-kernel@vger.kernel.org Cc: Patrick Rudolph , Jean Delvare , Guenter Roeck , linux-hwmon@vger.kernel.org Subject: [PATCH v2 3/5] hwmon: pmbus: ucd9000: Use generic code Date: Wed, 17 Jul 2024 09:29:54 +0200 Message-ID: <20240717073000.786228-3-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240717073000.786228-1-patrick.rudolph@9elements.com> References: <20240717073000.786228-1-patrick.rudolph@9elements.com> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use generic pmbus bus write access delay. Signed-off-by: Patrick Rudolph --- drivers/hwmon/pmbus/ucd9000.c | 64 ++--------------------------------- 1 file changed, 2 insertions(+), 62 deletions(-) diff --git a/drivers/hwmon/pmbus/ucd9000.c b/drivers/hwmon/pmbus/ucd9000.c index d817c719b90b..5d3d1773bf52 100644 --- a/drivers/hwmon/pmbus/ucd9000.c +++ b/drivers/hwmon/pmbus/ucd9000.c @@ -67,7 +67,6 @@ struct ucd9000_data { struct gpio_chip gpio; #endif struct dentry *debugfs; - ktime_t write_time; }; #define to_ucd9000_data(_info) container_of(_info, struct ucd9000_data, info) @@ -86,63 +85,6 @@ struct ucd9000_debugfs_entry { */ #define UCD90320_WAIT_DELAY_US 500 -static inline void ucd90320_wait(const struct ucd9000_data *data) -{ - s64 delta = ktime_us_delta(ktime_get(), data->write_time); - - if (delta < UCD90320_WAIT_DELAY_US) - udelay(UCD90320_WAIT_DELAY_US - delta); -} - -static int ucd90320_read_word_data(struct i2c_client *client, int page, - int phase, int reg) -{ - const struct pmbus_driver_info *info = pmbus_get_driver_info(client); - struct ucd9000_data *data = to_ucd9000_data(info); - - if (reg >= PMBUS_VIRT_BASE) - return -ENXIO; - - ucd90320_wait(data); - return pmbus_read_word_data(client, page, phase, reg); -} - -static int ucd90320_read_byte_data(struct i2c_client *client, int page, int reg) -{ - const struct pmbus_driver_info *info = pmbus_get_driver_info(client); - struct ucd9000_data *data = to_ucd9000_data(info); - - ucd90320_wait(data); - return pmbus_read_byte_data(client, page, reg); -} - -static int ucd90320_write_word_data(struct i2c_client *client, int page, - int reg, u16 word) -{ - const struct pmbus_driver_info *info = pmbus_get_driver_info(client); - struct ucd9000_data *data = to_ucd9000_data(info); - int ret; - - ucd90320_wait(data); - ret = pmbus_write_word_data(client, page, reg, word); - data->write_time = ktime_get(); - - return ret; -} - -static int ucd90320_write_byte(struct i2c_client *client, int page, u8 value) -{ - const struct pmbus_driver_info *info = pmbus_get_driver_info(client); - struct ucd9000_data *data = to_ucd9000_data(info); - int ret; - - ucd90320_wait(data); - ret = pmbus_write_byte(client, page, value); - data->write_time = ktime_get(); - - return ret; -} - static int ucd9000_get_fan_config(struct i2c_client *client, int fan) { int fan_config = 0; @@ -667,10 +609,8 @@ static int ucd9000_probe(struct i2c_client *client) info->func[0] |= PMBUS_HAVE_FAN12 | PMBUS_HAVE_STATUS_FAN12 | PMBUS_HAVE_FAN34 | PMBUS_HAVE_STATUS_FAN34; } else if (mid->driver_data == ucd90320) { - info->read_byte_data = ucd90320_read_byte_data; - info->read_word_data = ucd90320_read_word_data; - info->write_byte = ucd90320_write_byte; - info->write_word_data = ucd90320_write_word_data; + /* Delay SMBus operations after a write */ + info->write_delay = UCD90320_WAIT_DELAY_US; } ucd9000_probe_gpio(client, mid, data); From patchwork Wed Jul 17 07:29:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Rudolph X-Patchwork-Id: 13735183 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) (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 7AB3117BDC for ; Wed, 17 Jul 2024 07:31:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721201467; cv=none; b=i9LMjSnP0GCwws67UTDFMjFLAcCgIDfQRS2ZG4olwzqZMjryDqKhH+KHGUkNYqh+C6iNCvgd3umdA/sz646f4ARnxmKuVgZfayhHAxLsNLVxML03mLfV+bymss0lhu7JO0Nsadh918dsYqWG3UXHFK1yLX+M544EBU9E1Ygv5N0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721201467; c=relaxed/simple; bh=C8wpQJj+q1S305oWmbdoLTm9u1iD+4DN701nV5At900=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nNAI8Rfjo1Oi66vuh8EHo/ShwH8nf2aoznfyJ7SWPq/phk6YTrHQ6B00oklDF2LzobcwJSLCgq1K+Glj01RtzIagjYnk9EuCjo60UOqKpxY/Fc6gY0m53U2gMfLv4pkH43cVGvLuD5Mrj/e8G+wss19PcP1LO91Bew7mv1lFcQk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=9elements.com; spf=pass smtp.mailfrom=9elements.com; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b=c91rt6ml; arc=none smtp.client-ip=209.85.208.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=9elements.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=9elements.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b="c91rt6ml" Received: by mail-ed1-f53.google.com with SMTP id 4fb4d7f45d1cf-58ba3e38027so6595297a12.1 for ; Wed, 17 Jul 2024 00:31:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1721201464; x=1721806264; darn=vger.kernel.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=2iBs9G5I72sNRbH81BzberuVmjgumv9UTMOK7dxzACo=; b=c91rt6mlQULpFp0k7xD053KGDwjcEMeTuu+0oUyolHnAotm5upUJD5bJQqXg20JxTy NpCMYuzOxJOzr8de1dJ8e2iHBcBbhVQHQOHEsRjSbgBXNbBdx0RbAyx37hIggz7gNfCm kdDSU49palCLR/R/wDlIConUt6gRCizxgo1SQobS9qHeNXqTZKjK2O1jJVtLnOMpk5h8 +NpFiTNsyytfxJ5t69YgjDXdVpepIzPyEml0u3m4tUdF/vXaYiR9jnbZYhCk7CtRAbtp AxMm8p6KyP9RzdkPah8Xyqt5EskQoSZJOGztDKMkgIhtpwl7T5Bc444O0oOf3/RH/TC5 jXTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721201464; x=1721806264; 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=2iBs9G5I72sNRbH81BzberuVmjgumv9UTMOK7dxzACo=; b=orXPGxVGBIziRSzF/5VOtJ5u0IaJCttfUOo6WgJQ9EwL7J56oJwvuq/1dSRgBldiFN e5TQKFSLbeb8/ZEelwY868Paw7CqyInVw6k1VBM6gbJ5YIQfMfIgHNdh4eDdrRUhp8/9 0SO+b+ZN3XLJG4q7/b/RWvM6jDjYVJeYMfoJU8sMbXi5d3ai2V6/pEG3OAJvyoYy5u1X Cgz3I8SiJ/QyyJATIYzGUNVB5FkHIPp3kc5KEcDC6rkRodGOzWePBh58qd1m6z+F5Frc /L4aZ2GG9JPMbBR0y+26mvvyH7C3TW4UxDxq1NMhg/iBo1n6/NEzAlQuyhIRAPHbeqUM idyw== X-Forwarded-Encrypted: i=1; AJvYcCVeOlYNTf+3uxmj5+fvOa0huuKeemPs5jNylbYR8mk+erp6+QfoTtznshy/+JwXkVW1JzscsuOtWkAxCU2EsFoMKjiYtde5ZIpRClc= X-Gm-Message-State: AOJu0YypFgivf+ZoSYbBrwpo7vwK3U5zHBBzMNmDQs1bW3r+O7VEjJTm eRrm1FIKzbxAHGuOiI2FHZeUXxM4zCnkTiCfsxGl/3OLYMl587/mb6S//WxVoiM= X-Google-Smtp-Source: AGHT+IHLWD5CpIFO5o0hwJAI/o+B6rwJN5ayTpaT457fFXE5f6vy/ySpEwczOPkj9mEyD7LpgJDbUw== X-Received: by 2002:a05:6402:5192:b0:57c:a422:677b with SMTP id 4fb4d7f45d1cf-5a05b22a32bmr895535a12.8.1721201463955; Wed, 17 Jul 2024 00:31:03 -0700 (PDT) Received: from fedora.sec.9e.network (ip-037-049-067-221.um09.pools.vodafone-ip.de. [37.49.67.221]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-59edba561e0sm2766841a12.50.2024.07.17.00.31.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jul 2024 00:31:03 -0700 (PDT) From: Patrick Rudolph To: linux-kernel@vger.kernel.org Cc: Patrick Rudolph , Jean Delvare , Guenter Roeck , linux-hwmon@vger.kernel.org Subject: [PATCH v2 4/5] hwmon: pmbus: zl6100: Use generic code Date: Wed, 17 Jul 2024 09:29:55 +0200 Message-ID: <20240717073000.786228-4-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240717073000.786228-1-patrick.rudolph@9elements.com> References: <20240717073000.786228-1-patrick.rudolph@9elements.com> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Use generic pmbus bus access delay. Signed-off-by: Patrick Rudolph --- drivers/hwmon/pmbus/zl6100.c | 66 +++++------------------------------- 1 file changed, 8 insertions(+), 58 deletions(-) diff --git a/drivers/hwmon/pmbus/zl6100.c b/drivers/hwmon/pmbus/zl6100.c index 83458df0d0cf..7920a16203e1 100644 --- a/drivers/hwmon/pmbus/zl6100.c +++ b/drivers/hwmon/pmbus/zl6100.c @@ -22,8 +22,6 @@ enum chips { zl2004, zl2005, zl2006, zl2008, zl2105, zl2106, zl6100, zl6105, struct zl6100_data { int id; - ktime_t access; /* chip access time */ - int delay; /* Delay between chip accesses in uS */ struct pmbus_driver_info info; }; @@ -122,16 +120,6 @@ static u16 zl6100_d2l(long val) return (mantissa & 0x7ff) | ((exponent << 11) & 0xf800); } -/* Some chips need a delay between accesses */ -static inline void zl6100_wait(const struct zl6100_data *data) -{ - if (data->delay) { - s64 delta = ktime_us_delta(ktime_get(), data->access); - if (delta < data->delay) - udelay(data->delay - delta); - } -} - static int zl6100_read_word_data(struct i2c_client *client, int page, int phase, int reg) { @@ -174,9 +162,7 @@ static int zl6100_read_word_data(struct i2c_client *client, int page, break; } - zl6100_wait(data); ret = pmbus_read_word_data(client, page, phase, vreg); - data->access = ktime_get(); if (ret < 0) return ret; @@ -195,14 +181,11 @@ static int zl6100_read_word_data(struct i2c_client *client, int page, static int zl6100_read_byte_data(struct i2c_client *client, int page, int reg) { const struct pmbus_driver_info *info = pmbus_get_driver_info(client); - struct zl6100_data *data = to_zl6100_data(info); int ret, status; if (page >= info->pages) return -ENXIO; - zl6100_wait(data); - switch (reg) { case PMBUS_VIRT_STATUS_VMON: ret = pmbus_read_byte_data(client, 0, @@ -225,7 +208,6 @@ static int zl6100_read_byte_data(struct i2c_client *client, int page, int reg) ret = pmbus_read_byte_data(client, page, reg); break; } - data->access = ktime_get(); return ret; } @@ -234,8 +216,7 @@ static int zl6100_write_word_data(struct i2c_client *client, int page, int reg, u16 word) { const struct pmbus_driver_info *info = pmbus_get_driver_info(client); - struct zl6100_data *data = to_zl6100_data(info); - int ret, vreg; + int vreg; if (page >= info->pages) return -ENXIO; @@ -265,27 +246,7 @@ static int zl6100_write_word_data(struct i2c_client *client, int page, int reg, vreg = reg; } - zl6100_wait(data); - ret = pmbus_write_word_data(client, page, vreg, word); - data->access = ktime_get(); - - return ret; -} - -static int zl6100_write_byte(struct i2c_client *client, int page, u8 value) -{ - const struct pmbus_driver_info *info = pmbus_get_driver_info(client); - struct zl6100_data *data = to_zl6100_data(info); - int ret; - - if (page >= info->pages) - return -ENXIO; - - zl6100_wait(data); - ret = pmbus_write_byte(client, page, value); - data->access = ktime_get(); - - return ret; + return pmbus_write_word_data(client, page, vreg, word); } static const struct i2c_device_id zl6100_id[] = { @@ -363,14 +324,7 @@ static int zl6100_probe(struct i2c_client *client) * supported chips are known to require a wait time between I2C * accesses. */ - data->delay = delay; - - /* - * Since there was a direct I2C device access above, wait before - * accessing the chip again. - */ - data->access = ktime_get(); - zl6100_wait(data); + udelay(delay); info = &data->info; @@ -404,8 +358,7 @@ static int zl6100_probe(struct i2c_client *client) if (ret < 0) return ret; - data->access = ktime_get(); - zl6100_wait(data); + udelay(delay); if (ret & ZL8802_MFR_PHASES_MASK) info->func[1] |= PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT; @@ -418,8 +371,7 @@ static int zl6100_probe(struct i2c_client *client) if (ret < 0) return ret; - data->access = ktime_get(); - zl6100_wait(data); + udelay(delay); ret = i2c_smbus_read_word_data(client, ZL8802_MFR_USER_CONFIG); if (ret < 0) @@ -428,8 +380,7 @@ static int zl6100_probe(struct i2c_client *client) if (ret & ZL8802_MFR_XTEMP_ENABLE_2) info->func[i] |= PMBUS_HAVE_TEMP2; - data->access = ktime_get(); - zl6100_wait(data); + udelay(delay); } ret = i2c_smbus_read_word_data(client, ZL8802_MFR_USER_GLOBAL_CONFIG); if (ret < 0) @@ -446,13 +397,12 @@ static int zl6100_probe(struct i2c_client *client) info->func[0] |= PMBUS_HAVE_TEMP2; } - data->access = ktime_get(); - zl6100_wait(data); + udelay(delay); + info->access_delay = delay; info->read_word_data = zl6100_read_word_data; info->read_byte_data = zl6100_read_byte_data; info->write_word_data = zl6100_write_word_data; - info->write_byte = zl6100_write_byte; return pmbus_do_probe(client, info); } From patchwork Wed Jul 17 07:29:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Rudolph X-Patchwork-Id: 13735184 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 B47881CF8A for ; Wed, 17 Jul 2024 07:31:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721201468; cv=none; b=f4KZNQuQB3RNUF9aw5lRO/BC0zlHfQfAN7XfawNGJ77ylzRCb+eiEuSElkmmD9DcomGIi/sFGrkBIYCrqJ/6UxkZPj6y8qD+gxjyKr25tvr83EOtS9hoCGUUMN6zRosnrzVveztx3nTgPNek/ruj/umjaQ4wwrUnTqgonubMpeY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721201468; c=relaxed/simple; bh=msdvHICFqZBk3Qmz2OXLcwYLDlWXsaOJTSf+xIoW5K8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IVvJCOc2nwHQNlxAD02LmRT9hU86uO4S01BfCLtvPRbRIod7yaDTv6qJPB59WNaLVam1Fjc82td5wBGuAfbDBXbexBdNudSiX3ycb7uF/4ApJqxdMFpZ6ZYwM8jT3Cv5BJO2LBExhiKMm6T5LL53RfTSdSrvW2wbC1Rz60otr5Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=9elements.com; spf=pass smtp.mailfrom=9elements.com; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b=UsdYwnf9; arc=none smtp.client-ip=209.85.208.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=9elements.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=9elements.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b="UsdYwnf9" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5a09634354eso264759a12.3 for ; Wed, 17 Jul 2024 00:31:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1721201465; x=1721806265; darn=vger.kernel.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=7H+3a2UnmA5NVXZ9zwW5RQvv7oqwdwKXWiUEHwm4fFk=; b=UsdYwnf9iL0cjKnfgPvGE/oUnh7mRypsvsOytZsAU2YjQkrAsYcKPUeODqWcmnnxXJ WJhiOYdMrbnHO2A2kqIqzQ27n1PhDZhLz8fcCZ7zBoh5MuopFOK0ILeYRpGug6McQjdX inm3A91CnAAvT2IgIVGVPWCN4MdAbTpO7mi60qw2yCYysm135aOz1WvfnleaB+bVAwWe 3pfH7cvHEmolmxzJRLvEpqaUg1bKkNkOP4UK68+QGzymXP4j8BgSdDG52n7Wp2jJK1Mz 54IDepftB7o/owboE6Ywq9dUTInTGCenYCAaLElWVFRSWUBft7PC29vsIbrD6cN8rB7E cg5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721201465; x=1721806265; 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=7H+3a2UnmA5NVXZ9zwW5RQvv7oqwdwKXWiUEHwm4fFk=; b=UAq/pXxFLzFCaUUYySSRAWtGW1RrbMAcX6jig7OhmKVahyWuobPgLDRNcjR54ivSai ywYby/pDOtFxACL+Zp/1xSbZjBMXHo5yiWOWJexn+S31MlshQdAxHbzEGKVrCLKpQDo1 9T90YztdwbzYgr/F3L+3Z3aeIYsu5f8ozQgeSD+iD13fkMPWbIFhtgSgzVn8KeiuNcEr rtfWJ2OmKnGSCF8IAJLh1SXI2VZq0AhNIAW9OIpANjhZMGHWlJFWzmi93laXGPxF7TyU Hv6RoiXOk88o+3MaUGjvYOxzNOvnU/brNWvdOd2FwHcm3HOvO4+5mLSsDwG90RQBcu4V /Izg== X-Forwarded-Encrypted: i=1; AJvYcCXGMk3PhoXYmsBxQbC39CwZOKq43ge7BHaqq5bzZF/jHeyUvfLCls/wZo0Z5ETMPOtJm3dox9Ktjue/Cr1SAcC2ptabXrMhYGH7CHw= X-Gm-Message-State: AOJu0YwZ5v7wFlcRZhxCVZIU9uUPEwO565XB5ZXN0yHzl9CQ7H4S2ZiL 5T/a4E/34QFMl1V20U1vY9z4UIL0Mwc0wV7XqGRDhD3N3QoFiVbx+1pf1/lO7Og= X-Google-Smtp-Source: AGHT+IEZtcVXcfwtImP1fpyarc5yRV6TUo8N8SeviTjYaw+TozD8Xo8zU+Xhcw5IGQhmNtEuvts9Tg== X-Received: by 2002:a50:d69c:0:b0:58b:d7f2:eef3 with SMTP id 4fb4d7f45d1cf-5a05b9dac64mr580801a12.12.1721201465233; Wed, 17 Jul 2024 00:31:05 -0700 (PDT) Received: from fedora.sec.9e.network (ip-037-049-067-221.um09.pools.vodafone-ip.de. [37.49.67.221]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-59edba561e0sm2766841a12.50.2024.07.17.00.31.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jul 2024 00:31:04 -0700 (PDT) From: Patrick Rudolph To: linux-kernel@vger.kernel.org Cc: Patrick Rudolph , Jean Delvare , Guenter Roeck , linux-hwmon@vger.kernel.org Subject: [PATCH v2 5/5] hwmon: pmbus: pli12096bc: Add write delay Date: Wed, 17 Jul 2024 09:29:56 +0200 Message-ID: <20240717073000.786228-5-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240717073000.786228-1-patrick.rudolph@9elements.com> References: <20240717073000.786228-1-patrick.rudolph@9elements.com> Precedence: bulk X-Mailing-List: linux-hwmon@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Tests on PLI12096bc showed that sometimes a small delay is necessary after a write operation before a new operation can be processed. If not respected the device will probably NACK the data phase of the SMBus transaction. Tests showed that the probability to observe transaction errors can be raised by either reading sensor data or toggling the regulator enable. Further tests showed that 250 microseconds, as used previously for the CLEAR_FAULTS workaround, is sufficient. Signed-off-by: Patrick Rudolph --- drivers/hwmon/pmbus/pli1209bc.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/drivers/hwmon/pmbus/pli1209bc.c b/drivers/hwmon/pmbus/pli1209bc.c index 2c6c9ec2a652..178e0cdb7887 100644 --- a/drivers/hwmon/pmbus/pli1209bc.c +++ b/drivers/hwmon/pmbus/pli1209bc.c @@ -54,30 +54,6 @@ static int pli1209bc_read_word_data(struct i2c_client *client, int page, } } -static int pli1209bc_write_byte(struct i2c_client *client, int page, u8 reg) -{ - int ret; - - switch (reg) { - case PMBUS_CLEAR_FAULTS: - ret = pmbus_write_byte(client, page, reg); - /* - * PLI1209 takes 230 usec to execute the CLEAR_FAULTS command. - * During that time it's busy and NACKs all requests on the - * SMBUS interface. It also NACKs reads on PMBUS_STATUS_BYTE - * making it impossible to poll the BUSY flag. - * - * Just wait for not BUSY unconditionally. - */ - usleep_range(250, 300); - break; - default: - ret = -ENODATA; - break; - } - return ret; -} - #if IS_ENABLED(CONFIG_SENSORS_PLI1209BC_REGULATOR) static const struct regulator_desc pli1209bc_reg_desc = { .name = "vout2", @@ -127,7 +103,7 @@ static struct pmbus_driver_info pli1209bc_info = { | PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_STATUS_INPUT, .read_word_data = pli1209bc_read_word_data, - .write_byte = pli1209bc_write_byte, + .write_delay = 250, #if IS_ENABLED(CONFIG_SENSORS_PLI1209BC_REGULATOR) .num_regulators = 1, .reg_desc = &pli1209bc_reg_desc,