Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp4835871ybg; Tue, 29 Oct 2019 13:08:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqwkZrDoLmu7y6tKXPrDswDxHU3f7QGNHZx73+sDdPF1cpp+4SHcH7GYATWbqIhp2MS8daUB X-Received: by 2002:a17:906:244a:: with SMTP id a10mr5171786ejb.15.1572379736107; Tue, 29 Oct 2019 13:08:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572379736; cv=none; d=google.com; s=arc-20160816; b=hSEaurjy9EHjmw5FNKYTK5Z2F3gW/4p/iBozsjysul/FWZ9wykKR090m5IUxu9NwUy /iJFMBllZN8YfNtzC0YUge9EOzfk3GB47auJf+oPswEJ3ymPvpz8bfQyhffsQhNESdtK f0lIaSrO8sPxqSVNb3hB7FRbZ17e5/gCVt/Oeub0pG8qFEBIGQg262606YphzVOH+VxT tJB/BEIRU0u20AjPOCqH9NlfgnTSHpS3sBQpfvgqR1u6QdhzC6qeSzAWnaFqkuliPDVa N+E7DGIyg/EAdgJ9VcrN2apT26bsQyLl0uQzHyk1O3YVe0Vk2oUsPg78hAvDLPUPnOMB PMgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dmarc-filter:dkim-signature:dkim-signature; bh=dl+AO5fdZYR7FuqirakRJQ2pDaY74Xd1tYAFo0Oe8ug=; b=0NiH9w6Vwkh0lbh+/QGWBWUQSEIQUSaVMrFnmToXQqHI6IrriL/pS9/wnZLpwjObgi +g0UZkSsnmK4hzMfhdkgPaqvOu7+gYwgHoZ0WnJ8BFoTDuf1kUTtS/N4AEpbhY/D9k5u pY49HGjZ2m3bsL4WW4MC71dyARGXyKSdVe2DzuhQ17lgGKw3KRXrbOd+QpNJT6eLwTpe QxF3ERt9YchEFMEGczUnHn0z9O3iuhXWs0U6NUi4nKFA7BKUMDz6qYLvt6yAknzeGT7U QcQkyRdmu5XPiJCLQTZFHhY9A7UFqzXV0Lf8+s9Bpx8mNT7dBEaJvwZpe95HnUlf8sVU bBhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b="KaV/V775"; dkim=pass header.i=@codeaurora.org header.s=default header.b="KaV/V775"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d51si10753728ede.168.2019.10.29.13.08.32; Tue, 29 Oct 2019 13:08:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b="KaV/V775"; dkim=pass header.i=@codeaurora.org header.s=default header.b="KaV/V775"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732546AbfJ2TlN (ORCPT + 99 others); Tue, 29 Oct 2019 15:41:13 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:58516 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731976AbfJ2TlN (ORCPT ); Tue, 29 Oct 2019 15:41:13 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B834360F72; Tue, 29 Oct 2019 19:41:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1572378071; bh=XmR2nOvQvO71x0qPLlu+jkarkwz77Yeq9HCPZf7u/Nc=; h=From:To:Cc:Subject:Date:From; b=KaV/V775wrc12T76S3wHmnJ/hnhXJN5XAJqwX3UaNhoNNomX+XrdhgHpeO/X6UxNb bzn0g7pfvcr5UvuHj1fdNRqVwJ53upOGE/1bO75f/jwAVH5t0ZEiZOt5+1MW8Q1Iks YfHvbanXtzCjJ+0Kh92NA5VMo5cPXiBfnoy+vYsE= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED,SPF_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from eberman-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: eberman@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id CDC3D60D8D; Tue, 29 Oct 2019 19:41:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1572378071; bh=XmR2nOvQvO71x0qPLlu+jkarkwz77Yeq9HCPZf7u/Nc=; h=From:To:Cc:Subject:Date:From; b=KaV/V775wrc12T76S3wHmnJ/hnhXJN5XAJqwX3UaNhoNNomX+XrdhgHpeO/X6UxNb bzn0g7pfvcr5UvuHj1fdNRqVwJ53upOGE/1bO75f/jwAVH5t0ZEiZOt5+1MW8Q1Iks YfHvbanXtzCjJ+0Kh92NA5VMo5cPXiBfnoy+vYsE= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org CDC3D60D8D Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=eberman@codeaurora.org From: Elliot Berman To: bjorn.andersson@linaro.org, saipraka@codeaurora.org, agross@kernel.org Cc: tsoni@codeaurora.org, sidgup@codeaurora.org, psodagud@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Elliot Berman Subject: [RFC 00/17] Restructure, improve target support for qcom_scm driver Date: Tue, 29 Oct 2019 12:40:48 -0700 Message-Id: <1572378065-4490-1-git-send-email-eberman@codeaurora.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project