Skip to content

RFC Restructure, improve target support for qcom_scm driver

Elliot Berman linux-arm-msm lkml 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 RFC Latest17 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/17firmware: qcom_scm: Rename macros and structuresdrivers/firmware/qcom_scm-32.c drivers/firmware/qcom_scm-64.c drivers/firmware/qcom_scm.c +2 more+67 -650 replies
2/17firmware: qcom_scm: Apply consistent naming scheme to command IDsdrivers/firmware/qcom_scm-32.c drivers/firmware/qcom_scm-64.c drivers/firmware/qcom_scm.c +1 more+55 -600 replies
3/17firmware: qcom_scm: Order functions, definitions by service/commanddrivers/firmware/qcom_scm-32.c drivers/firmware/qcom_scm-64.c drivers/firmware/qcom_scm.c +2 more+350 -3490 replies
4/17firmware: qcom_scm: Remove unused qcom_scm_get_versiondrivers/firmware/qcom_scm-32.c include/linux/qcom_scm.h+0 -380 replies
5/17firmware: qcom_scm-64: Move svc/cmd/owner into qcom_scm_descdrivers/firmware/qcom_scm-64.c+120 -710 replies
6/17firmware: qcom_scm-64: Add SCM results to descriptordrivers/firmware/qcom_scm-64.c+41 -600 replies
7/17firmware: qcom_scm-64: Remove qcom_scm_call_do_smcccdrivers/firmware/qcom_scm-64.c+20 -260 replies
8/17firmware: qcom_scm-64: Move SMC register filling to qcom_scm_call_smcccdrivers/firmware/qcom_scm-64.c+25 -190 replies
9/17firmware: qcom_scm-64: Improve SMC convention detectiondrivers/firmware/qcom_scm-64.c+21 -170 replies
10/17firmware: qcom_scm-32: Use SMC arch wrappersdrivers/firmware/qcom_scm-32.c+17 -540 replies
11/17firmware: qcom_scm-32: Use qcom_scm_desc in non-atomic callsdrivers/firmware/qcom_scm-32.c+169 -1010 replies
12/17firmware: qcom_scm-32: Move SMCCC register filling to qcom_scm_calldrivers/firmware/qcom_scm-32.c+31 -160 replies
13/17firmware: qcom_scm-32: Create common legacy atomic calldrivers/firmware/qcom_scm-32.c+66 -410 replies
14/17firmware: qcom_scm-32: Add device argument to atomic callsdrivers/firmware/qcom_scm-32.c drivers/firmware/qcom_scm-64.c drivers/firmware/qcom_scm.c +1 more+18 -140 replies
15/17firmware: qcom_scm: Merge legacy and SMCCC conventionsdrivers/firmware/qcom_scm-64.c+314 -80 replies
16/17firmware: qcom_scm: Enable legacy calling convention in qcom_scm-64.cdrivers/firmware/qcom_scm-64.c+35 -50 replies
17/17firmware: qcom_scm: Rename -64 -> -smc, remove -32drivers/firmware/Kconfig drivers/firmware/Makefile drivers/firmware/qcom_scm-32.c +2 more+950 -16080 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [RFC 00/17] Restructure, improve target support for qcom_scm driver

This series improves support for 32-bit Qualcomm targets on qcom_scm driver.

Currently, the qcom_scm driver supports only 64-bit Qualcomm targets and very old 32-bit Qualcomm targets. Newer 32-bit targets use ARM's SMC Calling Convention to communicate with secure world. Older 32-bit targets use a "buffer-based" legacy approach for communicating with secure world (as implemented in qcom_scm-32.c). All arm64 Qualcomm targets use ARM SMCCC. Currently, SMCCC-based communication is enabled only on ARM64 config and buffer-based communication only on ARM config. This patch-series combines SMCCC and legacy conventions and selects the correct convention by querying the secure world [1].

We decided to take the opportunity as well to clean up the driver rather than try to patch together qcom_scm-32 and qcom_scm-64.

Patches 1-4 improve macro names, reorder macros/functions, and prune unused
macros/functions. No functional changes were introduced.
Patches 5-9 clears up the SCM abstraction in qcom_scm-64.
Patches 10-14 clears up the SCM abstraction in qcom_scm-32. Patches 9 and 15-16 enable dynamically using the different calling conventions.

This series is based on https://lore.kernel.org/patchwork/cover/1129991/

[1]: https://source.codeaurora.org/quic/la/kernel/msm-4.9/tree/drivers/soc/qcom/scm.c?h=kernel.lnx.4.9.r28-rel#n555

Elliot Berman (17):
firmware: qcom_scm: Rename macros and structures
firmware: qcom_scm: Apply consistent naming scheme to command IDs
firmware: qcom_scm: Order functions, definitions by service/command
firmware: qcom_scm: Remove unused qcom_scm_get_version
firmware: qcom_scm-64: Move svc/cmd/owner into qcom_scm_desc
firmware: qcom_scm-64: Add SCM results to descriptor
firmware: qcom_scm-64: Remove qcom_scm_call_do_smccc
firmware: qcom_scm-64: Move SMC register filling to
qcom_scm_call_smccc
firmware: qcom_scm-64: Improve SMC convention detection
firmware: qcom_scm-32: Use SMC arch wrappers
firmware: qcom_scm-32: Use qcom_scm_desc in non-atomic calls
firmware: qcom_scm-32: Move SMCCC register filling to qcom_scm_call
firmware: qcom_scm-32: Create common legacy atomic call
firmware: qcom_scm-32: Add device argument to atomic calls
firmware: qcom_scm: Merge legacy and SMCCC conventions
firmware: qcom_scm: Enable legacy calling convention in qcom_scm-64.c
firmware: qcom_scm: Rename -64 -> -smc, remove -32

 drivers/firmware/Kconfig        |  18 +-
 drivers/firmware/Makefile       |   4 +-
 drivers/firmware/qcom_scm-32.c  | 621 --------------------------
 drivers/firmware/qcom_scm-64.c  | 567 ------------------------
 drivers/firmware/qcom_scm-smc.c | 938 ++++++++++++++++++++++++++++++++++++++++
 drivers/firmware/qcom_scm.c     | 232 +++++-----
 drivers/firmware/qcom_scm.h     | 117 +++--
 include/linux/qcom_scm.h        |  74 ++--
 8 files changed, 1159 insertions(+), 1412 deletions(-)
 delete mode 100644 drivers/firmware/qcom_scm-32.c
 delete mode 100644 drivers/firmware/qcom_scm-64.c
 create mode 100644 drivers/firmware/qcom_scm-smc.c
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project