Restructure, improve target support for qcom_scm driver
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v5 Latest17 patches 4 repliesIn review
- v4 posting 2/217 patches 1 replySuperseded
- v4 posting 1/20 of 17 patches 3 repliesSuperseded
Earlier versions · 4
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v3 posting 2/2 | 17 patches | 0 replies | Superseded | |
| v3 posting 1/2 | 0 of 17 patches | 0 replies | Superseded | |
| v2 | 18 patches | 20 replies | Superseded | |
| v1 | 17 patches | 16 replies | Superseded |
Changes in v5 from the cover letter
- Restored missing arginfo/args to pas_auth_and_reset
Patches in v5 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/17 | firmware: qcom_scm: Rename macros and structuresdrivers/ drivers/ | +64 | 0 replies | |
| 2/17 | firmware: qcom_scm: Apply consistent naming scheme to command IDsdrivers/ drivers/ drivers/ +1 more | +64 | 0 replies | |
| 3/17 | firmware: qcom_scm: Remove unused qcom_scm_get_versiondrivers/ include/ | +0 | 0 replies | |
| 4/17 | firmware: qcom_scm-64: Make SMC macros less magicaldrivers/ | +3 | 0 replies | |
| 5/17 | firmware: qcom_scm-64: Move svc/cmd/owner into qcom_scm_descdrivers/ | +121 | 0 replies | |
| 6/17 | firmware: qcom_scm-64: Add SCM results structdrivers/ | +50 | 0 replies | |
| 7/17 | firmware: qcom_scm-64: Move SMC register filling to qcom_scm_call_smcccdrivers/ | +34 | 0 replies | |
| 8/17 | firmware: qcom_scm-64: Improve SMC convention detectiondrivers/ | +27 | 0 replies | |
| 9/17 | firmware: qcom_scm-32: Use SMC arch wrappersdrivers/ drivers/ | +17 | 0 replies | |
| 10/17 | firmware: qcom_scm-32: Add funcnum IDsdrivers/ | +5 | 0 replies | |
| 11/17 | firmware: qcom_scm-32: Use qcom_scm_desc in non-atomic callsdrivers/ | +218 | 0 replies | |
| 12/17 | firmware: qcom_scm-32: Move SMCCC register filling to qcom_scm_calldrivers/ | +24 | 0 replies | |
| 13/17 | firmware: qcom_scm-32: Create common legacy atomic calldrivers/ | +68 | 0 replies | |
| 14/17 | firmware: qcom_scm-32: Add device argument to atomic callsdrivers/ drivers/ drivers/ +1 more | +19 | 0 replies | |
| 15/17 | firmware: qcom_scm: Order functions, definitions by service/commanddrivers/ drivers/ include/ | +315 | 0 replies | |
| 16/17 | firmware: qcom_scm: Remove thin wrappersdrivers/ drivers/ drivers/ +1 more | +428 | 0 replies | |
| 17/17 | firmware: qcom_scm: Dynamically support SMCCC and legacy conventionsdrivers/ drivers/ drivers/ +3 more | +176 | 1 reply |
Reviews trailers per patch
4 of 17 patches have a Reviewed-by or Acked-by.
| Patch | Brian Masney | Stephan Gerhold | Bjorn Andersson | Vinod Koul | Stephen Boyd |
|---|---|---|---|---|---|
| 1/17 | T-b | T-b | |||
| 2/17 | T-b | T-b | R-b | R-b | R-b |
| 3/17 | T-b | T-b | R-b | R-b | R-b |
| 4/17 | T-b | T-b | R-b | ||
| 5/17 | T-b | T-b | |||
| 6/17 | T-b | T-b | |||
| 7/17 | T-b | T-b | |||
| 8/17 | T-b | T-b | |||
| 9/17 | T-b | T-b | |||
| 10/17 | T-b | T-b | |||
| 11/17 | T-b | T-b | |||
| 12/17 | T-b | T-b | |||
| 13/17 | T-b | T-b | |||
| 14/17 | T-b | T-b | |||
| 15/17 | T-b | T-b | A-b | ||
| 16/17 | T-b | T-b | |||
| 17/17 | T-b | T-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.
Cover letter [PATCH v5 00/17] Restructure, improve target support for qcom_scm driver
This series improves support for 32-bit Qualcomm targets on qcom_scm driver and cleans up the driver for 64-bit implementations.
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-3 and 15 improve macro names, reorder macros/functions, and prune unused
macros/functions. No functional changes were introduced.
Patches 4-8 clears up the SCM abstraction in qcom_scm-64.
Patches 9-14 clears up the SCM abstraction in qcom_scm-32.
Patches 16-17 enable dynamically using the different calling conventions.
Changes since v4:
- Restored missing arginfo/args to pas_auth_and_reset
Changes since v3:
- Updated recepients
Changes since v2:
- Addressed Stephen's comments throughout v2.
- Rebased onto latest for-next branch
- Removed v2 08/18 (firmware: qcom_scm-64: Remove qcom_scm_call_do_smccc)
- Cleaned up the convention query from v2 to align with [1].
Changes since v1:
- Renamed functions/variables per Vinod's suggestions
- Split v1 01/17 into v2 [01,02,03]/18 per Vinod's suggestion
- Fix suggestions by Bjorn in v1 09/18 (now v2 10/18)
- Refactor last 3 commits per Bjorn suggestions in v1 17/18 and v1 10/18
Changes since RFC:
- Fixed missing return values in qcom_scm_call_smccc
- Fixed order of arguments in qcom_scm_set_warm_boot_addr
- Adjusted logic of SMC convention to properly support older QCOM secure worlds
- Boot tested on IFC6410 based on linaro kernel tag:
debian-qcom-dragonboard410c-18.01 (which does basic verification of legacy SCM calls: at least warm_boot_addr, cold_boot_addr, and power_down)
Elliot Berman (17):
firmware: qcom_scm: Rename macros and structures
firmware: qcom_scm: Apply consistent naming scheme to command IDs
firmware: qcom_scm: Remove unused qcom_scm_get_version
firmware: qcom_scm-64: Make SMC macros less magical
firmware: qcom_scm-64: Move svc/cmd/owner into qcom_scm_desc
firmware: qcom_scm-64: Add SCM results struct
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: Add funcnum IDs
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: Order functions, definitions by service/command
firmware: qcom_scm: Remove thin wrappers
firmware: qcom_scm: Dynamically support SMCCC and legacy conventions
drivers/firmware/Kconfig | 8 - drivers/firmware/Makefile | 5 +- drivers/firmware/qcom_scm-32.c | 671 ----------------------------- drivers/firmware/qcom_scm-64.c | 579 ------------------------- drivers/firmware/qcom_scm-legacy.c | 242 +++++++++++ drivers/firmware/qcom_scm-smc.c | 151 +++++++ drivers/firmware/qcom_scm.c | 854 +++++++++++++++++++++++++++++-------- drivers/firmware/qcom_scm.h | 178 ++++---- include/linux/qcom_scm.h | 125 +++--- 9 files changed, 1232 insertions(+), 1581 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-legacy.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