From nobody Mon Apr 20 07:33:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D35B4CCA47E for ; Tue, 21 Jun 2022 18:57:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351661AbiFUS5O (ORCPT ); Tue, 21 Jun 2022 14:57:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352325AbiFUS5A (ORCPT ); Tue, 21 Jun 2022 14:57:00 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9B142A272 for ; Tue, 21 Jun 2022 11:56:58 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id n185so7985072wmn.4 for ; Tue, 21 Jun 2022 11:56:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ruCtX16/9aMNCe9aHrNaoYuLjA2cdIvRTGTl8yQdAMY=; b=BIAPnfQu5vekah1gE3Fxlkj2HEd0Aid1SHxRsiYdlHrt5SVogi/M+WoI9BecCttcd7 WMS0I1/KhxXhWAD3DSfEyq3Fc0tWK769Db+H88RtDqNXCbLMQjK9JAycEAPRRkt1BP29 RubXefQDMdYi18R8C9byl6J0AQZHe4SNonk6k6UJaFKF1F8vYDYqwI9xizpaKeMwLLpt 6r82dT75GnvfOS3XjFZctq9vOB1ARizD6ZDDUvlPVuiJAEfcn0tA3FsOnjWAN3OwyxbP m0TO9A1Ss7LH8LHUvwXdXVFml52/2ycjNiiu32MoIvKGizjMm/Fwl8SGXx0HnGvnWvXp cfnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ruCtX16/9aMNCe9aHrNaoYuLjA2cdIvRTGTl8yQdAMY=; b=Jz//BqO4INTj/dHV1ZKgINNN0e4Kfskya9m/jSie4SVvkMCsP+x5ID+JOkeE20I3jM mEsvG0nstBu6vDy/tfUMQEDydDIzbOx9PTESnSCK49ZaUOmeniOJdLDykDE/oJBMxzjg y/sNdFHhbhdwq69Li/+9dcDKKBQBj66pEsD4oMyh+vIiPgGcsvhHSMSgnVRAbr3VGdDp 1DzFW4DaxumblxTTg9Ebr8XonzMAvZFJfJr+IYOKGsRgJK8eg2/Zyf8Xw76kiLXQhoWa 6c3hnjREUWmfn302mfb4k7AyWT6OVMhyg9VCxP4FeicIz8VvUoT4oTM15UtS9MrpT9vl /nQg== X-Gm-Message-State: AJIora8+Vc5NqKpLLNI/GPc6R5+ZajzU+RFpgDHMK670VXvoVfSD9aHr /uAxCnsSb2uhH+6o4qa7Pq/LMA== X-Google-Smtp-Source: AGRyM1taVNZ3tvbztEikZDwRU5uqq6K3i3ElxLlgGYTFtxOGHWpZrNWcvC9KW9asM2DcktUsKdyVGQ== X-Received: by 2002:a05:600c:2f90:b0:39e:ee0d:6419 with SMTP id t16-20020a05600c2f9000b0039eee0d6419mr22907305wmn.59.1655837817456; Tue, 21 Jun 2022 11:56:57 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id f6-20020a1c6a06000000b003a0231af43csm294903wmc.48.2022.06.21.11.56.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 11:56:57 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Konrad Dybcio , Amit Pundir , Trilok Soni , Rob Clark , Stephan Gerhold , Kumar Gala , Stephen Boyd , Krzysztof Kozlowski Subject: [PATCH v2 1/2] dt-bindings: arm: qcom: document qcom,msm-id and qcom,board-id Date: Tue, 21 Jun 2022 20:56:48 +0200 Message-Id: <20220621185649.37391-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220621185649.37391-1-krzysztof.kozlowski@linaro.org> References: <20220621185649.37391-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The top level qcom,msm-id and qcom,board-id properties are utilized by bootloaders on Qualcomm MSM platforms to determine which device tree should be used and passed to the kernel. The commit b32e592d3c28 ("devicetree: bindings: Document qcom board compatible format") from 2015 was a consensus during discussion about upstreaming qcom,msm-id and qcom,board-id fields. There are however still problems with that consensus: 1. It was reached 7 years ago but it turned out its implementation did not reach all possible products. 2. Initially additional tool (dtbTool) was needed for parsing these fields to create a QCDT image consisting of multiple DTBs, later the bootloaders were improved and they use these qcom,msm-id and qcom,board-id properties directly. 3. Extracting relevant information from the board compatible requires this additional tool (dtbTool), which makes the build process more complicated and not easily reproducible (DTBs are modified after the kernel build). 4. Some versions of Qualcomm bootloaders expect these properties even when booting with a single DTB. The community is stuck with these bootloaders thus they require properties in the DTBs. Since several upstreamed Qualcomm SoC-based boards require these properties to properly boot and the properties are reportedly used by bootloaders, document them. Link: https://lore.kernel.org/r/a3c932d1-a102-ce18-deea-18cbbd05ecab@linaro= .org/ Co-developed-by: Kumar Gala Signed-off-by: Kumar Gala Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- .../devicetree/bindings/arm/qcom.yaml | 123 ++++++++++++++++++ include/dt-bindings/arm/qcom,ids.h | 30 +++++ 2 files changed, 153 insertions(+) create mode 100644 include/dt-bindings/arm/qcom,ids.h diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentatio= n/devicetree/bindings/arm/qcom.yaml index 6c38c1387afd..05b98cde4653 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml @@ -403,6 +403,129 @@ properties: - qcom,sm8450-qrd - const: qcom,sm8450 =20 + # Board compatibles go above + + qcom,msm-id: + $ref: /schemas/types.yaml#/definitions/uint32-matrix + minItems: 1 + maxItems: 8 + items: + items: + - description: | + MSM chipset ID - an exact match value consisting of three bitf= ields:: + - bits 0-15 - The unique MSM chipset ID + - bits 16-31 - Reserved; should be 0 + - description: | + Hardware revision ID - a chipset specific 32-bit ID representi= ng + the version of the chipset. It is best a match value - the + bootloader will look for the closest possible match. + deprecated: true + description: + The MSM chipset and hardware revision use by Qualcomm bootloaders. = It + can optionally be an array of these to indicate multiple hardware th= at + use the same device tree. It is expected that the bootloader will u= se + this information at boot-up to decide which device tree to use when = given + multiple device trees, some of which may not be compatible with the + actual hardware. It is the bootloader's responsibility to pass the + correct device tree to the kernel. + The property is deprecated - it is not expected on newer boards + (starting with SM8350). + + qcom,board-id: + $ref: /schemas/types.yaml#/definitions/uint32-matrix + minItems: 1 + maxItems: 8 + items: + oneOf: + - maxItems: 2 + items: + - description: | + Board ID consisting of three bitfields:: + - bits 31-24 - Unused + - bits 23-16 - Platform Version Major + - bits 15-8 - Platform Version Minor + - bits 7-0 - Platform Type + Platform Type field is an exact match value. The + Platform Major/Minor field is a best match. The bootloade= r will + look for the closest possible match. + - description: | + Subtype ID unique to a Platform Type/Chipset ID. For a gi= ven + Platform Type, there will typically only be a single board= and the + subtype_id will be 0. However in some cases board variant= s may + need to be distinguished by different subtype_id values. + # OnePlus uses a variant of board-id with four elements: + - minItems: 4 + items: + - const: 8 + - const: 0 + - description: OnePlus board ID + - description: OnePlus subtype ID + deprecated: true + description: + The board type and revision information. It can optionally be an ar= ray + of these to indicate multiple boards that use the same device tree. = It + is expected that the bootloader will use this information at boot-up= to + decide which device tree to use when given multiple device trees, so= me of + which may not be compatible with the actual hardware. It is the + bootloader's responsibility to pass the correct device tree to the + kernel + The property is deprecated - it is not expected on newer boards + (starting with SM8350). + +allOf: + # Explicit allow-list for older SoCs. The legacy properties are not allo= wed + # on newer SoCs. + - if: + properties: + compatible: + contains: + enum: + - qcom,apq8026 + - qcom,apq8094 + - qcom,apq8096 + - qcom,msm8992 + - qcom,msm8994 + - qcom,msm8996 + - qcom,msm8998 + - qcom,sdm630 + - qcom,sdm632 + - qcom,sdm845 + - qcom,sdx55 + - qcom,sdx65 + - qcom,sm6125 + - qcom,sm6350 + - qcom,sm7225 + - qcom,sm8150 + - qcom,sm8250 + then: + properties: + qcom,board-id: true + qcom,msm-id: true + else: + properties: + qcom,board-id: false + qcom,msm-id: false + + - if: + properties: + compatible: + contains: + enum: + - oneplus,cheeseburger + - oneplus,dumpling + - oneplus,enchilada + - oneplus,fajita + then: + properties: + qcom,board-id: + items: + minItems: 4 + else: + properties: + qcom,board-id: + items: + maxItems: 2 + additionalProperties: true =20 ... diff --git a/include/dt-bindings/arm/qcom,ids.h b/include/dt-bindings/arm/q= com,ids.h new file mode 100644 index 000000000000..eaf86c18650f --- /dev/null +++ b/include/dt-bindings/arm/qcom,ids.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Linaro Ltd + * Author: Krzysztof Kozlowski based on previous work of= Kumar Gala. + */ +#ifndef _DT_BINDINGS_ARM_QCOM_IDS_H +#define _DT_BINDINGS_ARM_QCOM_IDS_H + +/* qcom,msm-id */ +#define QCOM_ID_APQ8026 199 +#define QCOM_ID_MSM8916 206 +#define QCOM_ID_MSM8994 207 +#define QCOM_ID_MSM8996_3_0 246 +#define QCOM_ID_APQ8016 247 +#define QCOM_ID_MSM8216 248 +#define QCOM_ID_MSM8116 249 +#define QCOM_ID_MSM8616 250 +#define QCOM_ID_MSM8998 292 +#define QCOM_ID_SDM845 321 + +/* qcom,board-id */ +#define QCOM_BOARD_ID(a, major, minor) \ + (((major & 0xff) << 16) | ((minor & 0xff) << 8) | QCOM_BOARD_ID_##a) + +#define QCOM_BOARD_ID_MTP 8 +#define QCOM_BOARD_ID_DRAGONBOARD 10 +#define QCOM_BOARD_ID_SBC 24 + +#endif /* _DT_BINDINGS_ARM_QCOM_IDS_H */ --=20 2.34.1 From nobody Mon Apr 20 07:33:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7F26C43334 for ; Tue, 21 Jun 2022 18:57:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352547AbiFUS5R (ORCPT ); Tue, 21 Jun 2022 14:57:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352400AbiFUS5B (ORCPT ); Tue, 21 Jun 2022 14:57:01 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E31122A264 for ; Tue, 21 Jun 2022 11:56:59 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id i81-20020a1c3b54000000b0039c76434147so9792078wma.1 for ; Tue, 21 Jun 2022 11:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hHi3QBFwCXmqlLHYHksg4ge5xGm0n6+LjU5yPR19Zx4=; b=YdX6j2KdpAmHSOr5jFlVhQ7ewEBzVwmy5aYqwhZ+fO6szxEaoYdChCbO8YT6HxS4/f Sdq/k1jfgMJZ/1FlHNR4Jjn65rgBvlERkEM7+jIy0q2fA1Ik8hVpPbfX4paQ3C90LiYJ wwCwpx25LQiMWJpphGIfDnjA/9iT7+8B/+gyGIluvboDHbdOktFh97gAG+lHANEpPPnS m88rFF40/gw+i0Uferr9xa23hrXr/Ob6yXah6aZ6B9rgnEsLZARt246yWGsUSOq4urRO +CHP/PY97nLmeaOBPZvUo3Y416jMcPfe5yGtbrl2SjQBSJ9a2qMWWnHbzk3FBEiW2fsn hIhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hHi3QBFwCXmqlLHYHksg4ge5xGm0n6+LjU5yPR19Zx4=; b=jcRCvmiQ9wassLHVOcOHd6Tdjl+zhPvJ9JDlHBWbnnz2rNCTp/qDZXcQQPvMXhIRk/ vEgwom6z5/NBIoHi9WVU/KghoQe65ZHNhcSRQCGAN9j4XoIGZIF1bvC492PU02xtyqAG rmnpjaeLLYbslbS22BEczvM3lqHUHFztoXj/v/ITzEcTtj4T3hNeNixqyTpkD7Xn6YfL pxp0kT7/UWnLAEA7UTsFvVaEMsR0hgiqAumg518h4L/WeZhAE/HcCdT9mIZ6DnIex0m8 1nOGGsURCRV2CyJqxWVoPQKz5J7fYFtUtjWLazVMO/cXUW6Gtea0yIChm+PRswvBo7aC 3PVQ== X-Gm-Message-State: AJIora/WBvqwGpQqw87RdqmbXyCIlG3RiMm787eJItx8sEARTN6Pj3Z9 vM7h4r393fBtAp48nJWBfRAwFQ== X-Google-Smtp-Source: AGRyM1t7z3BbNcUImtmsld5hJrT81N3RlicBabJj09Hr0A9JiQAruokI7ukC0NJrr6CetuZI4iPRgA== X-Received: by 2002:a05:600c:a182:b0:39e:fea2:c5d6 with SMTP id id2-20020a05600ca18200b0039efea2c5d6mr13836064wmb.54.1655837818489; Tue, 21 Jun 2022 11:56:58 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id f6-20020a1c6a06000000b003a0231af43csm294903wmc.48.2022.06.21.11.56.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jun 2022 11:56:58 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Konrad Dybcio , Amit Pundir , Trilok Soni , Rob Clark , Stephan Gerhold , Kumar Gala , Stephen Boyd , Krzysztof Kozlowski Subject: [PATCH v2 2/2] arm64: dts: qcom: msm8992-xiaomi-libra: split qcom,msm-id into tuples Date: Tue, 21 Jun 2022 20:56:49 +0200 Message-Id: <20220621185649.37391-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220621185649.37391-1-krzysztof.kozlowski@linaro.org> References: <20220621185649.37391-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The qcom,msm-id is an uint32 matrix, so a list of tuples. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Baryshkov --- arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts b/arch/arm64= /boot/dts/qcom/msm8992-xiaomi-libra.dts index 7748b745a5df..15467b697e94 100644 --- a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts +++ b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts @@ -17,7 +17,7 @@ / { chassis-type =3D "handset"; =20 /* required for bootloader to select correct board */ - qcom,msm-id =3D <251 0 252 0>; + qcom,msm-id =3D <251 0>, <252 0>; qcom,pmic-id =3D <65545 65546 0 0>; qcom,board-id =3D <12 0>; =20 --=20 2.34.1