mirror of https://lore.kernel.org/linux-amlogic/
 help / color / mirror / Atom feed
* [PATCH v1 0/2] firmware: meson_sm: cleanup error paths inside probe()
@ 2023-11-08 12:56 Evgeny Bachinin
  2023-11-08 12:56 ` [PATCH v1 1/2] firmware: meson_sm: refactor serial sysfs entry via dev_groups attrs Evgeny Bachinin
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Evgeny Bachinin @ 2023-11-08 12:56 UTC (permalink / raw)
  To: Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
	Evgeny Bachinin, Dmitry Rokosov, Miles Chen, Alexey Romanov
  Cc: kernel, evgen89bachinin, linux-arm-kernel, linux-amlogic, linux-kernel

At first, patches series refactors sysfs node creation to avoid extra code
paths. After that, the resource leak in probe error path is fixed.

Evgeny Bachinin (2):
  firmware: meson_sm: refactor serial sysfs entry via dev_groups attrs
  firmware: meson-sm: unmap out_base shmem in error path

 drivers/firmware/meson/meson_sm.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

-- 
2.34.1


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v1 1/2] firmware: meson_sm: refactor serial sysfs entry via dev_groups attrs
  2023-11-08 12:56 [PATCH v1 0/2] firmware: meson_sm: cleanup error paths inside probe() Evgeny Bachinin
@ 2023-11-08 12:56 ` Evgeny Bachinin
  2023-11-08 12:56 ` [PATCH v1 2/2] firmware: meson-sm: unmap out_base shmem in error path Evgeny Bachinin
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Evgeny Bachinin @ 2023-11-08 12:56 UTC (permalink / raw)
  To: Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
	Evgeny Bachinin, Dmitry Rokosov, Miles Chen, Alexey Romanov
  Cc: kernel, evgen89bachinin, linux-arm-kernel, linux-amlogic, linux-kernel

Introduce just another way to register sysfs serial entry:
the less code, the better in the absence of extra error-paths

Signed-off-by: Evgeny Bachinin <EABachinin@salutedevices.com>
---
 drivers/firmware/meson/meson_sm.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c
index 27a8cd4747f8..73878ff9833c 100644
--- a/drivers/firmware/meson/meson_sm.c
+++ b/drivers/firmware/meson/meson_sm.c
@@ -273,14 +273,11 @@ static ssize_t serial_show(struct device *dev, struct device_attribute *attr,
 
 static DEVICE_ATTR_RO(serial);
 
-static struct attribute *meson_sm_sysfs_attributes[] = {
+static struct attribute *meson_sm_sysfs_attrs[] = {
 	&dev_attr_serial.attr,
 	NULL,
 };
-
-static const struct attribute_group meson_sm_sysfs_attr_group = {
-	.attrs = meson_sm_sysfs_attributes,
-};
+ATTRIBUTE_GROUPS(meson_sm_sysfs);
 
 static const struct of_device_id meson_sm_ids[] = {
 	{ .compatible = "amlogic,meson-gxbb-sm", .data = &gxbb_chip },
@@ -320,9 +317,6 @@ static int __init meson_sm_probe(struct platform_device *pdev)
 	if (devm_of_platform_populate(dev))
 		goto out_in_base;
 
-	if (sysfs_create_group(&pdev->dev.kobj, &meson_sm_sysfs_attr_group))
-		goto out_in_base;
-
 	pr_info("secure-monitor enabled\n");
 
 	return 0;
@@ -337,6 +331,7 @@ static struct platform_driver meson_sm_driver = {
 	.driver = {
 		.name = "meson-sm",
 		.of_match_table = of_match_ptr(meson_sm_ids),
+		.dev_groups = meson_sm_sysfs_groups,
 	},
 };
 module_platform_driver_probe(meson_sm_driver, meson_sm_probe);
-- 
2.34.1


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v1 2/2] firmware: meson-sm: unmap out_base shmem in error path
  2023-11-08 12:56 [PATCH v1 0/2] firmware: meson_sm: cleanup error paths inside probe() Evgeny Bachinin
  2023-11-08 12:56 ` [PATCH v1 1/2] firmware: meson_sm: refactor serial sysfs entry via dev_groups attrs Evgeny Bachinin
