From patchwork Thu Dec 12 18:51:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliot Berman X-Patchwork-Id: 11289163 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 09776109A for ; Thu, 12 Dec 2019 18:51:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D233C22527 for ; Thu, 12 Dec 2019 18:51:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="XfXtQ2WG"; dkim=pass (1024-bit key) header.d=amazonses.com header.i=@amazonses.com header.b="OGuZr61s" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730261AbfLLSvI (ORCPT ); Thu, 12 Dec 2019 13:51:08 -0500 Received: from a27-21.smtp-out.us-west-2.amazonses.com ([54.240.27.21]:39998 "EHLO a27-21.smtp-out.us-west-2.amazonses.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730258AbfLLSvI (ORCPT ); Thu, 12 Dec 2019 13:51:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=zsmsymrwgfyinv5wlfyidntwsjeeldzt; d=codeaurora.org; t=1576176667; h=From:To:Cc:Subject:Date:Message-Id; bh=kKoHOP9qOffADui+fbcwZFFFHSchmemtI+XGhBYvyJs=; b=XfXtQ2WGRnit+XEMx4jUF75saxoMfwEy3tOdfXqrSZq5r5AUzlAI9XlzbfNr6O/m +vAIHzvIddFFGbOGfBg/kL7IhZzSWOvLMOT5STtwdArprRROLvUoP1m5K1vG0CDL7m1 Puvn3LQEnm7yUXuwVzLQZFUyWjfC3T5QgLBaTWTM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx; d=amazonses.com; t=1576176667; h=From:To:Cc:Subject:Date:Message-Id:Feedback-ID; bh=kKoHOP9qOffADui+fbcwZFFFHSchmemtI+XGhBYvyJs=; b=OGuZr61swyJvcW/TOkPAM6bDhKxygvLhLvkpNLeCu7RbahNLcP1muoIgvArtPsYl AcTFZGYj3CKLJ3+oZ+f/nUDKg8uIJ5rUf4UUV4yvNZksabSUyeDvNOJbRQdMGNrbWKz aKW3YcwXNvOR+Xp6WtKLMAYey1DiYWnRpZwQS390= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.0 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 8F65AC4479F Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=eberman@codeaurora.org From: Elliot Berman To: bjorn.andersson@linaro.org, agross@kernel.org, swboyd@chromium.org Cc: Elliot Berman , saiprakash.ranjan@codeaurora.org, tsoni@codeaurora.org, sidgup@codeaurora.org, psodagud@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 00/17] Restructure, improve target support for qcom_scm driver Date: Thu, 12 Dec 2019 18:51:07 +0000 Message-ID: <0101016efb7349c0-3c8f33b3-f7d2-46df-9bbb-c8f4401c5bf2-000000@us-west-2.amazonses.com> X-Mailer: git-send-email 2.7.4 X-SES-Outgoing: 2019.12.12-54.240.27.21 Feedback-ID: 1.us-west-2.CZuq2qbDmUIuT3qdvXlRHZZCpfZqZ4GtG9v3VKgRyF0=:AmazonSES Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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. [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 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 | 852 +++++++++++++++++++++++++++++-------- drivers/firmware/qcom_scm.h | 178 ++++---- include/linux/qcom_scm.h | 113 ++--- 9 files changed, 1224 insertions(+), 1575 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 Tested-by: Brian Masney # arm32