On 09.06.20 15:11, Andrej Utz wrote:
> Signed-off-by: Andrej Utz <[email protected]>
> ---
>  configs/x86/f2a88xm-hd3.c | 43 +++++++++++----------------------------
>  1 file changed, 12 insertions(+), 31 deletions(-)
> 
> diff --git a/configs/x86/f2a88xm-hd3.c b/configs/x86/f2a88xm-hd3.c
> index e5dfd78f..b529e6a6 100644
> --- a/configs/x86/f2a88xm-hd3.c
> +++ b/configs/x86/f2a88xm-hd3.c
> @@ -27,7 +27,7 @@ struct {
>       struct jailhouse_irqchip irqchips[2];
>       struct jailhouse_pio pio_regions[8];
>       struct jailhouse_pci_device pci_devices[26];
> -     struct jailhouse_pci_capability pci_caps[27];
> +     struct jailhouse_pci_capability pci_caps[24];
>  } __attribute__((packed)) config = {
>       .header = {
>               .signature = JAILHOUSE_SYSTEM_SIGNATURE,
> @@ -384,7 +384,7 @@ struct {
>                       .iommu = 0,
>                       .domain = 0x0,
>                       .bdf = 0x8,
> -                     .caps_start = 3,
> +                     .caps_start = 0,
>                       .num_caps = 4,
>                       .num_msi_vectors = 1,
>                       .msi_64bits = 1,
> @@ -398,7 +398,7 @@ struct {
>                       .iommu = 0,
>                       .domain = 0x0,
>                       .bdf = 0x9,
> -                     .caps_start = 3,
> +                     .caps_start = 0,
>                       .num_caps = 4,
>                       .num_msi_vectors = 1,
>                       .msi_64bits = 1,
> @@ -440,7 +440,7 @@ struct {
>                       .iommu = 0,
>                       .domain = 0x0,
>                       .bdf = 0x19,
> -                     .caps_start = 7,
> +                     .caps_start = 4,
>                       .num_caps = 5,
>                       .num_msi_vectors = 1,
>                       .msi_64bits = 1,
> @@ -468,7 +468,7 @@ struct {
>                       .iommu = 0,
>                       .domain = 0x0,
>                       .bdf = 0x80,
> -                     .caps_start = 12,
> +                     .caps_start = 9,
>                       .num_caps = 4,
>                       .num_msi_vectors = 8,
>                       .msi_64bits = 1,
> @@ -482,7 +482,7 @@ struct {
>                       .iommu = 0,
>                       .domain = 0x0,
>                       .bdf = 0x81,
> -                     .caps_start = 12,
> +                     .caps_start = 9,
>                       .num_caps = 4,
>                       .num_msi_vectors = 8,
>                       .msi_64bits = 1,
> @@ -496,7 +496,7 @@ struct {
>                       .iommu = 0,
>                       .domain = 0x0,
>                       .bdf = 0x88,
> -                     .caps_start = 16,
> +                     .caps_start = 13,
>                       .num_caps = 2,
>                       .num_msi_vectors = 8,
>                       .msi_64bits = 1,
> @@ -524,7 +524,7 @@ struct {
>                       .iommu = 0,
>                       .domain = 0x0,
>                       .bdf = 0x92,
> -                     .caps_start = 18,
> +                     .caps_start = 15,
>                       .num_caps = 2,
>                       .num_msi_vectors = 0,
>                       .msi_64bits = 0,
> @@ -552,7 +552,7 @@ struct {
>                       .iommu = 0,
>                       .domain = 0x0,
>                       .bdf = 0x9a,
> -                     .caps_start = 18,
> +                     .caps_start = 15,
>                       .num_caps = 2,
>                       .num_msi_vectors = 0,
>                       .msi_64bits = 0,
> @@ -580,7 +580,7 @@ struct {
>                       .iommu = 0,
>                       .domain = 0x0,
>                       .bdf = 0xa2,
> -                     .caps_start = 20,
> +                     .caps_start = 17,
>                       .num_caps = 1,
>                       .num_msi_vectors = 0,
>                       .msi_64bits = 0,
> @@ -678,7 +678,7 @@ struct {
>                       .iommu = 0,
>                       .domain = 0x0,
>                       .bdf = 0xc3,
> -                     .caps_start = 21,
> +                     .caps_start = 18,
>                       .num_caps = 1,
>                       .num_msi_vectors = 0,
>                       .msi_64bits = 0,
> @@ -720,7 +720,7 @@ struct {
>                       .iommu = 0,
>                       .domain = 0x0,
>                       .bdf = 0x100,
> -                     .caps_start = 22,
> +                     .caps_start = 19,
>                       .num_caps = 5,
>                       .num_msi_vectors = 1,
>                       .msi_64bits = 1,
> @@ -731,25 +731,6 @@ struct {
>       },
>  
>       .pci_caps = {
> -             /* PCIDevice: 00:00.2 */
> -             {
> -                     .id = PCI_CAP_ID_SECDEV,
> -                     .start = 0x40,
> -                     .len = 2,
> -                     .flags = 0,
> -             },
> -             {
> -                     .id = PCI_CAP_ID_MSI,
> -                     .start = 0x54,
> -                     .len = 14,
> -                     .flags = JAILHOUSE_PCICAPS_WRITE,
> -             },
> -             {
> -                     .id = PCI_CAP_ID_HT,
> -                     .start = 0x64,
> -                     .len = 2,
> -                     .flags = 0,
> -             },
>               /* PCIDevice: 00:01.0 */
>               /* PCIDevice: 00:01.1 */
>               {
> 

All 3 applied to next.

Thanks,
Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

-- 
You received this message because you are subscribed to the Google Groups 
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To view this discussion on the web visit 
https://groups.google.com/d/msgid/jailhouse-dev/535ef366-b345-a223-a9dd-1fffb2aac256%40siemens.com.

Reply via email to