From: Stefan Binding <sbinding@opensource.cirrus.com>
To: "Rafael J . Wysocki" <rafael@kernel.org>,
Len Brown <lenb@kernel.org>, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>
Cc: linux-acpi@vger.kernel.org, alsa-devel@alsa-project.org,
Stefan Binding <sbinding@opensource.cirrus.com>,
linux-kernel@vger.kernel.org, patches@opensource.cirrus.com
Subject: [PATCH v1 1/2] ACPI: utils: Add api to read _SUB from ACPI
Date: Wed, 22 Jun 2022 14:07:29 +0100 [thread overview]
Message-ID: <20220622130730.1573747-2-sbinding@opensource.cirrus.com> (raw)
In-Reply-To: <20220622130730.1573747-1-sbinding@opensource.cirrus.com>
Add a wrapper function to read the _SUB string from ACPI.
Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
---
drivers/acpi/utils.c | 26 ++++++++++++++++++++++++++
include/linux/acpi.h | 8 ++++++++
2 files changed, 34 insertions(+)
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 3a9773a09e19..5d1bdb79e372 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -291,6 +291,32 @@ int acpi_get_local_address(acpi_handle handle, u32 *addr)
}
EXPORT_SYMBOL(acpi_get_local_address);
+int acpi_get_sub(acpi_handle handle, char *sub, size_t size)
+{
+ struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+ union acpi_object *obj;
+ acpi_status status;
+ int ret;
+
+ status = acpi_evaluate_object(handle, METHOD_NAME__SUB, NULL, &buffer);
+ if (!ACPI_SUCCESS(status)) {
+ acpi_handle_debug(handle, "Reading ACPI _SUB failed: %#x\n", status);
+ return -ENOENT;
+ }
+
+ obj = buffer.pointer;
+ if (obj->type == ACPI_TYPE_STRING) {
+ ret = strscpy(sub, obj->string.pointer, size);
+ } else {
+ acpi_handle_warn(handle, "Warning ACPI _SUB did not return a string\n");
+ ret = -EINVAL;
+ }
+ acpi_os_free(buffer.pointer);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(acpi_get_sub);
+
acpi_status
acpi_evaluate_reference(acpi_handle handle,
acpi_string pathname,
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 4f82a5bc6d98..9bf18adf5920 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -21,6 +21,8 @@
#endif
#include <acpi/acpi.h>
+#define ACPI_MAX_SUB_BUF_SIZE 9
+
#ifdef CONFIG_ACPI
#include <linux/list.h>
@@ -762,6 +764,7 @@ static inline u64 acpi_arch_get_root_pointer(void)
#endif
int acpi_get_local_address(acpi_handle handle, u32 *addr);
+int acpi_get_sub(acpi_handle handle, char *sub, size_t size);
#else /* !CONFIG_ACPI */
@@ -1023,6 +1026,11 @@ static inline int acpi_get_local_address(acpi_handle handle, u32 *addr)
return -ENODEV;
}
+static int acpi_get_sub(acpi_handle handle, char *sub, size_t size)
+{
+ return -ENODEV;
+}
+
static inline int acpi_register_wakeup_handler(int wake_irq,
bool (*wakeup)(void *context), void *context)
{
--
2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Stefan Binding <sbinding@opensource.cirrus.com>
To: "Rafael J . Wysocki" <rafael@kernel.org>,
Len Brown <lenb@kernel.org>, Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>
Cc: <linux-acpi@vger.kernel.org>, <alsa-devel@alsa-project.org>,
<linux-kernel@vger.kernel.org>, <patches@opensource.cirrus.com>,
Stefan Binding <sbinding@opensource.cirrus.com>
Subject: [PATCH v1 1/2] ACPI: utils: Add api to read _SUB from ACPI
Date: Wed, 22 Jun 2022 14:07:29 +0100 [thread overview]
Message-ID: <20220622130730.1573747-2-sbinding@opensource.cirrus.com> (raw)
In-Reply-To: <20220622130730.1573747-1-sbinding@opensource.cirrus.com>
Add a wrapper function to read the _SUB string from ACPI.
Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
---
drivers/acpi/utils.c | 26 ++++++++++++++++++++++++++
include/linux/acpi.h | 8 ++++++++
2 files changed, 34 insertions(+)
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 3a9773a09e19..5d1bdb79e372 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -291,6 +291,32 @@ int acpi_get_local_address(acpi_handle handle, u32 *addr)
}
EXPORT_SYMBOL(acpi_get_local_address);
+int acpi_get_sub(acpi_handle handle, char *sub, size_t size)
+{
+ struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+ union acpi_object *obj;
+ acpi_status status;
+ int ret;
+
+ status = acpi_evaluate_object(handle, METHOD_NAME__SUB, NULL, &buffer);
+ if (!ACPI_SUCCESS(status)) {
+ acpi_handle_debug(handle, "Reading ACPI _SUB failed: %#x\n", status);
+ return -ENOENT;
+ }
+
+ obj = buffer.pointer;
+ if (obj->type == ACPI_TYPE_STRING) {
+ ret = strscpy(sub, obj->string.pointer, size);
+ } else {
+ acpi_handle_warn(handle, "Warning ACPI _SUB did not return a string\n");
+ ret = -EINVAL;
+ }
+ acpi_os_free(buffer.pointer);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(acpi_get_sub);
+
acpi_status
acpi_evaluate_reference(acpi_handle handle,
acpi_string pathname,
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 4f82a5bc6d98..9bf18adf5920 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -21,6 +21,8 @@
#endif
#include <acpi/acpi.h>
+#define ACPI_MAX_SUB_BUF_SIZE 9
+
#ifdef CONFIG_ACPI
#include <linux/list.h>
@@ -762,6 +764,7 @@ static inline u64 acpi_arch_get_root_pointer(void)
#endif
int acpi_get_local_address(acpi_handle handle, u32 *addr);
+int acpi_get_sub(acpi_handle handle, char *sub, size_t size);
#else /* !CONFIG_ACPI */
@@ -1023,6 +1026,11 @@ static inline int acpi_get_local_address(acpi_handle handle, u32 *addr)
return -ENODEV;
}
+static int acpi_get_sub(acpi_handle handle, char *sub, size_t size)
+{
+ return -ENODEV;
+}
+
static inline int acpi_register_wakeup_handler(int wake_irq,
bool (*wakeup)(void *context), void *context)
{
--
2.25.1
next prev parent reply other threads:[~2022-06-22 13:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-22 13:07 [PATCH v1 0/2] Read _SUB from ACPI to be able to identify firmware Stefan Binding
2022-06-22 13:07 ` Stefan Binding
2022-06-22 13:07 ` Stefan Binding [this message]
2022-06-22 13:07 ` [PATCH v1 1/2] ACPI: utils: Add api to read _SUB from ACPI Stefan Binding
2022-06-22 13:19 ` Rafael J. Wysocki
2022-06-22 13:19 ` Rafael J. Wysocki
2022-06-22 21:00 ` kernel test robot
2022-06-22 21:00 ` kernel test robot
2022-06-22 21:10 ` kernel test robot
2022-06-22 21:10 ` kernel test robot
2022-06-22 13:07 ` [PATCH v1 2/2] ASoC: cs35l41: Read System Name from ACPI _SUB to identify firmware Stefan Binding
2022-06-22 13:07 ` Stefan Binding
2022-06-23 4:01 ` kernel test robot
2022-06-23 4:01 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220622130730.1573747-2-sbinding@opensource.cirrus.com \
--to=sbinding@opensource.cirrus.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lenb@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.