Unverified Commit 57e06f8c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-drivers-for-6.7' of... 

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

Qualcomm driver updates for v6.7

This introduces partial support for the Qualcomm Secure Execution
Environment SCM interface, and uses this to implement EFI variable
access on the Windows On Snapdragon devices (for now).

The 32/64-bit calling convention detector of the SCM interface is
updated to not choose 64-bit convention when Linux is 32-bit. The
"extern" specifier is dropped from the interface include file.

The LLCC driver gains support for carrying configuration for multiple
different system/DDR configurations for a given platform, and selecting
between them. Support for Q[DR]U1000 is added to the driver.

All exported symbols are transitioned to EXPORT_SYMBOL_GPL().

The platform_drivers in the Qualcomm SoC are transitioned to the
void-returning remove_new implementation.

The rmtfs memory driver gains support for leaving guard pages around the
used area, to avoid issues if the allocation happens to be placed
adjacent to another protected memory region.

The socinfo driver gains knowledge about IPQ8174, QCM6490, SM7150P and
various PMICs used together with SM8550.

* tag 'qcom-drivers-for-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (44 commits)
  soc: qcom: socinfo: Convert to platform remove callback returning void
  soc: qcom: smsm: Convert to platform remove callback returning void
  soc: qcom: smp2p: Convert to platform remove callback returning void
  soc: qcom: smem: Convert to platform remove callback returning void
  soc: qcom: rmtfs_mem: Convert to platform remove callback returning void
  soc: qcom: qcom_stats: Convert to platform remove callback returning void
  soc: qcom: qcom_gsbi: Convert to platform remove callback returning void
  soc: qcom: qcom_aoss: Convert to platform remove callback returning void
  soc: qcom: pmic_glink: Convert to platform remove callback returning void
  soc: qcom: ocmem: Convert to platform remove callback returning void
  soc: qcom: llcc-qcom: Convert to platform remove callback returning void
  soc: qcom: icc-bwmon: Convert to platform remove callback returning void
  firmware: qcom_scm: use 64-bit calling convention only when client is 64-bit
  soc: qcom: llcc: Handle a second device without data corruption
  soc: qcom: Switch to EXPORT_SYMBOL_GPL()
  soc: qcom: smem: Annotate struct qcom_smem with __counted_by
  soc: qcom: rmtfs: Support discarding guard pages
  dt-bindings: reserved-memory: rmtfs: Allow guard pages
  dt-bindings: firmware: qcom,scm: document IPQ5018 compatible
  firmware: qcom_scm: disable SDI if required
  ...

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 09427e19 c0989f7d

Documentation/devicetree/bindings/cache/qcom,llcc.yaml

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ description: | 
properties:

  compatible:

    enum:

      - qcom,qdu1000-llcc

      - qcom,sc7180-llcc

      - qcom,sc7280-llcc

      - qcom,sc8180x-llcc
@@ -44,6 +45,14 @@ properties: 
  interrupts:

    maxItems: 1



  nvmem-cells:

    items:

      - description: Reference to an nvmem node for multi channel DDR



  nvmem-cell-names:

    items:

      - const: multi-chan-ddr



required:

  - compatible

  - reg
@@ -92,6 +101,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - qcom,qdu1000-llcc

              - qcom,sc8180x-llcc

              - qcom,sc8280xp-llcc

    then:

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

+10 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
          - qcom,scm-apq8064

          - qcom,scm-apq8084

          - qcom,scm-ipq4019

          - qcom,scm-ipq5018

          - qcom,scm-ipq5332

          - qcom,scm-ipq6018

          - qcom,scm-ipq806x
@@ -56,6 +57,7 @@ properties: 
          - qcom,scm-sm6125

          - qcom,scm-sm6350

          - qcom,scm-sm6375

          - qcom,scm-sm7150

          - qcom,scm-sm8150

          - qcom,scm-sm8250

          - qcom,scm-sm8350
@@ -89,6 +91,14 @@ properties: 
      protocol to handle sleeping SCM calls.

    maxItems: 1



  qcom,sdi-enabled:

    description:

      Indicates that the SDI (Secure Debug Image) has been enabled by TZ

      by default and it needs to be disabled.

      If not disabled WDT assertion or reboot will cause the board to hang

      in the debug mode.

    type: boolean



  qcom,dload-mode:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    items:

Documentation/devicetree/bindings/reserved-memory/qcom,rmtfs-mem.yaml

+11 −0
Original line number Diff line number Diff line
@@ -26,6 +26,17 @@ properties: 
    description: >

      identifier of the client to use this region for buffers



  qcom,use-guard-pages:

    type: boolean

    description: >

      Indicates that the firmware, or hardware, does not gracefully handle

      memory protection of this region when placed adjacent to other protected

      memory regions, and that padding around the used portion of the memory

      region is necessary.



      When this is set, the first and last page should be left unused, and the

      effective size of the region will thereby shrink with two pages.



  qcom,vmid:

    $ref: /schemas/types.yaml#/definitions/uint32-array

    description: >

Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ properties: 
  iommus:

    maxItems: 1



  dma-coherent: true



required:

  - compatible

  - reg

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -17801,6 +17801,18 @@ S: Maintained 
F:	Documentation/devicetree/bindings/mtd/qcom,nandc.yaml

F:	drivers/mtd/nand/raw/qcom_nandc.c









QUALCOMM QSEECOM DRIVER









M:	Maximilian Luz <luzmaximilian@gmail.com>









L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	drivers/firmware/qcom_qseecom.c

















QUALCOMM QSEECOM UEFISECAPP DRIVER









M:	Maximilian Luz <luzmaximilian@gmail.com>









L:	linux-arm-msm@vger.kernel.org









S:	Maintained









F:	drivers/firmware/qcom_qseecom_uefisecapp.c

















QUALCOMM RMNET DRIVER









M:	Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com>









M:	Sean Tranchetti <quic_stranche@quicinc.com>