From patchwork Mon Mar 4 16:44:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naresh Solanki X-Patchwork-Id: 209637 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1541564dyc; Mon, 4 Mar 2024 08:45:17 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWwCuPkbSp4gBlt9n3Z4r+H4lUJY7XEkEnMXReq3SEr9AYWmeV1sqdV/7UnOIP4K2petgeccJMIncBq6BOzEV+DbwEebg== X-Google-Smtp-Source: AGHT+IEPc9OuQGs9pmZ2pH3xEt2X5y3U4OWLio2mKuN1J3Vv65TrwtiEqKNYSTfAw9RrB/K3i8b9 X-Received: by 2002:a05:6a00:939d:b0:6e4:7b26:3f28 with SMTP id ka29-20020a056a00939d00b006e47b263f28mr9573561pfb.21.1709570717728; Mon, 04 Mar 2024 08:45:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709570717; cv=pass; d=google.com; s=arc-20160816; b=VDlYbUxEZwYAtpyCfS7HSBg+mCmRfsVZdIp1GaLKjGHXdCTcK/jiIpdb67jb/SKtdO VG3pOdGbTTm6EEdv0XYV8p9+tcZw9e1lSH18M70EWwPQdYyp0T48ZkRGf6QWNZFyRqvc dwnx1DraOJit2yxODdiHpFqge5mRMfLAV9KwLr6QJBNGM9fT6RkDMJQrszMe7aL97s80 VRQy4p39YrFSVjNDeuRFJNCeW+TaCv5iHOQdGtv6KesfsoseEgCLW6GOsjYatm1fnaXO 5rmTBFzb7vdHABWXLSgpo/m3n9w/1uEA4wA+929owzWbgIBNhjotgZRDQkG79kKWL8Qj vacA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=U0FiBP+//kknF4KTWR0RQTkCl2jmVnjkFryXNaTnTKI=; fh=9aNflTdrYOU/r6msCAKDVhAW9zs0yDyus4+jzZiH558=; b=rrgKWBz18G+EVptUSlUnaEFX9x5SGDSOK/rMTutbT9+b2hTyzdIGlE0EOky812GdUS u3E6yEffe6LOCraBpsVUqrLIujVCGOSsTbN13GfK5cf1uUVqZl2/VRtGG/ZH5DFQq9gp HkM+YeaXGfqg5vvLk+Ql2SbVRebAoe8ynkesOnvnz1faYVsB3A0G0wAAM59XgLIrsDub yZFrSBImL9Ej5OknYw3Z1tc8PVHpwJ2qXGBfql/syTgjZUSUiYb751WnCjcpezsprQKD +2z4834zLbRY+TN06bgbPBozx0n9vai9ns6lGBcJ5YW71h9PtMHNBKvm4eJr+w3BbMZN r18Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=SdOoF4mr; arc=pass (i=1 spf=pass spfdomain=9elements.com dkim=pass dkdomain=9elements.com dmarc=pass fromdomain=9elements.com); spf=pass (google.com: domain of linux-kernel+bounces-90949-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90949-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id hq4-20020a056a00680400b006e4e0f4e249si8320462pfb.323.2024.03.04.08.45.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 08:45:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-90949-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@9elements.com header.s=google header.b=SdOoF4mr; arc=pass (i=1 spf=pass spfdomain=9elements.com dkim=pass dkdomain=9elements.com dmarc=pass fromdomain=9elements.com); spf=pass (google.com: domain of linux-kernel+bounces-90949-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90949-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=9elements.com 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 81CD6282EA5 for ; Mon, 4 Mar 2024 16:45:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BB37E4DA0C; Mon, 4 Mar 2024 16:45:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=9elements.com header.i=@9elements.com header.b="SdOoF4mr" Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 6F3E54D599 for ; Mon, 4 Mar 2024 16:45:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709570706; cv=none; b=hrEHkJ/3sK5yXwmT4tLuTCpF46nwUPA5q5lZauMMItR3q5vg5vLdz7qR7H4cAnY1MdCtpqUwvmYxzRiddIFGEHdwZsDqUWUlhxpYa6YYDT8QQ+DiYVfie1vmP5eMZfVX0yoVf5UJAGHl88ceh2EoQf2AICbEglZo5vF+2ZsDdwE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709570706; c=relaxed/simple; bh=c0nOlOGVKnbvZd0aqgDLKYGxvgeBthYhCQaGDdivyEs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=VzfPvA9RSg1+W3xj+drLsBVpy261Al2QLP4rYyuJZnSYEd2AUH4BrrFG9nk/81yPqh/n2XOkKyNywhdqoM6ASQ5C5sYY6QDSeiJVxahNYUZ7D3IOEvNsFtVeUpi+uf2oRPFxOymFMYC19udjpAdTmFIZsENQ7+QZT/6awAZHiMg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none 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=SdOoF4mr; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=9elements.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=9elements.com Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-a4499ef8b5aso325168066b.0 for ; Mon, 04 Mar 2024 08:45:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1709570702; x=1710175502; 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=U0FiBP+//kknF4KTWR0RQTkCl2jmVnjkFryXNaTnTKI=; b=SdOoF4mrSlAdjK9UaeVBwgi4DdH+MCwVNUgesfP1i8NU1A4JVITvV2ls/TY5iHa++C /ARcvjNIn/LzZmI6l6VWNXW7TRPG7On8w2U74KlwEG04Gh7usZxOxB07mPh1zNC3Wz1P +dgftEU4v3RH3DNHmLwps3hGNfKjmrllrRDb/refdSZBMowKw3RdblLSmRDtxeR184eS 5DDCw0RI2USWcRfW2h6kSONvYfODJ15egDv75sUijxsWfbv1/iDcL0KudUkjs4XDhncO nIbCG1pmpm4MGxyFxNPpb7ssSKszDa2AJiEraCb+rxreyKr94UNVBNENtr9da+5r0g0C Q3Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709570702; x=1710175502; 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=U0FiBP+//kknF4KTWR0RQTkCl2jmVnjkFryXNaTnTKI=; b=ERgsf4qvu+Bj31pGE5s3ttTTZWlMe/h/llOKYFJRjascdJrw/1+CBi8ZT1UKwSr225 OAQ/jVjywIq7VVNZrDgTqVMy3YYD4zfHSFQnRuaao1ryZ03L/6Kh4MqkKkLXUoer+AAA 8zfawFk/ZEds4qZRALc76YUr3l02KoAYsIjGzdqk8WLqWMI8TKHVa27jJHCGCR2+6xwc R07qy8m8dpnTJXX484PaiWz6NqH/JHkbxP5wRBVwPWj63h81N+BPFlRigoTD60sageCf M7hMujwAn0XNoCvjWYe8VPIHBjqocF+hfCn+VE6ps74FJw0Uv4AVrduvUbuM4D3e1BUA bQzg== X-Forwarded-Encrypted: i=1; AJvYcCWSm2MKVkGM3xxl7QD5d884jKdizU1AhkYUzsztcZ199C5VWfwayPkchjKWhH7VZzXGvlJ32Oaab1IXX5Ub0FucWgrNqrez6tHCg47R X-Gm-Message-State: AOJu0YzJDx4YSc9m+N6FCnRybNIm5iYTT2wXDGYapp7UAV8lnf8vHwVP HYy+7lq4GvgHw8+b3Qj7IePh65PeCfRnZXursnAnUYTtpWkf7Fq/6yTnMhWgEXo= X-Received: by 2002:a17:906:b014:b0:a44:c6b4:ee4b with SMTP id v20-20020a170906b01400b00a44c6b4ee4bmr4831161ejy.25.1709570701689; Mon, 04 Mar 2024 08:45:01 -0800 (PST) Received: from stroh80.sec.9e.network (ip-078-094-000-051.um19.pools.vodafone-ip.de. [78.94.0.51]) by smtp.gmail.com with ESMTPSA id tj7-20020a170907c24700b00a413d1eda4bsm5039616ejc.87.2024.03.04.08.45.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 08:45:01 -0800 (PST) From: Naresh Solanki To: Guenter Roeck , Jean Delvare Cc: mazziesaccount@gmail.com, Patrick Rudolph , Naresh Solanki , linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] hwmon: (pmbus/mp2975) Fix IRQ masking Date: Mon, 4 Mar 2024 22:14:45 +0530 Message-ID: <20240304164446.4153915-1-naresh.solanki@9elements.com> X-Mailer: git-send-email 2.42.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792614825072187438 X-GMAIL-MSGID: 1792614825072187438 From: Patrick Rudolph The MP2971/MP2973 use a custom 16bit register format for SMBALERT_MASK which doesn't follow the PMBUS specification. Map the PMBUS defined bits used by the common code onto the custom format used by MPS and since the SMBALERT_MASK is currently never read by common code only implement the mapping for write transactions. Signed-off-by: Patrick Rudolph Signed-off-by: Naresh Solanki --- drivers/hwmon/pmbus/mp2975.c | 77 ++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) base-commit: 90d35da658da8cff0d4ecbb5113f5fac9d00eb72 diff --git a/drivers/hwmon/pmbus/mp2975.c b/drivers/hwmon/pmbus/mp2975.c index e5fa10b3b8bc..766026204d88 100644 --- a/drivers/hwmon/pmbus/mp2975.c +++ b/drivers/hwmon/pmbus/mp2975.c @@ -392,6 +392,82 @@ static int mp2973_read_word_data(struct i2c_client *client, int page, return ret; } +static int mp2973_write_word_data(struct i2c_client *client, int page, + int reg, u16 word) +{ + u8 target, mask; + int ret; + + if (reg != PMBUS_SMBALERT_MASK) + return -ENODATA; + + /* + * Vendor-specific SMBALERT_MASK register with 16 maskable bits. + */ + ret = pmbus_read_word_data(client, 0, 0, PMBUS_SMBALERT_MASK); + if (ret < 0) + return ret; + + target = word & 0xff; + mask = word >> 8; + +/* + * Set/Clear 'bit' in 'ret' based on condition followed by define for each bit in SMBALERT_MASK. + * Also bit 2 & 15 are reserved. + */ +#define SWAP(cond, bit) (ret = (mask & cond) ? (ret & ~BIT(bit)) : (ret | BIT(bit))) + +#define MP2973_TEMP_OT 0 +#define MP2973_VIN_UVLO 1 +#define MP2973_VIN_OVP 3 +#define MP2973_MTP_FAULT 4 +#define MP2973_OTHER_COMM 5 +#define MP2973_MTP_BLK_TRIG 6 +#define MP2973_PACKET_ERROR 7 +#define MP2973_INVALID_DATA 8 +#define MP2973_INVALID_COMMAND 9 +#define MP2973_IOUT_OC_LV 10 +#define MP2973_IOUT_OC 11 +#define MP2973_VOUT_MAX_MIN_WARNING 12 +#define MP2973_VOLTAGE_UV 13 +#define MP2973_VOLTAGE_OV 14 + + switch (target) { + case PMBUS_STATUS_CML: + SWAP(PB_CML_FAULT_INVALID_DATA, MP2973_INVALID_DATA); + SWAP(PB_CML_FAULT_INVALID_COMMAND, MP2973_INVALID_COMMAND); + SWAP(PB_CML_FAULT_OTHER_COMM, MP2973_OTHER_COMM); + SWAP(PB_CML_FAULT_PACKET_ERROR, MP2973_PACKET_ERROR); + break; + case PMBUS_STATUS_VOUT: + SWAP(PB_VOLTAGE_UV_FAULT, MP2973_VOLTAGE_UV); + SWAP(PB_VOLTAGE_OV_FAULT, MP2973_VOLTAGE_OV); + break; + case PMBUS_STATUS_IOUT: + SWAP(PB_IOUT_OC_FAULT, MP2973_IOUT_OC); + SWAP(PB_IOUT_OC_LV_FAULT, MP2973_IOUT_OC_LV); + break; + case PMBUS_STATUS_TEMPERATURE: + SWAP(PB_TEMP_OT_FAULT, MP2973_TEMP_OT); + break; + /* + * Map remaining bits to MFR specific to let the PMBUS core mask + * those bits by default. + */ + case PMBUS_STATUS_MFR_SPECIFIC: + SWAP(BIT(1), MP2973_VIN_UVLO); + SWAP(BIT(3), MP2973_VIN_OVP); + SWAP(BIT(4), MP2973_MTP_FAULT); + SWAP(BIT(6), MP2973_MTP_BLK_TRIG); + break; + default: + return 0; + } +#undef SWAP + + return pmbus_write_word_data(client, 0, PMBUS_SMBALERT_MASK, ret); +} + static int mp2975_read_word_data(struct i2c_client *client, int page, int phase, int reg) { @@ -907,6 +983,7 @@ static struct pmbus_driver_info mp2973_info = { PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_POUT | PMBUS_HAVE_PIN | PMBUS_HAVE_STATUS_INPUT, .read_word_data = mp2973_read_word_data, + .write_word_data = mp2973_write_word_data, #if IS_ENABLED(CONFIG_SENSORS_MP2975_REGULATOR) .num_regulators = 1, .reg_desc = mp2975_reg_desc,