@ 2023-11-08 12:56 ` Evgeny Bachinin
  2023-11-27  8:02 ` [PATCH v1 0/2] firmware: meson_sm: cleanup error paths inside probe() Neil Armstrong
  2023-11-27  8:18 ` Neil Armstrong
  3 siblings, 0 replies; 5+ messages in thread
From: Evgeny Bachinin @ 2023-11-08 12:56 UTC (permalink / raw)
  To: Neil Armstrong, Kevin Hilman, Jerome Brunet, Martin Blumenstingl,
	Evgeny Bachinin, Dmitry Rokosov, Miles Chen, Alexey Romanov
  Cc: kernel, evgen89bachinin, linux-arm-kernel, linux-amlogic, linux-kernel

When SM driver was introduced in [1], the code flow did not require
to unmap out_base shmem in case of errors inside probe().
During [2], the additional error path appeared, which requires unmap.

Patch adds iounmap() missed.

Links:
[1] https://lore.kernel.org/linux-amlogic/1466339944-602-2-git-send-email-carlo@caione.org/
[2] https://lore.kernel.org/linux-amlogic/1532613556-5398-1-git-send-email-narmstrong@baylibre.com/

Fixes: 0789724f86a5 ("firmware: meson_sm: Add serial number sysfs entry")
Signed-off-by: Evgeny Bachinin <EABachinin@salutedevices.com>
---
 drivers/firmware/meson/meson_sm.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c
index 73878ff9833c..ca5f3534eddd 100644
--- a/drivers/firmware/meson/meson_sm.c
+++ b/drivers/firmware/meson/meson_sm.c
@@ -307,7 +307,7 @@ static int __init meson_sm_probe(struct platform_device *pdev)
 		fw->sm_shmem_out_base = meson_sm_map_shmem(chip->cmd_shmem_out_base,
 							   chip->shmem_size);
 		if (WARN_ON(!fw->sm_shmem_out_base))
-			goto out_in_base;
+			goto unmap_in_base;
 	}
 
 	fw->chip = chip;
@@ -315,13 +315,15 @@ static int __init meson_sm_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, fw);
 
 	if (devm_of_platform_populate(dev))
-		goto out_in_base;
+		goto unmap_out_base;
 
 	pr_info("secure-monitor enabled\n");
 
 	return 0;
 
-out_in_base:
+unmap_out_base:
+	iounmap(fw->sm_shmem_out_base);
+unmap_in_base:
 	iounmap(fw->sm_shmem_in_base);
 out:
 	return -EINVAL;
-- 
2.34.1


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v1 0/2] firmware: meson_sm: cleanup error paths inside probe()
  2023-11-08 12:56 [PATCH v1 0/2] firmware: meson_sm: cleanup error paths inside probe() Evgeny Bachinin
  2023-11-08 12:56 ` [PATCH v1 1/2] firmware: meson_sm: refactor serial sysfs entry via dev_groups attrs Evgeny Bachinin
  2023-11-08 12:56 ` [PATCH v1 2/2] firmware: meson-sm: unmap out_base shmem in error path Evgeny Bachinin
@ 2023-11-27  8:02 ` Neil Armstrong
  2023-11-27  8:18 ` Neil Armstrong
  3 siblings, 0 replies; 5+ messages in thread
From: Neil Armstrong @ 2023-11-27  8:02 UTC (permalink / raw)
  To: Evgeny Bachinin, Kevin Hilman, Jerome Brunet,
	Martin Blumenstingl, Dmitry Rokosov, Miles Chen, Alexey Romanov
  Cc: kernel, evgen89bachinin, linux-arm-kernel, linux-amlogic, linux-kernel

On 08/11/2023 13:56, Evgeny Bachinin wrote:
> At first, patches series refactors sysfs node creation to avoid extra code
> paths. After that, the resource leak in probe error path is fixed.
> 
> Evgeny Bachinin (2):
>    firmware: meson_sm: refactor serial sysfs entry via dev_groups attrs
>    firmware: meson-sm: unmap out_base shmem in error path
> 
>   drivers/firmware/meson/meson_sm.c | 19 ++++++++-----------
>   1 file changed, 8 insertions(+), 11 deletions(-)
> 

Acked-by: Neil Armstrong <neil.armstrong@linaro.org>

_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v1 0/2] firmware: meson_sm: cleanup error paths inside probe()
  2023-11-08 12:56 [PATCH v1 0/2] firmware: meson_sm: cleanup error paths inside probe() Evgeny Bachinin
                   ` (2 preceding siblings ...)
  2023-11-27  8:02 ` [PATCH v1 0/2] firmware: meson_sm: cleanup error paths inside probe() Neil Armstrong
@ 2023-11-27  8:18 ` Neil Armstrong
  3 siblings, 0 replies; 5+ messages in thread
