[PATCH RFC 0/4] Add modemsmem for Google phones

[PATCH RFC 0/4] Add modemsmem for Google phones

[David Heidelberg via B4 Relay]

Q:
Where do these types of drivers go? This driver is probably providing
info to vendor code in the modem firmware, so it might not belong in
drivers/soc/qcom/.

Maybe it should go in another directory, like drivers/misc or firmware?

Signed-off-by: David Heidelberg <david@ixit.cz>
---
David Heidelberg (2):
      dt-bindings: soc: google: Add modemsmem
      arm64: dts: qcom: sdm845-google: Add modemsmem

Richard Acayan (2):
      soc: qcom: Add modemsmem for Google phones
      arm64: dts: qcom: sdm670-google: Add modemsmem

 .../bindings/soc/google/google,modemsmem.yaml      | 39 +++++++++
 arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi |  5 ++
 arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi |  5 ++
 drivers/soc/qcom/Kconfig                           | 14 ++++
 drivers/soc/qcom/Makefile                          |  1 +
 drivers/soc/qcom/modemsmem.c                       | 98 ++++++++++++++++++++++
 6 files changed, 162 insertions(+)
---
base-commit: 7079a12d7506b07fb53b54a664bfad5fa9b16d70
change-id: 20260906-modemsmem-9a1dc1070f7b

Best regards,
--  
David Heidelberg <david@ixit.cz>

[PATCH RFC 1/4] dt-bindings: soc: google: Add modemsmem

[David Heidelberg via B4 Relay]

From: David Heidelberg <david@ixit.cz>

The modem firmware on Google Pixel 3 - 5a devices expects the application
processor to publish SoC platform information in a vendor-defined SMEM
item before the modem boots.

Assisted-by: LLM
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 .../bindings/soc/google/google,modemsmem.yaml      | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/Documentation/devicetree/bindings/soc/google/google,modemsmem.yaml b/Documentation/devicetree/bindings/soc/google/google,modemsmem.yaml
new file mode 100644
index 0000000000000..a5214a8093ba0
--- /dev/null
+++ b/Documentation/devicetree/bindings/soc/google/google,modemsmem.yaml
@@ -0,0 +1,39 @@
+# SPDX-License-Identifier: GPL-2.0-only
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/soc/google/google,modemsmem.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Google Modem Shared Memory
+
+maintainers:
+  - Richard Acayan <mailingradian@gmail.com>
+
+description:
+  The modem firmware on Google Pixel devices (Pixel 3 through Pixel 5a)
+  expects the application processor to publish SoC information (platform
+  type and revision) in a vendor-defined Qualcomm Shared Memory (SMEM)
+  item before the modem boots.
+
+properties:
+  compatible:
+    const: google,modemsmem
+
+  qcom,smem-id:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description:
+      Identifier of the SMEM item the SoC information is written to. Google
+      firmware uses the first vendor-reserved item.
+
+required:
+  - compatible
+  - qcom,smem-id
+
+additionalProperties: false
+
+examples:
+  - |
+    modemsmem {
+        compatible = "google,modemsmem";
+        qcom,smem-id = <134>;
+    };

-- 
2.55.0

[PATCH RFC 2/4] soc: qcom: Add modemsmem for Google phones

[David Heidelberg via B4 Relay]

From: Richard Acayan <mailingradian@gmail.com>

Modems on Google Pixel devices require extra information about the
SoC to be passed through a vendor-controlled Shared Memory (SMEM)
channel. This driver provides this information.

Skimming through the device tree overlays, modemsmem seems to be used by
every Pixel chronologically between the Pixel 3 and Pixel 5a, inclusive.

The modem_flag field is not being initialized yet because the bootloader
doesn't always add the property in dtb (so it might not be necessary)
and because there are problems with how the proper value is being
retrieved in the original downstream driver.

Downstream kernels have this driver in:
drivers/soc/qcom/modemsmem/modemsmem.c

Assisted-by: LLM
Signed-off-by: Richard Acayan <mailingradian@gmail.com>
Co-developed-by: David Heidelberg <david@ixit.cz>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 drivers/soc/qcom/Kconfig     | 14 +++++++
 drivers/soc/qcom/Makefile    |  1 +
 drivers/soc/qcom/modemsmem.c | 98 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 113 insertions(+)

diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index 2b524154d9fb3..32975f90bd63f 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -284,16 +284,30 @@ config QCOM_PBS
 	depends on SPMI
 	default m if ARCH_QCOM
 	help
 	  This driver supports configuring software programmable boot sequencer (PBS)
 	  trigger event through PBS RAM on Qualcomm Technologies, Inc. PMICs.
 	  This module provides the APIs to the client drivers that wants to send the
 	  PBS trigger event to the PBS RAM.
 
