From patchwork Fri Nov 11 17:17:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georgi Vlaev X-Patchwork-Id: 13040658 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7297DC4332F for ; Fri, 11 Nov 2022 17:43:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZZpoqR5G88kT6ulw46p6JWKGMXQ4Mbntn3lO8g3nyeo=; b=Uk2JkcV//9rD/G pL8SXVKpzvQR12qah1KJ/yqUswi5AwmD0vJEX2tJNgqFREmMQT6addXtsuwhGcSHqMtr5mHo0Xh8Q jISXauOgB03a7bbvJvVyqUu0C0gBZhfjHRsrAb7KU6l373V1dW/Tq0bvxT7D9qIehWaVxT1rsypOl sWQ1Wvh5U68M6hEKZEokgfIaVsdO5JA4gmBHbbxn6nz9NPNBNb+4CmETR3CLnzD9hYQO5yx/mwGhH te+MvlO85dxxJg/52482a3OJGn7hEvqPySifSrYL/KPeLcKqwJydNNi42+GdJ9lum9mJkoRAPlLtJ cd2rk40Rdk2dO++7JsCw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1otY33-00HNbJ-VE; Fri, 11 Nov 2022 17:42:38 +0000 Received: from fllv0015.ext.ti.com ([198.47.19.141]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1otXfl-00HB22-Jt for linux-arm-kernel@lists.infradead.org; Fri, 11 Nov 2022 17:18:35 +0000 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 2ABHIPQZ081056; Fri, 11 Nov 2022 11:18:25 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1668187105; bh=ECDL3sZx5BUYYCI2k/6ernjy/NSdgpC69pPfs/90DWo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=scWPUFRkcjttQ6j29ThrYa7LaXXHjQJ9e9PImFPMHlWPeDihkNje3R7fIdxlhynUt PkEg/PUk5pqxE0oyP9W91Ro4bJx/jndyHE070bRZ3RDTZhk8Zh6pZu/LJHuQNQwTxu UZzSZcQ8V+sVYtdd7dt9hkXa0e6UCJ2nQmuSJTMs= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 2ABHIP7A057132 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 11 Nov 2022 11:18:25 -0600 Received: from DLEE114.ent.ti.com (157.170.170.25) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.6; Fri, 11 Nov 2022 11:18:25 -0600 Received: from lelv0326.itg.ti.com (10.180.67.84) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.6 via Frontend Transport; Fri, 11 Nov 2022 11:18:25 -0600 Received: from jti.ent.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 2ABHHewb028454; Fri, 11 Nov 2022 11:18:18 -0600 From: Georgi Vlaev To: Nishanth Menon , Tero Kristo , Santosh Shilimkar , Rob Herring , Krzysztof Kozlowski CC: , , , Vibhore Vardhan , Vignesh Raghavendra , Roger Quadros , Georgi Vlaev Subject: [PATCH v3 4/5] firmware: ti_sci: Use dt provided fw name and address to load at suspend time Date: Fri, 11 Nov 2022 19:17:38 +0200 Message-ID: <20221111171739.160693-5-g-vlaev@ti.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221111171739.160693-1-g-vlaev@ti.com> References: <20221111171739.160693-1-g-vlaev@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221111_091833_810415_B79610A3 X-CRM114-Status: GOOD ( 24.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Dave Gerlach Use request_firmware_direct to load the fs stub LPM firmware to a provided memory region. The filename for the firmware is provided in the device tree as "firmware-name". Use a pm_notifier for loading of the low power firmware during PM_SUSPEND_PREPARE phase so that it can be loaded from the rootfs before it is suspended. It is possible in the future for this firmware to require reload, so add a check to indicate that the firmware is currently loaded so it is only loaded once. Signed-off-by: Dave Gerlach Signed-off-by: Vibhore Vardhan Signed-off-by: Georgi Vlaev Tested-by: Roger Quadros --- drivers/firmware/ti_sci.c | 97 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 2434cf1ec5e6..a961506dbbc4 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -22,6 +23,7 @@ #include #include #include +#include #include #include "ti_sci.h" @@ -89,10 +91,13 @@ struct ti_sci_desc { * @dev: Device pointer * @desc: SoC description for this instance * @nb: Reboot Notifier block + * @pm_nb: PM notifier block * @d: Debugfs file entry * @debug_region: Memory region where the debug message are available * @debug_region_size: Debug region size * @debug_buffer: Buffer allocated to copy debug messages. + * @lpm_region: Memory region where the FS Stub LPM Firmware will be stored + * @lpm_region_size: LPM region size * @handle: Instance of TI SCI handle to send to clients. * @cl: Mailbox Client * @chan_tx: Transmit mailbox channel @@ -104,15 +109,20 @@ struct ti_sci_desc { * @ctx_mem_buf: Low power context memory buffer * @users: Number of users of this instance * @is_suspending: Flag set to indicate in suspend path. + * @lpm_firmware_loaded: Flag to indicate if LPM firmware has been loaded + * @lpm_firmware_name: Name of firmware binary to load from fw search path */ struct ti_sci_info { struct device *dev; struct notifier_block nb; + struct notifier_block pm_nb; const struct ti_sci_desc *desc; struct dentry *d; void __iomem *debug_region; char *debug_buffer; size_t debug_region_size; + void __iomem *lpm_region; + size_t lpm_region_size; struct ti_sci_handle handle; struct mbox_client cl; struct mbox_chan *chan_tx; @@ -125,11 +135,14 @@ struct ti_sci_info { /* protected by ti_sci_list_mutex */ int users; bool is_suspending; + bool lpm_firmware_loaded; + const char *lpm_firmware_name; }; #define cl_to_ti_sci_info(c) container_of(c, struct ti_sci_info, cl) #define handle_to_ti_sci_info(h) container_of(h, struct ti_sci_info, handle) #define reboot_to_ti_sci_info(n) container_of(n, struct ti_sci_info, nb) +#define pm_nb_to_ti_sci_info(n) container_of(n, struct ti_sci_info, pm_nb) #ifdef CONFIG_DEBUG_FS @@ -3465,6 +3478,32 @@ static int tisci_reboot_handler(struct notifier_block *nb, unsigned long mode, return NOTIFY_BAD; } +static int ti_sci_load_lpm_firmware(struct device *dev, struct ti_sci_info *info) +{ + const struct firmware *firmware; + int ret = 0; + + /* If no firmware name is set, do not attempt to load. */ + if (!info->lpm_firmware_name) + return -EINVAL; + + ret = request_firmware_direct(&firmware, info->lpm_firmware_name, dev); + if (ret) { + dev_warn(dev, "Cannot load %s\n", info->lpm_firmware_name); + return ret; + } + + if (firmware->size > info->lpm_region_size) { + release_firmware(firmware); + return -ENOMEM; + } + + memcpy_toio(info->lpm_region, firmware->data, firmware->size); + + release_firmware(firmware); + + return ret; +} static void ti_sci_set_is_suspending(struct ti_sci_info *info, bool is_suspending) { info->is_suspending = is_suspending; @@ -3494,10 +3533,33 @@ static int ti_sci_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(ti_sci_pm_ops, ti_sci_suspend, ti_sci_resume); +static int tisci_pm_handler(struct notifier_block *nb, unsigned long pm_event, + void *unused) +{ + struct ti_sci_info *info = pm_nb_to_ti_sci_info(nb); + int ret; + + /* Load the LPM firmware on PM_SUSPEND_PREPARE if not loaded yet */ + if (pm_event != PM_SUSPEND_PREPARE || info->lpm_firmware_loaded) + return NOTIFY_DONE; + + ret = ti_sci_load_lpm_firmware(info->dev, info); + if (ret) { + dev_err(info->dev, "Failed to LPM firmware, suspend is disabled (%d)\n", + ret); + return NOTIFY_BAD; + } + + info->lpm_firmware_loaded = true; + + return NOTIFY_OK; +} + static int ti_sci_init_suspend(struct platform_device *pdev, struct ti_sci_info *info) { struct device *dev = &pdev->dev; + struct resource *res; int ret; dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)); @@ -3521,6 +3583,38 @@ static int ti_sci_init_suspend(struct platform_device *pdev, if (ret) goto err; + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "lpm"); + if (!res) { + dev_warn(dev, + "lpm region is required for suspend but not provided.\n"); + ret = -EINVAL; + goto err; + } + + info->lpm_region = devm_ioremap_resource(dev, res); + if (IS_ERR(info->lpm_region)) { + ret = PTR_ERR(info->lpm_region); + goto err; + } + info->lpm_region_size = resource_size(res); + + if (of_property_read_string(dev->of_node, "firmware-name", + &info->lpm_firmware_name)) { + dev_warn(dev, + "firmware-name is required for suspend but not provided.\n"); + ret = -EINVAL; + goto err; + } + + info->pm_nb.notifier_call = tisci_pm_handler; + info->pm_nb.priority = 128; + + ret = register_pm_notifier(&info->pm_nb); + if (ret) { + dev_err(dev, "pm_notifier registration fail(%d)\n", ret); + goto err; + } + return 0; err: dma_free_coherent(info->dev, LPM_CTX_MEM_SIZE, @@ -3718,6 +3812,9 @@ static int ti_sci_remove(struct platform_device *pdev) info = platform_get_drvdata(pdev); + if (info->pm_nb.notifier_call) + unregister_pm_notifier(&info->pm_nb); + if (info->nb.notifier_call) unregister_restart_handler(&info->nb);