From: Neil Armstrong @ 2023-11-27  8:18 UTC (permalink / raw)
  To: Kevin Hilman, Jerome Brunet, Martin Blumenstingl, Dmitry Rokosov,
	Miles Chen, Alexey Romanov, Evgeny Bachinin
  Cc: kernel, evgen89bachinin, linux-arm-kernel, linux-amlogic, linux-kernel

Hi,

On Wed, 08 Nov 2023 15:56:02 +0300, Evgeny Bachinin wrote:
> At first, patches series refactors sysfs node creation to avoid extra code
> paths. After that, the resource leak in probe error path is fixed.
> 
> Evgeny Bachinin (2):
>   firmware: meson_sm: refactor serial sysfs entry via dev_groups attrs
>   firmware: meson-sm: unmap out_base shmem in error path
> 
> [...]

Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.8/drivers)

[1/2] firmware: meson_sm: refactor serial sysfs entry via dev_groups attrs
      https://git.kernel.org/amlogic/c/d397965e584e0f2c6193b927c1e7693d514a6738
[2/2] firmware: meson-sm: unmap out_base shmem in error path
      https://git.kernel.org/amlogic/c/d8385d7433f9c7d718448465e30d6b8c1207b59f

These changes has been applied on the intermediate git tree [1].

The v6.8/drivers branch will then be sent via a formal Pull Request to the Linux SoC maintainers
for inclusion in their intermediate git branches in order to be sent to Linus during
the next merge window, or sooner if it's a set of fixes.

In the cases of fixes, those will be merged in the current release candidate
kernel and as soon they appear on the Linux master branch they will be
backported to the previous Stable and Long-Stable kernels [2].

The intermediate git branches are merged daily in the linux-next tree [3],
people are encouraged testing these pre-release kernels and report issues on the
relevant mailing-lists.

If problems are discovered on those changes, please submit a signed-off-by revert
patch followed by a corrective changeset.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git

-- 
Neil


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-11-27  8:19 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-08 12:56 [PATCH v1 0/2] firmware: meson_sm: cleanup error paths inside probe() Evgeny Bachinin
2023-11-08 12:56 ` [PATCH v1 1/2] firmware: meson_sm: refactor serial sysfs entry via dev_groups attrs Evgeny Bachinin
2023-11-08 12:56 ` [PATCH v1 2/2] firmware: meson-sm: unmap out_base shmem in error path Evgeny Bachinin
2023-11-27  8:02 ` [PATCH v1 0/2] firmware: meson_sm: cleanup error paths inside probe() Neil Armstrong
2023-11-27  8:18 ` Neil Armstrong

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®