Merge branch '2024-01-18-assorted-fixes'

- A number of OS boot related cleanups, a number of TI platform
  fixes/cleanups, SMBIOS fixes, tweak get_maintainers.pl to report me
  for more places, fix the "clean the build" pytest and add a bootstage
  pytest, fix PKCS11 URI being omitted in some valid cases, make an iommu
  problem easier to debug on new platforms, nvme and pci improvements,
  refactor image-host code a bit, fix a typo in env setting, add a missing
  dependency for CMD_LICENSE, and correct how we call getchar() in some
  places.
This commit is contained in:
Tom Rini 2024-01-19 08:46:47 -05:00
commit f4d5486506
68 changed files with 12107 additions and 14320 deletions

View file

@ -41,7 +41,7 @@ struct mm_region k3_mem_map[] = {
}, { }, {
.virt = 0x500000000UL, .virt = 0x500000000UL,
.phys = 0x500000000UL, .phys = 0x500000000UL,
.size = 0x400000000UL, .size = 0x380000000UL,
.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
PTE_BLOCK_NON_SHARE | PTE_BLOCK_NON_SHARE |
PTE_BLOCK_PXN | PTE_BLOCK_UXN PTE_BLOCK_PXN | PTE_BLOCK_UXN

File diff suppressed because it is too large Load diff

View file

@ -143,7 +143,6 @@ sec-cfg:
processor_id: 0 processor_id: 0
proc_access_master: 0 proc_access_master: 0
proc_access_secondary: [0, 0, 0] proc_access_secondary: [0, 0, 0]
host_hierarchy: host_hierarchy:
subhdr: subhdr:
magic: 0x8D27 magic: 0x8D27

View file

@ -253,833 +253,714 @@ rm-cfg:
type: 64 type: 64
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 4 num_resource: 4
type: 64 type: 64
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 4 num_resource: 4
type: 64 type: 64
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 20 start_resource: 20
num_resource: 22 num_resource: 22
type: 64 type: 64
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 16 num_resource: 16
type: 192 type: 192
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 34 start_resource: 34
num_resource: 2 num_resource: 2
type: 192 type: 192
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 4 num_resource: 4
type: 320 type: 320
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 4 start_resource: 4
num_resource: 4 num_resource: 4
type: 320 type: 320
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 26 num_resource: 26
type: 384 type: 384
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 50176 start_resource: 50176
num_resource: 164 num_resource: 164
type: 1666 type: 1666
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1 num_resource: 1
type: 1667 type: 1667
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 18 num_resource: 18
type: 1677 type: 1677
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1677 type: 1677
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1677 type: 1677
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 24 start_resource: 24
num_resource: 2 num_resource: 2
type: 1677 type: 1677
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 26 start_resource: 26
num_resource: 6 num_resource: 6
type: 1677 type: 1677
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 54 start_resource: 54
num_resource: 18 num_resource: 18
type: 1678 type: 1678
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 72 start_resource: 72
num_resource: 6 num_resource: 6
type: 1678 type: 1678
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 72 start_resource: 72
num_resource: 6 num_resource: 6
type: 1678 type: 1678
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 78 start_resource: 78
num_resource: 2 num_resource: 2
type: 1678 type: 1678
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 80 start_resource: 80
num_resource: 2 num_resource: 2
type: 1678 type: 1678
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 32 start_resource: 32
num_resource: 12 num_resource: 12
type: 1679 type: 1679
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 6 num_resource: 6
type: 1679 type: 1679
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 6 num_resource: 6
type: 1679 type: 1679
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 50 start_resource: 50
num_resource: 2 num_resource: 2
type: 1679 type: 1679
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 52 start_resource: 52
num_resource: 2 num_resource: 2
type: 1679 type: 1679
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 18 num_resource: 18
type: 1696 type: 1696
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1696 type: 1696
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1696 type: 1696
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 24 start_resource: 24
num_resource: 2 num_resource: 2
type: 1696 type: 1696
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 26 start_resource: 26
num_resource: 6 num_resource: 6
type: 1696 type: 1696
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 18 num_resource: 18
type: 1697 type: 1697
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1697 type: 1697
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1697 type: 1697
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 24 start_resource: 24
num_resource: 2 num_resource: 2
type: 1697 type: 1697
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 26 start_resource: 26
num_resource: 2 num_resource: 2
type: 1697 type: 1697
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 12 num_resource: 12
type: 1698 type: 1698
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 12 start_resource: 12
num_resource: 6 num_resource: 6
type: 1698 type: 1698
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 12 start_resource: 12
num_resource: 6 num_resource: 6
type: 1698 type: 1698
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 2 num_resource: 2
type: 1698 type: 1698
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 20 start_resource: 20
num_resource: 2 num_resource: 2
type: 1698 type: 1698
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 5 start_resource: 5
num_resource: 35 num_resource: 35
type: 1802 type: 1802
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 36 num_resource: 36
type: 1802 type: 1802
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 36 num_resource: 36
type: 1802 type: 1802
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 168 start_resource: 168
num_resource: 8 num_resource: 8
type: 1802 type: 1802
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 512 num_resource: 512
type: 1805 type: 1805
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 525 start_resource: 525
num_resource: 256 num_resource: 256
type: 1805 type: 1805
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 525 start_resource: 525
num_resource: 256 num_resource: 256
type: 1805 type: 1805
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 781 start_resource: 781
num_resource: 128 num_resource: 128
type: 1805 type: 1805
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 909 start_resource: 909
num_resource: 627 num_resource: 627
type: 1805 type: 1805
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1024 num_resource: 1024
type: 1807 type: 1807
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 4096 start_resource: 4096
num_resource: 29 num_resource: 29
type: 1808 type: 1808
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 4608 start_resource: 4608
num_resource: 99 num_resource: 99
type: 1809 type: 1809
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 5120 start_resource: 5120
num_resource: 24 num_resource: 24
type: 1810 type: 1810
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 5632 start_resource: 5632
num_resource: 51 num_resource: 51
type: 1811 type: 1811
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 6144 start_resource: 6144
num_resource: 51 num_resource: 51
type: 1812 type: 1812
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 6656 start_resource: 6656
num_resource: 51 num_resource: 51
type: 1813 type: 1813
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 8192 start_resource: 8192
num_resource: 32 num_resource: 32
type: 1814 type: 1814
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 8704 start_resource: 8704
num_resource: 32 num_resource: 32
type: 1815 type: 1815
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 9216 start_resource: 9216
num_resource: 32 num_resource: 32
type: 1816 type: 1816
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 9728 start_resource: 9728
num_resource: 22 num_resource: 22
type: 1817 type: 1817
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 10240 start_resource: 10240
num_resource: 22 num_resource: 22
type: 1818 type: 1818
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 10752 start_resource: 10752
num_resource: 22 num_resource: 22
type: 1819 type: 1819
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 11264 start_resource: 11264
num_resource: 28 num_resource: 28
type: 1820 type: 1820
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 11776 start_resource: 11776
num_resource: 28 num_resource: 28
type: 1821 type: 1821
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 12288 start_resource: 12288
num_resource: 28 num_resource: 28
type: 1822 type: 1822
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1 num_resource: 1
type: 1923 type: 1923
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1936 type: 1936
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 64 num_resource: 64
type: 1937 type: 1937
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 64 num_resource: 64
type: 1937 type: 1937
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 83 start_resource: 83
num_resource: 8 num_resource: 8
type: 1938 type: 1938
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 91 start_resource: 91
num_resource: 8 num_resource: 8
type: 1939 type: 1939
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 99 start_resource: 99
num_resource: 10 num_resource: 10
type: 1942 type: 1942
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 109 start_resource: 109
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 109 start_resource: 109
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 112 start_resource: 112
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 115 start_resource: 115
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 118 start_resource: 118
num_resource: 16 num_resource: 16
type: 1943 type: 1943
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 118 start_resource: 118
num_resource: 16 num_resource: 16
type: 1943 type: 1943
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 134 start_resource: 134
num_resource: 8 num_resource: 8
type: 1944 type: 1944
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 134 start_resource: 134
num_resource: 8 num_resource: 8
type: 1945 type: 1945
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 142 start_resource: 142
num_resource: 8 num_resource: 8
type: 1946 type: 1946
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 142 start_resource: 142
num_resource: 8 num_resource: 8
type: 1947 type: 1947
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1955 type: 1955
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 8 num_resource: 8
type: 1956 type: 1956
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 8 num_resource: 8
type: 1956 type: 1956
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 27 start_resource: 27
num_resource: 1 num_resource: 1
type: 1957 type: 1957
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 28 start_resource: 28
num_resource: 1 num_resource: 1
type: 1958 type: 1958
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1961 type: 1961
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1962 type: 1962
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 1 num_resource: 1
type: 1963 type: 1963
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 1 num_resource: 1
type: 1963 type: 1963
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 16 num_resource: 16
type: 1964 type: 1964
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 16 num_resource: 16
type: 1964 type: 1964
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 20 start_resource: 20
num_resource: 1 num_resource: 1
type: 1965 type: 1965
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 35 start_resource: 35
num_resource: 8 num_resource: 8
type: 1966 type: 1966
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 21 start_resource: 21
num_resource: 1 num_resource: 1
type: 1967 type: 1967
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 35 start_resource: 35
num_resource: 8 num_resource: 8
type: 1968 type: 1968
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 22 start_resource: 22
num_resource: 1 num_resource: 1
type: 1969 type: 1969
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 43 start_resource: 43
num_resource: 8 num_resource: 8
type: 1970 type: 1970
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 23 start_resource: 23
num_resource: 1 num_resource: 1
type: 1971 type: 1971
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 43 start_resource: 43
num_resource: 8 num_resource: 8
type: 1972 type: 1972
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1 num_resource: 1
type: 2112 type: 2112
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 2 start_resource: 2
num_resource: 2 num_resource: 2

View file

@ -253,833 +253,714 @@ rm-cfg:
type: 64 type: 64
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 4 num_resource: 4
type: 64 type: 64
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 4 num_resource: 4
type: 64 type: 64
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 20 start_resource: 20
num_resource: 22 num_resource: 22
type: 64 type: 64
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 16 num_resource: 16
type: 192 type: 192
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 34 start_resource: 34
num_resource: 2 num_resource: 2
type: 192 type: 192
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 4 num_resource: 4
type: 320 type: 320
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 4 start_resource: 4
num_resource: 4 num_resource: 4
type: 320 type: 320
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 26 num_resource: 26
type: 384 type: 384
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 50176 start_resource: 50176
num_resource: 164 num_resource: 164
type: 1666 type: 1666
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1 num_resource: 1
type: 1667 type: 1667
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 18 num_resource: 18
type: 1677 type: 1677
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1677 type: 1677
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1677 type: 1677
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 24 start_resource: 24
num_resource: 2 num_resource: 2
type: 1677 type: 1677
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 26 start_resource: 26
num_resource: 6 num_resource: 6
type: 1677 type: 1677
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 54 start_resource: 54
num_resource: 18 num_resource: 18
type: 1678 type: 1678
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 72 start_resource: 72
num_resource: 6 num_resource: 6
type: 1678 type: 1678
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 72 start_resource: 72
num_resource: 6 num_resource: 6
type: 1678 type: 1678
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 78 start_resource: 78
num_resource: 2 num_resource: 2
type: 1678 type: 1678
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 80 start_resource: 80
num_resource: 2 num_resource: 2
type: 1678 type: 1678
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 32 start_resource: 32
num_resource: 12 num_resource: 12
type: 1679 type: 1679
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 6 num_resource: 6
type: 1679 type: 1679
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 6 num_resource: 6
type: 1679 type: 1679
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 50 start_resource: 50
num_resource: 2 num_resource: 2
type: 1679 type: 1679
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 52 start_resource: 52
num_resource: 2 num_resource: 2
type: 1679 type: 1679
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 18 num_resource: 18
type: 1696 type: 1696
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1696 type: 1696
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1696 type: 1696
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 24 start_resource: 24
num_resource: 2 num_resource: 2
type: 1696 type: 1696
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 26 start_resource: 26
num_resource: 6 num_resource: 6
type: 1696 type: 1696
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 18 num_resource: 18
type: 1697 type: 1697
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1697 type: 1697
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1697 type: 1697
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 24 start_resource: 24
num_resource: 2 num_resource: 2
type: 1697 type: 1697
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 26 start_resource: 26
num_resource: 2 num_resource: 2
type: 1697 type: 1697
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 12 num_resource: 12
type: 1698 type: 1698
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 12 start_resource: 12
num_resource: 6 num_resource: 6
type: 1698 type: 1698
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 12 start_resource: 12
num_resource: 6 num_resource: 6
type: 1698 type: 1698
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 2 num_resource: 2
type: 1698 type: 1698
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 20 start_resource: 20
num_resource: 2 num_resource: 2
type: 1698 type: 1698
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 5 start_resource: 5
num_resource: 35 num_resource: 35
type: 1802 type: 1802
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 36 num_resource: 36
type: 1802 type: 1802
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 36 num_resource: 36
type: 1802 type: 1802
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 168 start_resource: 168
num_resource: 8 num_resource: 8
type: 1802 type: 1802
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 512 num_resource: 512
type: 1805 type: 1805
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 525 start_resource: 525
num_resource: 256 num_resource: 256
type: 1805 type: 1805
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 525 start_resource: 525
num_resource: 256 num_resource: 256
type: 1805 type: 1805
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 781 start_resource: 781
num_resource: 128 num_resource: 128
type: 1805 type: 1805
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 909 start_resource: 909
num_resource: 627 num_resource: 627
type: 1805 type: 1805
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1024 num_resource: 1024
type: 1807 type: 1807
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 4096 start_resource: 4096
num_resource: 29 num_resource: 29
type: 1808 type: 1808
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 4608 start_resource: 4608
num_resource: 99 num_resource: 99
type: 1809 type: 1809
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 5120 start_resource: 5120
num_resource: 24 num_resource: 24
type: 1810 type: 1810
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 5632 start_resource: 5632
num_resource: 51 num_resource: 51
type: 1811 type: 1811
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 6144 start_resource: 6144
num_resource: 51 num_resource: 51
type: 1812 type: 1812
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 6656 start_resource: 6656
num_resource: 51 num_resource: 51
type: 1813 type: 1813
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 8192 start_resource: 8192
num_resource: 32 num_resource: 32
type: 1814 type: 1814
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 8704 start_resource: 8704
num_resource: 32 num_resource: 32
type: 1815 type: 1815
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 9216 start_resource: 9216
num_resource: 32 num_resource: 32
type: 1816 type: 1816
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 9728 start_resource: 9728
num_resource: 22 num_resource: 22
type: 1817 type: 1817
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 10240 start_resource: 10240
num_resource: 22 num_resource: 22
type: 1818 type: 1818
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 10752 start_resource: 10752
num_resource: 22 num_resource: 22
type: 1819 type: 1819
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 11264 start_resource: 11264
num_resource: 28 num_resource: 28
type: 1820 type: 1820
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 11776 start_resource: 11776
num_resource: 28 num_resource: 28
type: 1821 type: 1821
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 12288 start_resource: 12288
num_resource: 28 num_resource: 28
type: 1822 type: 1822
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1 num_resource: 1
type: 1923 type: 1923
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1936 type: 1936
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 64 num_resource: 64
type: 1937 type: 1937
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 64 num_resource: 64
type: 1937 type: 1937
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 83 start_resource: 83
num_resource: 8 num_resource: 8
type: 1938 type: 1938
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 91 start_resource: 91
num_resource: 8 num_resource: 8
type: 1939 type: 1939
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 99 start_resource: 99
num_resource: 10 num_resource: 10
type: 1942 type: 1942
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 109 start_resource: 109
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 109 start_resource: 109
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 112 start_resource: 112
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 115 start_resource: 115
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 118 start_resource: 118
num_resource: 16 num_resource: 16
type: 1943 type: 1943
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 118 start_resource: 118
num_resource: 16 num_resource: 16
type: 1943 type: 1943
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 134 start_resource: 134
num_resource: 8 num_resource: 8
type: 1944 type: 1944
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 134 start_resource: 134
num_resource: 8 num_resource: 8
type: 1945 type: 1945
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 142 start_resource: 142
num_resource: 8 num_resource: 8
type: 1946 type: 1946
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 142 start_resource: 142
num_resource: 8 num_resource: 8
type: 1947 type: 1947
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1955 type: 1955
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 8 num_resource: 8
type: 1956 type: 1956
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 8 num_resource: 8
type: 1956 type: 1956
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 27 start_resource: 27
num_resource: 1 num_resource: 1
type: 1957 type: 1957
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 28 start_resource: 28
num_resource: 1 num_resource: 1
type: 1958 type: 1958
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1961 type: 1961
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1962 type: 1962
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 1 num_resource: 1
type: 1963 type: 1963
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 1 num_resource: 1
type: 1963 type: 1963
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 16 num_resource: 16
type: 1964 type: 1964
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 16 num_resource: 16
type: 1964 type: 1964
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 20 start_resource: 20
num_resource: 1 num_resource: 1
type: 1965 type: 1965
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 35 start_resource: 35
num_resource: 8 num_resource: 8
type: 1966 type: 1966
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 21 start_resource: 21
num_resource: 1 num_resource: 1
type: 1967 type: 1967
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 35 start_resource: 35
num_resource: 8 num_resource: 8
type: 1968 type: 1968
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 22 start_resource: 22
num_resource: 1 num_resource: 1
type: 1969 type: 1969
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 43 start_resource: 43
num_resource: 8 num_resource: 8
type: 1970 type: 1970
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 23 start_resource: 23
num_resource: 1 num_resource: 1
type: 1971 type: 1971
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 43 start_resource: 43
num_resource: 8 num_resource: 8
type: 1972 type: 1972
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1 num_resource: 1
type: 2112 type: 2112
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 2 start_resource: 2
num_resource: 2 num_resource: 2

View file

@ -253,756 +253,648 @@ tifs-rm-cfg:
type: 1677 type: 1677
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1677 type: 1677
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1677 type: 1677
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 24 start_resource: 24
num_resource: 2 num_resource: 2
type: 1677 type: 1677
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 26 start_resource: 26
num_resource: 6 num_resource: 6
type: 1677 type: 1677
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 54 start_resource: 54
num_resource: 18 num_resource: 18
type: 1678 type: 1678
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 72 start_resource: 72
num_resource: 6 num_resource: 6
type: 1678 type: 1678
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 72 start_resource: 72
num_resource: 6 num_resource: 6
type: 1678 type: 1678
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 78 start_resource: 78
num_resource: 2 num_resource: 2
type: 1678 type: 1678
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 80 start_resource: 80
num_resource: 2 num_resource: 2
type: 1678 type: 1678
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 32 start_resource: 32
num_resource: 12 num_resource: 12
type: 1679 type: 1679
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 6 num_resource: 6
type: 1679 type: 1679
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 6 num_resource: 6
type: 1679 type: 1679
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 50 start_resource: 50
num_resource: 2 num_resource: 2
type: 1679 type: 1679
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 52 start_resource: 52
num_resource: 2 num_resource: 2
type: 1679 type: 1679
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 18 num_resource: 18
type: 1696 type: 1696
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1696 type: 1696
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1696 type: 1696
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 24 start_resource: 24
num_resource: 2 num_resource: 2
type: 1696 type: 1696
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 26 start_resource: 26
num_resource: 6 num_resource: 6
type: 1696 type: 1696
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 18 num_resource: 18
type: 1697 type: 1697
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1697 type: 1697
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1697 type: 1697
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 24 start_resource: 24
num_resource: 2 num_resource: 2
type: 1697 type: 1697
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 26 start_resource: 26
num_resource: 2 num_resource: 2
type: 1697 type: 1697
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 12 num_resource: 12
type: 1698 type: 1698
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 12 start_resource: 12
num_resource: 6 num_resource: 6
type: 1698 type: 1698
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 12 start_resource: 12
num_resource: 6 num_resource: 6
type: 1698 type: 1698
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 2 num_resource: 2
type: 1698 type: 1698
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 20 start_resource: 20
num_resource: 2 num_resource: 2
type: 1698 type: 1698
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 6 start_resource: 6
num_resource: 34 num_resource: 34
type: 1802 type: 1802
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 36 num_resource: 36
type: 1802 type: 1802
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 36 num_resource: 36
type: 1802 type: 1802
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 168 start_resource: 168
num_resource: 8 num_resource: 8
type: 1802 type: 1802
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1024 num_resource: 1024
type: 1807 type: 1807
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 4096 start_resource: 4096
num_resource: 29 num_resource: 29
type: 1808 type: 1808
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 4608 start_resource: 4608
num_resource: 99 num_resource: 99
type: 1809 type: 1809
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 5120 start_resource: 5120
num_resource: 24 num_resource: 24
type: 1810 type: 1810
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 5632 start_resource: 5632
num_resource: 51 num_resource: 51
type: 1811 type: 1811
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 6144 start_resource: 6144
num_resource: 51 num_resource: 51
type: 1812 type: 1812
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 6656 start_resource: 6656
num_resource: 51 num_resource: 51
type: 1813 type: 1813
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 8192 start_resource: 8192
num_resource: 32 num_resource: 32
type: 1814 type: 1814
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 8704 start_resource: 8704
num_resource: 32 num_resource: 32
type: 1815 type: 1815
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 9216 start_resource: 9216
num_resource: 32 num_resource: 32
type: 1816 type: 1816
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 9728 start_resource: 9728
num_resource: 22 num_resource: 22
type: 1817 type: 1817
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 10240 start_resource: 10240
num_resource: 22 num_resource: 22
type: 1818 type: 1818
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 10752 start_resource: 10752
num_resource: 22 num_resource: 22
type: 1819 type: 1819
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 11264 start_resource: 11264
num_resource: 28 num_resource: 28
type: 1820 type: 1820
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 11776 start_resource: 11776
num_resource: 28 num_resource: 28
type: 1821 type: 1821
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 12288 start_resource: 12288
num_resource: 28 num_resource: 28
type: 1822 type: 1822
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1936 type: 1936
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 64 num_resource: 64
type: 1937 type: 1937
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 64 num_resource: 64
type: 1937 type: 1937
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 83 start_resource: 83
num_resource: 8 num_resource: 8
type: 1938 type: 1938
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 91 start_resource: 91
num_resource: 8 num_resource: 8
type: 1939 type: 1939
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 99 start_resource: 99
num_resource: 10 num_resource: 10
type: 1942 type: 1942
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 109 start_resource: 109
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 109 start_resource: 109
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 112 start_resource: 112
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 115 start_resource: 115
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 118 start_resource: 118
num_resource: 16 num_resource: 16
type: 1943 type: 1943
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 118 start_resource: 118
num_resource: 16 num_resource: 16
type: 1943 type: 1943
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 134 start_resource: 134
num_resource: 8 num_resource: 8
type: 1944 type: 1944
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 134 start_resource: 134
num_resource: 8 num_resource: 8
type: 1945 type: 1945
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 142 start_resource: 142
num_resource: 8 num_resource: 8
type: 1946 type: 1946
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 142 start_resource: 142
num_resource: 8 num_resource: 8
type: 1947 type: 1947
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1955 type: 1955
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 8 num_resource: 8
type: 1956 type: 1956
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 8 num_resource: 8
type: 1956 type: 1956
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 27 start_resource: 27
num_resource: 1 num_resource: 1
type: 1957 type: 1957
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 28 start_resource: 28
num_resource: 1 num_resource: 1
type: 1958 type: 1958
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1961 type: 1961
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1962 type: 1962
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 1 num_resource: 1
type: 1963 type: 1963
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 1 num_resource: 1
type: 1963 type: 1963
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 16 num_resource: 16
type: 1964 type: 1964
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 16 num_resource: 16
type: 1964 type: 1964
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 20 start_resource: 20
num_resource: 1 num_resource: 1
type: 1965 type: 1965
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 35 start_resource: 35
num_resource: 8 num_resource: 8
type: 1966 type: 1966
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 21 start_resource: 21
num_resource: 1 num_resource: 1
type: 1967 type: 1967
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 35 start_resource: 35
num_resource: 8 num_resource: 8
type: 1968 type: 1968
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 22 start_resource: 22
num_resource: 1 num_resource: 1
type: 1969 type: 1969
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 43 start_resource: 43
num_resource: 8 num_resource: 8
type: 1970 type: 1970
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 23 start_resource: 23
num_resource: 1 num_resource: 1
type: 1971 type: 1971
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 43 start_resource: 43
num_resource: 8 num_resource: 8
type: 1972 type: 1972
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1 num_resource: 1
type: 2112 type: 2112
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 2 start_resource: 2
num_resource: 2 num_resource: 2
type: 2122 type: 2122
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 6 num_resource: 6
type: 12750 type: 12750
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 6 num_resource: 6
type: 12769 type: 12769
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 8 num_resource: 8
type: 12810 type: 12810
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 3072 start_resource: 3072
num_resource: 6 num_resource: 6
type: 12828 type: 12828
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 3584 start_resource: 3584
num_resource: 6 num_resource: 6
type: 12829 type: 12829
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 4096 start_resource: 4096
num_resource: 6 num_resource: 6

View file

@ -18,6 +18,7 @@
#include "../common/board_detect.h" #include "../common/board_detect.h"
#define board_is_am64x_gpevm() (board_ti_k3_is("AM64-GPEVM") || \ #define board_is_am64x_gpevm() (board_ti_k3_is("AM64-GPEVM") || \
board_ti_k3_is("AM64-EVM") || \
board_ti_k3_is("AM64-HSEVM")) board_ti_k3_is("AM64-HSEVM"))
#define board_is_am64x_skevm() (board_ti_k3_is("AM64-SKEVM") || \ #define board_is_am64x_skevm() (board_ti_k3_is("AM64-SKEVM") || \

