Message-ID: <57680235.2060402@linaro.org>
Date:	Mon, 20 Jun 2016 15:48:21 +0100
From:	Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
To:	Bjorn Andersson <bjorn.andersson@...aro.org>,
	Ohad Ben-Cohen <ohad@...ery.com>
Cc:	Ian Campbell <ijc+devicetree@...lion.org.uk>,
	Mark Rutland <mark.rutland@....com>,
	Pawel Moll <pawel.moll@....com>,
	Rob Herring <robh+dt@...nel.org>, devicetree@...r.kernel.org,
	linux-kernel@...r.kernel.org, linux-arm-msm@...r.kernel.org,
	linux-remoteproc@...r.kernel.org,
	Bjorn Andersson <bjorn.andersson@...ymobile.com>
Subject: Re: [PATCH v2 1/2] remoteproc: qcom: Driver for the
 self-authenticating Hexagon v5

Thanks Bjorn for this patch,

I will start playing with patch soon, but here are few comments.

On 17/06/16 18:17, Bjorn Andersson wrote:
> From: Bjorn Andersson <bjorn.andersson@...ymobile.com>
>
> This initial hack powers the q6v5, boots and authenticate the mba and
> use that to load the mdt and subsequent bXX files.
>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@...ymobile.com>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@...aro.org>
> ---
>
> Changes since v1:
> - Corrected boot address in relocation case
> - Using rproc_da_to_va() to clean up mdt loader api
> - Dynamically allocating scratch space for mdt verification
>
>   drivers/remoteproc/Kconfig           |  12 +
>   drivers/remoteproc/Makefile          |   2 +
>   drivers/remoteproc/qcom_mdt_loader.c | 166 +++++++
>   drivers/remoteproc/qcom_mdt_loader.h |  13 +
>   drivers/remoteproc/qcom_q6v5_pil.c   | 914 +++++++++++++++++++++++++++++++++++

We should probably split this patch into two one for mdt loader and 
other for pil.

Also checkpatch reports:

total: 1 errors, 28 warnings, 1117 lines checked


>   5 files changed, 1107 insertions(+)
>   create mode 100644 drivers/remoteproc/qcom_mdt_loader.c
>   create mode 100644 drivers/remoteproc/qcom_mdt_loader.h
>   create mode 100644 drivers/remoteproc/qcom_q6v5_pil.c
>
> diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
> index 72e97d7a5209..9ec66d99b978 100644
> --- a/drivers/remoteproc/Kconfig
> +++ b/drivers/remoteproc/Kconfig
> @@ -77,6 +77,18 @@ config DA8XX_REMOTEPROC
>   	  It's safe to say n here if you're not interested in multimedia
>   	  offloading.
>
> +config QCOM_MDT_LOADER
> +	tristate
> +
> +config QCOM_Q6V5_PIL
> +	tristate "Qualcomm Hexagon V5 Peripherial Image Loader"
> +	depends on OF && ARCH_QCOM
> +	select REMOTEPROC
> +	select QCOM_MDT_LOADER
> +	help
> +	  Say y here to support the Qualcomm Peripherial Image Loader for the
> +	  Hexagon V5 based remote processors.
> +
>   config ST_REMOTEPROC
>   	tristate "ST remoteproc support"
>   	depends on ARCH_STI
> diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile
> index 279cb2edc880..92d3758bd15c 100644
> --- a/drivers/remoteproc/Makefile
> +++ b/drivers/remoteproc/Makefile
> @@ -11,4 +11,6 @@ obj-$(CONFIG_OMAP_REMOTEPROC)		+= omap_remoteproc.o
>   obj-$(CONFIG_STE_MODEM_RPROC)	 	+= ste_modem_rproc.o
>   obj-$(CONFIG_WKUP_M3_RPROC)		+= wkup_m3_rproc.o
>   obj-$(CONFIG_DA8XX_REMOTEPROC)		+= da8xx_remoteproc.o
> +obj-$(CONFIG_QCOM_MDT_LOADER)		+= qcom_mdt_loader.o
> +obj-$(CONFIG_QCOM_Q6V5_PIL)		+= qcom_q6v5_pil.o
>   obj-$(CONFIG_ST_REMOTEPROC)		+= st_remoteproc.o
> diff --git a/drivers/remoteproc/qcom_mdt_loader.c b/drivers/remoteproc/qcom_mdt_loader.c
> new file mode 100644
> index 000000000000..4efeda908d9a
> --- /dev/null
> +++ b/drivers/remoteproc/qcom_mdt_loader.c
> @@ -0,0 +1,166 @@
> +/*
> + * Qualcomm Peripheral Image Loader
> + *
> + * Copyright (C) 2016 Linaro Ltd
> + * Copyright (C) 2015 Sony Mobile Communications Inc
> + * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * version 2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/elf.h>
> +#include <linux/firmware.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/qcom_scm.h>

??

> +#include <linux/remoteproc.h>
> +#include <linux/slab.h>
??

> +
> +#include "remoteproc_internal.h"
> +#include "qcom_mdt_loader.h"
> +
> +/**
> + * qcom_mdt_find_rsc_table() - provide dummy resource table for remoteproc
> + * @rproc:	remoteproc handle
> + * @fw:		firmware header
> + * @tablesz:	outgoing size of the table
> + *
> + * Returns a dummy table.
> + */
> +struct resource_table *qcom_mdt_find_rsc_table(struct rproc *rproc,
> +					       const struct firmware *fw,
> +					       int *tablesz)
> +{
> +	static struct resource_table table = { .ver = 1, };
> +
> +	*tablesz = sizeof(table);
> +	return &table;
> +}
> +EXPORT_SYMBOL_GPL(qcom_mdt_find_rsc_table);
> +
> +int qcom_mdt_parse(const struct firmware *fw, phys_addr_t *fw_addr, size_t *fw_size, bool *fw_relocate)
Missing doc for this function?

