From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 1764932C931 for ; Tue, 4 Nov 2025 14:06:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762265210; cv=none; b=P1fVJOdp61/pQOrPT3DYlQq7TIh/EbDkj9m3AW5I1SzCJ6YE/A6kGrhk0+FxN8PJK/ALOqg0L6ijl1vAjM33KCWLvlDE0mYP9Nr/fngHhSC52bLsVIeLq/KJp0iwh4woE0tJ4vjRM2JXQrQ6vXleifd6rHZfQCiWWu0zwFumInw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762265210; c=relaxed/simple; bh=J7o+qvVj/pTXaFpXaAcj2Tg3Jq+K/NDPOk446ICszDs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WnUVJz11I9FdsgEKbIBCPhQxjzuiUXmeg0rWW5eC9Aq5t/HGUguEIJIw/QFua2JoS9JdtxUmAxLKv0PGKeiqFOuRhpZmLf82xeTyGvCYlCDU/NRyki8kfnYmUYhAmY3xqKbp5WozBchIWu5gwTg5YYsZwFQQuB2u3mD4yOfXDiA= 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=YptXjI4a; arc=none smtp.client-ip=209.85.128.52 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="YptXjI4a" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4775638d819so3571715e9.1 for ; Tue, 04 Nov 2025 06:06:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762265206; x=1762870006; 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=B0YVoVEFCaf8aeEHsaoJ6V5EGSx1RgPZYK2i+8/mRSY=; b=YptXjI4adkOTCyiRqXG3uqUAAMK98so0pcxjH7BsYWb4FzmqRhOgFmu12Pf5xqm2tx g5O/gmF/bXw3NLLlOyCeR4eYskUi5RmIiPmeMWllZ8O1hWaQqwenKtRQkZ6fJwqQzWpe aoRVg8H+r1w5EFWRdSPeQPqZ/pEYsQpj9tz+L5w84EGm89HaFKiJqCd7TS5QtP1Ofqzj tTX7W+f54GdCu/HDrtYg1C/28HzeJzWy1GH2GBe/Tbw9J5aEd2JLz8FbNS24MzzWIUYA WXFMCYV1mQH2nYAqg9O+7HZGXwLKVXSxSVzGramPI0RK4YH05QM3xqan3/ms2fCLsL+t SgOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762265206; x=1762870006; 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=B0YVoVEFCaf8aeEHsaoJ6V5EGSx1RgPZYK2i+8/mRSY=; b=OHxy4kAsNfu9igwu/QsEKzWoCr8qDJ2UZPAIG726KoJI46w0lJd39ZXUS+yiZUPV5Q Lgq0FtMWHOilx/+oZOK/waSHTfCMwSUq5aGucWiiYcmI61grkxtcyF6L/jzhfCmzZz8F 7cm/VShwZJ/7N7xUOt4hhPX+feZt8RN1TE4USaYWGG94TdNegSjS4WNtfiCBuvYJXxcq y6aQBx1MWBfkl01oydWTlymOCe7KqFvJyhzICNAOCCIPJz1Rkmd4K5e/V5rD1MwOabEg 3zIqtV8vnOZSQtP5P4ZBYzxsk6x6zRoTGExtripcWFU0rrkDsjWSO6YGoAJeGKh+nWEH zH2g== X-Forwarded-Encrypted: i=1; AJvYcCV4/EkQsrmpvUP7gijwSMefPMyQ5wT7JkvmVcjNAjSVAdtyGpvrEmD3MZA86aELdKA7MaDd7iZJrMCXw7al@vger.kernel.org X-Gm-Message-State: AOJu0YyrpDq1EVykW+l55Tti52QndJChpKiyCSKRxX6oTZiRawmBVt/7 2HBWKHg1wPZVq3Dd9i285tSqr5sBgaCRo34pvGBngcFCKPX8CWh0trks X-Gm-Gg: ASbGnctkefU/o9nMQdKFnd6PR+CdRpNt5yThyWj5KUa3q9jHVOJC4jXqIPHgDTgl2Wr 2ks2GLamk7hXCUBaeBbPTRiJiEQm1+Qk+O8q52FiY5l1/blupUSYRFjCBH6qTNIAndIGJvcbgcz tZOIvnEgbFTVf+uYTp3zAdFv4rPQI71sACWX0aOt8YIlCBNepZfGvt+hWASPRTPVSAHToiLpGP9 6F8JsDXV/UAWmN/Ap3xpfXAPyxwsu8340Ugwfw7y8xY5ZKPa/gtFCcIMKCScLtji/wr/i9CzkOh akpXx/Kytst97iUuuAancd7MWOqZodX+Z3BYe4Sau46hujDAXHO2+wGVDH11AELmpyDCXwmNIiS nXuVkrRUrG65hiFZTEypQoqGybvP0rhk9YU80G+YdYGw2Bp6oXgL/Z5Cfj5ZXC0/Aq0NQWvN4zH b/FHvJYfqybDJzeMPoFTwIBI3gRF7WPw== X-Google-Smtp-Source: AGHT+IHysG3/qeAR1noZEqq9C4WhUroWJnqAclS/5AWKKIu7XUXyFIQ1hIfpstDAPpN5e6K90GHyhQ== X-Received: by 2002:a05:600c:5020:b0:471:700:f281 with SMTP id 5b1f17b1804b1-477308a15a7mr136413305e9.25.1762265205897; Tue, 04 Nov 2025 06:06:45 -0800 (PST) Received: from Ansuel-XPS24 (93-34-90-37.ip49.fastwebnet.it. [93.34.90.37]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-47754adcd08sm52511205e9.5.2025.11.04.06.06.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 06:06:45 -0800 (PST) From: Christian Marangi To: Ilia Lin , "Rafael J. Wysocki" , Viresh Kumar , linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi , Dmitry Baryshkov Subject: [PATCH v3 1/1] cpufreq: qcom-nvmem: add compatible fallback for ipq806x for no SMEM Date: Tue, 4 Nov 2025 15:06:30 +0100 Message-ID: <20251104140635.25965-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251104140635.25965-1-ansuelsmth@gmail.com> References: <20251104140635.25965-1-ansuelsmth@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit On some IPQ806x SoC SMEM might be not initialized by SBL. This is the case for some Google devices (the OnHub family) that can't make use of SMEM to detect the SoC ID. To handle these specific case, check if the SMEM is not initialized (by checking if the qcom_smem_get_soc_id returns -ENODEV) and fallback to OF machine compatible checking to identify the SoC variant. Suggested-by: Dmitry Baryshkov Signed-off-by: Christian Marangi --- drivers/cpufreq/qcom-cpufreq-nvmem.c | 35 ++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c index 3a8ed723a23e..17c79955ff2f 100644 --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c @@ -252,13 +252,22 @@ static int qcom_cpufreq_krait_name_version(struct device *cpu_dev, return ret; } +static const struct of_device_id qcom_cpufreq_ipq806x_match_list[] = { + { .compatible = "qcom,ipq8062", .data = (const void *)QCOM_ID_IPQ8062 }, + { .compatible = "qcom,ipq8064", .data = (const void *)QCOM_ID_IPQ8064 }, + { .compatible = "qcom,ipq8065", .data = (const void *)QCOM_ID_IPQ8065 }, + { .compatible = "qcom,ipq8066", .data = (const void *)QCOM_ID_IPQ8066 }, + { .compatible = "qcom,ipq8068", .data = (const void *)QCOM_ID_IPQ8068 }, + { .compatible = "qcom,ipq8069", .data = (const void *)QCOM_ID_IPQ8069 }, +}; + static int qcom_cpufreq_ipq8064_name_version(struct device *cpu_dev, struct nvmem_cell *speedbin_nvmem, char **pvs_name, struct qcom_cpufreq_drv *drv) { + int msm_id = -1, ret = 0; int speed = 0, pvs = 0; - int msm_id, ret = 0; u8 *speedbin; size_t len; @@ -275,8 +284,30 @@ static int qcom_cpufreq_ipq8064_name_version(struct device *cpu_dev, get_krait_bin_format_a(cpu_dev, &speed, &pvs, speedbin); ret = qcom_smem_get_soc_id(&msm_id); - if (ret) + if (ret == -ENODEV) { + const struct of_device_id *match; + struct device_node *root; + + root = of_find_node_by_path("/"); + if (!root) { + ret = -ENODEV; + goto exit; + } + + /* Fallback to compatible match with no SMEM initialized */ + match = of_match_node(qcom_cpufreq_ipq806x_match_list, root); + of_node_put(root); + if (!match) { + ret = -ENODEV; + goto exit; + } + + /* We found a matching device, get the msm_id from the data entry */ + msm_id = (int)match->data; + ret = 0; + } else if (ret) { goto exit; + } switch (msm_id) { case QCOM_ID_IPQ8062: -- 2.51.0