+config QCOM_MODEMSMEM
+	tristate "Google Pixel modem SMEM information"
+	depends on ARCH_QCOM || COMPILE_TEST
+	depends on OF
+	depends on QCOM_SMEM
+	help
+	  The modem firmware on Google Pixel 3 through Pixel 5a devices expects
+	  the application processor to publish SoC platform type and revision
+	  in a vendor-defined SMEM item before the modem is started. This
+	  driver fills in that item from the socinfo SMEM data.
+
+	  Say Y or M if you want a working modem on one of those phones.
+	  If unsure, say N.
+
 endif
 
 # Options selected by other drivers from different subsystems must be outside
 # of the menuconfig if-block:
 
 config QCOM_INLINE_CRYPTO_ENGINE
 	tristate
 	select QCOM_SCM
diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile
index 798643be3590c..4a04cd6e497d1 100644
--- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@ -35,9 +35,10 @@ obj-$(CONFIG_QCOM_STATS)	+= qcom_stats.o
 obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o
 obj-$(CONFIG_QCOM_APR) += apr.o
 obj-$(CONFIG_QCOM_LLCC) += llcc-qcom.o
 obj-$(CONFIG_QCOM_KRYO_L2_ACCESSORS) +=	kryo-l2-accessors.o
 obj-$(CONFIG_QCOM_ICC_BWMON)	+= icc-bwmon.o
 qcom_ice-objs			+= ice.o
 obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE)	+= qcom_ice.o
 obj-$(CONFIG_QCOM_PBS) +=	qcom-pbs.o
+obj-$(CONFIG_QCOM_MODEMSMEM)	+= modemsmem.o
 obj-$(CONFIG_QCOM_UBWC_CONFIG) += ubwc_config.o
diff --git a/drivers/soc/qcom/modemsmem.c b/drivers/soc/qcom/modemsmem.c
new file mode 100644
index 0000000000000..7a733422ff7c1
--- /dev/null
+++ b/drivers/soc/qcom/modemsmem.c
@@ -0,0 +1,98 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * SoC Information over Shared Memory.
+ *
+ * Copyright 2022-2024, Richard Acayan.
+ */
+
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/soc/qcom/smem.h>
+#include <linux/soc/qcom/socinfo.h>
+
+#define MODEM_SMEM_VERSION 0
+
+#define PLAT_VER_TO_MAJOR_ID(v) (((v) >> 16) & 0xff)
+#define PLAT_VER_TO_MINOR_ID(v) ((v) & 0xff)
+
+struct modem_smem_info {
+	__le32 version;
+	__le32 modem_flag;
+	__le32 major_id;
+	__le32 minor_id;
+	__le32 subtype;
+	__le32 platform;
+	__le32 efs_magic;
+	__le32 ftm_magic;
+};
+
+static int write_socinfo(struct modem_smem_info *target)
+{
+	struct socinfo *socinfo;
+	u32 plat_ver;
+
+	socinfo = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_HW_SW_BUILD_ID, NULL);
+	if (IS_ERR(socinfo))
+		return PTR_ERR(socinfo);
+
+	/* hw_plat_subtype was added in socinfo format 0.6 */
+	if (le32_to_cpu(socinfo->fmt) < SOCINFO_VERSION(0, 6))
+		return -EOPNOTSUPP;
+
+	plat_ver = le32_to_cpu(socinfo->plat_ver);
+
+	target->version = cpu_to_le32(MODEM_SMEM_VERSION);
+	target->major_id = cpu_to_le32(PLAT_VER_TO_MAJOR_ID(plat_ver));
+	target->minor_id = cpu_to_le32(PLAT_VER_TO_MINOR_ID(plat_ver));
+	target->platform = socinfo->hw_plat;
+	target->subtype = socinfo->hw_plat_subtype;
+
+	return 0;
+}
+
+static int modemsmem_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct modem_smem_info *info;
+	u32 smem_id;
+	int ret;
+
+	ret = of_property_read_u32(dev->of_node, "qcom,smem-id", &smem_id);
+	if (ret)
+		return dev_err_probe(dev, ret, "Could not read smem id\n");
+
+	ret = qcom_smem_alloc(QCOM_SMEM_HOST_ANY, smem_id, sizeof(*info));
+	if (ret)
+		return dev_err_probe(dev, ret, "Could not allocate modem smem\n");
+
+	info = qcom_smem_get(QCOM_SMEM_HOST_ANY, smem_id, NULL);
+	if (IS_ERR(info))
+		return dev_err_probe(dev, PTR_ERR(info), "Could not get modem smem\n");
+
+	ret = write_socinfo(info);
+	if (ret)
+		return dev_err_probe(dev, ret, "Could not submit info to modemsmem\n");
+
+	return 0;
+}
+
+static const struct of_device_id modemsmem_of_match[] = {
+	{ .compatible = "google,modemsmem" },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, modemsmem_of_match);
+
+static struct platform_driver modemsmem_driver = {
+	.probe = modemsmem_probe,
+	.driver = {
+		.name = "modemsmem",
+		.of_match_table = modemsmem_of_match,
+	},
+};
+module_platform_driver(modemsmem_driver);
+
+MODULE_AUTHOR("Richard Acayan <mailingradian@gmail.com>");
+MODULE_DESCRIPTION("SoC Information over SMEM driver");
+MODULE_LICENSE("GPL");

