Unverified Commit edf0a405 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-drivers-for-6.17-2' of... 

Merge tag 'qcom-drivers-for-6.17-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/drivers

More Qualcomm driver updates for v6.17

Fix race condition during SCM driver initialization, in relation to
tzmem and waitqueue irq handling,

Make the rpmh RSC driver support version 4 of the IP block.

Add SM7635 family and related PMICs to the socinfo driver. Also add
support for retrieving the bootloader build details.

* tag 'qcom-drivers-for-6.17-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  dt-bindings: soc: qcom: qcom,pmic-glink: document Milos compatible
  dt-bindings: soc: qcom,aoss-qmp: document the Milos Always-On Subsystem side channel
  dt-bindings: firmware: qcom,scm: document Milos SCM Firmware Interface
  soc: qcom: socinfo: Add support to retrieve APPSBL build details
  soc: qcom: pmic_glink: fix OF node leak
  soc: qcom: spmi-pmic: add more PMIC SUBTYPE IDs
  soc: qcom: socinfo: Add PM7550 & PMIV0108 PMICs
  soc: qcom: socinfo: Add SoC IDs for SM7635 family
  dt-bindings: arm: qcom,ids: Add SoC IDs for SM7635 family
  firmware: qcom: scm: request the waitqueue irq *after* initializing SCM
  firmware: qcom: scm: initialize tzmem before marking SCM as available
  firmware: qcom: scm: take struct device as argument in SHM bridge enable
  firmware: qcom: scm: remove unused arguments from SHM bridge routines
  soc: qcom: rpmh-rsc: Add RSC version 4 support

Link: https://lore.kernel.org/r/20250720030743.285440-1-andersson@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5b814159 4587d391

Documentation/devicetree/bindings/firmware/qcom,scm.yaml

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ properties: 
          - qcom,scm-ipq8074

          - qcom,scm-ipq9574

          - qcom,scm-mdm9607

          - qcom,scm-milos

          - qcom,scm-msm8226

          - qcom,scm-msm8660

          - qcom,scm-msm8916
@@ -198,6 +199,7 @@ allOf: 
          compatible:

            contains:

              enum:

                - qcom,scm-milos

                - qcom,scm-sm8450

                - qcom,scm-sm8550

                - qcom,scm-sm8650

Documentation/devicetree/bindings/soc/qcom/qcom,aoss-qmp.yaml

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ properties: 
  compatible:

    items:

      - enum:

          - qcom,milos-aoss-qmp

          - qcom,qcs615-aoss-qmp

          - qcom,qcs8300-aoss-qmp

          - qcom,qdu1000-aoss-qmp

Documentation/devicetree/bindings/soc/qcom/qcom,pmic-glink.yaml

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ properties: 
          - const: qcom,pmic-glink

      - items:

          - enum:

              - qcom,milos-pmic-glink

              - qcom,sm8650-pmic-glink

              - qcom,sm8750-pmic-glink

              - qcom,x1e80100-pmic-glink

drivers/firmware/qcom/qcom_scm.c

+46 −49
Original line number Diff line number Diff line
@@ -1603,7 +1603,13 @@ bool qcom_scm_lmh_dcvsh_available(void) 
}

EXPORT_SYMBOL_GPL(qcom_scm_lmh_dcvsh_available);



int qcom_scm_shm_bridge_enable(void)

/*

 * This is only supposed to be called once by the TZMem module. It takes the

 * SCM struct device as argument and uses it to pass the call as at the time

 * the SHM Bridge is enabled, the SCM is not yet fully set up and doesn't

 * accept global user calls. Don't try to use the __scm pointer here.

 */

int qcom_scm_shm_bridge_enable(struct device *scm_dev)

