| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <7595c01b-fbef-5a49-54ad-a49fda3a389b@quicinc.com>
Date: Sun, 21 May 2023 22:35:44 +0530
From: Manikanta Mylavarapu <quic_mmanikan@...cinc.com>
To: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>,
<agross@...nel.org>, <andersson@...nel.org>,
<konrad.dybcio@...aro.org>, <robh+dt@...nel.org>,
<krzysztof.kozlowski+dt@...aro.org>, <jassisinghbrar@...il.com>,
<mathieu.poirier@...aro.org>, <mturquette@...libre.com>,
<sboyd@...nel.org>, <quic_gurus@...cinc.com>,
<loic.poulain@...aro.org>, <quic_eberman@...cinc.com>,
<robimarko@...il.com>, <linux-arm-msm@...r.kernel.org>,
<devicetree@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<linux-remoteproc@...r.kernel.org>, <linux-clk@...r.kernel.org>
CC: <quic_srichara@...cinc.com>, <quic_gokulsri@...cinc.com>,
<quic_sjaganat@...cinc.com>, <quic_kathirav@...cinc.com>,
<quic_arajkuma@...cinc.com>, <quic_anusha@...cinc.com>,
<quic_poovendh@...cinc.com>
Subject: Re: [PATCH 08/11] remoteproc: qcom: Add Hexagon based multipd rproc
driver
On 3/7/2023 9:09 PM, Krzysztof Kozlowski wrote:
> On 07/03/2023 05:41, Manikanta Mylavarapu wrote:
>> APSS brings Q6 out of reset and then Q6 brings
>> WCSS block (wifi radio's) out of reset.
>>
>> ---------------
>> --> |WiFi 2G radio|
>> | --------------
>> |
>> -------- ------- |
>> | APSS | ---> |QDSP6| -----|
>> --------- ------- |
>> |
>> |
>> | --------------
>> --> |WiFi 5G radio|
>> --------------
>>
>> Problem here is if any radio crashes, subsequently other
>> radio also should crash because Q6 crashed. Let's say
>> 2G radio crashed, Q6 should pass this info to APSS. Only
>> Q6 processor interrupts registered with APSS. Obviously
>> Q6 should crash and raise fatal interrupt to APSS. Due
>> to this 5G radio also crashed. But no issue in 5G radio,
>> because of 2G radio crash 5G radio also impacted.
>>
>
>
> Please wrap commit message according to Linux coding style / submission
> process (neither too early nor over the limit):
> https://elixir.bootlin.com/linux/v5.18-rc4/source/Documentation/process/submitting-patches.rst#L586
>
Sure, i will update.
>> In multi pd model, this problem is resolved. Here WCSS
>> functionality (WiFi radio's) moved out from Q6 root pd
>> to a separate user pd. Due to this, radio's independently
>> pass their status info to APPS with out crashing Q6. So
>> other radio's won't be impacted.
>>
>> ---------
>> |WiFi |
>> --> |2G radio|
>> | ---------
>> ------ Start Q6 ------- |
>> | | ------------------> | | |
>> | | Start WCSS PD1 (2G) | | |
>> |APSS| ----------------------->|QDSP6|-----|
>> | | Start WCSS PD1 (5G) | |
>> | | ----------------------->| |-----|
>> ------ ------- |
>> |
>> | -----------
>> |-->|WiFi |
>> |5G radio |
>> -----------
>> According to linux terminology, here consider Q6 as root
>> i.e it provide all services, WCSS (wifi radio's) as user
>> i.e it uses services provided by root.
>>
>> Since Q6 root & WCSS user pd's able to communicate with
>> APSS individually, multipd remoteproc driver registers
>> each PD with rproc framework. Here clients (Wifi host drivers)
>> intrested on WCSS PD rproc, so multipd driver start's root
>> pd in the context of WCSS user pd rproc start. Similarly
>> on down path, root pd will be stopped after wcss user pd
>> stopped.
>>
>> Here WCSS(user) PD is dependent on Q6(root) PD, so first
>> q6 pd should be up before wcss pd. After wcss pd goes down,
>> q6 pd should be turned off.
>>
>> rproc->ops->start(userpd_rproc) {
>> /* Boot root pd rproc */
>> rproc_boot(upd_dev->parent);
>> ---
>> /* user pd rproc start sequence */
>> ---
>> ---
>> }
>> With this way we ensure that root pd brought up before userpd.
>>
>> rproc->ops->stop(userpd_rproc) {
>> ---
>> ---
>> /* user pd rproc stop sequence */
>> ---
>> ---
>> /* Shutdown root pd rproc */
>> rproc_shutdown(upd_dev->parent);
>> }
>> After userpd rproc stops, root pd rproc will be stopped.
>> IPQ5018, IPQ9574 supports multipd remoteproc driver.
>>
>> Signed-off-by: Manikanta Mylavarapu <quic_mmanikan@...cinc.com>
>> ---
>> drivers/firmware/qcom_scm.c | 114 +++++
>> drivers/firmware/qcom_scm.h | 6 +
>> drivers/remoteproc/Kconfig | 20 +
>> drivers/remoteproc/Makefile | 1 +
>> drivers/remoteproc/qcom_common.c | 23 +
>> drivers/remoteproc/qcom_common.h | 1 +
>> drivers/remoteproc/qcom_q6v5.c | 41 +-
>> drivers/remoteproc/qcom_q6v5.h | 15 +-
>> drivers/remoteproc/qcom_q6v5_adsp.c | 5 +-
>> drivers/remoteproc/qcom_q6v5_mpd.c | 668 +++++++++++++++++++++++++
>
> Why exactly do you need a new driver for this instead of extending
> existing PIL? I feel all this is growing because no one wants to touch
> existing code and merge with it...
>
>
>> drivers/remoteproc/qcom_q6v5_mss.c | 4 +-
>> drivers/remoteproc/qcom_q6v5_pas.c | 3 +-
>> drivers/soc/qcom/mdt_loader.c | 314 ++++++++++++
>> include/linux/firmware/qcom/qcom_scm.h | 3 +
>> include/linux/soc/qcom/mdt_loader.h | 19 +
>> 15 files changed, 1228 insertions(+), 9 deletions(-)
>> create mode 100644 drivers/remoteproc/qcom_q6v5_mpd.c
>>
>> diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
>> index d88c5f14bd54..d69560963353 100644
>> --- a/drivers/firmware/qcom_scm.c
>> +++ b/drivers/firmware/qcom_scm.c
>> @@ -654,6 +654,120 @@ int qcom_scm_pas_shutdown(u32 peripheral)
>> }
>> EXPORT_SYMBOL(qcom_scm_pas_shutdown);
>>
>> +/**
>> + * qti_scm_int_radio_powerup - Bring up internal radio userpd
>> + *
>> + * @peripheral: peripheral id
>> + *
>> + * Return 0 on success.
>> + */
>
> ...
>
>> diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile
>> index 91314a9b43ce..b64051080ec1 100644
>> --- a/drivers/remoteproc/Makefile
>> +++ b/drivers/remoteproc/Makefile
>> @@ -25,6 +25,7 @@ obj-$(CONFIG_QCOM_PIL_INFO) += qcom_pil_info.o
>> obj-$(CONFIG_QCOM_RPROC_COMMON) += qcom_common.o
>> obj-$(CONFIG_QCOM_Q6V5_COMMON) += qcom_q6v5.o
>> obj-$(CONFIG_QCOM_Q6V5_ADSP) += qcom_q6v5_adsp.o
>> +obj-$(CONFIG_QCOM_Q6V5_MPD) += qcom_q6v5_mpd.o
>> obj-$(CONFIG_QCOM_Q6V5_MSS) += qcom_q6v5_mss.o
>> obj-$(CONFIG_QCOM_Q6V5_PAS) += qcom_q6v5_pas.o
>> obj-$(CONFIG_QCOM_Q6V5_WCSS) += qcom_q6v5_wcss.o
>> diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
>> index a0d4238492e9..b72fbda02242 100644
>> --- a/drivers/remoteproc/qcom_common.c
>> +++ b/drivers/remoteproc/qcom_common.c
>> @@ -510,5 +510,28 @@ void qcom_remove_ssr_subdev(struct rproc *rproc, struct qcom_rproc_ssr *ssr)
>> }
>> EXPORT_SYMBOL_GPL(qcom_remove_ssr_subdev);
>>
>> +/**
>> + * qcom_get_pd_asid() - get the pd asid number from DT node
>> + * @node: device tree node
>> + *
>> + * Returns asid if node name has 'pd' string
>> + */
>> +s8 qcom_get_pd_asid(struct device_node *node)
>> +{
>> + char *str;
>> + u8 pd_asid;
>> +
>> + if (!node)
>> + return -EINVAL;
>> +
>> + str = strstr(node->name, "pd");
>> + if (!str)
>> + return 0;
>> +
>> + str += strlen("pd");
>> + return kstrtos8(str, 10, &pd_asid) ? -EINVAL : pd_asid;
>> +}
>> +EXPORT_SYMBOL(qcom_get_pd_asid);
>
> Why do you need it in shared file?
>
I will move to qcom_q6v5_mpd driver, since it's required only for MPD model.
>> +
>> MODULE_DESCRIPTION("Qualcomm Remoteproc helper driver");
>> MODULE_LICENSE("GPL v2");
>> diff --git a/drivers/remoteproc/qcom_common.h b/drivers/remoteproc/qcom_common.h
>> index 9ef4449052a9..9f3fb11224aa 100644
>> --- a/drivers/remoteproc/qcom_common.h
>> +++ b/drivers/remoteproc/qcom_common.h
>> @@ -75,5 +75,6 @@ static inline bool qcom_sysmon_shutdown_acked(struct qcom_sysmon *sysmon)
>> return false;
>> }
>> #endif
>> +s8 qcom_get_pd_asid(struct device_node *node);
>>
>> #endif
>> diff --git a/drivers/remoteproc/qcom_q6v5.c b/drivers/remoteproc/qcom_q6v5.c
>> index 192c7aa0e39e..b88bf3a8e53b 100644
>> --- a/drivers/remoteproc/qcom_q6v5.c
>> +++ b/drivers/remoteproc/qcom_q6v5.c
>> @@ -118,7 +118,7 @@ static irqreturn_t q6v5_wdog_interrupt(int irq, void *data)
>> return IRQ_HANDLED;
>> }
>>
>> -static irqreturn_t q6v5_fatal_interrupt(int irq, void *data)
>> +irqreturn_t q6v5_fatal_interrupt(int irq, void *data)
>
> The amount of changes you are doing to other interfaces is worrying...
> Actually it points to the fact that you are duplicating a lot instead of
> merging the code.
>
> Also this patch is doing so many things at the same time.
>
I will pull out common functonality to seperate patches.
>> {
>> struct qcom_q6v5 *q6v5 = data;
>> size_t len;
>> @@ -139,7 +139,7 @@ static irqreturn_t q6v5_fatal_interrupt(int irq, void *data)
>> return IRQ_HANDLED;
>> }
>>
>> -static irqreturn_t q6v5_ready_interrupt(int irq, void *data)
>> +irqreturn_t q6v5_ready_interrupt(int irq, void *data)
>> {
>> struct qcom_q6v5 *q6v5 = data;
>>
>> @@ -183,7 +183,16 @@ static irqreturn_t q6v5_handover_interrupt(int irq, void *data)
>> return IRQ_HANDLED;
>> }
>>
>> -static irqreturn_t q6v5_stop_interrupt(int irq, void *data)
>> +irqreturn_t q6v5_spawn_interrupt(int irq, void *data)
>
>> +{
>> + struct qcom_q6v5 *q6v5 = data;
>> +
>> + complete(&q6v5->spawn_done);
>> +
>> + return IRQ_HANDLED;
>> +}
>> +
>> +irqreturn_t q6v5_stop_interrupt(int irq, void *data)
>> {
>> struct qcom_q6v5 *q6v5 = data;
>>
>> @@ -220,6 +229,28 @@ int qcom_q6v5_request_stop(struct qcom_q6v5 *q6v5, struct qcom_sysmon *sysmon)
>> }
>> EXPORT_SYMBOL_GPL(qcom_q6v5_request_stop);
>>
>> +/**
>> + * qcom_q6v5_request_spawn() - request the remote processor to spawn
>> + * @q6v5: reference to qcom_q6v5 context
>> + *
>> + * Return: 0 on success, negative errno on failure
>> + */
>> +int qcom_q6v5_request_spawn(struct qcom_q6v5 *q6v5)
>> +{
>> + int ret;
>> +
>> + ret = qcom_smem_state_update_bits(q6v5->spawn_state,
>> + BIT(q6v5->spawn_bit), BIT(q6v5->spawn_bit));
>> +
>> + ret = wait_for_completion_timeout(&q6v5->spawn_done, 5 * HZ);
>> +
>> + qcom_smem_state_update_bits(q6v5->spawn_state,
>> + BIT(q6v5->spawn_bit), 0);
>> +
>> + return ret == 0 ? -ETIMEDOUT : 0;
>> +}
>> +EXPORT_SYMBOL_GPL(qcom_q6v5_request_spawn);
>> +
>> /**
>> * qcom_q6v5_panic() - panic handler to invoke a stop on the remote
>> * @q6v5: reference to qcom_q6v5 context
>> @@ -250,7 +281,8 @@ EXPORT_SYMBOL_GPL(qcom_q6v5_panic);
>> * Return: 0 on success, negative errno on failure
>> */
>> int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev,
>> - struct rproc *rproc, int crash_reason, const char *load_state,
>> + struct rproc *rproc, int remote_id, int crash_reason,
>> + const char *load_state,
>> void (*handover)(struct qcom_q6v5 *q6v5))
>> {
>> int ret;
>> @@ -258,6 +290,7 @@ int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev,
>> q6v5->rproc = rproc;
>> q6v5->dev = &pdev->dev;
>> q6v5->crash_reason = crash_reason;
>> + q6v5->remote_id = remote_id;
>> q6v5->handover = handover;
>>
>> init_completion(&q6v5->start_done);
>> diff --git a/drivers/remoteproc/qcom_q6v5.h b/drivers/remoteproc/qcom_q6v5.h
>> index 5a859c41896e..d00568339d46 100644
>> --- a/drivers/remoteproc/qcom_q6v5.h
>> +++ b/drivers/remoteproc/qcom_q6v5.h
>> @@ -18,22 +18,29 @@ struct qcom_q6v5 {
>>
>> struct qcom_smem_state *state;
>> struct qmp *qmp;
>> + struct qcom_smem_state *shutdown_state;
>> + struct qcom_smem_state *spawn_state;
>>
>> struct icc_path *path;
>>
>> unsigned stop_bit;
>> + unsigned shutdown_bit;
>> + unsigned spawn_bit;
>>
>> int wdog_irq;
>> int fatal_irq;
>> int ready_irq;
>> int handover_irq;
>> int stop_irq;
>> + int spawn_irq;
>>
>> bool handover_issued;
>>
>> struct completion start_done;
>> struct completion stop_done;
>> + struct completion spawn_done;
>>
>> + int remote_id;
>> int crash_reason;
>>
>> bool running;
>> @@ -43,14 +50,20 @@ struct qcom_q6v5 {
>> };
>>
>> int qcom_q6v5_init(struct qcom_q6v5 *q6v5, struct platform_device *pdev,
>> - struct rproc *rproc, int crash_reason, const char *load_state,
>> + struct rproc *rproc, int remote_id, int crash_reason,
>> + const char *load_state,
>> void (*handover)(struct qcom_q6v5 *q6v5));
>> void qcom_q6v5_deinit(struct qcom_q6v5 *q6v5);
>>
>> int qcom_q6v5_prepare(struct qcom_q6v5 *q6v5);
>> int qcom_q6v5_unprepare(struct qcom_q6v5 *q6v5);
>> int qcom_q6v5_request_stop(struct qcom_q6v5 *q6v5, struct qcom_sysmon *sysmon);
>> +int qcom_q6v5_request_spawn(struct qcom_q6v5 *q6v5);
>> int qcom_q6v5_wait_for_start(struct qcom_q6v5 *q6v5, int timeout);
>> unsigned long qcom_q6v5_panic(struct qcom_q6v5 *q6v5);
>> +irqreturn_t q6v5_fatal_interrupt(int irq, void *data);
>> +irqreturn_t q6v5_ready_interrupt(int irq, void *data);
>> +irqreturn_t q6v5_spawn_interrupt(int irq, void *data);
>> +irqreturn_t q6v5_stop_interrupt(int irq, void *data);
>>
>> #endif
>> diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c
>> index 08d8dad22ca7..bf8909ad5ff5 100644
>> --- a/drivers/remoteproc/qcom_q6v5_adsp.c
>> +++ b/drivers/remoteproc/qcom_q6v5_adsp.c
>> @@ -733,8 +733,9 @@ static int adsp_probe(struct platform_device *pdev)
>> if (ret)
>> goto disable_pm;
>>
>> - ret = qcom_q6v5_init(&adsp->q6v5, pdev, rproc, desc->crash_reason_smem,
>> - desc->load_state, qcom_adsp_pil_handover);
>> + ret = qcom_q6v5_init(&adsp->q6v5, pdev, rproc, QCOM_SMEM_HOST_ANY,
>> + desc->crash_reason_smem, desc->load_state,
>> + qcom_adsp_pil_handover);
>> if (ret)
>> goto disable_pm;
>>
>> diff --git a/drivers/remoteproc/qcom_q6v5_mpd.c b/drivers/remoteproc/qcom_q6v5_mpd.c
>> new file mode 100644
>> index 000000000000..853aa3bc5859
>> --- /dev/null
>> +++ b/drivers/remoteproc/qcom_q6v5_mpd.c
>> @@ -0,0 +1,668 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +/*
>> + * Copyright (C) 2016-2018 Linaro Ltd.
>> + * Copyright (C) 2014 Sony Mobile Communications AB
>> + * Copyright (c) 2012-2018, 2021 The Linux Foundation. All rights reserved.
>> + */
>> +#include <linux/clk.h>
>> +#include <linux/delay.h>
>> +#include <linux/io.h>
>> +#include <linux/iopoll.h>
>> +#include <linux/kernel.h>
>> +#include <linux/module.h>
>> +#include <linux/of_address.h>
>> +#include <linux/of_device.h>
>> +#include <linux/of_reserved_mem.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/reset.h>
>> +#include <linux/soc/qcom/mdt_loader.h>
>> +#include <linux/soc/qcom/smem.h>
>> +#include <linux/soc/qcom/smem_state.h>
>> +#include <linux/firmware/qcom/qcom_scm.h>
>> +#include <linux/interrupt.h>
>> +#include "qcom_common.h"
>> +#include "qcom_q6v5.h"
>> +
>> +#include "remoteproc_internal.h"
>> +
>> +#define WCSS_CRASH_REASON 421
>> +#define WCSS_SMEM_HOST 1
>> +
>> +#define WCNSS_PAS_ID 6
>> +#define MPD_WCNSS_PAS_ID 0xD
>> +
>> +#define BUF_SIZE 35
>> +
>> +/**
>> + * enum state - state of a wcss (private)
>> + * @WCSS_NORMAL: subsystem is operating normally
>> + * @WCSS_CRASHED: subsystem has crashed and hasn't been shutdown
>> + * @WCSS_RESTARTING: subsystem has been shutdown and is now restarting
>> + * @WCSS_SHUTDOWN: subsystem has been shutdown
>> + *
>> + */
>> +enum q6_wcss_state {
>> + WCSS_NORMAL,
>> + WCSS_CRASHED,
>> + WCSS_RESTARTING,
>> + WCSS_SHUTDOWN,
>> +};
>> +
>> +enum {
>> + Q6_IPQ,
>> + WCSS_AHB_IPQ,
>> + WCSS_PCIE_IPQ,
>> +};
>> +
>> +struct q6_wcss {
>> + struct device *dev;
>> + struct qcom_rproc_glink glink_subdev;
>> + struct qcom_rproc_ssr ssr_subdev;
>> + struct qcom_q6v5 q6;
>> + phys_addr_t mem_phys;
>> + phys_addr_t mem_reloc;
>> + void *mem_region;
>> + size_t mem_size;
>> + int crash_reason_smem;
>> + u32 version;
>> + s8 pd_asid;
>> + enum q6_wcss_state state;
>> +};
>> +
>> +struct wcss_data {
>> + int (*init_irq)(struct qcom_q6v5 *q6, struct platform_device *pdev,
>> + struct rproc *rproc, int remote_id,
>> + int crash_reason, const char *load_state,
>> + void (*handover)(struct qcom_q6v5 *q6));
>> + const char *q6_firmware_name;
>> + int crash_reason_smem;
>> + int remote_id;
>> + u32 version;
>> + const char *ssr_name;
>> + const struct rproc_ops *ops;
>> + bool need_auto_boot;
>> + bool glink_subdev_required;
>> + s8 pd_asid;
>> + bool reset_seq;
>> + u32 pasid;
>> + int (*mdt_load_sec)(struct device *dev, const struct firmware *fw,
>> + const char *fw_name, int pas_id, void *mem_region,
>> + phys_addr_t mem_phys, size_t mem_size,
>> + phys_addr_t *reloc_base);
>> +};
>> +
>> +static int q6_wcss_start(struct rproc *rproc)
>> +{
>> + struct q6_wcss *wcss = rproc->priv;
>> + int ret;
>> + struct device_node *upd_np;
>> + struct platform_device *upd_pdev;
>> + struct rproc *upd_rproc;
>> + struct q6_wcss *upd_wcss;
>> + const struct wcss_data *desc;
>> +
>> + desc = of_device_get_match_data(wcss->dev);
>
> Why do you match in start callback, not in probe?
>
I will match it in probe and later use in code wherever required.
>> + if (!desc)
>> + return -EINVAL;
>> +
>> + qcom_q6v5_prepare(&wcss->q6);
>> +
>> + ret = qcom_scm_pas_auth_and_reset(desc->pasid);
>> + if (ret) {
>> + dev_err(wcss->dev, "wcss_reset failed\n");
>> + return ret;
>> + }
>> +
>> + ret = qcom_q6v5_wait_for_start(&wcss->q6, 5 * HZ);
>> + if (ret == -ETIMEDOUT)
>> + dev_err(wcss->dev, "start timed out\n");
>> +
>> + /* Bring userpd wcss state to default value */
>> + for_each_available_child_of_node(wcss->dev->of_node, upd_np) {
>> + if (!strstr(upd_np->name, "pd"))
>
> Device node names are not an ABI. Don't try to make them, NAK.
>
Sure, i will update.
>> + continue;
>> + upd_pdev = of_find_device_by_node(upd_np);
>> + upd_rproc = platform_get_drvdata(upd_pdev);
>> + upd_wcss = upd_rproc->priv;
>> + upd_wcss->state = WCSS_NORMAL;
>> + }
>> + return ret;
>
> So all this looks pretty standard and simialr to other wcss/pils...
>
Yeah basically MPD driver is secure PIL driver. But in MPD model, Q6 and
WCSS block been seperated. On WCSS crash, Q6 still running and we can
recover WCSS alone.
>> +}
>> +
>> +static int q6_wcss_spawn_pd(struct rproc *rproc)
>> +{
>> + int ret;
>> + struct q6_wcss *wcss = rproc->priv;
>> +
>> + ret = qcom_q6v5_request_spawn(&wcss->q6);
>> + if (ret == -ETIMEDOUT) {
>> + pr_err("%s spawn timedout\n", rproc->name);
>> + return ret;
>> + }
>> +
>> + ret = qcom_q6v5_wait_for_start(&wcss->q6, msecs_to_jiffies(10000));
>> + if (ret == -ETIMEDOUT) {
>> + pr_err("%s start timedout\n", rproc->name);
>> + wcss->q6.running = false;
>> + return ret;
>> + }
>> + wcss->q6.running = true;
>> + return ret;
>> +}
>> +
>> +static int wcss_ahb_pcie_pd_start(struct rproc *rproc)
>> +{
>> + struct q6_wcss *wcss = rproc->priv;
>> + const struct wcss_data *desc = of_device_get_match_data(wcss->dev);
>> + int ret;
>> +
>> + if (desc->reset_seq) {
>> + ret = qti_scm_int_radio_powerup(desc->pasid);
>> + if (ret) {
>> + dev_err(wcss->dev, "failed to power up ahb pd\n");
>> + return ret;
>> + }
>> + }
>> +
>> + if (wcss->q6.spawn_bit) {
>> + ret = q6_wcss_spawn_pd(rproc);
>> + if (ret)
>> + return ret;
>> + }
>> +
>> + wcss->state = WCSS_NORMAL;
>> + return 0;
>> +}
>> +
>> +static int q6_wcss_stop(struct rproc *rproc)
>> +{
>> + struct q6_wcss *wcss = rproc->priv;
>> + int ret;
>> + const struct wcss_data *desc =
>> + of_device_get_match_data(wcss->dev);
>> +
>> + if (!desc)
>> + return -EINVAL;
>> +
>> + ret = qcom_scm_pas_shutdown(desc->pasid);
>> + if (ret) {
>> + dev_err(wcss->dev, "not able to shutdown\n");
>> + return ret;
>> + }
>> + qcom_q6v5_unprepare(&wcss->q6);
>> +
>> + return 0;
>> +}
>> +
>> +static int wcss_ahb_pcie_pd_stop(struct rproc *rproc)
>> +{
>> + struct q6_wcss *wcss = rproc->priv;
>> + struct rproc *rpd_rproc = dev_get_drvdata(wcss->dev->parent);
>> + const struct wcss_data *desc = of_device_get_match_data(wcss->dev);
>> + int ret;
>> +
>> + if (rproc->state != RPROC_CRASHED && wcss->q6.stop_bit) {
>> + ret = qcom_q6v5_request_stop(&wcss->q6, NULL);
>> + if (ret) {
>> + dev_err(&rproc->dev, "pd not stopped\n");
>> + return ret;
>> + }
>> + }
>> +
>> + if (desc->reset_seq) {
>> + ret = qti_scm_int_radio_powerdown(desc->pasid);
>> + if (ret) {
>> + dev_err(wcss->dev, "failed to power down pd\n");
>> + return ret;
>> + }
>> + }
>> +
>> + if (rproc->state != RPROC_CRASHED)
>> + rproc_shutdown(rpd_rproc);
>> +
>> + wcss->state = WCSS_SHUTDOWN;
>> + return 0;
>> +}
>> +
>> +static void *q6_wcss_da_to_va(struct rproc *rproc, u64 da, size_t len,
>> + bool *is_iomem)
>> +{
>> + struct q6_wcss *wcss = rproc->priv;
>> + int offset;
>> +
>> + offset = da - wcss->mem_reloc;
>> + if (offset < 0 || offset + len > wcss->mem_size)
>> + return NULL;
>> +
>> + return wcss->mem_region + offset;
>> +}
>> +
>> +static int q6_wcss_load(struct rproc *rproc, const struct firmware *fw)
>> +{
>> + struct q6_wcss *wcss = rproc->priv;
>> + const struct firmware *m3_fw;
>> + int ret;
>> + const char *m3_fw_name;
>> + struct device_node *upd_np;
>> + struct platform_device *upd_pdev;
>> + const struct wcss_data *desc =
>> + of_device_get_match_data(wcss->dev);
>> +
>> + if (!desc)
>> + return -EINVAL;
>> +
>> + /* load m3 firmware */
>> + for_each_available_child_of_node(wcss->dev->of_node, upd_np) {
>> + if (!strstr(upd_np->name, "pd"))
>> + continue;
>> + upd_pdev = of_find_device_by_node(upd_np);
>> +
>> + ret = of_property_read_string(upd_np, "m3_firmware",
>> + &m3_fw_name);
>
> Undocumented property. Drop.
>
I will drop it.
>> + if (!ret && m3_fw_name) {
>> + ret = request_firmware(&m3_fw, m3_fw_name,
>> + &upd_pdev->dev);
>> + if (ret)
>> + continue;
>> +
>> + ret = qcom_mdt_load_no_init(wcss->dev, m3_fw,
>> + m3_fw_name, 0,
>> + wcss->mem_region,
>> + wcss->mem_phys,
>> + wcss->mem_size,
>> + &wcss->mem_reloc);
>> +
>> + release_firmware(m3_fw);
>> +
>> + if (ret) {
>> + dev_err(wcss->dev,
>> + "can't load m3_fw.bXX ret:%d\n", ret);
>> + return ret;
>> + }
>> + }
>> + }
>> +
>> + return qcom_mdt_load(wcss->dev, fw, rproc->firmware,
>> + desc->pasid, wcss->mem_region,
>> + wcss->mem_phys, wcss->mem_size,
>> + &wcss->mem_reloc);
>> +}
>> +
>> +static int wcss_ahb_pcie_pd_load(struct rproc *rproc, const struct firmware *fw)
>> +{
>> + struct q6_wcss *wcss = rproc->priv, *wcss_rpd;
>> + struct rproc *rpd_rproc = dev_get_drvdata(wcss->dev->parent);
>> + int ret;
>> + const struct wcss_data *desc =
>> + of_device_get_match_data(wcss->dev);
>
> Actually now I see you match devices in all over the place. Don't do it,
> there is no need. Match it once and use the result.
>
> This really should not introduce its own patterns and coding style.
>
Sure, i will do it.
>> +
>> + if (!desc)
>> + return -EINVAL;
>> +
>> + wcss_rpd = rpd_rproc->priv;
>> +
>> + /* Boot rootpd rproc */
>> + ret = rproc_boot(rpd_rproc);
>> + if (ret || wcss->state == WCSS_NORMAL)
>> + return ret;
>> +
>> + return desc->mdt_load_sec(wcss->dev, fw, rproc->firmware,
>> + desc->pasid, wcss->mem_region,
>> + wcss->mem_phys, wcss->mem_size,
>> + &wcss->mem_reloc);
>> +}
>
> (...)
>
>> +MODULE_DESCRIPTION("Hexagon WCSS Multipd Peripheral Image Loader");
>> +MODULE_LICENSE("GPL v2");
>> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
>> index ab053084f7a2..48685bb85718 100644
>> --- a/drivers/remoteproc/qcom_q6v5_mss.c
>> +++ b/drivers/remoteproc/qcom_q6v5_mss.c
>> @@ -28,6 +28,7 @@
>> #include <linux/soc/qcom/mdt_loader.h>
>> #include <linux/iopoll.h>
>> #include <linux/slab.h>
>> +#include <linux/soc/qcom/smem.h>
>>
>> #include "remoteproc_internal.h"
>> #include "qcom_common.h"
>> @@ -2070,7 +2071,8 @@ static int q6v5_probe(struct platform_device *pdev)
>> qproc->need_mem_protection = desc->need_mem_protection;
>> qproc->has_mba_logs = desc->has_mba_logs;
>>
>> - ret = qcom_q6v5_init(&qproc->q6v5, pdev, rproc, MPSS_CRASH_REASON_SMEM, "modem",
>> + ret = qcom_q6v5_init(&qproc->q6v5, pdev, rproc, QCOM_SMEM_HOST_ANY,
>
> Not obvious... aren't you doing multiple things in one patch?
>
>
Adding 'remote_id' parameter is not required for bring up. It's required
only for crash handling. Now i will strip off crash handling code from
this series.
Thanks & Regards,
Manikanta.
> Best regards,
> Krzysztof
>
Powered by blists - more mailing lists