File diff suppressed because it is too large Load diff

View file

@ -143,7 +143,6 @@ sec-cfg:
processor_id: 0 processor_id: 0
proc_access_master: 0 proc_access_master: 0
proc_access_secondary: [0, 0, 0] proc_access_secondary: [0, 0, 0]
host_hierarchy: host_hierarchy:
subhdr: subhdr:
magic: 0x8D27 magic: 0x8D27

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -143,7 +143,6 @@ sec-cfg:
processor_id: 0 processor_id: 0
proc_access_master: 0 proc_access_master: 0
proc_access_secondary: [0, 0, 0] proc_access_secondary: [0, 0, 0]
host_hierarchy: host_hierarchy:
subhdr: subhdr:
magic: 0x8D27 magic: 0x8D27

View file

@ -143,7 +143,6 @@ sec-cfg:
processor_id: 0 processor_id: 0
proc_access_master: 0 proc_access_master: 0
proc_access_secondary: [0, 0, 0] proc_access_secondary: [0, 0, 0]
host_hierarchy: host_hierarchy:
subhdr: subhdr:
magic: 0x8D27 magic: 0x8D27

File diff suppressed because it is too large Load diff

View file

@ -253,833 +253,714 @@ rm-cfg:
type: 64 type: 64
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 4 num_resource: 4
type: 64 type: 64
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 4 num_resource: 4
type: 64 type: 64
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 20 start_resource: 20
num_resource: 22 num_resource: 22
type: 64 type: 64
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 16 num_resource: 16
type: 192 type: 192
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 34 start_resource: 34
num_resource: 2 num_resource: 2
type: 192 type: 192
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 4 num_resource: 4
type: 320 type: 320
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 4 start_resource: 4
num_resource: 4 num_resource: 4
type: 320 type: 320
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 26 num_resource: 26
type: 384 type: 384
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 50176 start_resource: 50176
num_resource: 164 num_resource: 164
type: 1666 type: 1666
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1 num_resource: 1
type: 1667 type: 1667
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 18 num_resource: 18
type: 1677 type: 1677
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1677 type: 1677
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1677 type: 1677
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 24 start_resource: 24
num_resource: 2 num_resource: 2
type: 1677 type: 1677
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 26 start_resource: 26
num_resource: 6 num_resource: 6
type: 1677 type: 1677
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 54 start_resource: 54
num_resource: 18 num_resource: 18
type: 1678 type: 1678
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 72 start_resource: 72
num_resource: 6 num_resource: 6
type: 1678 type: 1678
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 72 start_resource: 72
num_resource: 6 num_resource: 6
type: 1678 type: 1678
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 78 start_resource: 78
num_resource: 2 num_resource: 2
type: 1678 type: 1678
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 80 start_resource: 80
num_resource: 2 num_resource: 2
type: 1678 type: 1678
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 32 start_resource: 32
num_resource: 12 num_resource: 12
type: 1679 type: 1679
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 6 num_resource: 6
type: 1679 type: 1679
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 6 num_resource: 6
type: 1679 type: 1679
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 50 start_resource: 50
num_resource: 2 num_resource: 2
type: 1679 type: 1679
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 52 start_resource: 52
num_resource: 2 num_resource: 2
type: 1679 type: 1679
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 18 num_resource: 18
type: 1696 type: 1696
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1696 type: 1696
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1696 type: 1696
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 24 start_resource: 24
num_resource: 2 num_resource: 2
type: 1696 type: 1696
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 26 start_resource: 26
num_resource: 6 num_resource: 6
type: 1696 type: 1696
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 18 num_resource: 18
type: 1697 type: 1697
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1697 type: 1697
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 6 num_resource: 6
type: 1697 type: 1697
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 24 start_resource: 24
num_resource: 2 num_resource: 2
type: 1697 type: 1697
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 26 start_resource: 26
num_resource: 2 num_resource: 2
type: 1697 type: 1697
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 12 num_resource: 12
type: 1698 type: 1698
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 12 start_resource: 12
num_resource: 6 num_resource: 6
type: 1698 type: 1698
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 12 start_resource: 12
num_resource: 6 num_resource: 6
type: 1698 type: 1698
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 18 start_resource: 18
num_resource: 2 num_resource: 2
type: 1698 type: 1698
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 20 start_resource: 20
num_resource: 2 num_resource: 2
type: 1698 type: 1698
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 5 start_resource: 5
num_resource: 35 num_resource: 35
type: 1802 type: 1802
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 36 num_resource: 36
type: 1802 type: 1802
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 44 start_resource: 44
num_resource: 36 num_resource: 36
type: 1802 type: 1802
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 168 start_resource: 168
num_resource: 8 num_resource: 8
type: 1802 type: 1802
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 512 num_resource: 512
type: 1805 type: 1805
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 525 start_resource: 525
num_resource: 256 num_resource: 256
type: 1805 type: 1805
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 525 start_resource: 525
num_resource: 256 num_resource: 256
type: 1805 type: 1805
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 781 start_resource: 781
num_resource: 128 num_resource: 128
type: 1805 type: 1805
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 909 start_resource: 909
num_resource: 627 num_resource: 627
type: 1805 type: 1805
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1024 num_resource: 1024
type: 1807 type: 1807
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 4096 start_resource: 4096
num_resource: 29 num_resource: 29
type: 1808 type: 1808
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 4608 start_resource: 4608
num_resource: 99 num_resource: 99
type: 1809 type: 1809
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 5120 start_resource: 5120
num_resource: 24 num_resource: 24
type: 1810 type: 1810
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 5632 start_resource: 5632
num_resource: 51 num_resource: 51
type: 1811 type: 1811
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 6144 start_resource: 6144
num_resource: 51 num_resource: 51
type: 1812 type: 1812
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 6656 start_resource: 6656
num_resource: 51 num_resource: 51
type: 1813 type: 1813
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 8192 start_resource: 8192
num_resource: 32 num_resource: 32
type: 1814 type: 1814
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 8704 start_resource: 8704
num_resource: 32 num_resource: 32
type: 1815 type: 1815
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 9216 start_resource: 9216
num_resource: 32 num_resource: 32
type: 1816 type: 1816
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 9728 start_resource: 9728
num_resource: 22 num_resource: 22
type: 1817 type: 1817
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 10240 start_resource: 10240
num_resource: 22 num_resource: 22
type: 1818 type: 1818
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 10752 start_resource: 10752
num_resource: 22 num_resource: 22
type: 1819 type: 1819
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 11264 start_resource: 11264
num_resource: 28 num_resource: 28
type: 1820 type: 1820
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 11776 start_resource: 11776
num_resource: 28 num_resource: 28
type: 1821 type: 1821
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 12288 start_resource: 12288
num_resource: 28 num_resource: 28
type: 1822 type: 1822
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1 num_resource: 1
type: 1923 type: 1923
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1936 type: 1936
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1936 type: 1936
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 64 num_resource: 64
type: 1937 type: 1937
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 64 num_resource: 64
type: 1937 type: 1937
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 83 start_resource: 83
num_resource: 8 num_resource: 8
type: 1938 type: 1938
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 91 start_resource: 91
num_resource: 8 num_resource: 8
type: 1939 type: 1939
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 99 start_resource: 99
num_resource: 10 num_resource: 10
type: 1942 type: 1942
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 109 start_resource: 109
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 109 start_resource: 109
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 112 start_resource: 112
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 115 start_resource: 115
num_resource: 3 num_resource: 3
type: 1942 type: 1942
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 118 start_resource: 118
num_resource: 16 num_resource: 16
type: 1943 type: 1943
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 118 start_resource: 118
num_resource: 16 num_resource: 16
type: 1943 type: 1943
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 134 start_resource: 134
num_resource: 8 num_resource: 8
type: 1944 type: 1944
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 134 start_resource: 134
num_resource: 8 num_resource: 8
type: 1945 type: 1945
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 142 start_resource: 142
num_resource: 8 num_resource: 8
type: 1946 type: 1946
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 142 start_resource: 142
num_resource: 8 num_resource: 8
type: 1947 type: 1947
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1955 type: 1955
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1955 type: 1955
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 8 num_resource: 8
type: 1956 type: 1956
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 8 num_resource: 8
type: 1956 type: 1956
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 27 start_resource: 27
num_resource: 1 num_resource: 1
type: 1957 type: 1957
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 28 start_resource: 28
num_resource: 1 num_resource: 1
type: 1958 type: 1958
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1961 type: 1961
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1961 type: 1961
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 10 num_resource: 10
type: 1962 type: 1962
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 35 host_id: 35
reserved: 0 reserved: 0
- -
start_resource: 10 start_resource: 10
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 13 start_resource: 13
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 30 host_id: 30
reserved: 0 reserved: 0
- -
start_resource: 16 start_resource: 16
num_resource: 3 num_resource: 3
type: 1962 type: 1962
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 1 num_resource: 1
type: 1963 type: 1963
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 1 num_resource: 1
type: 1963 type: 1963
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 16 num_resource: 16
type: 1964 type: 1964
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 19 start_resource: 19
num_resource: 16 num_resource: 16
type: 1964 type: 1964
host_id: 36 host_id: 36
reserved: 0 reserved: 0
- -
start_resource: 20 start_resource: 20
num_resource: 1 num_resource: 1
type: 1965 type: 1965
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 35 start_resource: 35
num_resource: 8 num_resource: 8
type: 1966 type: 1966
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 21 start_resource: 21
num_resource: 1 num_resource: 1
type: 1967 type: 1967
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 35 start_resource: 35
num_resource: 8 num_resource: 8
type: 1968 type: 1968
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 22 start_resource: 22
num_resource: 1 num_resource: 1
type: 1969 type: 1969
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 43 start_resource: 43
num_resource: 8 num_resource: 8
type: 1970 type: 1970
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 23 start_resource: 23
num_resource: 1 num_resource: 1
type: 1971 type: 1971
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 43 start_resource: 43
num_resource: 8 num_resource: 8
type: 1972 type: 1972
host_id: 12 host_id: 12
reserved: 0 reserved: 0
- -
start_resource: 0 start_resource: 0
num_resource: 1 num_resource: 1
type: 2112 type: 2112
host_id: 128 host_id: 128
reserved: 0 reserved: 0
- -
start_resource: 2 start_resource: 2
num_resource: 2 num_resource: 2

