Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2d2dd50880d018e42076252f9fff16e11c567de0

Authored by Bob Moore
Committed by Rafael J. Wysocki
1 parent 00eb32550f
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ACPICA: Update support for ACPI 5 MPST table 

Fixes some problems introduced by late changes to the table as it
was added to the ACPI 5.0 specification.  Both the table compiler
and the disassembler and the main header support for the table.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Showing 1 changed file with 11 additions and 11 deletions Side-by-side Diff

include/acpi/actbl3.h
Diff comments   View file @ 2d2dd50
... ... @@ -277,10 +277,10 @@
277 277 ******************************************************************************/
278 278  
279 279 #define ACPI_MPST_CHANNEL_INFO \
280   - u16 reserved1; \
281 280 u8 channel_id; \
282   - u8 reserved2; \
283   - u16 power_node_count;
  281 + u8 reserved1[3]; \
  282 + u16 power_node_count; \
  283 + u16 reserved2;
284 284  
285 285 /* Main table */
286 286  
... ... @@ -304,9 +304,8 @@
304 304 u32 length;
305 305 u64 range_address;
306 306 u64 range_length;
307   - u8 num_power_states;
308   - u8 num_physical_components;
309   - u16 reserved2;
  307 + u32 num_power_states;
  308 + u32 num_physical_components;
310 309 };
311 310  
312 311 /* Values for Flags field above */
313 312  
... ... @@ -332,10 +331,11 @@
332 331  
333 332 struct acpi_mpst_data_hdr {
334 333 u16 characteristics_count;
  334 + u16 reserved;
335 335 };
336 336  
337 337 struct acpi_mpst_power_data {
338   - u8 revision;
  338 + u8 structure_id;
339 339 u8 flags;
340 340 u16 reserved1;
341 341 u32 average_power;
... ... @@ -356,10 +356,10 @@
356 356 u32 signature;
357 357 u16 pcc_command;
358 358 u16 pcc_status;
359   - u16 command_register;
360   - u16 status_register;
361   - u16 power_state_id;
362   - u16 power_node_id;
  359 + u32 command_register;
  360 + u32 status_register;
  361 + u32 power_state_id;
  362 + u32 power_node_id;
363 363 u64 energy_consumed;
364 364 u64 average_power;
365 365 };