mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 05:44:11 +00:00
Code Issues Releases Wiki Activity

firmware: tegra: Changes for v5.16-rc1

Browse source 
This contains a fix for a stack usage problem that was causing build
 failures on 32-bit ARM and a minor janitorial cleanup.
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmFgoEITHHRyZWRpbmdA
 bnZpZGlhLmNvbQAKCRDdI6zXfz6zodblD/41EhC7Qes5eklr+iGukG3oEa46MAfw
 5ABcYBpBI2bjNFfrfUfWBNf4JvcxAOpDFBSRIxwypxynXHhv+W2E2dbCKte0Pf5Z
 PQ93aKio9skyRxfNPik3d6tZcjP6qWI4y0giP+zIKhNWL5YlkxsNKPEL+4V6nTBJ
 r8/U5psKvHI1nNJ1PwPyr6S4O2TsyWgYJiXGNNAfKWmtE8rFYn7F12ZC5akFssmS
 4XAnEUSbGQMU1LeaytuoOwr66Qa3Gp38QTm5K57zm5TTmnmrjTCQCghPDqZi+fPe
 pwX7rNSaz/OPs34ZUtUrzyJo49bosYKCJKK8v0CR0swh9U9/e4uGu5/TZRDzT4i6
 CCeRQUpp9PKba5JbWOH2R/+cMGqsKl1j75YZQQAq1fciZ56qXmar6IRuTh4VCYfr
 za3Def123Aux5zH8KgyyEH8uecLr++hStylj663yWt8tPvLkJr0vhDD3Ptvzoql8
 xI6wa8XgttIy3rnL1bXNl3hujm89QWanQUG+96bm53L+26cHv8BOtxvW8rysIXHg
 CPE5vkgv0RzX2Ghv3qJ0a+uINIY57zIFmcyJwINOVqieX7HUh+IIZSOTUvHz/fPG
 +XTfH0xNLK1BrhY4Wr5U2cWO/YyxvgFxY+0zhiT8OIoQdiQgUdHA1BCOp3oB812Q
 TkIMM3uWr/uJPA==
 =JReQ
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmFj/TAACgkQmmx57+YA
 GNlUKg/9EeOYV0rK7g7BldzK9v071xecwUtu6Q3a5iM/hqwuMQWvXKeJo0CS/u5n
 WCsdx/y38NzuhjhMPa1jGm+alVLw2GZB9fdqBlNmnGisipyL+WSBXwQ91iIPO8cF
 8Warj2lArsmJu+HQTE3aBcJUT9WYvKW2GT0Ac1z6OvBe77bj1bfoniCjO0XwppeH
 Wmdzmn4ABf78qVg14u2Yb9L9oBkVmyva0W5KRuBsQxdDYXyGvY2ehA8ThWsPCG7P
 hsWPMOK0Xe66SVlN1GiZnN02XsCDdlK17XMMDM1Uioe8UVUYQ4mwpYfUNaBrXNCE
 QUCqbSBSlat4Ys3vHNyHq86OdUbp7BxOFe5PLJaeg4bqRCvEM+4WE76ptwfTaKmn
 4yopDDADHixP816wm9Fl9zJJTSq81y8XetaXNxyMtIXIAO6lr8piJtmugwFAF5dQ
 u4dzrQdjLaUDISI7TEk5j15af/vNyCmt1d9e+EuN0n5fmAp3kyrCQPtjarMZrLRY
 4lE0xncXNqLFF7SAYAicVVjTmyXThFcLBuHxRzwbu6mxLT9qGhkSIF6onDdvSdzF
 TvI6z9YsNm8Pp7iYKfolGV+mYuecrvePDxpfTrhxqOJ6E26raCVDJs10irhGH1ZL
 5QzujR7vmJN7vStG+iRTLXyOz9C14FZ7O4QDP824lxO0pKPeu7I=
 =fzM3
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-10-11 11:00:30 +02:00
commit e4fb7b4411
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/firmware/tegra/bpmp-debugfs.c
View file

@ -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;
}

7
drivers/firmware/tegra/bpmp-tegra210.c
View file

@ -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);