Re: [PATCH v4 2/8] acpi: Fix unmatched expected DSDT.pxb file
On 01/14/21 02:30, Jiahui Cen wrote:
> Hi Michael,
>
> On 2021/1/13 22:00, Michael S. Tsirkin wrote:
>> On Thu, Jan 07, 2021 at 07:40:37PM +0800, Jiahui Cen wrote:
>>> Commit fe1127da11 ("unit-test: Add the binary file and clear diff.h") does
>>> not
>>> use the up-to-date expected file for pxb for ARM virt.
>>>
>>> Fix the expected DSDT.pxb file.
>>>
>>> Full diff of changed file disassembly:
>>>
>>> diff -ru /tmp/old/tests/data/acpi/virt/DSDT.pxb.dsl
>>> /tmp/new/tests/data/acpi/virt/DSDT.pxb.dsl
>>> --- /tmp/old/tests/data/acpi/virt/DSDT.pxb.dsl 2021-01-07
>>> 17:04:51.246831080 +0800
>>
>> This --- sign confuses git am. You shouldn't put this in the commit log
>> really ...
>>
>
> Yes, it does confuse. I found there were some patches with commit log
> like this, so I did the same :(
>
> So, I'll modify the commit logs and resend them.
It's OK to include diffs in the commit message or in the Notes section
of the patch, in general, but such diffs should always be indented, or
quoted in email-style (angle bracket on the left side), covering *all*
parts of the diff (headers, hunk headers, etc).
Laszlo
Re: [PATCH v4 2/8] acpi: Fix unmatched expected DSDT.pxb file
Hi Michael,
On 2021/1/13 22:00, Michael S. Tsirkin wrote:
> On Thu, Jan 07, 2021 at 07:40:37PM +0800, Jiahui Cen wrote:
>> Commit fe1127da11 ("unit-test: Add the binary file and clear diff.h") does
>> not
>> use the up-to-date expected file for pxb for ARM virt.
>>
>> Fix the expected DSDT.pxb file.
>>
>> Full diff of changed file disassembly:
>>
>> diff -ru /tmp/old/tests/data/acpi/virt/DSDT.pxb.dsl
>> /tmp/new/tests/data/acpi/virt/DSDT.pxb.dsl
>> --- /tmp/old/tests/data/acpi/virt/DSDT.pxb.dsl 2021-01-07
>> 17:04:51.246831080 +0800
>
> This --- sign confuses git am. You shouldn't put this in the commit log
> really ...
>
Yes, it does confuse. I found there were some patches with commit log
like this, so I did the same :(
So, I'll modify the commit logs and resend them.
Thanks,
Jiahui
>
>> +++ /tmp/new/tests/data/acpi/virt/DSDT.pxb.dsl 2021-01-07
>> 17:11:59.566831080 +0800
>> @@ -9,9 +9,9 @@
>> *
>> * Original Table Header:
>> * Signature"DSDT"
>> - * Length 0x1E7A (7802)
>> + * Length 0x1DF9 (7673)
>> * Revision 0x02
>> - * Checksum 0x57
>> + * Checksum 0x42
>> * OEM ID "BOCHS "
>> * OEM Table ID "BXPCDSDT"
>> * OEM Revision 0x0001 (1)
>> @@ -45,32 +45,6 @@
>> })
>> }
>>
>> -Device (FLS0)
>> -{
>> -Name (_HID, "LNRO0015") // _HID: Hardware ID
>> -Name (_UID, Zero) // _UID: Unique ID
>> -Name (_CRS, ResourceTemplate () // _CRS: Current Resource
>> Settings
>> -{
>> -Memory32Fixed (ReadWrite,
>> -0x, // Address Base
>> -0x0400, // Address Length
>> -)
>> -})
>> -}
>> -
>> -Device (FLS1)
>> -{
>> -Name (_HID, "LNRO0015") // _HID: Hardware ID
>> -Name (_UID, One) // _UID: Unique ID
>> -Name (_CRS, ResourceTemplate () // _CRS: Current Resource
>> Settings
>> -{
>> -Memory32Fixed (ReadWrite,
>> -0x0400, // Address Base
>> -0x0400, // Address Length
>> -)
>> -})
>> -}
>> -
>> Device (FWCF)
>> {
>> Name (_HID, "QEMU0002") // _HID: Hardware ID
>> @@ -665,9 +639,6 @@
>> {
>> Name (_HID, "PNP0A08" /* PCI Express Bus */) // _HID: Hardware
>> ID
>> Name (_CID, "PNP0A03" /* PCI Bus */) // _CID: Compatible ID
>> -Name (_ADR, Zero) // _ADR: Address
>> -Name (_CCA, One) // _CCA: Cache Coherency Attribute
>> -Name (_SEG, Zero) // _SEG: PCI Segment
>> Name (_BBN, 0x80) // _BBN: BIOS Bus Number
>> Name (_UID, 0x80) // _UID: Unique ID
>> Name (_STR, Unicode ("pxb Device")) // _STR: Description String
>> @@ -1857,7 +1828,7 @@
>> Name (_CID, "PNP0A03" /* PCI Bus */) // _CID: Compatible ID
>> Name (_SEG, Zero) // _SEG: PCI Segment
>> Name (_BBN, Zero) // _BBN: BIOS Bus Number
>> -Name (_UID, "PCI0") // _UID: Unique ID
>> +Name (_UID, Zero) // _UID: Unique ID
>> Name (_STR, Unicode ("PCIe 0 Device")) // _STR: Description
>> String
>> Name (_CCA, One) // _CCA: Cache Coherency Attribute
>> Name (_PRT, Package (0x80) // _PRT: PCI Routing Table
>> @@ -2983,41 +2954,37 @@
>> Return (0x00401000)
>> }
>>
>> -Method (_CRS, 0, NotSerialized) // _CRS: Current Resource
>> Settings
>> +Name (_CRS, ResourceTemplate () // _CRS: Current Resource
>> Settings
>> {
>> -Return (ResourceTemplate ()
>> -{
>> -WordBusNumber (ResourceProducer, MinFixed, MaxFixed,
>> PosDecode,
>> -0x, // Granularity
>> -0x, // Range Minimum
>> -0x007F, // Range Maximum
>> -0x, // Translation Offset
>> -0x0080, // Length
>> -,, )
>> -DWordMemory (ResourceProducer, PosDecode, MinFixed,
>> MaxFixed, NonCacheable, ReadWrite,
>> -0x, // Granularity
>> -0x1000, // Range Minimum
>> -0x3EFE, // Range Maximum
>> -0x, // Translation Offset
>> -0x2EFF, // Length
>> -,, , AddressRangeMemory, TypeStatic)
>> -DWordIO (ResourceProducer, MinFixed, MaxFixed,
>> PosDecode, EntireRange,
>> -
Re: [PATCH v4 2/8] acpi: Fix unmatched expected DSDT.pxb file
On Thu, Jan 07, 2021 at 07:40:37PM +0800, Jiahui Cen wrote:
> Commit fe1127da11 ("unit-test: Add the binary file and clear diff.h") does not
> use the up-to-date expected file for pxb for ARM virt.
>
> Fix the expected DSDT.pxb file.
>
> Full diff of changed file disassembly:
>
> diff -ru /tmp/old/tests/data/acpi/virt/DSDT.pxb.dsl
> /tmp/new/tests/data/acpi/virt/DSDT.pxb.dsl
> --- /tmp/old/tests/data/acpi/virt/DSDT.pxb.dsl 2021-01-07 17:04:51.246831080
> +0800
This --- sign confuses git am. You shouldn't put this in the commit log
really ...
> +++ /tmp/new/tests/data/acpi/virt/DSDT.pxb.dsl 2021-01-07 17:11:59.566831080
> +0800
> @@ -9,9 +9,9 @@
> *
> * Original Table Header:
> * Signature"DSDT"
> - * Length 0x1E7A (7802)
> + * Length 0x1DF9 (7673)
> * Revision 0x02
> - * Checksum 0x57
> + * Checksum 0x42
> * OEM ID "BOCHS "
> * OEM Table ID "BXPCDSDT"
> * OEM Revision 0x0001 (1)
> @@ -45,32 +45,6 @@
> })
> }
>
> -Device (FLS0)
> -{
> -Name (_HID, "LNRO0015") // _HID: Hardware ID
> -Name (_UID, Zero) // _UID: Unique ID
> -Name (_CRS, ResourceTemplate () // _CRS: Current Resource
> Settings
> -{
> -Memory32Fixed (ReadWrite,
> -0x, // Address Base
> -0x0400, // Address Length
> -)
> -})
> -}
> -
> -Device (FLS1)
> -{
> -Name (_HID, "LNRO0015") // _HID: Hardware ID
> -Name (_UID, One) // _UID: Unique ID
> -Name (_CRS, ResourceTemplate () // _CRS: Current Resource
> Settings
> -{
> -Memory32Fixed (ReadWrite,
> -0x0400, // Address Base
> -0x0400, // Address Length
> -)
> -})
> -}
> -
> Device (FWCF)
> {
> Name (_HID, "QEMU0002") // _HID: Hardware ID
> @@ -665,9 +639,6 @@
> {
> Name (_HID, "PNP0A08" /* PCI Express Bus */) // _HID: Hardware
> ID
> Name (_CID, "PNP0A03" /* PCI Bus */) // _CID: Compatible ID
> -Name (_ADR, Zero) // _ADR: Address
> -Name (_CCA, One) // _CCA: Cache Coherency Attribute
> -Name (_SEG, Zero) // _SEG: PCI Segment
> Name (_BBN, 0x80) // _BBN: BIOS Bus Number
> Name (_UID, 0x80) // _UID: Unique ID
> Name (_STR, Unicode ("pxb Device")) // _STR: Description String
> @@ -1857,7 +1828,7 @@
> Name (_CID, "PNP0A03" /* PCI Bus */) // _CID: Compatible ID
> Name (_SEG, Zero) // _SEG: PCI Segment
> Name (_BBN, Zero) // _BBN: BIOS Bus Number
> -Name (_UID, "PCI0") // _UID: Unique ID
> +Name (_UID, Zero) // _UID: Unique ID
> Name (_STR, Unicode ("PCIe 0 Device")) // _STR: Description
> String
> Name (_CCA, One) // _CCA: Cache Coherency Attribute
> Name (_PRT, Package (0x80) // _PRT: PCI Routing Table
> @@ -2983,41 +2954,37 @@
> Return (0x00401000)
> }
>
> -Method (_CRS, 0, NotSerialized) // _CRS: Current Resource
> Settings
> +Name (_CRS, ResourceTemplate () // _CRS: Current Resource
> Settings
> {
> -Return (ResourceTemplate ()
> -{
> -WordBusNumber (ResourceProducer, MinFixed, MaxFixed,
> PosDecode,
> -0x, // Granularity
> -0x, // Range Minimum
> -0x007F, // Range Maximum
> -0x, // Translation Offset
> -0x0080, // Length
> -,, )
> -DWordMemory (ResourceProducer, PosDecode, MinFixed,
> MaxFixed, NonCacheable, ReadWrite,
> -0x, // Granularity
> -0x1000, // Range Minimum
> -0x3EFE, // Range Maximum
> -0x, // Translation Offset
> -0x2EFF, // Length
> -,, , AddressRangeMemory, TypeStatic)
> -DWordIO (ResourceProducer, MinFixed, MaxFixed,
> PosDecode, EntireRange,
> -0x, // Granularity
> -0x, // Range Minimum
> -0x, // Range Maximum
> -0x3EFF, // Translation Offset
> -0x0001, // Length
> -,, , TypeStatic, Dense
[PATCH v4 2/8] acpi: Fix unmatched expected DSDT.pxb file
Commit fe1127da11 ("unit-test: Add the binary file and clear diff.h") does not
use the up-to-date expected file for pxb for ARM virt.
Fix the expected DSDT.pxb file.
Full diff of changed file disassembly:
diff -ru /tmp/old/tests/data/acpi/virt/DSDT.pxb.dsl
/tmp/new/tests/data/acpi/virt/DSDT.pxb.dsl
--- /tmp/old/tests/data/acpi/virt/DSDT.pxb.dsl 2021-01-07 17:04:51.246831080
+0800
+++ /tmp/new/tests/data/acpi/virt/DSDT.pxb.dsl 2021-01-07 17:11:59.566831080
+0800
@@ -9,9 +9,9 @@
*
* Original Table Header:
* Signature"DSDT"
- * Length 0x1E7A (7802)
+ * Length 0x1DF9 (7673)
* Revision 0x02
- * Checksum 0x57
+ * Checksum 0x42
* OEM ID "BOCHS "
* OEM Table ID "BXPCDSDT"
* OEM Revision 0x0001 (1)
@@ -45,32 +45,6 @@
})
}
-Device (FLS0)
-{
-Name (_HID, "LNRO0015") // _HID: Hardware ID
-Name (_UID, Zero) // _UID: Unique ID
-Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
-{
-Memory32Fixed (ReadWrite,
-0x, // Address Base
-0x0400, // Address Length
-)
-})
-}
-
-Device (FLS1)
-{
-Name (_HID, "LNRO0015") // _HID: Hardware ID
-Name (_UID, One) // _UID: Unique ID
-Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
-{
-Memory32Fixed (ReadWrite,
-0x0400, // Address Base
-0x0400, // Address Length
-)
-})
-}
-
Device (FWCF)
{
Name (_HID, "QEMU0002") // _HID: Hardware ID
@@ -665,9 +639,6 @@
{
Name (_HID, "PNP0A08" /* PCI Express Bus */) // _HID: Hardware ID
Name (_CID, "PNP0A03" /* PCI Bus */) // _CID: Compatible ID
-Name (_ADR, Zero) // _ADR: Address
-Name (_CCA, One) // _CCA: Cache Coherency Attribute
-Name (_SEG, Zero) // _SEG: PCI Segment
Name (_BBN, 0x80) // _BBN: BIOS Bus Number
Name (_UID, 0x80) // _UID: Unique ID
Name (_STR, Unicode ("pxb Device")) // _STR: Description String
@@ -1857,7 +1828,7 @@
Name (_CID, "PNP0A03" /* PCI Bus */) // _CID: Compatible ID
Name (_SEG, Zero) // _SEG: PCI Segment
Name (_BBN, Zero) // _BBN: BIOS Bus Number
-Name (_UID, "PCI0") // _UID: Unique ID
+Name (_UID, Zero) // _UID: Unique ID
Name (_STR, Unicode ("PCIe 0 Device")) // _STR: Description String
Name (_CCA, One) // _CCA: Cache Coherency Attribute
Name (_PRT, Package (0x80) // _PRT: PCI Routing Table
@@ -2983,41 +2954,37 @@
Return (0x00401000)
}
-Method (_CRS, 0, NotSerialized) // _CRS: Current Resource Settings
+Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
{
-Return (ResourceTemplate ()
-{
-WordBusNumber (ResourceProducer, MinFixed, MaxFixed,
PosDecode,
-0x, // Granularity
-0x, // Range Minimum
-0x007F, // Range Maximum
-0x, // Translation Offset
-0x0080, // Length
-,, )
-DWordMemory (ResourceProducer, PosDecode, MinFixed,
MaxFixed, NonCacheable, ReadWrite,
-0x, // Granularity
-0x1000, // Range Minimum
-0x3EFE, // Range Maximum
-0x, // Translation Offset
-0x2EFF, // Length
-,, , AddressRangeMemory, TypeStatic)
-DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode,
EntireRange,
-0x, // Granularity
-0x, // Range Minimum
-0x, // Range Maximum
-0x3EFF, // Translation Offset
-0x0001, // Length
-,, , TypeStatic, DenseTranslation)
-QWordMemory (ResourceProducer, PosDecode, MinFixed,
MaxFixed, NonCacheable, ReadWrite,
-0x, // Granularity
-0x0080, // Range Minimum
-0x00FF, // Range Maximum
-0x, // Translation Offset
-
