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 0x00001E7A (7802)
>> + * Length 0x00001DF9 (7673)
>> * Revision 0x02
>> - * Checksum 0x57
>> + * Checksum 0x42
>> * OEM ID "BOCHS "
>> * OEM Table ID "BXPCDSDT"
>> * OEM Revision 0x00000001 (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,
>> - 0x00000000, // Address Base
>> - 0x04000000, // 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,
>> - 0x04000000, // Address Base
>> - 0x04000000, // 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 (0x0000004010000000)
>> }
>>
>> - Method (_CRS, 0, NotSerialized) // _CRS: Current Resource
>> Settings
>> + Name (_CRS, ResourceTemplate () // _CRS: Current Resource
>> Settings
>> {
>> - Return (ResourceTemplate ()
>> - {
>> - WordBusNumber (ResourceProducer, MinFixed, MaxFixed,
>> PosDecode,
>> - 0x0000, // Granularity
>> - 0x0000, // Range Minimum
>> - 0x007F, // Range Maximum
>> - 0x0000, // Translation Offset
>> - 0x0080, // Length
>> - ,, )
>> - DWordMemory (ResourceProducer, PosDecode, MinFixed,
>> MaxFixed, NonCacheable, ReadWrite,
>> - 0x00000000, // Granularity
>> - 0x10000000, // Range Minimum
>> - 0x3EFEFFFF, // Range Maximum
>> - 0x00000000, // Translation Offset
>> - 0x2EFF0000, // Length
>> - ,, , AddressRangeMemory, TypeStatic)
>> - DWordIO (ResourceProducer, MinFixed, MaxFixed,
>> PosDecode, EntireRange,
>> - 0x00000000, // Granularity
>> - 0x00000000, // Range Minimum
>> - 0x0000FFFF, // Range Maximum
>> - 0x3EFF0000, // Translation Offset
>> - 0x00010000, // Length
>> - ,, , TypeStatic, DenseTranslation)
>> - QWordMemory (ResourceProducer, PosDecode, MinFixed,
>> MaxFixed, NonCacheable, ReadWrite,
>> - 0x0000000000000000, // Granularity
>> - 0x0000008000000000, // Range Minimum
>> - 0x000000FFFFFFFFFF, // Range Maximum
>> - 0x0000000000000000, // Translation Offset
>> - 0x0000008000000000, // Length
>> - ,, , AddressRangeMemory, TypeStatic)
>> - })
>> - }
>> -
>> + WordBusNumber (ResourceProducer, MinFixed, MaxFixed,
>> PosDecode,
>> + 0x0000, // Granularity
>> + 0x0000, // Range Minimum
>> + 0x007F, // Range Maximum
>> + 0x0000, // Translation Offset
>> + 0x0080, // Length
>> + ,, )
>> + DWordMemory (ResourceProducer, PosDecode, MinFixed,
>> MaxFixed, NonCacheable, ReadWrite,
>> + 0x00000000, // Granularity
>> + 0x10000000, // Range Minimum
>> + 0x3EFEFFFF, // Range Maximum
>> + 0x00000000, // Translation Offset
>> + 0x2EFF0000, // Length
>> + ,, , AddressRangeMemory, TypeStatic)
>> + DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode,
>> EntireRange,
>> + 0x00000000, // Granularity
>> + 0x00000000, // Range Minimum
>> + 0x0000FFFF, // Range Maximum
>> + 0x3EFF0000, // Translation Offset
>> + 0x00010000, // Length
>> + ,, , TypeStatic, DenseTranslation)
>> + QWordMemory (ResourceProducer, PosDecode, MinFixed,
>> MaxFixed, NonCacheable, ReadWrite,
>> + 0x0000000000000000, // Granularity
>> + 0x0000008000000000, // Range Minimum
>> + 0x000000FFFFFFFFFF, // Range Maximum
>> + 0x0000000000000000, // Translation Offset
>> + 0x0000008000000000, // Length
>> + ,, , AddressRangeMemory, TypeStatic)
>> + })
>> Name (SUPP, Zero)
>> Name (CTRL, Zero)
>> Method (_OSC, 4, NotSerialized) // _OSC: Operating System
>> Capabilities
>>
>> Fixes: fe1127da11 ("unit-test: Add the binary file and clear diff.h")
>> Signed-off-by: Jiahui Cen <cenjia...@huawei.com>
>> ---
>> tests/data/acpi/virt/DSDT.pxb | Bin 7802 -> 7673 bytes
>> 1 file changed, 0 insertions(+), 0 deletions(-)
>>
>> diff --git a/tests/data/acpi/virt/DSDT.pxb b/tests/data/acpi/virt/DSDT.pxb
>> index
>> d5f0533a02d62bc2ae2db9b9de9484e5c06652fe..76f5f1c2fd487644c6b4f827a70ad770edb9fdc9
>> 100644
>> GIT binary patch
>> delta 70
>> zcmV-M0J;DAJo!5cL{mgm`5gcN0z#1r8v=ygktblW?YIa6OPZ6X2_m!G35f{>PNz^q
>> cNt3DxACrg^53`&Ttq27OUqez;vr-%=0*oRUFaQ7m
>>
>> delta 217
>> zcmexq{mX{SCD<jTN{)enDSRTAG*j!-iRuaUhHgH=1|0Doo-VvTenI{Q28N~#9Py!^
>> zE<n;bC|FRCi?5B7fsp|MSSlH!n?PC&v1wsM*TMqS1=eEW7Vhi@(GuwD8){%+U<5Qj
>> zIK*+|g83XwzOyGgaw_pVx&(nNb#?@r6YT1~If1i>lgWL><aa`bth@ovo(7xch1YU$
>> Qia3I;VOX;HqO=AR0CN5_Pyhe`
>>
>> --
>> 2.29.2
>
> .
>