{

	int ret;
@@ -1615,11 +1621,11 @@ int qcom_scm_shm_bridge_enable(void) 


	struct qcom_scm_res res;



	if (!__qcom_scm_is_call_available(__scm->dev, QCOM_SCM_SVC_MP,

	if (!__qcom_scm_is_call_available(scm_dev, QCOM_SCM_SVC_MP,

					  QCOM_SCM_MP_SHM_BRIDGE_ENABLE))

		return -EOPNOTSUPP;



	ret = qcom_scm_call(__scm->dev, &desc, &res);

	ret = qcom_scm_call(scm_dev, &desc, &res);



	if (ret)

		return ret;
@@ -1631,7 +1637,7 @@ int qcom_scm_shm_bridge_enable(void) 
}

EXPORT_SYMBOL_GPL(qcom_scm_shm_bridge_enable);



int qcom_scm_shm_bridge_create(struct device *dev, u64 pfn_and_ns_perm_flags,

int qcom_scm_shm_bridge_create(u64 pfn_and_ns_perm_flags,

			       u64 ipfn_and_s_perm_flags, u64 size_and_flags,

			       u64 ns_vmids, u64 *handle)

{
@@ -1659,7 +1665,7 @@ int qcom_scm_shm_bridge_create(struct device *dev, u64 pfn_and_ns_perm_flags, 
}

EXPORT_SYMBOL_GPL(qcom_scm_shm_bridge_create);



int qcom_scm_shm_bridge_delete(struct device *dev, u64 handle)

int qcom_scm_shm_bridge_delete(u64 handle)

{

	struct qcom_scm_desc desc = {

		.svc = QCOM_SCM_SVC_MP,
@@ -2250,24 +2256,47 @@ static int qcom_scm_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	/* Paired with smp_load_acquire() in qcom_scm_is_available(). */

	smp_store_release(&__scm, scm);

	ret = of_reserved_mem_device_init(scm->dev);

	if (ret && ret != -ENODEV)

		return dev_err_probe(scm->dev, ret,

				     "Failed to setup the reserved memory region for TZ mem\n");



	ret = qcom_tzmem_enable(scm->dev);

	if (ret)

		return dev_err_probe(scm->dev, ret,

				     "Failed to enable the TrustZone memory allocator\n");



	memset(&pool_config, 0, sizeof(pool_config));

	pool_config.initial_size = 0;

	pool_config.policy = QCOM_TZMEM_POLICY_ON_DEMAND;

	pool_config.max_size = SZ_256K;



	scm->mempool = devm_qcom_tzmem_pool_new(scm->dev, &pool_config);

	if (IS_ERR(scm->mempool))

		return dev_err_probe(scm->dev, PTR_ERR(scm->mempool),

				     "Failed to create the SCM memory pool\n");



	irq = platform_get_irq_optional(pdev, 0);

	if (irq < 0) {

		if (irq != -ENXIO) {

			ret = irq;

			goto err;

		}

		if (irq != -ENXIO)

			return irq;

	} else {

		ret = devm_request_threaded_irq(__scm->dev, irq, NULL, qcom_scm_irq_handler,

						IRQF_ONESHOT, "qcom-scm", __scm);

		if (ret < 0) {

			dev_err_probe(scm->dev, ret, "Failed to request qcom-scm irq\n");

			goto err;

		}

		ret = devm_request_threaded_irq(scm->dev, irq, NULL, qcom_scm_irq_handler,

						IRQF_ONESHOT, "qcom-scm", scm);

		if (ret < 0)

			return dev_err_probe(scm->dev, ret,

					     "Failed to request qcom-scm irq\n");

	}



	/*

	 * Paired with smp_load_acquire() in qcom_scm_is_available().

	 *

	 * This marks the SCM API as ready to accept user calls and can only

	 * be called after the TrustZone memory pool is initialized and the

	 * waitqueue interrupt requested.

	 */

	smp_store_release(&__scm, scm);



	__get_convention();



	/*
@@ -2283,32 +2312,6 @@ static int qcom_scm_probe(struct platform_device *pdev) 
	if (of_property_read_bool(pdev->dev.of_node, "qcom,sdi-enabled") || !download_mode)

		qcom_scm_disable_sdi();



	ret = of_reserved_mem_device_init(__scm->dev);

	if (ret && ret != -ENODEV) {

		dev_err_probe(__scm->dev, ret,

			      "Failed to setup the reserved memory region for TZ mem\n");

		goto err;

	}



	ret = qcom_tzmem_enable(__scm->dev);

	if (ret) {

		dev_err_probe(__scm->dev, ret,

			      "Failed to enable the TrustZone memory allocator\n");

		goto err;

	}



	memset(&pool_config, 0, sizeof(pool_config));

	pool_config.initial_size = 0;

	pool_config.policy = QCOM_TZMEM_POLICY_ON_DEMAND;

	pool_config.max_size = SZ_256K;



	__scm->mempool = devm_qcom_tzmem_pool_new(__scm->dev, &pool_config);

	if (IS_ERR(__scm->mempool)) {

		ret = dev_err_probe(__scm->dev, PTR_ERR(__scm->mempool),

				    "Failed to create the SCM memory pool\n");

		goto err;

	}



	/*

	 * Initialize the QSEECOM interface.

	 *
@@ -2323,12 +2326,6 @@ static int qcom_scm_probe(struct platform_device *pdev) 
	WARN(ret < 0, "failed to initialize qseecom: %d\n", ret);



	return 0;



err:

	/* Paired with smp_load_acquire() in qcom_scm_is_available(). */

	smp_store_release(&__scm, NULL);



	return ret;

}



static void qcom_scm_shutdown(struct platform_device *pdev)

drivers/firmware/qcom/qcom_scm.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ int scm_legacy_call(struct device *dev, const struct qcom_scm_desc *desc, 
		    struct qcom_scm_res *res);



struct qcom_tzmem_pool *qcom_scm_get_tzmem_pool(void);

int qcom_scm_shm_bridge_enable(struct device *scm_dev);



#define QCOM_SCM_SVC_BOOT		0x01

#define QCOM_SCM_BOOT_SET_ADDR		0x01