Unverified Commit e4fb7b44 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.16-firmware' of... 

Merge tag 'tegra-for-5.16-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers

firmware: tegra: Changes for v5.16-rc1

This contains a fix for a stack usage problem that was causing build
failures on 32-bit ARM and a minor janitorial cleanup.

* tag 'tegra-for-5.16-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  firmware: tegra: bpmp: Use devm_platform_ioremap_resource()
  firmware: tegra: Reduce stack usage

Link: https://lore.kernel.org/r/20211008201132.1678814-3-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 88557618 f11c34bd

drivers/firmware/tegra/bpmp-debugfs.c

+17 −9
Original line number Diff line number Diff line
@@ -74,28 +74,36 @@ static void seqbuf_seek(struct seqbuf *seqbuf, ssize_t offset) 
static const char *get_filename(struct tegra_bpmp *bpmp,

				const struct file *file, char *buf, int size)

{

	char root_path_buf[512];

	const char *root_path;

	const char *filename;

	const char *root_path, *filename = NULL;

	char *root_path_buf;

	size_t root_len;



	root_path_buf = kzalloc(512, GFP_KERNEL);

	if (!root_path_buf)

		goto out;



	root_path = dentry_path(bpmp->debugfs_mirror, root_path_buf,

				sizeof(root_path_buf));

	if (IS_ERR(root_path))

		return NULL;

		goto out;



	root_len = strlen(root_path);



	filename = dentry_path(file->f_path.dentry, buf, size);

	if (IS_ERR(filename))

		return NULL;

	if (IS_ERR(filename)) {

		filename = NULL;

		goto out;

	}



	if (strlen(filename) < root_len ||

			strncmp(filename, root_path, root_len))

		return NULL;

	if (strlen(filename) < root_len || strncmp(filename, root_path, root_len)) {

		filename = NULL;

		goto out;

	}



	filename += root_len;



out:

	kfree(root_path_buf);

	return filename;

}

drivers/firmware/tegra/bpmp-tegra210.c

+2 −5
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ static int tegra210_bpmp_init(struct tegra_bpmp *bpmp) 
{

	struct platform_device *pdev = to_platform_device(bpmp->dev);

	struct tegra210_bpmp *priv;

	struct resource *res;

	unsigned int i;

	int err;
@@ -172,13 +171,11 @@ static int tegra210_bpmp_init(struct tegra_bpmp *bpmp) 


	bpmp->priv = priv;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->atomics = devm_ioremap_resource(&pdev->dev, res);

	priv->atomics = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->atomics))

		return PTR_ERR(priv->atomics);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	priv->arb_sema = devm_ioremap_resource(&pdev->dev, res);

	priv->arb_sema = devm_platform_ioremap_resource(pdev, 1);

	if (IS_ERR(priv->arb_sema))

		return PTR_ERR(priv->arb_sema);