-- 
2.55.0

Re: [PATCH RFC 2/4] soc: qcom: Add modemsmem for Google phones

[Konrad Dybcio]

On 9/6/26 2:41 AM, David Heidelberg via B4 Relay wrote:
> From: Richard Acayan <mailingradian@gmail.com>
> 
> Modems on Google Pixel devices require extra information about the
> SoC to be passed through a vendor-controlled Shared Memory (SMEM)
> channel. This driver provides this information.

[...]

> +	ret = of_property_read_u32(dev->of_node, "qcom,smem-id", &smem_id);

Is it ever not 134?

FWIW you may find this useful:

134 - SMEM_ID_VENDOR0
135 - SMEM_ID_VENDOR1
136 - SMEM_ID_VENDOR2

which you may find in various downstream kernel used for various
purposes

Konrad

[PATCH RFC 3/4] arm64: dts: qcom: sdm845-google: Add modemsmem

[David Heidelberg via B4 Relay]

From: David Heidelberg <david@ixit.cz>

The Pixel 3 / 3 XL modem needs the modemsmem client. Add it in the device
tree so the modem can properly boot.

Based on work of Casey Tunturi.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi
index 9e952f9862f24..7e8f1a34a79f8 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi
@@ -45,16 +45,21 @@ chosen {
 		framebuffer0: framebuffer-0 {
 			compatible = "simple-framebuffer";
 			memory-region = <&cont_splash_mem>;
 
 			format = "a8r8g8b8";
 		};
 	};
 
+	modemsmem {
+		compatible = "google,modemsmem";
+		qcom,smem-id = <134>;
+	};
+
 	reserved-memory {
 		cont_splash_mem: splash@9d400000 {
 			reg = <0 0x9d400000 0 0x02400000>;
 			no-map;
 		};
 
 		mpss_region: memory@8e000000 {
 			reg = <0 0x8e000000 0 0x9800000>;

-- 
2.55.0

[PATCH RFC 4/4] arm64: dts: qcom: sdm670-google: Add modemsmem

[David Heidelberg via B4 Relay]

From: Richard Acayan <mailingradian@gmail.com>

The Pixel 3a modem needs the modemsmem client. Add it in the device
tree so the modem can properly boot.

Signed-off-by: Richard Acayan <mailingradian@gmail.com>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi b/arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi
index b4854801a5f5e..4604c4eb2192a 100644
--- a/arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi
@@ -61,16 +61,21 @@ gpio-keys {
 
 		key-vol-up {
 			label = "Volume Up";
 			linux,code = <KEY_VOLUMEUP>;
 			gpios = <&pm660l_gpios 7 GPIO_ACTIVE_LOW>;
 		};
 	};
 
+	modemsmem {
+		compatible = "google,modemsmem";
+		qcom,smem-id = <134>;
+	};
+
 	reserved-memory {
 		#address-cells = <2>;
 		#size-cells = <2>;
 
 		mpss_region: mpss@8b000000 {
 			reg = <0 0x8b000000 0 0x9800000>;
 			no-map;
 		};

-- 
2.55.0

Re: [PATCH RFC 0/4] Add modemsmem for Google phones

[Konrad Dybcio]

On 9/6/26 2:41 AM, David Heidelberg via B4 Relay wrote:
> Q:
> Where do these types of drivers go? This driver is probably providing
> info to vendor code in the modem firmware, so it might not belong in
> drivers/soc/qcom/.
> 
> Maybe it should go in another directory, like drivers/misc or firmware?
> 
> Signed-off-by: David Heidelberg <david@ixit.cz>
> ---
> David Heidelberg (2):
>       dt-bindings: soc: google: Add modemsmem

Would a list of machine compatibles be better suited here?

Konrad