Skip to contentSkip to conversation

x86: tangier: Use official ACPI HID for FLIS IP

PATCH New Andy Shevchenko 2 participants 4 messages Nov 10, 2017 – Nov 20, 2017 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: tangier: Use official ACPI HID for FLIS IP

FLIS IP since now gets its own ACPI ID.
Drop PRP0001 workaround in favour of official ACPI HID.

---
 arch/x86/include/asm/arch-tangier/acpi/southcluster.asl | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
arch/x86/include/asm/arch-tangier/acpi/southcluster.asl +1 -8
index e80ec0a9be..288b57cb80 100644
@@ -264,7 +264,7 @@ Device (PCI0)
 
 Device (FLIS)
 {
-    Name (_HID, "PRP0001")
+    Name (_HID, "INTC1002")
     Name (_DDN, "Intel Merrifield Family-Level Interface Shim")
     Name (RBUF, ResourceTemplate()
     {
@@ -284,13 +284,6 @@ Device (FLIS)
         Return (RBUF)
     }
 
-    Name (_DSD, Package () {
-        ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
-        Package () {
-            Package () {"compatible", "intel,merrifield-pinctrl"},
-        }
-    })
-
     Method (_STA, 0, NotSerialized)
     {
         Return (STA_VISIBLE)
Signature · 1 line
2.14.2
#1 lore raw

PATCH 1/1 x86: tangier: Use official ACPI HID for FLIS IP

Hi Andy,

Quoted 8 lines · Andy Shevchenko

FLIS IP since now gets its own ACPI ID.
Drop PRP0001 workaround in favour of official ACPI HID.

---
 arch/x86/include/asm/arch-tangier/acpi/southcluster.asl | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

BTW: can you put some xrefs in the commit message like where the new ACPI ID is introduced? I did not find the "INTC1002" in my kernel tree.

Quoted 18 lines
arch/x86/include/asm/arch-tangier/acpi/southcluster.asl +1 -2
index e80ec0a9be..288b57cb80 100644
@@ -264,7 +264,7 @@ Device (PCI0)
 
 Device (FLIS)
 {
-    Name (_HID, "PRP0001")
+    Name (_HID, "INTC1002")
     Name (_DDN, "Intel Merrifield Family-Level Interface Shim")
     Name (RBUF, ResourceTemplate()
     {
@@ -284,13 +284,6 @@ Device (FLIS)
         Return (RBUF)
     }
 
-    Name (_DSD, Package () {

arch/x86/include/asm/arch-tangier/acpi/southcluster.asl Device (FLIS)

Quoted 10 lines
arch/x86/include/asm/arch-tangier/acpi/southcluster.asl +0 -7
-        ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
-        Package () {
-            Package () {"compatible", "intel,merrifield-pinctrl"},
-        }
-    })
-
     Method (_STA, 0, NotSerialized)
     {
         Return (STA_VISIBLE)
--

Regards,
Bin

#2 lore raw

PATCH 1/1 x86: tangier: Use official ACPI HID for FLIS IP

Quoted 9 lines · Bin Meng

Hi Andy,

Quoted 3 lines · Andy Shevchenko

FLIS IP since now gets its own ACPI ID.
Drop PRP0001 workaround in favour of official ACPI HID.

Thanks, though I think it would be better to add _CRS as well to be fully complete with device resources.

So, taking into consideration your below comment let me send v2 after the ID makes Linux kernel.

Quoted 3 lines

BTW: can you put some xrefs in the commit message like where the new ACPI ID is introduced? I did not find the "INTC1002" in my kernel tree.

The patch is under review, I'm pretty sure it will be in after merge window closed.

Quoted 28 lines
Quoted 21 lines

Device (FLIS)
{

arch/x86/include/asm/arch-tangier/acpi/southcluster.asl +1 -8
-    Name (_HID, "PRP0001")
+    Name (_HID, "INTC1002")
     Name (_DDN, "Intel Merrifield Family-Level Interface Shim")
     Name (RBUF, ResourceTemplate()
     {
@@ -284,13 +284,6 @@ Device (FLIS)
         Return (RBUF)
     }
 
 
 
 
-    Name (_DSD, Package () {
-        ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
-        Package () {
-            Package () {"compatible", "intel,merrifield-pinctrl"},
-        }
-    })
-
Quoted 4 lines

Method (_STA, 0, NotSerialized)
{
Return (STA_VISIBLE)
--

Regards,
Bin

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#3 lore raw

PATCH 1/1 x86: tangier: Use official ACPI HID for FLIS IP

Quoted 5 lines · Andy Shevchenko
Quoted 1 line · Bin Meng

I think it would be better to add _CRS as well to be fully complete with device resources.

Ah, I have done this already (I'm talking about Memory32Fixed() resource).

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy