From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (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 826643BCD33 for ; Sat, 4 Jul 2026 16:08:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783181319; cv=none; b=dW0KpLeNs5vTcyH6iNMhtCC7jdf1UnidC9zNHMMYw0uNpnjgUi/jUAq5qUQLXNlAA8PX381LisiU+joKuwJBhS3+SLsYjceb99QPRD3NyODzLuYJjVs0VbijaElHGdixpV8dUlj0Hx1QdVb1tL8eaG/a7ytoQ4EYZOVYA0SKJDI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783181319; c=relaxed/simple; bh=4NG8zneOYe7p0UrTp9P9R7HnMyKE7GyM9DN8ppk6JVo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iM+QFasSfHGpCtyxtOm2zoz+1e9NMgWH3IzWUimJLES7AcDc5RcSS4uDyvbrNkP6//+vVJkayG0kEsSardi63yNd0VB93ByUM8hqO75hD0zst3zhQlnq3x/kv/iNzIc0JAk3RbgfCMWSHJ6qvHpvHfV7pckj9gC788kTHbghAKM= 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=nAyHmCdu; arc=none smtp.client-ip=209.85.208.50 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="nAyHmCdu" Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-697bd21fdc2so2596441a12.1 for ; Sat, 04 Jul 2026 09:08:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783181316; x=1783786116; 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=UMhE6Jch/T1UvoknEZxvYaZzdpc2xBp5cw8Z7tMZGzI=; b=nAyHmCduIRga9XqSsxm6NHkRUl5TrvjCy/cOLYHXTKxqRSkFqeDSwKZz9NAeqh2jPL nYIK0+T8Z8IbRnx1kLShK3jYXeForJfBmwctcfgNeps7fzj/hIo/NNWj1ezrXoHR1+hj 4m9J6PSW/lcuJb2qxCUEmLJsoZNhvMaSV+Cox7GByzO7eG+Shjt6C4Tp6jR5A413a7pd im96xUQ4uoQqMnZ8G+5oTTSB3ZBxNcpyz8NzEAF4WnrSZiWbZEzOne+TR1QRSRadD7KF 8viq74ACEWZd4XgJRLGrYHHteyh/jmEFG47endbjItsKd27MMIPPeLWaqUyK46YBV70u DazQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783181316; x=1783786116; 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=UMhE6Jch/T1UvoknEZxvYaZzdpc2xBp5cw8Z7tMZGzI=; b=PwD8hhS3mTQ8CISRw0srZCGEAiNkI+cTOZCI3d/BGaU2kgB+BQinkmn9CPsUN8SIZm enoRm5Iw3Qq2xcfE+KwEThsF4dzYRDKuyPVastzpsa7zm49hxua1DURSnDT8/6LSSCaT kq6x1QTGoZ/oGKsCHJ5TwNYHdox9iTrjT+dV3RwBdkA67cCzwwznBI2SM0t5eDf3mM8K BNnUC52SKqDUaTx0qqGIjtj3+eWu6iwXsNosL6qPhiaJBLN28bgxhExDa/4+CxUGoMSp 4BkViT0hcpMJdnIWoGISQeUKdaHiQcAfE5CYYqS2WTv0bK6SvnZx1YhU8sJf3HlWb6lx 51lA== X-Forwarded-Encrypted: i=1; AHgh+RrtjevFk8QQTNZ3oziHDAhodfxof/8S+5Bl8mTZ/JthlHPgbK/PpRGM9T4E6xx0ZqsN1fchvNOE8aKX7rM=@vger.kernel.org X-Gm-Message-State: AOJu0YyT4W9q/bIUlTleKr8LlB+9YeJt1Yt+BAXtRHJpmHmUx9hdwbCI JjXOKiqTTtQ0lbCXnGtglpc7MJzqNCDajIdwW3cjtsintqn4Dmwuvcwp X-Gm-Gg: AfdE7ckpWmxoUIq99IuspJQPAO0aGauQ8Mva3MWOl91u4he+Eva46LoeWKScNIr/Kbi rCqzCFpfNavk0MYrIhagNVYMbPjZEkReYAD28U5tzghOyl9FM1If07XFuZusqLO/z2GdFYjx51G k9amiPIUbIwFuhA4BL5gO7spbgnOMTvdRa9RVPX8ZnRXsTJmD2iFZRqJJ4iPGY+5GoiUSPxN1oS G/537fQxBLTLIojFeaiL6cyauLFOuI7F050Q9/gpbrwMSpzD0GjTQKrq0eRKedJhIRT9htVewGk ea8BG7WZMYQz0vFxs7LI3V2dapun7BjskKgcbcHawoDcLpITfClFV/RgxdqZBXD/mWXJU5flRY5 KNknw1tZiuSLnWjUT+GJWCIAreeO8yNp0jX5T2wqihQigloo4+UVwLkvF4P99YxJVKqEf17I78U 25pc02oHaYXCMenjxd16kBDCqjfiLleesrskG771GxbEqV427EEv6/RYL9VkAuuj0= X-Received: by 2002:a17:907:998d:b0:c12:d64:ca50 with SMTP id a640c23a62f3a-c12e6ab6f98mr119057566b.16.1783181315826; Sat, 04 Jul 2026 09:08:35 -0700 (PDT) Received: from node ([202.47.63.86]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c12b60575c4sm438586266b.9.2026.07.04.09.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2026 09:08:35 -0700 (PDT) From: Muhammad Bilal To: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, jorge.lopez2@hp.com, Thomas.Weissschuh@linutronix.de, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Mario Limonciello , Armin Wolf , Muhammad Bilal Subject: [PATCH v2 2/3] platform/x86: hp-bioscfg: accept reduced ACPI packages from older HP BIOS Date: Sat, 4 Jul 2026 21:07:58 +0500 Message-ID: <20260704160759.236249-3-meatuni001@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260704160759.236249-1-meatuni001@gmail.com> References: <20260704160759.236249-1-meatuni001@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 hp_init_bios_package_attribute() hard-fails when a WMI ACPI package contains fewer elements than the type-specific expected count (e.g. 11 elements instead of 13 for INTEGER or ENUMERATION attributes). This causes the entire hp_bioscfg driver to skip attribute enumeration on older HP hardware whose BIOS returns shortened packages when optional fields like prerequisites or possible values are absent. Observed on HP EliteBook 840 G2 (BIOS M71 Ver. 01.31): hp_bioscfg: ACPI-package does not have enough elements: 11 < 13 The element layout has two tiers: - Elements 0-9 (SECURITY_LEVEL+1 = 10): common to all attribute types - Elements 10-N: type-specific (bounds, values, encodings, ...) The per-type populate functions (hp_populate_*_elements_from_package) already handle sparse packages correctly via their own elem < count loop guards and inner-loop bounds checks. The only unsafe case is when we lack even the common elements needed to register the attribute. Fix by introducing COMMON_ELEM_CNT to mark the hard minimum (10), and splitting the check into two tiers: - Fewer than COMMON_ELEM_CNT elements: hard fail, can't proceed. - Fewer than expected type-specific elements: warn, but let the populate function parse what is available. Fixes: a34fc329b189 ("platform/x86: hp-bioscfg: bioscfg") Cc: stable@vger.kernel.org Signed-off-by: Muhammad Bilal --- drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 11 ++++++++--- drivers/platform/x86/hp/hp-bioscfg/bioscfg.h | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c index 768330d291da8..78019644ec358 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c @@ -661,12 +661,17 @@ static int hp_init_bios_package_attribute(enum hp_wmi_data_type attr_type, int ret = 0; /* Take action appropriate to each ACPI TYPE */ - if (obj->package.count < min_elements) { - pr_err("ACPI-package does not have enough elements: %d < %d\n", - obj->package.count, min_elements); + if (obj->package.count < COMMON_ELEM_CNT) { + pr_err("ACPI-package is missing common elements: %d < %d\n", + obj->package.count, COMMON_ELEM_CNT); goto pack_attr_exit; } + if (obj->package.count < min_elements) { + pr_warn("ACPI-package has fewer elements than expected: %d < %d, parsing available elements\n", + obj->package.count, min_elements); + } + elements = obj->package.elements; /* sanity checking */ diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.h b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.h index 416d7e7aaaae3..ac57d6eab4c35 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.h +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.h @@ -279,6 +279,9 @@ enum hp_wmi_data_elements { PSWD_ENCODINGS = 13, PSWD_IS_SET = 14, PSWD_ELEM_CNT = 15, + + /* Minimum elements shared by all attribute types (NAME..SECURITY_LEVEL) */ + COMMON_ELEM_CNT = SECURITY_LEVEL + 1, }; #define GET_INSTANCE_ID(type) \ -- 2.55.0