From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 D3EB233F397 for ; Wed, 24 Dec 2025 09:50:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766569836; cv=none; b=ZFTGoZ5eH8ZhY+LWmVH5V2IbReUVIWT3znXeJHI3LkbBus0VigWI4NJmvgjr13GWnKpYPrQADK0Wol0JWsWLupoy7j0jOWWhu3Vuew95Z+ezwK+qHvPeQQn+wAzMljGfrJFautCOII1BnQNXMEv/txPvR3vefnPI5J8cvAvs9zU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766569836; c=relaxed/simple; bh=V5EGk4BGjnS/4/eleHFD550gqcXi7T6uzPhHKGSXLaY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WNGLNQcoeqLi1KxQTpXVJzxaAFW7kMmvwdxYglHWb/88c4IZI0lBIfXe/Tv2D1wNWIpdAAfsFR5M9LAGfWdOkJsQTH8VwvBI+COdiSWWVndnuTBZGp2rnWOO+V8rNouPMNh5u/ezh/06h9OSPTSjj8nmZ9XPyAE1fxyMy/kgFZU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MJ8OKaHM; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MJ8OKaHM" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-7b8eff36e3bso9128906b3a.2 for ; Wed, 24 Dec 2025 01:50:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766569833; x=1767174633; 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=Hn8WmsMwEydmglOkF6CvabWkz0d6PWX3JFU+DhEGtU0=; b=MJ8OKaHMvj6B6bpXhf7ZqpAW6JV4EW5BKcc9hhtI8+cVqouYjMYafC9TScyJmhUn+o cnYvBHY5KklfHrdhrLhOG6PkCSaszIChMybBpsA4Xubf1C+2stFomKeGk73UvdnfO7T6 zUb1MIGUjrOITdNaCkKnfZW4CYgeRHy17maxK5RGdBW2Os/n7gprpWJl2vsH4lTJIJb6 3hHR7VBWwe9N1ly/hDuhNniUPd/BKLpsfibk5fAcNmOQvQtx//Z1O8wMyJOQCtWXFsbq MtsS3rFB4YG7tTenBuBftARYX604A30OlT/6ew03D5WEOXDhyuUp8TYVFxa5HaOyzIH/ F8ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766569833; x=1767174633; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Hn8WmsMwEydmglOkF6CvabWkz0d6PWX3JFU+DhEGtU0=; b=IQPx3oR5ZiN6u+BEOKSo6TVu2/9k6TifX50CsWs8qKql6VYtAetN/94K1kRslyeEkN E8c6QxjWMvtZ0eqWZ0zNiGzje2OiAIrsV5jWS/Cim4sJyiESIeWUY4fdvsNYJ1r3nFII my49/vkJTDhGs2/G+UBesQFAUqWbdFU+KFBUHTZ+reeTR1um1MRyJGvnTHtdEDqQJg5K 0Pt9SmgAYf9unDdcS5b1N3tbwW+IGz4EWOyLeYuyJJ9MnKpWtk3xrJwz7+N/vAiNQ8YS GH5oIl5RVpeL82f967fAwkHXVtg6H3YTUsL8E672zC6JtSnGV1Ot+s8W9GyhT50ysrHf d7gQ== X-Forwarded-Encrypted: i=1; AJvYcCWNY0tiKSkGI5vH1/XfJMS3l+MU1I2IRiDF/8n9KWV0sPseGmmAfEvZ0RlPVcTweCaZyly7ZV/CKDDTjTk=@vger.kernel.org X-Gm-Message-State: AOJu0Ywlo4Mt6JgjX7dHzM8cx739DjGxujfOnXIIZ5QiLsIFnbJjl0jD Xf/Gti1aY1RlC9mpAfcuJ4t24i2UID5UyGhKuuo+h02cd4dgmXa/H5JM X-Gm-Gg: AY/fxX553PEc3KBaLkz3DrSAmURpiqcFkIh8ruNOWBdDNWgyx4HbJSq7N7bhIeaQFBb +o0YBmL6cQb0vuBazGCykdhMeBtk9niSV+f/AVlL2I4koA5TkA0aqTvaDFce/EkXl+tdyXNyIoE a76dlk881EAD9kecPgMORDjmMrKQ0Z/zkGZCcpPcLmxWCZoE5AAV2wfBsDT0ZBxcYl/6L0ww1un y8h5tNMq/uXCzUXqs1p8iRxnA9c8xhS4/ezs24Wts9XGU0G01G00jYCb2Rq3rtbpgg4NPhAQto8 XKPJSzU0xeSLy7C3/0kte981KFDUi47vJhhH/mV/zngzBqHid/3wQ1siLE2gga/MblQgwlzjp5o VRkrYcCcAucwr/FDJS2FBCVilVPiklHLfmNsoJ38FH12yaI46Ta282lbyQNqDv4FAmWYxbxB6o0 qbHrwo2RZO4XI7vlUWvLUvOPCghhxUSA== X-Google-Smtp-Source: AGHT+IETVJYi2E5BtSLEGF8Rmd3fNXRH+VBDvZUg94MbaZzPvtwxOLMq/Y/lo6J9evMOoL+usBQSLw== X-Received: by 2002:a05:6a00:420f:b0:7ac:1444:6777 with SMTP id d2e1a72fcca58-7ff646f9380mr16325759b3a.12.1766569833193; Wed, 24 Dec 2025 01:50:33 -0800 (PST) Received: from nitin-ThinkPad-T1g-Gen-8.. ([2405:201:3006:188a:9ac9:e6ff:432:bb3]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7ff7aa328basm16372003b3a.11.2025.12.24.01.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Dec 2025 01:50:32 -0800 (PST) From: Nitin Joshi To: hansg@kernel.org, ilpo.jarvinen@linux.intel.com Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, njoshi1@lenovo.com, Nitin Joshi , Mark Pearson Subject: [PATCH v6 2/2] platform/x86: thinkpad_acpi: Add sysfs to display details of damaged device. Date: Wed, 24 Dec 2025 18:50:19 +0900 Message-ID: <20251224095019.11622-2-nitjoshi@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251224095019.11622-1-nitjoshi@gmail.com> References: <20251224095019.11622-1-nitjoshi@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add new sysfs interface to identify the impacted component with location of device. Reviewed-by: Mark Pearson Signed-off-by: Nitin Joshi --- Changes since v2: -Control visibility of the sysfs attribute based upon ucdd_supported Changes since v3: -Fix documentation build warning Changes since v4: -Improved indentation and removed extra line Changes since v5: -Improved indentation --- .../admin-guide/laptops/thinkpad-acpi.rst | 13 ++- drivers/platform/x86/lenovo/thinkpad_acpi.c | 104 +++++++++++++++++- 2 files changed, 114 insertions(+), 3 deletions(-) diff --git a/Documentation/admin-guide/laptops/thinkpad-acpi.rst b/Documentation/admin-guide/laptops/thinkpad-acpi.rst index 2db05f718b11..3a37b14863a8 100644 --- a/Documentation/admin-guide/laptops/thinkpad-acpi.rst +++ b/Documentation/admin-guide/laptops/thinkpad-acpi.rst @@ -1580,7 +1580,7 @@ Documentation/ABI/testing/sysfs-class-power. Hardware damage detection capability ------------------------------------ -sysfs attributes: hwdd_status +sysfs attributes: hwdd_status, hwdd_detail Thinkpads are adding the ability to detect and report hardware damage. Add new sysfs interface to identify the damaged device status. @@ -1594,6 +1594,17 @@ This value displays status of device damaged - 0 = Not Damaged - 1 = Damaged +The command to check location of damaged device is:: + + cat /sys/devices/platform/thinkpad_acpi/hwdd_detail + +This value displays location of damaged device having 1 line per damaged "item". +For example: +if no damage is detected: +- No damage detected +if damage detected: +- TYPE-C: Base, Right side, Center port + The property is read-only. If feature is not supported then sysfs attribute is not created. diff --git a/drivers/platform/x86/lenovo/thinkpad_acpi.c b/drivers/platform/x86/lenovo/thinkpad_acpi.c index 3702374357ab..95755fa1e008 100644 --- a/drivers/platform/x86/lenovo/thinkpad_acpi.c +++ b/drivers/platform/x86/lenovo/thinkpad_acpi.c @@ -11089,8 +11089,24 @@ static const struct attribute_group auxmac_attr_group = { #define HWDD_NOT_SUPPORTED BIT(31) #define HWDD_SUPPORT_USBC BIT(0) -#define PORT_STATUS GENMASK(7, 4) -#define NUM_PORTS 4 +#define PORT_STATUS GENMASK(7, 4) +#define LID_STATUS GENMASK(11, 8) +#define BASE_STATUS GENMASK(15, 12) +#define POS_STATUS GENMASK(3, 2) +#define PANEL_STATUS GENMASK(1, 0) + +#define PORT_DETAIL_OFFSET 16 + +#define PANEL_TOP 0 +#define PANEL_BASE 1 +#define PANEL_LEFT 2 +#define PANEL_RIGHT 3 + +#define POS_LEFT 0 +#define POS_CENTER 1 +#define POS_RIGHT 2 + +#define NUM_PORTS 4 static bool hwdd_support_available; static bool ucdd_supported; @@ -11108,6 +11124,88 @@ static int hwdd_command(int command, int *output) return 0; } +static bool display_damage(char *buf, int *count, char *type, unsigned int dmg_status) +{ + unsigned char lid_status, base_status, port_status; + unsigned char loc_status, pos_status, panel_status; + bool damage_detected = false; + int i; + + port_status = FIELD_GET(PORT_STATUS, dmg_status); + lid_status = FIELD_GET(LID_STATUS, dmg_status); + base_status = FIELD_GET(BASE_STATUS, dmg_status); + for (i = 0; i < NUM_PORTS; i++) { + if (!(dmg_status & BIT(i)) || !(port_status & BIT(i))) + continue; + + *count += sysfs_emit_at(buf, *count, "%s: ", type); + loc_status = (dmg_status >> (PORT_DETAIL_OFFSET + (4 * i))) & 0xF; + pos_status = FIELD_GET(POS_STATUS, loc_status); + panel_status = FIELD_GET(PANEL_STATUS, loc_status); + + if (lid_status & BIT(i)) + *count += sysfs_emit_at(buf, *count, "Lid, "); + if (base_status & BIT(i)) + *count += sysfs_emit_at(buf, *count, "Base, "); + + switch (pos_status) { + case PANEL_TOP: + *count += sysfs_emit_at(buf, *count, "Top, "); + break; + case PANEL_BASE: + *count += sysfs_emit_at(buf, *count, "Bottom, "); + break; + case PANEL_LEFT: + *count += sysfs_emit_at(buf, *count, "Left, "); + break; + case PANEL_RIGHT: + *count += sysfs_emit_at(buf, *count, "Right, "); + break; + default: + pr_err("Unexpected value %d in switch statement\n", pos_status); + }; + + switch (panel_status) { + case POS_LEFT: + *count += sysfs_emit_at(buf, *count, "Left port\n"); + break; + case POS_CENTER: + *count += sysfs_emit_at(buf, *count, "Center port\n"); + break; + case POS_RIGHT: + *count += sysfs_emit_at(buf, *count, "Right port\n"); + break; + default: + *count += sysfs_emit_at(buf, *count, "Undefined\n"); + break; + }; + damage_detected = true; + } + return damage_detected; +} + +/* sysfs type-c damage detection detail */ +static ssize_t hwdd_detail_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + unsigned int damage_status; + int err, count = 0; + + if (!ucdd_supported) + return -ENODEV; + + /* Get USB TYPE-C damage status */ + err = hwdd_command(HWDD_GET_DMG_USBC, &damage_status); + if (err) + return err; + + if (!display_damage(buf, &count, "Type-C", damage_status)) + count += sysfs_emit_at(buf, count, "No damage detected\n"); + + return count; +} + /* sysfs type-c damage detection capability */ static ssize_t hwdd_status_show(struct device *dev, struct device_attribute *attr, @@ -11135,9 +11233,11 @@ static ssize_t hwdd_status_show(struct device *dev, return sysfs_emit(buf, "0\n"); } static DEVICE_ATTR_RO(hwdd_status); +static DEVICE_ATTR_RO(hwdd_detail); static struct attribute *hwdd_attributes[] = { &dev_attr_hwdd_status.attr, + &dev_attr_hwdd_detail.attr, NULL }; -- 2.43.0