View file

@ -632,7 +632,7 @@ int bootdev_next_label(struct bootflow_iter *iter, struct udevice **devp,
int bootdev_next_prio(struct bootflow_iter *iter, struct udevice **devp) int bootdev_next_prio(struct bootflow_iter *iter, struct udevice **devp)
{ {
struct udevice *dev = *devp; struct udevice *dev = *devp, *last_dev = NULL;
bool found; bool found;
int ret; int ret;
@ -682,9 +682,19 @@ int bootdev_next_prio(struct bootflow_iter *iter, struct udevice **devp)
} }
} else { } else {
ret = device_probe(dev); ret = device_probe(dev);
if (!ret)
last_dev = dev;
if (ret) { if (ret) {
log_debug("Device '%s' failed to probe\n", log_warning("Device '%s' failed to probe\n",
dev->name); dev->name);
if (last_dev == dev) {
/*
* We have already tried this device
* and it failed to probe. Give up.
*/
return log_msg_ret("probe", ret);
}
last_dev = dev;
dev = NULL; dev = NULL;
} }
} }

View file

@ -361,7 +361,7 @@ static int bootflow_check(struct bootflow_iter *iter, struct bootflow *bflow)
} }
/* Unless there is nothing more to try, move to the next device */ /* Unless there is nothing more to try, move to the next device */
else if (ret != BF_NO_MORE_PARTS && ret != -ENOSYS) { if (ret != BF_NO_MORE_PARTS && ret != -ENOSYS) {
log_debug("Bootdev '%s' part %d method '%s': Error %d\n", log_debug("Bootdev '%s' part %d method '%s': Error %d\n",
dev->name, iter->part, iter->method->name, ret); dev->name, iter->part, iter->method->name, ret);
/* /*
@ -371,10 +371,8 @@ static int bootflow_check(struct bootflow_iter *iter, struct bootflow *bflow)
if (iter->flags & BOOTFLOWIF_ALL) if (iter->flags & BOOTFLOWIF_ALL)
return log_msg_ret("all", ret); return log_msg_ret("all", ret);
} }
if (ret)
return log_msg_ret("check", ret);
return 0; return log_msg_ret("check", ret);
} }
int bootflow_scan_first(struct udevice *dev, const char *label, int bootflow_scan_first(struct udevice *dev, const char *label,

View file

@ -120,7 +120,6 @@ int bootflow_menu_new(struct expo **expp)
if (ret < 0) if (ret < 0)
return log_msg_ret("itm", -EINVAL); return log_msg_ret("itm", -EINVAL);
ret = 0;
priv->num_bootflows++; priv->num_bootflows++;
} }

View file

@ -192,6 +192,7 @@ config CMD_HISTORY
config CMD_LICENSE config CMD_LICENSE
bool "license" bool "license"
select BUILD_BIN2C select BUILD_BIN2C
depends on GZIP
help help
Print GPL license text Print GPL license text

View file

@ -543,8 +543,6 @@ static int do_bootflow_cmdline(struct cmd_tbl *cmdtp, int flag, int argc,
op = argv[1]; op = argv[1];
arg = argv[2]; arg = argv[2];
if (*op == 's') { if (*op == 's') {
if (argc < 3)
return CMD_RET_USAGE;
val = argv[3] ?: (const char *)BOOTFLOWCL_EMPTY; val = argv[3] ?: (const char *)BOOTFLOWCL_EMPTY;
} }

View file

@ -230,7 +230,7 @@ static ulong load_serial(long offset)
static int read_record(char *buf, ulong len) static int read_record(char *buf, ulong len)
{ {
char *p; char *p;
char c; int c;
--len; /* always leave room for terminating '\0' byte */ --len; /* always leave room for terminating '\0' byte */
@ -827,7 +827,7 @@ static void handle_send_packet(int n)
/* k_recv receives a OS Open image file over kermit line */ /* k_recv receives a OS Open image file over kermit line */
static int k_recv(void) static int k_recv(void)
{ {
char new_char; int new_char;
char k_state, k_state_saved; char k_state, k_state_saved;
int sum; int sum;
int done; int done;

View file

@ -540,7 +540,7 @@ static int cread_line_simple(const char *const prompt, char *p)
int n = 0; /* buffer index */ int n = 0; /* buffer index */
int plen = 0; /* prompt length */ int plen = 0; /* prompt length */
int col; /* output column cnt */ int col; /* output column cnt */
char c; int c;
/* print prompt */ /* print prompt */
if (prompt) { if (prompt) {

View file

@ -86,16 +86,16 @@ int dev_iommu_enable(struct udevice *dev)
ret = dev_read_phandle_with_args(dev, "iommus", ret = dev_read_phandle_with_args(dev, "iommus",
"#iommu-cells", 0, i, &args); "#iommu-cells", 0, i, &args);
if (ret) { if (ret) {
debug("%s: dev_read_phandle_with_args failed: %d\n", log_err("%s: Failed to parse 'iommus' property for '%s': %d\n",
__func__, ret); __func__, dev->name, ret);
return ret; return ret;
} }
ret = uclass_get_device_by_ofnode(UCLASS_IOMMU, args.node, ret = uclass_get_device_by_ofnode(UCLASS_IOMMU, args.node,
&dev_iommu); &dev_iommu);
if (ret) { if (ret) {
debug("%s: uclass_get_device_by_ofnode failed: %d\n", log_err("%s: Failed to find IOMMU device for '%s': %d\n",
__func__, ret); __func__, dev->name, ret);
return ret; return ret;
} }
dev->iommu = dev_iommu; dev->iommu = dev_iommu;
@ -106,10 +106,13 @@ int dev_iommu_enable(struct udevice *dev)
ops = device_get_ops(dev->iommu); ops = device_get_ops(dev->iommu);
if (ops && ops->connect) { if (ops && ops->connect) {
ret = ops->connect(dev); ret = ops->connect(dev);
if (ret) if (ret) {
log_err("%s: Failed to connect '%s' to IOMMU '%s': %d\n",
__func__, dev->name, dev->iommu->name, ret);
return ret; return ret;
} }
} }
}
#if CONFIG_IS_ENABLED(PCI) #if CONFIG_IS_ENABLED(PCI)
if (count < 0 && device_is_on_pci_bus(dev)) if (count < 0 && device_is_on_pci_bus(dev))

View file

@ -695,6 +695,8 @@ int nvme_scan_namespace(void)
if (ret) { if (ret) {
log_err("Failed to probe '%s': err=%dE\n", dev->name, log_err("Failed to probe '%s': err=%dE\n", dev->name,
ret); ret);
/* Bail if we ran out of memory, else keep trying */
if (ret != -EBUSY)
return ret; return ret;
} }
} }
@ -835,8 +837,8 @@ int nvme_init(struct udevice *udev)
ndev->udev = udev; ndev->udev = udev;
INIT_LIST_HEAD(&ndev->namespaces); INIT_LIST_HEAD(&ndev->namespaces);
if (readl(&ndev->bar->csts) == -1) { if (readl(&ndev->bar->csts) == -1) {
ret = -ENODEV; ret = -EBUSY;
printf("Error: %s: Out of memory!\n", udev->name); printf("Error: %s: Controller not ready!\n", udev->name);
goto free_nvme; goto free_nvme;
} }

View file

@ -1611,6 +1611,17 @@ void *dm_pci_map_bar(struct udevice *dev, int bar, size_t offset, size_t len,
dm_pci_read_config32(udev, bar, &bar_response); dm_pci_read_config32(udev, bar, &bar_response);
pci_bus_addr = (pci_addr_t)(bar_response & ~0xf); pci_bus_addr = (pci_addr_t)(bar_response & ~0xf);
/* This has a lot of baked in assumptions, but essentially tries
* to mirror the behavior of BAR assignment for 64 Bit enabled
* hosts and 64 bit placeable BARs in the auto assign code.
*/
#if defined(CONFIG_SYS_PCI_64BIT)
if (bar_response & PCI_BASE_ADDRESS_MEM_TYPE_64) {
dm_pci_read_config32(udev, bar + 4, &bar_response);
pci_bus_addr |= (pci_addr_t)bar_response << 32;
}
#endif /* CONFIG_SYS_PCI_64BIT */
if (~((pci_addr_t)0) - pci_bus_addr < offset) if (~((pci_addr_t)0) - pci_bus_addr < offset)
return NULL; return NULL;

View file

@ -22,12 +22,13 @@ get_fit_overlaystring=
done; done;
get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile} get_fit_config=setexpr name_fit_config gsub / _ conf-${fdtfile}
run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring} run_fit=run get_fit_config; bootm ${addr_fit}#${name_fit_config}${overlaystring}
do_main_cpsw0_qsgmii_phyinit=0
bootcmd_ti_mmc= bootcmd_ti_mmc=
run findfdt; run init_${boot}; run findfdt; run init_${boot};
#if CONFIG_CMD_REMOTEPROC #if CONFIG_CMD_REMOTEPROC
if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1; if test ${do_main_cpsw0_qsgmii_phyinit} -eq 1;
then run main_cpsw0_qsgmii_phyinit; then run main_cpsw0_qsgmii_phyinit;
fi fi;
run boot_rprocs; run boot_rprocs;
#endif #endif
if test ${boot_fit} -eq 1; if test ${boot_fit} -eq 1;

View file

@ -1354,6 +1354,7 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t addr, size_t len,
* type 1 functions. * type 1 functions.
* Can also be used on type 0 functions that support Enhanced Allocation for * Can also be used on type 0 functions that support Enhanced Allocation for
* 32b/64b BARs. Note that duplicate BEI entries are not supported. * 32b/64b BARs. Note that duplicate BEI entries are not supported.
* Can also be used on 64b bars on type 0 functions.
* *
* @dev: Device to check * @dev: Device to check
* @bar: Bar register offset (PCI_BASE_ADDRESS_...) * @bar: Bar register offset (PCI_BASE_ADDRESS_...)

View file

@ -104,6 +104,8 @@ static int rsa_engine_get_pub_key(const char *keydir, const char *name,
const char *engine_id; const char *engine_id;
char key_id[1024]; char key_id[1024];
EVP_PKEY *key = NULL; EVP_PKEY *key = NULL;
const char *const pkcs11_schema = "pkcs11:";
const char *pkcs11_uri_prepend = "";
if (!evpp) if (!evpp)
return -EINVAL; return -EINVAL;
@ -113,19 +115,26 @@ static int rsa_engine_get_pub_key(const char *keydir, const char *name,
engine_id = ENGINE_get_id(engine); engine_id = ENGINE_get_id(engine);
if (engine_id && !strcmp(engine_id, "pkcs11")) { if (engine_id && !strcmp(engine_id, "pkcs11")) {
if (keydir) if (keydir) {
// Check for legacy keydir spec and prepend
if (strncmp(pkcs11_schema, keydir, strlen(pkcs11_schema))) {
pkcs11_uri_prepend = pkcs11_schema;
fprintf(stderr, "WARNING: Legacy URI specified. Please add '%s'.\n", pkcs11_schema);
}
if (strstr(keydir, "object=")) if (strstr(keydir, "object="))
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
"%s;type=public", "%s%s;type=public",
keydir); pkcs11_uri_prepend, keydir);
else else
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
"%s;object=%s;type=public", "%s%s;object=%s;type=public",
keydir, name); pkcs11_uri_prepend, keydir, name);
else } else {
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
"object=%s;type=public", "pkcs11:object=%s;type=public",
name); name);
}
} else if (engine_id) { } else if (engine_id) {
if (keydir) if (keydir)
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
@ -224,6 +233,8 @@ static int rsa_engine_get_priv_key(const char *keydir, const char *name,
const char *engine_id; const char *engine_id;
char key_id[1024]; char key_id[1024];
EVP_PKEY *key = NULL; EVP_PKEY *key = NULL;
const char *const pkcs11_schema = "pkcs11:";
const char *pkcs11_uri_prepend = "";
if (!evpp) if (!evpp)
return -EINVAL; return -EINVAL;
@ -235,19 +246,26 @@ static int rsa_engine_get_priv_key(const char *keydir, const char *name,
fprintf(stderr, "Please use 'keydir' with PKCS11\n"); fprintf(stderr, "Please use 'keydir' with PKCS11\n");
return -EINVAL; return -EINVAL;
} }
if (keydir) if (keydir) {
// Check for legacy keydir spec and prepend
if (strncmp(pkcs11_schema, keydir, strlen(pkcs11_schema))) {
pkcs11_uri_prepend = pkcs11_schema;
fprintf(stderr, "WARNING: Legacy URI specified. Please add '%s'.\n", pkcs11_schema);
}
if (strstr(keydir, "object=")) if (strstr(keydir, "object="))
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
"%s;type=private", "%s%s;type=private",
keydir); pkcs11_uri_prepend, keydir);
else else
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
"%s;object=%s;type=private", "%s%s;object=%s;type=private",
keydir, name); pkcs11_uri_prepend, keydir, name);
else } else {
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),
"object=%s;type=private", "pkcs11:object=%s;type=private",
name); name);
}
} else if (engine_id) { } else if (engine_id) {
if (keydir && name) if (keydir && name)
snprintf(key_id, sizeof(key_id), snprintf(key_id, sizeof(key_id),

View file

@ -48,38 +48,44 @@ DECLARE_GLOBAL_DATA_PTR;
/** /**
* struct map_sysinfo - Mapping of sysinfo strings to DT * struct map_sysinfo - Mapping of sysinfo strings to DT
* *
* @sysinfo_str: sysinfo string * @si_str: sysinfo string
* @dt_str: DT string * @dt_str: DT string
* @max: Max index of the tokenized string to pick. Counting starts from 0 * @max: Max index of the tokenized string to pick. Counting starts from 0
* *
*/ */
struct map_sysinfo { struct map_sysinfo {
const char *sysinfo_str; const char *si_node;
const char *si_str;
const char *dt_str; const char *dt_str;
int max; int max;
}; };
static const struct map_sysinfo sysinfo_to_dt[] = { static const struct map_sysinfo sysinfo_to_dt[] = {
{ .sysinfo_str = "product", .dt_str = "model", 2 }, { .si_node = "system", .si_str = "product", .dt_str = "model", 2 },
{ .sysinfo_str = "manufacturer", .dt_str = "compatible", 1 }, { .si_node = "system", .si_str = "manufacturer", .dt_str = "compatible", 1 },
{ .si_node = "baseboard", .si_str = "product", .dt_str = "model", 2 },
{ .si_node = "baseboard", .si_str = "manufacturer", .dt_str = "compatible", 1 },
}; };
/** /**
* struct smbios_ctx - context for writing SMBIOS tables * struct smbios_ctx - context for writing SMBIOS tables
* *
* @node: node containing the information to write (ofnode_null() if none) * @node: node containing the information to write (ofnode_null()
* if none)
* @dev: sysinfo device to use (NULL if none) * @dev: sysinfo device to use (NULL if none)
* @eos: end-of-string pointer for the table being processed. This is set * @subnode_name: sysinfo subnode_name. Used for DT fallback
* up when we start processing a table * @eos: end-of-string pointer for the table being processed.
* @next_ptr: pointer to the start of the next string to be added. When the * This is set up when we start processing a table
* table is nopt empty, this points to the byte after the \0 of the * @next_ptr: pointer to the start of the next string to be added.
* previous string. * When the table is not empty, this points to the byte
* @last_str: points to the last string that was written to the table, or NULL * after the \0 of the previous string.
* if none * @last_str: points to the last string that was written to the table,
* or NULL if none
*/ */
struct smbios_ctx { struct smbios_ctx {
ofnode node; ofnode node;
struct udevice *dev; struct udevice *dev;
const char *subnode_name;
char *eos; char *eos;
char *next_ptr; char *next_ptr;
char *last_str; char *last_str;
@ -108,12 +114,13 @@ struct smbios_write_method {
const char *subnode_name; const char *subnode_name;
}; };
static const struct map_sysinfo *convert_sysinfo_to_dt(const char *sysinfo_str) static const struct map_sysinfo *convert_sysinfo_to_dt(const char *node, const char *si)
{ {
int i; int i;
for (i = 0; i < ARRAY_SIZE(sysinfo_to_dt); i++) { for (i = 0; i < ARRAY_SIZE(sysinfo_to_dt); i++) {
if (!strcmp(sysinfo_str, sysinfo_to_dt[i].sysinfo_str)) if (node && !strcmp(node, sysinfo_to_dt[i].si_node) &&
!strcmp(si, sysinfo_to_dt[i].si_str))
return &sysinfo_to_dt[i]; return &sysinfo_to_dt[i];
} }
@ -233,7 +240,7 @@ static int smbios_add_prop_si(struct smbios_ctx *ctx, const char *prop,
} else { } else {
const struct map_sysinfo *nprop; const struct map_sysinfo *nprop;
nprop = convert_sysinfo_to_dt(prop); nprop = convert_sysinfo_to_dt(ctx->subnode_name, prop);
get_str_from_dt(nprop, str_dt, sizeof(str_dt)); get_str_from_dt(nprop, str_dt, sizeof(str_dt));
str = (const char *)str_dt; str = (const char *)str_dt;
} }
@ -574,9 +581,13 @@ ulong write_smbios_table(ulong addr)
int tmp; int tmp;
method = &smbios_write_funcs[i]; method = &smbios_write_funcs[i];
if (IS_ENABLED(CONFIG_OF_CONTROL) && method->subnode_name) ctx.subnode_name = NULL;
if (method->subnode_name) {
ctx.subnode_name = method->subnode_name;
if (IS_ENABLED(CONFIG_OF_CONTROL))
ctx.node = ofnode_find_subnode(parent_node, ctx.node = ofnode_find_subnode(parent_node,
method->subnode_name); method->subnode_name);
}
tmp = method->write((ulong *)&addr, handle++, &ctx); tmp = method->write((ulong *)&addr, handle++, &ctx);
max_struct_size = max(max_struct_size, tmp); max_struct_size = max(max_struct_size, tmp);
@ -591,8 +602,8 @@ ulong write_smbios_table(ulong addr)
table_addr = (ulong)map_sysmem(tables, 0); table_addr = (ulong)map_sysmem(tables, 0);
/* now go back and write the SMBIOS3 header */ /* now go back and write the SMBIOS3 header */
se = map_sysmem(start_addr, sizeof(struct smbios_entry)); se = map_sysmem(start_addr, sizeof(struct smbios3_entry));
memset(se, '\0', sizeof(struct smbios_entry)); memset(se, '\0', sizeof(struct smbios3_entry));
memcpy(se->anchor, "_SM3_", 5); memcpy(se->anchor, "_SM3_", 5);
se->length = sizeof(struct smbios3_entry); se->length = sizeof(struct smbios3_entry);
se->major_ver = SMBIOS_MAJOR_VER; se->major_ver = SMBIOS_MAJOR_VER;

View file

@ -80,7 +80,7 @@ my %commit_author_hash;
my %commit_signer_hash; my %commit_signer_hash;
my @penguin_chief = (); my @penguin_chief = ();
push(@penguin_chief, "Tom Rini:trini\@konsulko.com"); push(@penguin_chief, "Tom RINI:trini\@konsulko.com");
my @penguin_chief_names = (); my @penguin_chief_names = ();
foreach my $chief (@penguin_chief) { foreach my $chief (@penguin_chief) {

View file

@ -0,0 +1,67 @@
# SPDX-License-Identifier: GPL-2.0
# (C) Copyright 2023, Advanced Micro Devices, Inc.
import pytest
"""
Test the bootstage command.
It is used for checking the boot progress and timing by printing the bootstage
report, stashes the data into memory and unstashes the data from memory.
Note: This test relies on boardenv_* containing configuration values to define
the data size, memory address, and bootstage magic address (defined in
common/bootstage.c). Without this, bootstage stash and unstash tests will be
automatically skipped.
For example:
env__bootstage_cmd_file = {
'addr': 0x200000,
'size': 0x1000,
'bootstage_magic_addr': 0xb00757a3,
}
"""
@pytest.mark.buildconfigspec('bootstage')
@pytest.mark.buildconfigspec('cmd_bootstage')
def test_bootstage_report(u_boot_console):
output = u_boot_console.run_command('bootstage report')
assert 'Timer summary in microseconds' in output
assert 'Accumulated time:' in output
assert 'dm_r' in output
@pytest.mark.buildconfigspec('bootstage')
@pytest.mark.buildconfigspec('cmd_bootstage')
@pytest.mark.buildconfigspec('bootstage_stash')
def test_bootstage_stash(u_boot_console):
f = u_boot_console.config.env.get('env__bootstage_cmd_file', None)
if not f:
pytest.skip('No bootstage environment file is defined')
addr = f.get('addr')
size = f.get('size')
bootstage_magic = f.get('bootstage_magic_addr')
expected_text = 'dm_r'
u_boot_console.run_command('bootstage stash %x %x' % (addr, size))
output = u_boot_console.run_command('echo $?')
assert output.endswith('0')
output = u_boot_console.run_command('md %x 100' % addr)
# Check BOOTSTAGE_MAGIC address at 4th byte address
assert '0x' + output.split('\n')[0].split()[4] == hex(bootstage_magic)
# Check expected string in last column of output
output_last_col = ''.join([i.split()[-1] for i in output.split('\n')])
assert expected_text in output_last_col
return addr, size
@pytest.mark.buildconfigspec('bootstage')
@pytest.mark.buildconfigspec('cmd_bootstage')
@pytest.mark.buildconfigspec('bootstage_stash')
def test_bootstage_unstash(u_boot_console):
addr, size = test_bootstage_stash(u_boot_console)
u_boot_console.run_command('bootstage unstash %x %x' % (addr, size))
output = u_boot_console.run_command('echo $?')
assert output.endswith('0')

View file

@ -17,6 +17,11 @@ import pytest
@pytest.fixture @pytest.fixture
def tmp_copy_of_builddir(u_boot_config, tmp_path): def tmp_copy_of_builddir(u_boot_config, tmp_path):
"""For each test, provide a temporary copy of the initial build directory.""" """For each test, provide a temporary copy of the initial build directory."""
if os.path.realpath(u_boot_config.source_dir) == os.path.realpath(
u_boot_config.build_dir
):
pytest.skip("Leftover detection requires out of tree build.")
return None
shutil.copytree( shutil.copytree(
u_boot_config.build_dir, u_boot_config.build_dir,
tmp_path, tmp_path,

View file

@ -9,6 +9,7 @@
import os import os
import struct import struct
import yaml import yaml
import yamllint
from collections import OrderedDict from collections import OrderedDict
from jsonschema import validate from jsonschema import validate
@ -18,6 +19,7 @@ from binman.entry import Entry
from binman.etype.section import Entry_section from binman.etype.section import Entry_section
from dtoc import fdt_util from dtoc import fdt_util
from u_boot_pylib import tools from u_boot_pylib import tools
from yamllint import config
BOARDCFG = 0xB BOARDCFG = 0xB
BOARDCFG_SEC = 0xD BOARDCFG_SEC = 0xD
@ -244,6 +246,9 @@ class Entry_ti_board_config(Entry_section):
with open(self._schema_file, 'r') as sch: with open(self._schema_file, 'r') as sch:
self.schema_yaml = yaml.safe_load(sch) self.schema_yaml = yaml.safe_load(sch)
yaml_config = config.YamlLintConfig("extends: default")
for p in yamllint.linter.run(open(self._config_file, "r"), yaml_config):
self.Raise(f"Yamllint error: {p.line}: {p.rule}")
try: try:
validate(self.file_yaml, self.schema_yaml) validate(self.file_yaml, self.schema_yaml)
except Exception as e: except Exception as e:

View file

@ -7030,6 +7030,12 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
data = self._DoReadFile('293_ti_board_cfg.dts') data = self._DoReadFile('293_ti_board_cfg.dts')
self.assertEqual(TI_BOARD_CONFIG_DATA, data) self.assertEqual(TI_BOARD_CONFIG_DATA, data)
def testTIBoardConfigLint(self):
"""Test that an incorrectly linted config file would generate error"""
with self.assertRaises(ValueError) as e:
data = self._DoReadFile('323_ti_board_cfg_phony.dts')
self.assertIn("Yamllint error", str(e.exception))
def testTIBoardConfigCombined(self): def testTIBoardConfigCombined(self):
"""Test that a schema validated combined board config file can be generated""" """Test that a schema validated combined board config file can be generated"""
data = self._DoReadFile('294_ti_board_cfg_combined.dts') data = self._DoReadFile('294_ti_board_cfg_combined.dts')

View file

@ -0,0 +1,14 @@
// SPDX-License-Identifier: GPL-2.0+
/dts-v1/;
/ {
#address-cells = <1>;
#size-cells = <1>;
binman {
ti-board-config {
config = "yaml/config_phony.yaml";
schema = "yaml/schema.yaml";
};
};
};

View file

@ -0,0 +1,18 @@
# SPDX-License-Identifier: GPL-2.0+
#
# Test config
#
---
main-branch :
obj :
a : 0x0
b: 0
arr: [0, 0, 0, 0]
another-arr:
- # 1
c: 0
d: 0
- # 2
c: 0
d: 0

View file

@ -1,2 +1,3 @@
jsonschema==4.17.3 jsonschema==4.17.3
pyyaml==6.0 pyyaml==6.0
yamllint==1.26.3

View file

@ -342,6 +342,28 @@ err:
return ret; return ret;
} }
static int fit_image_read_key_iv_data(const char *keydir, const char *key_iv_name,
unsigned char *key_iv_data, int expected_size)
{
char filename[PATH_MAX];
int ret = -1;
ret = snprintf(filename, sizeof(filename), "%s/%s%s",
keydir, key_iv_name, ".bin");
if (ret >= sizeof(filename)) {
printf("Can't format the key or IV filename when setting up the cipher: insufficient buffer space\n");
ret = -1;
}
if (ret < 0) {
printf("Can't format the key or IV filename when setting up the cipher: snprintf error\n");
ret = -1;
}
ret = fit_image_read_data(filename, key_iv_data, expected_size);
return ret;
}
static int get_random_data(void *data, int size) static int get_random_data(void *data, int size)
{ {
unsigned char *tmp = data; unsigned char *tmp = data;
@ -378,7 +400,6 @@ static int fit_image_setup_cipher(struct image_cipher_info *info,
int noffset) int noffset)
{ {
char *algo_name; char *algo_name;
char filename[128];
int ret = -1; int ret = -1;
if (fit_image_cipher_get_algo(fit, noffset, &algo_name)) { if (fit_image_cipher_get_algo(fit, noffset, &algo_name)) {
@ -415,16 +436,16 @@ static int fit_image_setup_cipher(struct image_cipher_info *info,
goto out; goto out;
} }
/* Read the key in the file */
snprintf(filename, sizeof(filename), "%s/%s%s",
info->keydir, info->keyname, ".bin");
info->key = malloc(info->cipher->key_len); info->key = malloc(info->cipher->key_len);
if (!info->key) { if (!info->key) {
fprintf(stderr, "Can't allocate memory for key\n"); fprintf(stderr, "Can't allocate memory for key\n");
ret = -1; ret = -1;
goto out; goto out;
} }
ret = fit_image_read_data(filename, (unsigned char *)info->key,
/* Read the key in the file */
ret = fit_image_read_key_iv_data(info->keydir, info->keyname,
(unsigned char *)info->key,
info->cipher->key_len); info->cipher->key_len);
if (ret < 0) if (ret < 0)
goto out; goto out;
@ -438,10 +459,11 @@ static int fit_image_setup_cipher(struct image_cipher_info *info,
if (info->ivname) { if (info->ivname) {
/* Read the IV in the file */ /* Read the IV in the file */
snprintf(filename, sizeof(filename), "%s/%s%s", ret = fit_image_read_key_iv_data(info->keydir, info->ivname,
info->keydir, info->ivname, ".bin"); (unsigned char *)info->iv,
ret = fit_image_read_data(filename, (unsigned char *)info->iv,
info->cipher->iv_len); info->cipher->iv_len);
if (ret < 0)
goto out;
} else { } else {
/* Generate an ramdom IV */ /* Generate an ramdom IV */
ret = get_random_data((void *)info->iv, info->cipher->iv_len); ret = get_random_data((void *)info->iv, info->cipher->iv_len);