> +{
> +	const struct elf32_phdr *phdrs;
> +	const struct elf32_phdr *phdr;
> +	const struct elf32_hdr *ehdr;
> +	phys_addr_t min_addr = (phys_addr_t)ULLONG_MAX;
> +	phys_addr_t max_addr = 0;
> +	bool relocate = false;
> +	int i;
> +
> +	ehdr = (struct elf32_hdr *)fw->data;
> +	phdrs = (struct elf32_phdr *)(ehdr + 1);
> +
> +	for (i = 0; i < ehdr->e_phnum; i++) {
> +		phdr = &phdrs[i];
> +
> +		if (phdr->p_type != PT_LOAD)
> +			continue;
> +
> +		if ((phdr->p_flags & QCOM_MDT_TYPE_MASK) == QCOM_MDT_TYPE_HASH)
> +			continue;
> +
> +		if (!phdr->p_memsz)
> +			continue;
> +
> +		if (phdr->p_flags & QCOM_MDT_RELOCATABLE)
> +			relocate = true;
> +
> +		if (phdr->p_paddr < min_addr)
> +			min_addr = phdr->p_paddr;
> +
> +		if (phdr->p_paddr + phdr->p_memsz > max_addr)
> +			max_addr = round_up(phdr->p_paddr + phdr->p_memsz, SZ_4K);
> +	}
> +
> +	if (fw_addr)
> +		*fw_addr = min_addr;
> +	if (fw_size)
> +		*fw_size = max_addr - min_addr;
> +	if (fw_relocate)
> +		*fw_relocate = relocate;
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(qcom_mdt_parse);
> +
> +/**
> + * qcom_mdt_load() - load the firmware which header is defined in fw
> + * @rproc:	rproc handle
> + * @pas_id:	PAS identifier to load this firmware into

??

> + * @fw:		frimware object for the header

s/frimware/firmware

> + *
> + * Returns 0 on success, negative errno otherwise.
> + */
> +int qcom_mdt_load(struct rproc *rproc,
> +		  const struct firmware *fw,
> +		  const char *firmware)
> +{
> +	const struct elf32_phdr *phdrs;
> +	const struct elf32_phdr *phdr;
> +	const struct elf32_hdr *ehdr;
> +	unsigned fw_name_len;
> +	char *fw_name;
> +	void *ptr;
> +	int ret;
> +	int i;
> +
> +	ehdr = (struct elf32_hdr *)fw->data;
> +	phdrs = (struct elf32_phdr *)(ehdr + 1);
> +
> +	fw_name_len = strlen(firmware);
> +	if (fw_name_len <= 4)
> +		return -EINVAL;
> +
> +	fw_name = kstrdup(firmware, GFP_KERNEL);
> +	if (!fw_name)
> +		return -ENOMEM;
> +
> +	for (i = 0; i < ehdr->e_phnum; i++) {
> +		phdr = &phdrs[i];
> +
> +		if (phdr->p_type != PT_LOAD)
> +			continue;
> +
> +		if ((phdr->p_flags & QCOM_MDT_TYPE_MASK) == QCOM_MDT_TYPE_HASH)
> +			continue;
> +
> +		if (!phdr->p_memsz)
> +			continue;
> +
> +		ptr = rproc_da_to_va(rproc, phdr->p_paddr, phdr->p_memsz);
> +		if (!ptr) {
> +			dev_err(&rproc->dev, "segment outside memory range\n");
> +			ret = -EINVAL;
> +			break;
> +		}
> +
> +		if (phdr->p_filesz) {
> +			sprintf(fw_name + fw_name_len - 3, "b%02d", i);
> +			ret = request_firmware(&fw, fw_name, &rproc->dev);
> +			if (ret) {
> +				dev_err(&rproc->dev, "failed to load %s\n", fw_name);
> +				break;
> +			}
> +
> +			memcpy(ptr, fw->data, fw->size);
> +
> +			release_firmware(fw);
> +		}
> +
> +		if (phdr->p_memsz > phdr->p_filesz)
> +			memset(ptr + phdr->p_filesz, 0, phdr->p_memsz - phdr->p_filesz);
> +	}
> +
> +	kfree(fw_name);
> +
> +	return ret;
> +}
> +EXPORT_SYMBOL_GPL(qcom_mdt_load);

Module Licence info?

> diff --git a/drivers/remoteproc/qcom_mdt_loader.h b/drivers/remoteproc/qcom_mdt_loader.h
> new file mode 100644
> index 000000000000..c5d7122755b6
> --- /dev/null
> +++ b/drivers/remoteproc/qcom_mdt_loader.h
> @@ -0,0 +1,13 @@
> +#ifndef __QCOM_MDT_LOADER_H__
> +#define __QCOM_MDT_LOADER_H__
> +
> +#define QCOM_MDT_TYPE_MASK	(7 << 24)
> +#define QCOM_MDT_TYPE_HASH	(2 << 24)
> +#define QCOM_MDT_RELOCATABLE	BIT(27)
> +
> +struct resource_table * qcom_mdt_find_rsc_table(struct rproc *rproc, const struct firmware *fw, int *tablesz);
> +int qcom_mdt_load(struct rproc *rproc, const struct firmware *fw, const char *fw_name);
> +
> +int qcom_mdt_parse(const struct firmware *fw, phys_addr_t *fw_addr, size_t *fw_size, bool *fw_relocate);
> +
> +#endif
> diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
> new file mode 100644
> index 000000000000..7b1a8269a008
> --- /dev/null
> +++ b/drivers/remoteproc/qcom_q6v5_pil.c
> @@ -0,0 +1,914 @@
> +/*
> + * Qualcomm Peripheral Image Loader
> + *
> + * Copyright (C) 2016 Linaro Ltd.
> + * Copyright (C) 2014 Sony Mobile Communications AB
> + * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * version 2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/delay.h>
> +#include <linux/dma-mapping.h>
> +#include <linux/interrupt.h>
> +#include <linux/kernel.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/module.h>
> +#include <linux/of_address.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include <linux/regulator/consumer.h>
> +#include <linux/remoteproc.h>
> +#include <linux/reset.h>
> +#include <linux/soc/qcom/smem.h>
> +#include <linux/soc/qcom/smem_state.h>
> +
> +#include "remoteproc_internal.h"
> +#include "qcom_mdt_loader.h"
> +
> +#include <linux/qcom_scm.h>
> +
> +#define MBA_FIRMWARE_NAME		"mba.b00"
> +#define MPSS_FIRMWARE_NAME		"modem.mdt"
> +
> +#define MPSS_CRASH_REASON_SMEM		421
> +
> +/* RMB Status Register Values */
> +#define RMB_PBL_SUCCESS			0x1
> +
> +#define RMB_MBA_XPU_UNLOCKED		0x1
> +#define RMB_MBA_XPU_UNLOCKED_SCRIBBLED	0x2
> +#define RMB_MBA_META_DATA_AUTH_SUCCESS	0x3
> +#define RMB_MBA_AUTH_COMPLETE		0x4
> +
> +/* PBL/MBA interface registers */
> +#define RMB_MBA_IMAGE_REG		0x00
> +#define RMB_PBL_STATUS_REG		0x04
> +#define RMB_MBA_COMMAND_REG		0x08
> +#define RMB_MBA_STATUS_REG		0x0C
> +#define RMB_PMI_META_DATA_REG		0x10
> +#define RMB_PMI_CODE_START_REG		0x14
> +#define RMB_PMI_CODE_LENGTH_REG		0x18
> +
> +#define RMB_CMD_META_DATA_READY		0x1
> +#define RMB_CMD_LOAD_READY		0x2
> +
> +/* QDSP6SS Register Offsets */
> +#define QDSP6SS_RESET_REG		0x014
> +#define QDSP6SS_GFMUX_CTL_REG		0x020
> +#define QDSP6SS_PWR_CTL_REG		0x030
> +
> +/* AXI Halt Register Offsets */
> +#define AXI_HALTREQ_REG			0x0
> +#define AXI_HALTACK_REG			0x4
> +#define AXI_IDLE_REG			0x8
> +
> +#define HALT_ACK_TIMEOUT_MS		100
> +
> +/* QDSP6SS_RESET */
> +#define Q6SS_STOP_CORE			BIT(0)
> +#define Q6SS_CORE_ARES			BIT(1)
> +#define Q6SS_BUS_ARES_ENABLE		BIT(2)
> +
> +/* QDSP6SS_GFMUX_CTL */
> +#define Q6SS_CLK_ENABLE			BIT(1)
> +
> +/* QDSP6SS_PWR_CTL */
> +#define Q6SS_L2DATA_SLP_NRET_N_0	BIT(0)
> +#define Q6SS_L2DATA_SLP_NRET_N_1	BIT(1)
> +#define Q6SS_L2DATA_SLP_NRET_N_2	BIT(2)
> +#define Q6SS_L2TAG_SLP_NRET_N		BIT(16)
> +#define Q6SS_ETB_SLP_NRET_N		BIT(17)
> +#define Q6SS_L2DATA_STBY_N		BIT(18)
> +#define Q6SS_SLP_RET_N			BIT(19)
> +#define Q6SS_CLAMP_IO			BIT(20)
> +#define QDSS_BHS_ON			BIT(21)
> +#define QDSS_LDO_BYP			BIT(22)
> +
> +struct q6v5 {
> +	struct device *dev;
> +	struct rproc *rproc;
> +
> +	void __iomem *reg_base;
> +	void __iomem *rmb_base;
> +
> +	struct regmap *halt_map;
> +	u32 halt_q6;
> +	u32 halt_modem;
> +	u32 halt_nc;
> +
> +	struct reset_control *mss_restart;
> +
> +	struct qcom_smem_state *state;
> +	unsigned stop_bit;
> +
> +	struct regulator_bulk_data supply[4];
> +
> +	struct clk *ahb_clk;
> +	struct clk *axi_clk;
> +	struct clk *rom_clk;
> +
> +	struct completion start_done;
> +	struct completion stop_done;
> +	bool running;
> +
> +	phys_addr_t mba_phys;
> +	void *mba_region;
> +	size_t mba_size;
> +
> +	phys_addr_t mpss_phys;
> +	phys_addr_t mpss_reloc;
> +	void *mpss_region;
> +	size_t mpss_size;
> +};
> +
> +enum {
> +	Q6V5_SUPPLY_CX,
> +	Q6V5_SUPPLY_MX,
> +	Q6V5_SUPPLY_MSS,
> +	Q6V5_SUPPLY_PLL,
> +};
> +
> +static int q6v5_regulator_init(struct q6v5 *qproc)
> +{
> +	int ret;
> +
> +	qproc->supply[Q6V5_SUPPLY_CX].supply = "cx";
> +	qproc->supply[Q6V5_SUPPLY_MX].supply = "mx";
> +	qproc->supply[Q6V5_SUPPLY_MSS].supply = "mss";
> +	qproc->supply[Q6V5_SUPPLY_PLL].supply = "pll";
> +
> +	ret = devm_regulator_bulk_get(qproc->dev,
> +				      ARRAY_SIZE(qproc->supply), qproc->supply);
> +	if (ret < 0) {
> +		dev_err(qproc->dev, "failed to get supplies\n");
> +		return ret;
> +	}
> +
> +	regulator_set_load(qproc->supply[Q6V5_SUPPLY_CX].consumer, 100000);
> +	regulator_set_load(qproc->supply[Q6V5_SUPPLY_MSS].consumer, 100000);
> +	regulator_set_load(qproc->supply[Q6V5_SUPPLY_PLL].consumer, 10000);
> +
> +	return 0;
> +}
> +
> +static int q6v5_regulator_enable(struct q6v5 *qproc)
> +{
> +	int ret;
> +
> +	/* TODO: Q6V5_SUPPLY_CX is supposed to be set to super-turbo here */
> +	ret = regulator_set_voltage(qproc->supply[Q6V5_SUPPLY_MX].consumer,
> +				    1050000, INT_MAX);
> +	if (ret)
> +		return ret;
> +
> +	regulator_set_voltage(qproc->supply[Q6V5_SUPPLY_MSS].consumer,
> +			      1000000, 1150000);
> +
> +	return regulator_bulk_enable(ARRAY_SIZE(qproc->supply), qproc->supply);
> +}
> +
> +static void q6v5_regulator_disable(struct q6v5 *qproc)
> +{
> +	regulator_bulk_disable(ARRAY_SIZE(qproc->supply), qproc->supply);
> +	regulator_set_voltage(qproc->supply[Q6V5_SUPPLY_CX].consumer, 0, INT_MAX);
> +	regulator_set_voltage(qproc->supply[Q6V5_SUPPLY_MX].consumer, 0, INT_MAX);

we disable the regulators and then set voltage why?
I think these should be moved to q6v5_regulator_enable() unless am 
missing something here.

> +	regulator_set_voltage(qproc->supply[Q6V5_SUPPLY_MSS].consumer, 0, 1150000);
> +}
> +
> +static int q6v5_load(struct rproc *rproc, const struct firmware *fw)
> +{
> +	struct q6v5 *qproc = rproc->priv;
> +
> +	memcpy(qproc->mba_region, fw->data, fw->size);
> +
> +	return 0;
> +}
> +
> +static const struct rproc_fw_ops q6v5_fw_ops = {
> +	.find_rsc_table = qcom_mdt_find_rsc_table,
> +	.load = q6v5_load,
> +};
> +
> +static int q6v5_rmb_pbl_wait(struct q6v5 *qproc, int ms)
> +{
> +	unsigned long timeout;
> +	s32 val;
> +
> +	timeout = jiffies + msecs_to_jiffies(ms);
> +	for (;;) {
> +		val = readl(qproc->rmb_base + RMB_PBL_STATUS_REG);
> +		if (val)

I think making an explicit check for a bits of interest would be much 
readable.
Or a comment would be good.


> +			break;
> +
> +		if (time_after(jiffies, timeout))
> +			return -ETIMEDOUT;
> +
> +		msleep(1);
> +	}
> +
> +	return val;
> +}
> +
> +static int q6v5_rmb_mba_wait(struct q6v5 *qproc, u32 status, int ms)
> +{
> +
> +	unsigned long timeout;
> +	s32 val;
> +
> +	timeout = jiffies + msecs_to_jiffies(ms);
> +	for (;;) {
> +		val = readl(qproc->rmb_base + RMB_MBA_STATUS_REG);
> +		if (val < 0)
> +			break;
> +
> +		if (!status && val)
> +			break;
> +		else if (status && val == status)
> +			break;
> +
> +		if (time_after(jiffies, timeout))
> +			return -ETIMEDOUT;
> +
> +		msleep(1);
> +	}
> +
> +	return val;
> +}
> +
> +static void q6v5proc_reset(struct q6v5 *qproc)
> +{
> +	u32 val;
> +
> +	/* Assert resets, stop core */
> +	val = readl(qproc->reg_base + QDSP6SS_RESET_REG);
> +	val |= (Q6SS_CORE_ARES | Q6SS_BUS_ARES_ENABLE | Q6SS_STOP_CORE);
> +	writel(val, qproc->reg_base + QDSP6SS_RESET_REG);
> +
> +	/* Enable power block headswitch, and wait for it to stabilize */
> +	val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
> +	val |= QDSS_BHS_ON | QDSS_LDO_BYP;
> +	writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
> +	mb();
> +	udelay(1);
> +
> +	/*
> +	 * Turn on memories. L2 banks should be done individually
> +	 * to minimize inrush current.
> +	 */
> +	val = readl(qproc->reg_base + QDSP6SS_PWR_CTL_REG);
> +	val |= Q6SS_SLP_RET_N | Q6SS_L2TAG_SLP_NRET_N |
> +		Q6SS_ETB_SLP_NRET_N | Q6SS_L2DATA_STBY_N;
> +	writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
> +	val |= Q6SS_L2DATA_SLP_NRET_N_2;
> +	writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
> +	val |= Q6SS_L2DATA_SLP_NRET_N_1;
> +	writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
> +	val |= Q6SS_L2DATA_SLP_NRET_N_0;
> +	writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
> +
> +	/* Remove IO clamp */
> +	val &= ~Q6SS_CLAMP_IO;
> +	writel(val, qproc->reg_base + QDSP6SS_PWR_CTL_REG);
> +
> +	/* Bring core out of reset */
> +	val = readl(qproc->reg_base + QDSP6SS_RESET_REG);
> +	val &= ~Q6SS_CORE_ARES;
> +	writel(val, qproc->reg_base + QDSP6SS_RESET_REG);
> +
> +	/* Turn on core clock */
> +	val = readl(qproc->reg_base + QDSP6SS_GFMUX_CTL_REG);
> +	val |= Q6SS_CLK_ENABLE;
> +	writel(val, qproc->reg_base + QDSP6SS_GFMUX_CTL_REG);
> +
> +	/* Start core execution */
> +	val = readl(qproc->reg_base + QDSP6SS_RESET_REG);
> +	val &= ~Q6SS_STOP_CORE;
> +	writel(val, qproc->reg_base + QDSP6SS_RESET_REG);
> +}
> +
> +static void q6v5proc_halt_axi_port(struct q6v5 *qproc,
> +				   struct regmap *halt_map,
> +				   u32 offset)
> +{
> +	unsigned long timeout;
> +	unsigned int val;
> +	int ret;
> +
> +	/* Check if we're already idle */
> +	ret = regmap_read(halt_map, offset + AXI_IDLE_REG, &val);
> +	if (!ret && val)
> +		return;
> +
> +	/* Assert halt request */
> +	regmap_write(halt_map, offset + AXI_HALTREQ_REG, 1);
> +
> +	/* Wait for halt */
> +	timeout = jiffies + msecs_to_jiffies(HALT_ACK_TIMEOUT_MS);
> +	for (;;) {
> +		ret = regmap_read(halt_map, offset + AXI_HALTACK_REG, &val);
> +		if (ret || val || time_after(jiffies, timeout))
> +			break;
> +
> +		msleep(1);
> +	}
> +
> +	ret = regmap_read(halt_map, offset + AXI_IDLE_REG, &val);
> +	if (ret || !val)
> +		dev_err(qproc->dev, "port failed halt\n");
> +
> +	/* Clear halt request (port will remain halted until reset) */
> +	regmap_write(halt_map, offset + AXI_HALTREQ_REG, 0);
> +}
> +
> +static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw)
> +{
> +	DEFINE_DMA_ATTRS(attrs);
> +	dma_addr_t phys;
> +	void *ptr;
> +	int ret;
> +
> +	dma_set_attr(DMA_ATTR_FORCE_CONTIGUOUS, &attrs);
> +	ptr = dma_alloc_attrs(qproc->dev, fw->size, &phys, GFP_KERNEL, &attrs);
> +	if (!ptr) {
> +		dev_err(qproc->dev, "failed to allocate mdt buffer\n");
> +		return -ENOMEM;
> +	}
> +
> +	memcpy(ptr, fw->data, fw->size);
> +
> +	writel(phys, qproc->rmb_base + RMB_PMI_META_DATA_REG);
> +	writel(RMB_CMD_META_DATA_READY, qproc->rmb_base + RMB_MBA_COMMAND_REG);
> +
> +	ret = q6v5_rmb_mba_wait(qproc, RMB_MBA_META_DATA_AUTH_SUCCESS, 1000);
> +	if (ret == -ETIMEDOUT)
> +		dev_err(qproc->dev, "MBA header authentication timed out\n");
> +	else if (ret < 0)
> +		dev_err(qproc->dev, "MBA returned error %d for MDT header\n", ret);
> +
> +	dma_free_attrs(qproc->dev, fw->size, ptr, phys, &attrs);
> +
> +	return ret < 0 ? ret : 0;
> +}
> +
> +static int q6v5_mpss_validate(struct q6v5 *qproc, const struct firmware *fw)
> +{
> +	const struct elf32_phdr *phdrs;
> +	const struct elf32_phdr *phdr;
> +	struct elf32_hdr *ehdr;
> +	phys_addr_t boot_addr;
> +	phys_addr_t fw_addr;
> +	bool relocate;
> +	size_t size;
> +	u32 val;
> +	int ret;
> +	int i;
> +
> +	ret = qcom_mdt_parse(fw, &fw_addr, NULL, &relocate);
> +	if (ret) {
> +		dev_err(qproc->dev, "failed to parse mdt header\n");
> +		return ret;
> +	}
> +
> +	if (relocate)
> +		boot_addr = qproc->mpss_phys;
> +	else
> +		boot_addr = fw_addr;
> +
> +	ehdr = (struct elf32_hdr *)fw->data;
> +	phdrs = (struct elf32_phdr *)(ehdr + 1);
> +	for (i = 0; i < ehdr->e_phnum; i++, phdr++) {
> +		phdr = &phdrs[i];
> +
> +		if (phdr->p_type != PT_LOAD)
> +			continue;
> +
> +		if ((phdr->p_flags & QCOM_MDT_TYPE_MASK) == QCOM_MDT_TYPE_HASH)
> +			continue;
> +
> +		if (!phdr->p_memsz)
> +			continue;
> +
> +		size = readl(qproc->rmb_base + RMB_PMI_CODE_LENGTH_REG);
> +		if (!size) {
> +			writel(boot_addr, qproc->rmb_base + RMB_PMI_CODE_START_REG);
> +			writel(RMB_CMD_LOAD_READY, qproc->rmb_base + RMB_MBA_COMMAND_REG);
> +		}
> +
> +		size += phdr->p_memsz;
> +		writel(size, qproc->rmb_base + RMB_PMI_CODE_LENGTH_REG);
> +	}
> +
> +	val = readl(qproc->rmb_base + RMB_MBA_STATUS_REG);
> +	return val < 0 ? val : 0;
> +}
> +
> +static int q6v5_mpss_load(struct q6v5 *qproc)
> +{
> +	const struct firmware *fw;
> +	phys_addr_t fw_addr;
> +	bool relocate;
> +	int ret;
> +
> +	ret = request_firmware(&fw, MPSS_FIRMWARE_NAME, qproc->dev);
> +	if (ret < 0) {
> +		dev_err(qproc->dev, "unable to load " MPSS_FIRMWARE_NAME "\n");
> +		return ret;
> +	}
> +
> +	ret = qcom_mdt_parse(fw, &fw_addr, NULL, &relocate);
> +	if (ret) {
> +		dev_err(qproc->dev, "failed to parse mdt header\n");
> +		goto release_firmware;
> +	}
> +
> +	if (relocate)
> +		qproc->mpss_reloc = fw_addr;
> +
> +	/* Initialize the RMB validator */
> +	writel(0, qproc->rmb_base + RMB_PMI_CODE_LENGTH_REG);
> +
> +	ret = q6v5_mpss_init_image(qproc, fw);
> +	if (ret)
> +		goto release_firmware;
> +
> +	ret = qcom_mdt_load(qproc->rproc, fw, MPSS_FIRMWARE_NAME);
> +	if (ret)
> +		goto release_firmware;
> +
> +	ret = q6v5_mpss_validate(qproc, fw);
> +	if (ret)
> +		goto release_firmware;
> +
> +	ret = q6v5_rmb_mba_wait(qproc, RMB_MBA_AUTH_COMPLETE, 10000);
> +	if (ret == -ETIMEDOUT)
> +		dev_err(qproc->dev, "MBA authentication timed out\n");
> +	else if (ret < 0)
> +		dev_err(qproc->dev, "MBA returned error %d\n", ret);
> +
> +release_firmware:
> +	release_firmware(fw);
> +
> +	return ret < 0 ? ret : 0;
> +}
> +
> +static int q6v5_start(struct rproc *rproc)
> +{
> +	struct q6v5 *qproc = (struct q6v5 *)rproc->priv;
> +	int ret;
> +
> +	ret = q6v5_regulator_enable(qproc);
> +	if (ret) {
> +		dev_err(qproc->dev, "failed to enable supplies\n");
> +		return ret;
> +	}
> +
> +	ret = reset_control_deassert(qproc->mss_restart);
> +	if (ret) {
> +		dev_err(qproc->dev, "failed to deassert mss restart\n");
> +		goto disable_vdd;
> +	}
> +
> +	ret = clk_prepare_enable(qproc->ahb_clk);
> +	if (ret)
> +		goto assert_reset;
> +
> +	ret = clk_prepare_enable(qproc->axi_clk);
> +	if (ret)
> +		goto disable_ahb_clk;
> +
> +	ret = clk_prepare_enable(qproc->rom_clk);
> +	if (ret)
> +		goto disable_axi_clk;
> +
> +	writel(qproc->mba_phys, qproc->rmb_base + RMB_MBA_IMAGE_REG);
> +
> +	q6v5proc_reset(qproc);
> +
> +	ret = q6v5_rmb_pbl_wait(qproc, 1000);
> +	if (ret == -ETIMEDOUT) {
> +		dev_err(qproc->dev, "PBL boot timed out\n");
> +		goto halt_axi_ports;
> +	} else if (ret != RMB_PBL_SUCCESS) {
> +		dev_err(qproc->dev, "PBL returned unexpected status %d\n", ret);
> +		ret = -EINVAL;
> +		goto halt_axi_ports;
> +	}
> +
> +	ret = q6v5_rmb_mba_wait(qproc, 0, 5000);
> +	if (ret == -ETIMEDOUT) {
> +		dev_err(qproc->dev, "MBA boot timed out\n");
> +		goto halt_axi_ports;
> +	} else if (ret != RMB_MBA_XPU_UNLOCKED && ret != RMB_MBA_XPU_UNLOCKED_SCRIBBLED) {
> +		dev_err(qproc->dev, "MBA returned unexpected status %d\n", ret);
> +		ret = -EINVAL;
> +		goto halt_axi_ports;
> +	}
> +
> +	dev_info(qproc->dev, "MBA booted, loading mpss\n");
> +
> +	ret = q6v5_mpss_load(qproc);
> +	if (ret)
> +		goto halt_axi_ports;
> +
> +	ret = wait_for_completion_timeout(&qproc->start_done,
> +					  msecs_to_jiffies(5000));
> +	if (ret == 0) {
> +		dev_err(qproc->dev, "start timed out\n");
> +		ret = -ETIMEDOUT;
> +		goto halt_axi_ports;
> +	}
> +
> +	qproc->running = true;
> +
> +	/* All done, release the handover resources */
> +
> +	return 0;
> +
> +halt_axi_ports:
> +	q6v5proc_halt_axi_port(qproc, qproc->halt_map, qproc->halt_q6);
> +	q6v5proc_halt_axi_port(qproc, qproc->halt_map, qproc->halt_modem);
> +	q6v5proc_halt_axi_port(qproc, qproc->halt_map, qproc->halt_nc);
> +disable_axi_clk:
> +	clk_disable_unprepare(qproc->axi_clk);
> +disable_ahb_clk:
> +	clk_disable_unprepare(qproc->ahb_clk);
> +assert_reset:
> +	reset_control_assert(qproc->mss_restart);
> +disable_vdd:
> +	q6v5_regulator_disable(qproc);
> +
> +	return ret;
> +}
> +
> +static int q6v5_stop(struct rproc *rproc)
> +{
> +	struct q6v5 *qproc = (struct q6v5 *)rproc->priv;
> +	int ret;
> +
> +	qproc->running = false;
> +
> +	qcom_smem_state_update_bits(qproc->state,
> +				    BIT(qproc->stop_bit), BIT(qproc->stop_bit));
> +
> +	ret = wait_for_completion_timeout(&qproc->stop_done,
> +					  msecs_to_jiffies(5000));
> +	if (ret == 0)
> +		dev_err(qproc->dev, "timed out on wait\n");
> +
> +	qcom_smem_state_update_bits(qproc->state, BIT(qproc->stop_bit), 0);
> +
> +	q6v5proc_halt_axi_port(qproc, qproc->halt_map, qproc->halt_q6);
> +	q6v5proc_halt_axi_port(qproc, qproc->halt_map, qproc->halt_modem);
> +	q6v5proc_halt_axi_port(qproc, qproc->halt_map, qproc->halt_nc);
> +
> +	reset_control_assert(qproc->mss_restart);
> +	clk_disable_unprepare(qproc->axi_clk);
> +	clk_disable_unprepare(qproc->ahb_clk);
> +	q6v5_regulator_disable(qproc);
> +
> +	return 0;
> +}
> +
> +static void *q6v5_da_to_va(struct rproc *rproc, u64 da, int len)
> +{
> +	struct q6v5 *qproc = rproc->priv;
> +	int offset;
> +
> +	offset = da - qproc->mpss_reloc;
> +	if (offset < 0 || offset + len > qproc->mpss_size)
> +		return NULL;
> +
> +	return qproc->mpss_region + offset;
> +}
> +
> +static const struct rproc_ops q6v5_ops = {
> +	.start = q6v5_start,
> +	.stop = q6v5_stop,
> +	.da_to_va = q6v5_da_to_va,
> +};
> +
> +static irqreturn_t q6v5_wdog_interrupt(int irq, void *dev)
> +{
> +	struct q6v5 *qproc = dev;
> +	size_t len;
> +	char *msg;
> +
> +	/* Sometimes the stop triggers a watchdog rather than a stop-ack */
> +	if (!qproc->running) {
> +		complete(&qproc->stop_done);
> +		return IRQ_HANDLED;
> +	}
> +
> +	msg = qcom_smem_get(QCOM_SMEM_HOST_ANY, MPSS_CRASH_REASON_SMEM, &len);
> +	if (!IS_ERR(msg) && len > 0 && msg[0])
> +		dev_err(qproc->dev, "watchdog received: %s\n", msg);
> +	else
> +		dev_err(qproc->dev, "watchdog without message\n");
> +
> +	rproc_report_crash(qproc->rproc, RPROC_WATCHDOG);
> +
> +	if (!IS_ERR(msg))
> +		msg[0] = '\0';
> +
> +	return IRQ_HANDLED;
> +}
> +
> +static irqreturn_t q6v5_fatal_interrupt(int irq, void *dev)
> +{
> +	struct q6v5 *qproc = dev;
> +	size_t len;
> +	char *msg;
> +
> +	msg = qcom_smem_get(QCOM_SMEM_HOST_ANY, MPSS_CRASH_REASON_SMEM, &len);
> +	if (!IS_ERR(msg) && len > 0 && msg[0])
> +		dev_err(qproc->dev, "fatal error received: %s\n", msg);
> +	else
> +		dev_err(qproc->dev, "fatal error without message\n");
> +
> +	rproc_report_crash(qproc->rproc, RPROC_FATAL_ERROR);
> +
> +	if (!IS_ERR(msg))
> +		msg[0] = '\0';
> +
> +	return IRQ_HANDLED;
> +}
> +
> +static irqreturn_t q6v5_handover_interrupt(int irq, void *dev)
> +{
> +	struct q6v5 *qproc = dev;
> +
> +	complete(&qproc->start_done);
> +	return IRQ_HANDLED;
> +}
> +
> +static irqreturn_t q6v5_stop_ack_interrupt(int irq, void *dev)
> +{
> +	struct q6v5 *qproc = dev;
> +
> +	complete(&qproc->stop_done);
> +	return IRQ_HANDLED;
> +}
> +
> +static int q6v5_init_mem(struct q6v5 *qproc, struct platform_device *pdev)
> +{
> +	struct device_node *halt_np;
> +	struct resource *res;
> +	int ret;
> +
> +	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qdsp6");
> +	qproc->reg_base = devm_ioremap_resource(&pdev->dev, res);
> +	if (IS_ERR(qproc->reg_base)) {
> +		dev_err(qproc->dev, "failed to get qdsp6_base\n");
> +		return PTR_ERR(qproc->reg_base);
> +	}
> +
> +	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rmb");
> +	qproc->rmb_base = devm_ioremap_resource(&pdev->dev, res);
> +	if (IS_ERR(qproc->rmb_base)) {
> +		dev_err(qproc->dev, "failed to get rmb_base\n");
> +		return PTR_ERR(qproc->rmb_base);
> +	}
> +

> +	halt_np = of_parse_phandle(pdev->dev.of_node, "qcom,halt-regs", 0);
> +	if (!halt_np) {
> +		dev_err(&pdev->dev, "no qcom,halt-regs node\n");
> +		return -ENODEV;
> +	}
> +
> +	qproc->halt_map = syscon_node_to_regmap(halt_np);
> +	if (IS_ERR(qproc->halt_map))
> +		return PTR_ERR(qproc->halt_map);
> +
> +	ret = of_property_read_u32_index(pdev->dev.of_node, "qcom,halt-regs",
> +					 1, &qproc->halt_q6);
> +	if (ret < 0) {
> +		dev_err(&pdev->dev, "no q6 halt offset\n");
> +		return -EINVAL;
> +	}
> +
> +	ret = of_property_read_u32_index(pdev->dev.of_node, "qcom,halt-regs",
> +					 2, &qproc->halt_modem);
> +	if (ret < 0) {
> +		dev_err(&pdev->dev, "no modem halt offset\n");
> +		return -EINVAL;
> +	}
> +
> +	ret = of_property_read_u32_index(pdev->dev.of_node, "qcom,halt-regs",
> +					 3, &qproc->halt_nc);
> +	if (ret < 0) {
> +		dev_err(&pdev->dev, "no nc halt offset\n");
> +		return -EINVAL;
> +	}
We could used of_parse_phandle_with_fixed_args() here.

> +
> +	return 0;
> +}
> +
> +static int q6v5_init_clocks(struct q6v5 *qproc)
> +{
> +	qproc->ahb_clk = devm_clk_get(qproc->dev, "iface");
> +	if (IS_ERR(qproc->ahb_clk)) {
> +		dev_err(qproc->dev, "failed to get iface clock\n");
> +		return PTR_ERR(qproc->ahb_clk);
> +	}
> +
> +	qproc->axi_clk = devm_clk_get(qproc->dev, "bus");
> +	if (IS_ERR(qproc->axi_clk)) {
> +		dev_err(qproc->dev, "failed to get bus clock\n");
> +		return PTR_ERR(qproc->axi_clk);
> +	}
> +
> +	qproc->rom_clk = devm_clk_get(qproc->dev, "mem");
> +	if (IS_ERR(qproc->rom_clk)) {
> +		dev_err(qproc->dev, "failed to get mem clock\n");
> +		return PTR_ERR(qproc->rom_clk);
> +	}
> +
> +	return 0;
> +}
> +
> +static int q6v5_init_reset(struct q6v5 *qproc)
> +{
> +	qproc->mss_restart = devm_reset_control_get(qproc->dev, NULL);
> +	if (IS_ERR(qproc->mss_restart)) {
> +		dev_err(qproc->dev, "failed to acquire mss restart\n");
> +		return PTR_ERR(qproc->mss_restart);
> +	}
> +
> +	return 0;
> +}
> +
> +static int q6v5_request_irq(struct q6v5 *qproc,
> +			     struct platform_device *pdev,
> +			     const char *name,
> +			     irq_handler_t thread_fn)
> +{
> +	int ret;
> +
> +	ret = platform_get_irq_byname(pdev, name);
> +	if (ret < 0) {
> +		dev_err(&pdev->dev, "no %s IRQ defined\n", name);
> +		return ret;
> +	}
> +
> +	ret = devm_request_threaded_irq(&pdev->dev, ret,
> +					NULL, thread_fn,
> +					IRQF_TRIGGER_RISING | IRQF_ONESHOT,
> +					"q6v5", qproc);
> +	if (ret)
> +		dev_err(&pdev->dev, "request %s IRQ failed\n", name);
New line.
> +	return ret;
> +}
> +
> +static int q6v5_alloc_memory_region(struct q6v5 *qproc)
> +{
> +	struct device_node *child;
> +	struct device_node *node;
> +	struct resource r;
> +	int ret;
> +
<---
> +	child = of_get_child_by_name(qproc->dev->of_node, "mba");
> +	node = of_parse_phandle(child, "memory-region", 0);
> +	ret = of_address_to_resource(node, 0, &r);
> +	if (ret) {
> +		dev_err(qproc->dev, "unable to resolve mba region\n");
> +		return ret;
> +	}
> +
> +	qproc->mba_phys = r.start;
> +	qproc->mba_size = resource_size(&r);
> +	qproc->mba_region = devm_ioremap_wc(qproc->dev, qproc->mba_phys, qproc->mba_size);
> +	if (!qproc->mba_region) {
> +		dev_err(qproc->dev, "unable to map memory region: %pa+%zx\n",
> +			&r.start, qproc->mba_size);
> +		return -EBUSY;
> +	}
> +
-->

Looks like same code below, we could add a function to do the same.

> +	child = of_get_child_by_name(qproc->dev->of_node, "mpss");
> +	node = of_parse_phandle(child, "memory-region", 0);
> +	ret = of_address_to_resource(node, 0, &r);
> +	if (ret) {
> +		dev_err(qproc->dev, "unable to resolve mpss region\n");
> +		return ret;
> +	}
> +
> +	qproc->mpss_phys = qproc->mpss_reloc = r.start;
> +	qproc->mpss_size = resource_size(&r);
> +	qproc->mpss_region = devm_ioremap_wc(qproc->dev, qproc->mpss_phys, qproc->mpss_size);
> +	if (!qproc->mpss_region) {
> +		dev_err(qproc->dev, "unable to map memory region: %pa+%zx\n",
> +			&r.start, qproc->mpss_size);
> +		return -EBUSY;
> +	}
> +
> +	return 0;
> +}
> +
> +static int q6v5_probe(struct platform_device *pdev)
> +{
> +	struct q6v5 *qproc;
> +	struct rproc *rproc;
> +	int ret;
> +
> +	rproc = rproc_alloc(&pdev->dev, pdev->name, &q6v5_ops,
> +			    MBA_FIRMWARE_NAME, sizeof(*qproc));
> +	if (!rproc) {
> +		dev_err(&pdev->dev, "failed to allocate rproc\n");
> +		return -ENOMEM;
> +	}
> +
> +	rproc->fw_ops = &q6v5_fw_ops;
> +
> +	qproc = (struct q6v5 *)rproc->priv;
> +	qproc->dev = &pdev->dev;
> +	qproc->rproc = rproc;
> +	platform_set_drvdata(pdev, qproc);
> +
> +	init_completion(&qproc->start_done);
> +	init_completion(&qproc->stop_done);
> +
> +	ret = q6v5_init_mem(qproc, pdev);
> +	if (ret)
> +		goto free_rproc;
> +
> +	ret = q6v5_alloc_memory_region(qproc);
> +	if (ret)
> +		goto free_rproc;
> +
> +	ret = q6v5_init_clocks(qproc);
> +	if (ret)
> +		goto free_rproc;
> +
> +	ret = q6v5_regulator_init(qproc);
> +	if (ret)
> +		goto free_rproc;
> +
> +	ret = q6v5_init_reset(qproc);
> +	if (ret)
> +		goto free_rproc;
> +
> +	ret = q6v5_request_irq(qproc, pdev, "wdog", q6v5_wdog_interrupt);
> +	if (ret < 0)
> +		goto free_rproc;
> +
> +	ret = q6v5_request_irq(qproc, pdev, "fatal", q6v5_fatal_interrupt);
> +	if (ret < 0)
> +		goto free_rproc;
> +
> +	ret = q6v5_request_irq(qproc, pdev, "handover", q6v5_handover_interrupt);
> +	if (ret < 0)
> +		goto free_rproc;
> +
> +	ret = q6v5_request_irq(qproc, pdev, "stop-ack", q6v5_stop_ack_interrupt);
> +	if (ret < 0)
> +		goto free_rproc;
> +
> +	qproc->state = qcom_smem_state_get(&pdev->dev, "stop", &qproc->stop_bit);
> +	if (IS_ERR(qproc->state))
> +		goto free_rproc;
> +
> +	ret = rproc_add(rproc);
> +	if (ret)
> +		goto free_rproc;
> +
> +	return 0;
> +
> +free_rproc:
> +	rproc_put(rproc);
> +
> +	return ret;
> +}
> +
> +static int q6v5_remove(struct platform_device *pdev)
> +{
> +	struct q6v5 *qproc = platform_get_drvdata(pdev);
> +
> +	rproc_del(qproc->rproc);
> +	rproc_put(qproc->rproc);
clk_uprepare_disable of the used clks here?
resets?

> +
> +	return 0;
> +}
> +
> +static const struct of_device_id q6v5_of_match[] = {
> +	{ .compatible = "qcom,q6v5-pil", },
> +	{ },
> +};
> +
> +static struct platform_driver q6v5_driver = {
> +	.probe = q6v5_probe,
> +	.remove = q6v5_remove,
> +	.driver = {
> +		.name = "qcom-q6v5-pil",
> +		.of_match_table = q6v5_of_match,
> +	},
> +};
> +
> +module_platform_driver(q6v5_driver);

Module licence?

>

Powered by blists - more mailing lists