Unverified Commit 871e766d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

soc/tegra: Changes for v6.4-rc1

This contains minor fixes and cleanups. Note that one of the patches
here includes ARM firmware changes, but I picked that up after checking
with Sudeep and Rob because it didn't seem worth splitting it up any
further.

* tag 'tegra-for-6.4-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  firmware: Use of_property_present() for testing DT property presence
  firmware: tegra: bpmp: Fix error paths in debugfs

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 547d67a9 8c47b825

drivers/firmware/arm_scmi/optee.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static int setup_static_shmem(struct device *dev, struct scmi_chan_info *cinfo, 
static int setup_shmem(struct device *dev, struct scmi_chan_info *cinfo,

		       struct scmi_optee_channel *channel)

{

	if (of_find_property(cinfo->dev->of_node, "shmem", NULL))

	if (of_property_present(cinfo->dev->of_node, "shmem"))

		return setup_static_shmem(dev, cinfo, channel);

	else

		return setup_dynamic_shmem(dev, channel);

drivers/firmware/tegra/bpmp-debugfs.c

+8 −4
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static int mrq_debug_read(struct tegra_bpmp *bpmp, const char *name, 
		},

	};

	u32 fd = 0, len = 0;

	int remaining, err;

	int remaining, err, close_err;



	mutex_lock(&bpmp_debug_lock);

	err = mrq_debug_open(bpmp, name, &fd, &len, 0);
@@ -231,7 +231,9 @@ static int mrq_debug_read(struct tegra_bpmp *bpmp, const char *name, 
	*nbytes = len;



close:

	err = mrq_debug_close(bpmp, fd);

	close_err = mrq_debug_close(bpmp, fd);

	if (!err)

		err = close_err;

out:

	mutex_unlock(&bpmp_debug_lock);

	return err;
@@ -319,7 +321,7 @@ static int bpmp_debug_show(struct seq_file *m, void *p) 
		},

	};

	u32 fd = 0, len = 0;

	int remaining, err;

	int remaining, err, close_err;



	filename = get_filename(bpmp, file, fnamebuf, sizeof(fnamebuf));

	if (!filename)
@@ -353,7 +355,9 @@ static int bpmp_debug_show(struct seq_file *m, void *p) 
	}



close:

	err = mrq_debug_close(bpmp, fd);

	close_err = mrq_debug_close(bpmp, fd);

	if (!err)

		err = close_err;

out:

	mutex_unlock(&bpmp_debug_lock);

	return err;

drivers/firmware/tegra/bpmp.c

+3 −3
Original line number Diff line number Diff line
@@ -764,19 +764,19 @@ static int tegra_bpmp_probe(struct platform_device *pdev) 
	if (err < 0)

		goto free_mrq;



	if (of_find_property(pdev->dev.of_node, "#clock-cells", NULL)) {

	if (of_property_present(pdev->dev.of_node, "#clock-cells")) {

		err = tegra_bpmp_init_clocks(bpmp);

		if (err < 0)

			goto free_mrq;

	}



	if (of_find_property(pdev->dev.of_node, "#reset-cells", NULL)) {

	if (of_property_present(pdev->dev.of_node, "#reset-cells")) {

		err = tegra_bpmp_init_resets(bpmp);

		if (err < 0)

			goto free_mrq;

	}



	if (of_find_property(pdev->dev.of_node, "#power-domain-cells", NULL)) {

	if (of_property_present(pdev->dev.of_node, "#power-domain-cells")) {

		err = tegra_bpmp_init_powergates(bpmp);

		if (err < 0)

			goto free_mrq;