acpi: Add acpi_init_properties to ACPI driver code
Subsystems (3)
PATCH 1/2 acpi: Add acpi_init_properties to ACPI driver code
Some products in the field, like Intel Rocket Lake systems, contain AML code that can modify _DSD properties after they have been evaluated by ACPI init code. Therefore, there is a need for drivers to be able to reevaluate _DSDs so that the updated property values can be read. Export acpi_init_properties() for this purpose.
--- drivers/acpi/property.c | 1 + include/linux/acpi.h | 6 ++++++ 2 files changed, 7 insertions(+)
drivers/acpi/property.c +1 -0
@@ -432,6 +432,7 @@ void acpi_init_properties(struct acpi_device *adev)if (!adev->data.pointer)acpi_extract_apple_properties (adev); } +EXPORT_SYMBOL (acpi_init_properties);static void acpi_destroy_nondev_subnodes (struct list_head *list) {
include/linux/acpi.h +6 -0
@@ -716,6 +716,8 @@ static inline u64 acpi_arch_get_root_pointer(void)int acpi_get_local_address (acpi_handle handle,u32 *addr); +void acpi_init_properties (struct acpi_device *adev); +#else /* !CONFIG_ACPI */ #define acpi_disabled 1
@@ -976,6 +978,10 @@ static inline int acpi_get_local_address(acpi_handle handle, u32 *addr) return -ENODEV; } +static inline void acpi_init_properties (struct acpi_device *adev) +{ +} +#endif /* !CONFIG_ACPI */ #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
Signature · 1 line
2.25.1
PATCH 2/2 platform/x86/intel/pmc: Add PSON residency counter
Tiger Lake devices have the capability to track the duration of time that their Power Supply Units (PSUs) are turned off during S0ix. This patch adds a debugfs file pson_residency_usec to provide access to this counter.
In order to determine whether the device is capable of PSON, use acpi_init_properties() to reevaluate _DSD.
--- drivers/platform/x86/intel/pmc/core.c | 46 +++++++++++++++++++++++++++ drivers/platform/x86/intel/pmc/core.h | 7 ++++ 2 files changed, 53 insertions(+)
drivers/platform/x86/intel/pmc/core.c +46 -0
@@ -595,6 +595,8 @@ static const struct pmc_reg_map tgl_reg_map = { .lpm_sts = tgl_lpm_maps, .lpm_status_offset = TGL_LPM_STATUS_OFFSET, .lpm_live_status_offset = TGL_LPM_LIVE_STATUS_OFFSET, + .pson_residency_offset = TGL_PSON_RESIDENCY_OFFSET, + .pson_residency_counter_step = TGL_PSON_RES_COUNTER_STEP, .etr3_offset = ETR3_OFFSET, };
@@ -1084,6 +1086,20 @@ static int pmc_core_dev_state_get(void *data, u64 *val)DEFINE_DEBUGFS_ATTRIBUTE (pmc_core_dev_state, pmc_core_dev_state_get,NULL ,"%llu\n" ); +static int pmc_core_pson_residency_get (void *data,u64 *val) +{ +struct pmc_dev *pmcdev = data; +const struct pmc_reg_map *map = pmcdev->map; +u32 value; + + value =pmc_core_reg_read (pmcdev, map->pson_residency_offset); + *val = (u64 )value * pmcdev->map->pson_residency_counter_step; + +return 0 ; +} + +DEFINE_DEBUGFS_ATTRIBUTE (pmc_core_pson_residency, pmc_core_pson_residency_get,NULL ,"%llu\n" ); +static int pmc_core_check_read_lock_bit (struct pmc_dev *pmcdev) {u32 value;
@@ -1788,6 +1804,30 @@ static void pmc_core_get_low_power_modes(struct pmc_dev *pmcdev) } } +static bool pmc_core_is_pson_residency_enabled (struct pmc_dev *pmcdev) +{ +struct platform_device *pdev = pmcdev->pdev; +struct acpi_device *adev =ACPI_COMPANION (&pdev->dev); +acpi_status status; +u8 val; + +if (!adev) +return false; + +acpi_init_properties (adev); + status =acpi_evaluate_object (adev->handle,"PSOP" ,NULL ,NULL ); + +if (ACPI_FAILURE (status)) +return false; + +if (fwnode_property_read_u8 (acpi_fwnode_handle (adev), +"intel-cec-pson-switching-enabled-in-s0" , + &val)) +return false; + +return val ==1 ; +} +static void pmc_core_dbgfs_unregister (struct pmc_dev *pmcdev) {debugfs_remove_recursive (pmcdev->dbgfs_dir);
@@ -1856,6 +1896,11 @@ static void pmc_core_dbgfs_register(struct pmc_dev *pmcdev) pmcdev->dbgfs_dir, pmcdev, &pmc_core_substate_req_regs_fops); } + +if (pmcdev->map->pson_residency_offset &&pmc_core_is_pson_residency_enabled (pmcdev)) { +debugfs_create_file ("pson_residency_usec" ,0444 , + pmcdev->dbgfs_dir, pmcdev, &pmc_core_pson_residency); + } }static const struct x86_cpu_id intel_pmc_core_ids[] = {
@@ -1944,6 +1989,7 @@ static int pmc_core_probe(struct platform_device *pdev)return -ENOMEM ;platform_set_drvdata (pdev, pmcdev); + pmcdev->pdev = pdev; cpu_id =x86_match_cpu (intel_pmc_core_ids);if (!cpu_id)
drivers/platform/x86/intel/pmc/core.h +7 -0
@@ -214,6 +214,10 @@ enum ppfear_regs {#define TGL_LPM_PRI_OFFSET 0x1C7C#define TGL_LPM_NUM_MAPS 6 +/* Tigerlake PSON residency register */ +#define TGL_PSON_RESIDENCY_OFFSET 0x18f8 +#define TGL_PSON_RES_COUNTER_STEP 0x7A +/* Extended Test Mode Register 3 (CNL and later) */ #define ETR3_OFFSET 0x1048#define ETR3_CF9GR BIT(20)
@@ -301,6 +305,8 @@ struct pmc_reg_map {const u32 lpm_residency_offset;const u32 lpm_status_offset;const u32 lpm_live_status_offset; +const u32 pson_residency_offset; +const u32 pson_residency_counter_step;const u32 etr3_offset; };
@@ -337,6 +343,7 @@ struct pmc_dev {int num_lpm_modes;int lpm_en_modes[LPM_MAX_NUM_MODES ];u32 *lpm_req_regs; +struct platform_device *pdev; };#define pmc_for_each_mode (i, mode, pmcdev) \
Signature · 1 line
2.25.1
Rafael J. Wysocki
maintainerQuoted 4 lines · Michael Bottini
Some products in the field, like Intel Rocket Lake systems, contain AML code that can modify
_DSDproperties after they have been evaluated by ACPI init code.
That is directly against the spec.
Quoted 3 lines
Therefore, there is a need for drivers
to be able to reevaluate_DSDsso that the updated property values can be read. Exportacpi_init_properties()for this purpose.
I'm not sure. By the spec, the OS need not evaluate _DSD for a given device more than once.
Quoted 11 lines
Signed-off-by Michael Bottini <[email protected]>--- drivers/acpi/property.c | 1 + include/linux/acpi.h | 6 ++++++ 2 files changed, 7 insertions(+)drivers/acpi/property.c +0
-0
drivers/acpi/property.c void acpi_init_properties(struct acpi_device *adev) · line 435
Quoted 4 lines
drivers/acpi/property.c +1
-0@@ -432,6 +432,7 @@ void acpi_init_properties(struct acpi_device *adev)if (!adev->data.pointer)acpi_extract_apple_properties (adev); } +EXPORT_SYMBOL (acpi_init_properties);
EXPORT_SyMBOL_GPL(), please.
Quoted 29 lines
drivers/acpi/property.c +0
-0static void acpi_destroy_nondev_subnodes (struct list_head *list) {include/linux/acpi.h +6
-1@@ -716,6 +716,8 @@ static inline u64 acpi_arch_get_root_pointer(void)int acpi_get_local_address (acpi_handle handle,u32 *addr); +void acpi_init_properties (struct acpi_device *adev); +#else /* !CONFIG_ACPI */ #define acpi_disabled 1@@ -976,6 +978,10 @@ static inline int acpi_get_local_address(acpi_handle handle, u32 *addr) return -ENODEV; } +static inline void acpi_init_properties (struct acpi_device *adev) +{ +} +#endif /* !CONFIG_ACPI */ #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC --2.25.1
Re: [PATCH 2/2] platform/x86/intel/pmc: Add PSON residency counter
In reply to a message not in the archiveQuoted 15 lines · Andy Shevchenko
Quoted 10 lines · Michael Bottini
Tiger Lake devices have the capability to track the duration of time that their Power Supply Units (PSUs) are turned off during S0ix.
This patch adds a debugfs filepson_residency_usecto provide access to this counter.In order to determine whether the device is capable of PSON, use
acpi_init_properties()to reevaluate_DSD.
Quoted 8 lines
It’s direct abuse of ACPI specification as I read it:
“_DSD must return the same data each time it is evaluated. Firmware should not expect it to be evaluated every time (in case it is implemented as a method).”
NAK to the series.
Okay, we'll check with the BIOS folks. They are setting this property from _STA. They may not expect OSPM to reevaluate _DSD. But they may have expected that OSPM doesn't attempt to read _DSD until after _STA is executed.
David
Quoted 153 lines
Quoted 146 lines
Signed-off-by Michael Bottini <[email protected]>---
drivers/platform/x86/intel/pmc/core.c | 46
+++++++++++++++++++++++++++
drivers/platform/x86/intel/pmc/core.h | 7 ++++2 files changed, 53 insertions(+)drivers/platform/x86/intel/pmc/core.c +9
-0@@ -595,6 +595,8 @@ static const struct pmc_reg_map tgl_reg_map = { .lpm_sts = tgl_lpm_maps, .lpm_status_offset = TGL_LPM_STATUS_OFFSET, .lpm_live_status_offset = TGL_LPM_LIVE_STATUS_OFFSET, + .pson_residency_offset = TGL_PSON_RESIDENCY_OFFSET, + .pson_residency_counter_step = TGL_PSON_RES_COUNTER_STEP, .etr3_offset = ETR3_OFFSET, };@@ -1084,6 +1086,20 @@ static int pmc_core_dev_state_get(void *data, u64 *val) DEFINE_DEBUGFS_ATTRIBUTE(pmc_core_dev_state, pmc_core_dev_state_get,NULL ,"%llu\n" ); +static int pmc_core_pson_residency_get (void *data,u64 *val) +{ + struct pmc_dev *pmcdev = data; + const struct pmc_reg_map *map = pmcdev->map; + u32 value; + + value = pmc_core_reg_read(pmcdev, map-Quoted 1 line
pson_residency_offset);+ *val = (u64)value * pmcdev->map-
Quoted 1 line
pson_residency_counter_step;drivers/platform/x86/intel/pmc/core.c +5
-0+ + return 0; +} + +DEFINE_DEBUGFS_ATTRIBUTE(pmc_core_pson_residency,
pmc_core_pson_residency_get, NULL, "%llu\n");
+
static intpmc_core_check_read_lock_bit(struct pmc_dev *pmcdev){
u32 value;drivers/platform/x86/intel/pmc/core.c +18
-0@@ -1788,6 +1804,30 @@ static void pmc_core_get_low_power_modes(struct pmc_dev *pmcdev) } } +static bool pmc_core_is_pson_residency_enabled (struct pmc_dev *pmcdev) +{ + struct platform_device *pdev = pmcdev->pdev; + struct acpi_device *adev = ACPI_COMPANION(&pdev->dev); + acpi_status status; + u8 val; + + if (!adev) + return false; + + acpi_init_properties(adev); + status = acpi_evaluate_object(adev->handle, "PSOP", NULL,NULL ); + + if (ACPI_FAILURE(status)) + return false; + + if (fwnode_property_read_u8(acpi_fwnode_handle(adev), + "intel-cec-pson-switching-enabled-in-s0",
+ &val))
+ return false;drivers/platform/x86/intel/pmc/core.c +4
-0+ + return val == 1; +} +static void
pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev){
debugfs_remove_recursive(pmcdev->dbgfs_dir);drivers/platform/x86/intel/pmc/core.c +0
-0@@ -1856,6 +1896,11 @@ static void pmc_core_dbgfs_register(struct pmc_dev *pmcdev) pmcdev->dbgfs_dir, pmcdev,
&pmc_core_substate_req_regs_fops);
}
+
+ if (pmcdev->map->pson_residency_offset&&pmc_core_is_pson_residency_enabled(pmcdev)) {
+ debugfs_create_file("pson_residency_usec", 0444, + pmcdev->dbgfs_dir, pmcdev,&pmc_core_pson_residency);
+ }
}static const struct
x86_cpu_idintel_pmc_core_ids[] = {drivers/platform/x86/intel/pmc/core.c +1
-0@@ -1944,6 +1989,7 @@ static int pmc_core_probe(struct platform_device *pdev) return -ENOMEM; platform_set_drvdata(pdev, pmcdev); + pmcdev->pdev = pdev; cpu_id = x86_match_cpu(intel_pmc_core_ids);if (!cpu_id)
drivers/platform/x86/intel/pmc/core.h +7
-0@@ -214,6 +214,10 @@ enum ppfear_regs { #define TGL_LPM_PRI_OFFSET 0x1C7C #define TGL_LPM_NUM_MAPS 6 +/* Tigerlake PSON residency register */ +#define TGL_PSON_RESIDENCY_OFFSET 0x18f8 +#define TGL_PSON_RES_COUNTER_STEP 0x7A + /* Extended Test Mode Register 3 (CNL and later) */ #define ETR3_OFFSET 0x1048 #define ETR3_CF9GR BIT(20)@@ -301,6 +305,8 @@ struct pmc_reg_map { const u32 lpm_residency_offset; const u32 lpm_status_offset; const u32 lpm_live_status_offset; + const u32 pson_residency_offset; + const u32 pson_residency_counter_step; const u32 etr3_offset; };@@ -337,6 +343,7 @@ struct pmc_dev { int num_lpm_modes; int lpm_en_modes[LPM_MAX_NUM_MODES]; u32 *lpm_req_regs; + struct platform_device *pdev; }; #define pmc_for_each_mode(i, mode, pmcdev) \Signature · 1 line
2.25.1
Re: [PATCH 2/2] platform/x86/intel/pmc: Add PSON residency counter
Quoted 21 lines · David E. Box
Quoted 20 lines · Andy Shevchenko
Quoted 10 lines · Michael Bottini
Tiger Lake devices have the capability to track the duration of time that their Power Supply Units (PSUs) are turned off during S0ix.
This patch adds a debugfs filepson_residency_usecto provide access to this counter.In order to determine whether the device is capable of PSON, use
acpi_init_properties()to reevaluate_DSD.It’s direct abuse of ACPI specification as I read it:
“_DSD must return the same data each time it is evaluated. Firmware should not expect it to be evaluated every time (in case it is implemented as a method).”
Quoted 4 lines
Quoted 1 line
NAK to the series.
Okay, we'll check with the BIOS folks. They are setting this property from
_STA. They may not expect OSPM to reevaluate_DSD.
Does it matter?
Quoted 3 lines
But they may
have expected that OSPM doesn't attempt to read_DSDuntil after_STAis executed.
They may study a bit of ACPI specification perhaps?
Or if there is indeed an issue with the specification language (so native-speaking people misinterpret above) then ECR to ASWG should be submitted?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Hi,
Quoted 7 lines · Michael Bottini
Some products in the field, like Intel Rocket Lake systems, contain AML code that can modify
_DSDproperties after they have been evaluated by ACPI init code. Therefore, there is a need for drivers to be able to reevaluate_DSDsso that the updated property values can be read. Exportacpi_init_properties()for this purpose.Signed-off-by Michael Bottini <[email protected]>
My first instinct here is this is a firmware bug and we should go out of our way here to not support this and to instead apply pressure on the vendor to get the firmware fixed.
Let me explain, the standard use of _DSD is to allow embedding open-firmware/devicetree style properties inside ACPI nodes.
devicetree files, unlike AML contain static information, which is parsed once and only once.
Allowing AML code to dynamically change _DSD results pretty much breaks this entire model.
So I might be shooting from the hip a bit here:
"no, just no". IOW nack.
Regards,
Hans
Quoted 42 lines
--- drivers/acpi/property.c | 1 + include/linux/acpi.h | 6 ++++++ 2 files changed, 7 insertions(+)drivers/acpi/property.c +1
-0@@ -432,6 +432,7 @@ void acpi_init_properties(struct acpi_device *adev)if (!adev->data.pointer)acpi_extract_apple_properties (adev); } +EXPORT_SYMBOL (acpi_init_properties);static void acpi_destroy_nondev_subnodes (struct list_head *list) {include/linux/acpi.h +6
-0@@ -716,6 +716,8 @@ static inline u64 acpi_arch_get_root_pointer(void)int acpi_get_local_address (acpi_handle handle,u32 *addr); +void acpi_init_properties (struct acpi_device *adev); +#else /* !CONFIG_ACPI */ #define acpi_disabled 1@@ -976,6 +978,10 @@ static inline int acpi_get_local_address(acpi_handle handle, u32 *addr) return -ENODEV; } +static inline void acpi_init_properties (struct acpi_device *adev) +{ +} +#endif /* !CONFIG_ACPI */ #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
Hi,
Quoted 18 lines · Hans de Goede
Hi,
Quoted 7 lines · Michael Bottini
Some products in the field, like Intel Rocket Lake systems, contain AML code that can modify
_DSDproperties after they have been evaluated by ACPI init code. Therefore, there is a need for drivers to be able to reevaluate_DSDsso that the updated property values can be read. Exportacpi_init_properties()for this purpose.Signed-off-by Michael Bottini <[email protected]>My first instinct here is this is a firmware bug and we should go out of our way here to not support this and to instead apply pressure on the vendor to get the firmware fixed.
Let me explain, the standard use of
_DSDis to allow embedding open-firmware/devicetree style properties inside ACPI nodes.
Quoted 8 lines
devicetree files, unlike AML contain static information, which is parsed once and only once.
Allowing AML code to dynamically change
_DSDresults pretty much breaks this entire model.So I might be shooting from the hip a bit here:
"no, just no". IOW nack.
I should have read the rest of the thread first I guess.
I see that Andy and Rafael are saying the same thing.
So here we have 3 people who all 3 are somewhat experts in ACPI saying no to this. So yes please talk to the BIOS team as you indicated elsewhere in the thread.
Regards,
Hans
Quoted 42 lines
Quoted 42 lines
--- drivers/acpi/property.c | 1 + include/linux/acpi.h | 6 ++++++ 2 files changed, 7 insertions(+)drivers/acpi/property.c +1
-0@@ -432,6 +432,7 @@ void acpi_init_properties(struct acpi_device *adev)if (!adev->data.pointer)acpi_extract_apple_properties (adev); } +EXPORT_SYMBOL (acpi_init_properties);static void acpi_destroy_nondev_subnodes (struct list_head *list) {include/linux/acpi.h +6
-0@@ -716,6 +716,8 @@ static inline u64 acpi_arch_get_root_pointer(void)int acpi_get_local_address (acpi_handle handle,u32 *addr); +void acpi_init_properties (struct acpi_device *adev); +#else /* !CONFIG_ACPI */ #define acpi_disabled 1@@ -976,6 +978,10 @@ static inline int acpi_get_local_address(acpi_handle handle, u32 *addr) return -ENODEV; } +static inline void acpi_init_properties (struct acpi_device *adev) +{ +} +#endif /* !CONFIG_ACPI */ #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
Quoted 38 lines · Hans de Goede
Hi,
Quoted 22 lines · Hans de Goede
Hi,
Quoted 11 lines · Michael Bottini
Some products in the field, like Intel Rocket Lake systems, contain
AML code that can modify_DSDproperties after they have been evaluated by ACPI init code. Therefore, there is a need for drivers
to be able to reevaluate_DSDsso that the updated property values can
be read. Exportacpi_init_properties()for this purpose.Signed-off-by: Michael Bottini
<[email protected]>My first instinct here is this is a firmware bug and we should go out of our way here to not support this and to instead apply pressure on the vendor to get the firmware fixed.
Let me explain, the standard use of
_DSDis to allow embedding open-firmware/devicetree style properties inside ACPI nodes.Quoted 8 lines
devicetree files, unlike AML contain static information, which is parsed once and only once.
Allowing AML code to dynamically change
_DSDresults pretty much breaks this entire model.So I might be shooting from the hip a bit here:
"no, just no". IOW nack.I should have read the rest of the thread first I guess.
I see that Andy and Rafael are saying the same thing.
Quoted 7 lines
So here we have 3 people who all 3 are somewhat experts in ACPI saying no to this. So yes please talk to the BIOS team as you indicated elsewhere in the thread.
Regards,
Hans
We get that reevaluating the _DSD would be against spec. We have taken this back to the firmware team as a bug and asked for a fix or different solution. Thanks.
Quoted 51 lines
Quoted 50 lines
Quoted 50 lines
---
drivers/acpi/property.c | 1 +
include/linux/acpi.h | 6 ++++++2 files changed, 7 insertions(+)drivers/acpi/property.c +1
-0@@ -432,6 +432,7 @@ void acpi_init_properties(struct acpi_device *adev) if (!adev->data.pointer) acpi_extract_apple_properties(adev); } +EXPORT_SYMBOL (acpi_init_properties);
static voidacpi_destroy_nondev_subnodes(struct list_head *list){include/linux/acpi.h +0
-0@@ -716,6 +716,8 @@ static inline u64acpi_arch_get_root_pointer (void)
intacpi_get_local_address(acpi_handle handle, u32 *addr);include/linux/acpi.h +2
-0+void acpi_init_properties (struct acpi_device *adev); +#else /* !CONFIG_ACPI */
#defineacpi_disabled1include/linux/acpi.h +0
-0@@ -976,6 +978,10 @@ static inline int acpi_get_local_address(acpi_handle handle, u32 *addr) return -ENODEV; }
+static inline voidacpi_init_properties(struct acpi_device *adev)include/linux/acpi.h +3
-0+{ +} +#endif /* !CONFIG_ACPI */
#ifdefCONFIG_ACPI_HOTPLUG_IOAPIC