samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dsp: replace apr with gpr api

Browse Source 
Replace APR API to get ADSP state with GPR API.

Change-Id: I8edb8a831ef8755202fc95454af3b4210a114719
Signed-off-by: Taha Azzaoui <tazzaoui@codeaurora.org>
This commit is contained in:
Vignesh Kulothungan
2019-10-28 18:26:09 -07:00
committed by Gerrit - the friendly Code Review server
parent 148520fd4d
commit 8cc6e93451
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dsp/adsp-loader.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2012-2014, 2017-2019, The Linux Foundation. All rights reserved. * Copyright (c) 2012-2014, 2017-2020, The Linux Foundation. All rights reserved.
*/ */
#include <linux/init.h> #include <linux/init.h>
@@ -10,7 +10,7 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <ipc/apr.h> #include <dsp/gecko-core.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
@@ -24,6 +24,12 @@
#define IMAGE_UNLOAD_CMD 0 #define IMAGE_UNLOAD_CMD 0
#define MAX_FW_IMAGES 4 #define MAX_FW_IMAGES 4
enum apr_subsys_state {
APR_SUBSYS_DOWN,
APR_SUBSYS_UP,
APR_SUBSYS_LOADED,
};
static ssize_t adsp_boot_store(struct kobject *kobj, static ssize_t adsp_boot_store(struct kobject *kobj,
struct kobj_attribute *attr, struct kobj_attribute *attr,
const char *buf, size_t count); const char *buf, size_t count);
@@ -95,7 +101,7 @@ static void adsp_load_fw(struct work_struct *adsp_ldr_work)
/* adsp_state always returns "0". So load modem image based on /* adsp_state always returns "0". So load modem image based on
* apr_modem_state to prevent loading of image twice * apr_modem_state to prevent loading of image twice
*/ */
adsp_state = apr_get_modem_state(); //adsp_state = apr_get_modem_state();
if (adsp_state == APR_SUBSYS_DOWN) { if (adsp_state == APR_SUBSYS_DOWN) {
priv = platform_get_drvdata(pdev); priv = platform_get_drvdata(pdev);
if (!priv) { if (!priv) {
@@ -112,7 +118,7 @@ static void adsp_load_fw(struct work_struct *adsp_ldr_work)
} }
/* Set the state of the ADSP in APR driver */ /* Set the state of the ADSP in APR driver */
apr_set_modem_state(APR_SUBSYS_LOADED); //apr_set_modem_state(APR_SUBSYS_LOADED);
} else if (adsp_state == APR_SUBSYS_LOADED) { } else if (adsp_state == APR_SUBSYS_LOADED) {
dev_dbg(&pdev->dev, dev_dbg(&pdev->dev,
"%s: MDSP state = %x\n", __func__, adsp_state); "%s: MDSP state = %x\n", __func__, adsp_state);
@@ -124,7 +130,7 @@ static void adsp_load_fw(struct work_struct *adsp_ldr_work)
load_adsp: load_adsp:
{ {
adsp_state = apr_get_q6_state(); adsp_state = gecko_core_is_apm_ready();
if (adsp_state == APR_SUBSYS_DOWN) { if (adsp_state == APR_SUBSYS_DOWN) {
priv = platform_get_drvdata(pdev); priv = platform_get_drvdata(pdev);
if (!priv) { if (!priv) {