update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/acpi/acpica/acpredef.h
..
..
@@ -3,7 +3,7 @@
3
3
  *
4
4
  * Name: acpredef - Information table for ACPI predefined methods and objects
5
5
  *
6
- * Copyright (C) 2000 - 2018, Intel Corp.
6
+ * Copyright (C) 2000 - 2020, Intel Corp.
7
7
  *
8
8
  *****************************************************************************/
9
9
 
..
..
@@ -101,7 +101,7 @@
101
101
 
102
102
 /* Support macros for users of the predefined info table */
103
103
 
104
-#define METHOD_PREDEF_ARGS_MAX          4
104
+#define METHOD_PREDEF_ARGS_MAX          5
105
105
 #define METHOD_ARG_BIT_WIDTH            3
106
106
 #define METHOD_ARG_MASK                 0x0007
107
107
 #define ARG_COUNT_IS_MINIMUM            0x8000
..
..
@@ -117,6 +117,7 @@
117
117
 #define METHOD_2ARGS(a1,a2)             (2 | (a1 << 3) | (a2 << 6))
118
118
 #define METHOD_3ARGS(a1,a2,a3)          (3 | (a1 << 3) | (a2 << 6) | (a3 << 9))
119
119
 #define METHOD_4ARGS(a1,a2,a3,a4)       (4 | (a1 << 3) | (a2 << 6) | (a3 << 9) | (a4 << 12))
120
+#define METHOD_5ARGS(a1,a2,a3,a4,a5)    (5 | (a1 << 3) | (a2 << 6) | (a3 << 9) | (a4 << 12) | (a5 << 15))
120
121
 
121
122
 #define METHOD_RETURNS(type)            (type)
122
123
 #define METHOD_NO_RETURN_VALUE          0
..
..
@@ -631,6 +632,21 @@
631
632
 	{{"_MTL", METHOD_0ARGS,	/* ACPI 6.0 */
632
633
 	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
633
634
 
635
+	{{"_NBS", METHOD_0ARGS,	/* ACPI 6.3 */
636
+	  METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
637
+
638
+	{{"_NCH", METHOD_0ARGS,	/* ACPI 6.3 */
639
+	  METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
640
+
641
+	{{"_NIC", METHOD_0ARGS,	/* ACPI 6.3 */
642
+	  METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
643
+
644
+	{{"_NIG", METHOD_0ARGS, /* ACPI 6.3 */
645
+	  METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
646
+
647
+	{{"_NIH", METHOD_1ARGS(ACPI_TYPE_BUFFER), /* ACPI 6.3 */
648
+	  METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
649
+
634
650
 	{{"_NTT", METHOD_0ARGS,
635
651
 	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
636
652
 
..
..
@@ -887,9 +903,39 @@
887
903
 	{{"_S4W", METHOD_0ARGS,
888
904
 	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
889
905
 
906
+	{{"_SBA", METHOD_0ARGS,
907
+	  METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Fixed-length (4 Int) */
908
+	PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0),
909
+
910
+	{{"_SBI", METHOD_0ARGS,
911
+	  METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Fixed-length (1 Int, 1 Buf) */
912
+	PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 1,
913
+		     ACPI_RTYPE_BUFFER, 1, 0),
914
+
915
+	{{"_SBR",
916
+	  METHOD_3ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER,
917
+			ACPI_TYPE_INTEGER),
918
+	   METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Fixed-length (2 Int) */
919
+	PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2,
920
+		     ACPI_RTYPE_BUFFER | ACPI_RTYPE_INTEGER, 1, 0),
921
+
890
922
 	{{"_SBS", METHOD_0ARGS,
891
923
 	  METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
892
924
 
925
+	{{"_SBT",
926
+	  METHOD_4ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER,
927
+			ACPI_TYPE_ANY),
928
+	   METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},	/* Fixed-length (2 Int, 1 Buf | Int) */
929
+	PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2,
930
+		     ACPI_RTYPE_BUFFER | ACPI_RTYPE_INTEGER, 1, 0),
931
+
932
+	{{"_SBW",
933
+	  METHOD_5ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER,
934
+			ACPI_TYPE_INTEGER, ACPI_TYPE_ANY),
935
+	   METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}},
936
+	PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER | ACPI_RTYPE_INTEGER,
937
+		     1, 0, 0, 0),
938
+
893
939
 	{{"_SCP", METHOD_1ARGS(ACPI_TYPE_INTEGER) | ARG_COUNT_IS_MINIMUM,
894
940
 	  METHOD_NO_RETURN_VALUE}},	/* Acpi 1.0 allowed 1 integer arg. Acpi 3.0 expanded to 3 args. Allow both. */
895
941