Some sugar for the guidance of the reader. Use speaking name instead of hard-coded constants.
This patch was supported by: $ git grep -l "\.id = 0x1" | xargs sed -i 's/id = 0x1,/id = PCI_CAP_ID_PM,/' $ git grep -l "\.id = 0x3" | xargs sed -i 's/id = 0x3,/id = PCI_CAP_ID_VPD,/' $ git grep -l "\.id = 0x5" | xargs sed -i 's/id = 0x5,/id = PCI_CAP_ID_MSI,/' $ git grep -l "\.id = 0x8" | xargs sed -i 's/id = 0x8,/id = PCI_CAP_ID_HT,/' $ git grep -l "\.id = 0x9" | xargs sed -i 's/id = 0x9,/id = PCI_CAP_ID_VNDR,/' $ git grep -l "\.id = 0xa" | xargs sed -i 's/id = 0xa,/id = PCI_CAP_ID_DBG,/' $ git grep -l "\.id = 0xd" | xargs sed -i 's/id = 0xd,/id = PCI_CAP_ID_SSVID,/' $ git grep -l "\.id = 0xf" | xargs sed -i 's/id = 0xf,/id = PCI_CAP_ID_SECDEV,/' $ git grep -l "\.id = 0x10" | xargs sed -i 's/id = 0x10,/id = PCI_CAP_ID_EXP,/' $ git grep -l "\.id = 0x11" | xargs sed -i 's/id = 0x11,/id = PCI_CAP_ID_MSIX,/' $ git grep -l "\.id = 0x12" | xargs sed -i 's/id = 0x12,/id = PCI_CAP_ID_SATA,/' $ git grep -l "\.id = 0x13" | xargs sed -i 's/id = 0x13,/id = PCI_CAP_ID_AF,/' Extended cap ids were manually replaced. Signed-off-by: Ralf Ramsauer <[email protected]> --- configs/x86/e1000-demo.c | 2 +- configs/x86/f2a88xm-hd3.c | 54 ++++++++++++++++----------------- configs/x86/imb-a180.c | 52 +++++++++++++++---------------- configs/x86/linux-x86-demo.c | 12 ++++---- configs/x86/pci-demo.c | 2 +- configs/x86/qemu-x86.c | 20 ++++++------ include/jailhouse/cell-config.h | 16 ++++++++++ 7 files changed, 87 insertions(+), 71 deletions(-) diff --git a/configs/x86/e1000-demo.c b/configs/x86/e1000-demo.c index 09ca9eac..814f13ed 100644 --- a/configs/x86/e1000-demo.c +++ b/configs/x86/e1000-demo.c @@ -97,7 +97,7 @@ struct { .pci_caps = { { /* Intel e1000 @00:19.0 */ - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0xd0, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, diff --git a/configs/x86/f2a88xm-hd3.c b/configs/x86/f2a88xm-hd3.c index e73cbb06..315d0e29 100644 --- a/configs/x86/f2a88xm-hd3.c +++ b/configs/x86/f2a88xm-hd3.c @@ -737,19 +737,19 @@ struct { .pci_caps = { /* PCIDevice: 00:00.2 */ { - .id = 0xf, + .id = PCI_CAP_ID_SECDEV, .start = 0x40, .len = 2, .flags = 0, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0x54, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x8, + .id = PCI_CAP_ID_HT, .start = 0x64, .len = 2, .flags = 0, @@ -757,56 +757,56 @@ struct { /* PCIDevice: 00:01.0 */ /* PCIDevice: 00:01.1 */ { - .id = 0x9, + .id = PCI_CAP_ID_VNDR, .start = 0x48, .len = 2, .flags = 0, }, { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0x50, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x10, + .id = PCI_CAP_ID_EXP, .start = 0x58, .len = 2, .flags = 0, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0xa0, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, /* PCIDevice: 00:03.1 */ { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0x50, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x10, + .id = PCI_CAP_ID_EXP, .start = 0x58, .len = 2, .flags = 0, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0xa0, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0xd, + .id = PCI_CAP_ID_SSVID, .start = 0xb0, .len = 2, .flags = 0, }, { - .id = 0x8, + .id = PCI_CAP_ID_HT, .start = 0xb8, .len = 2, .flags = 0, @@ -814,38 +814,38 @@ struct { /* PCIDevice: 00:10.0 */ /* PCIDevice: 00:10.1 */ { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0x50, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0x70, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x11, + .id = PCI_CAP_ID_MSIX, .start = 0x90, .len = 12, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x10, + .id = PCI_CAP_ID_EXP, .start = 0xa0, .len = 2, .flags = 0, }, /* PCIDevice: 00:11.0 */ { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0x50, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x12, + .id = PCI_CAP_ID_SATA, .start = 0x70, .len = 2, .flags = 0, @@ -853,58 +853,58 @@ struct { /* PCIDevice: 00:12.2 */ /* PCIDevice: 00:13.2 */ { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0xc0, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0xa, + .id = PCI_CAP_ID_DBG, .start = 0xe4, .len = 2, .flags = 0, }, /* PCIDevice: 00:14.2 */ { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0x50, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, /* PCIDevice: 00:18.3 */ { - .id = 0xf, + .id = PCI_CAP_ID_SECDEV, .start = 0xf0, .len = 2, .flags = 0, }, /* PCIDevice: 01:00.0 */ { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0x40, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0x50, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x10, + .id = PCI_CAP_ID_EXP, .start = 0x70, .len = 2, .flags = 0, }, { - .id = 0x11, + .id = PCI_CAP_ID_MSIX, .start = 0xb0, .len = 12, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x3, + .id = PCI_CAP_ID_VPD, .start = 0xd0, .len = 2, .flags = 0, diff --git a/configs/x86/imb-a180.c b/configs/x86/imb-a180.c index 4faa0b41..e0d86e3a 100644 --- a/configs/x86/imb-a180.c +++ b/configs/x86/imb-a180.c @@ -613,25 +613,25 @@ struct { /* PCIDevice: 00:01.0 */ /* PCIDevice: 00:01.1 */ { - .id = 0x9, + .id = PCI_CAP_ID_VNDR, .start = 0x48, .len = 2, .flags = 0, }, { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0x50, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x10, + .id = PCI_CAP_ID_EXP, .start = 0x58, .len = 2, .flags = 0, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0xa0, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, @@ -639,81 +639,81 @@ struct { /* PCIDevice: 00:02.3 */ /* PCIDevice: 00:02.4 */ { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0x50, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x10, + .id = PCI_CAP_ID_EXP, .start = 0x58, .len = 2, .flags = 0, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0xa0, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0xd, + .id = PCI_CAP_ID_SSVID, .start = 0xb0, .len = 2, .flags = 0, }, { - .id = 0x8, + .id = PCI_CAP_ID_HT, .start = 0xb8, .len = 2, .flags = 0, }, /* PCIDevice: 00:10.0 */ { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0x50, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0x70, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x11, + .id = PCI_CAP_ID_MSIX, .start = 0x90, .len = 12, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x10, + .id = PCI_CAP_ID_EXP, .start = 0xa0, .len = 2, .flags = 0, }, /* PCIDevice: 00:11.0 */ { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0x60, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x12, + .id = PCI_CAP_ID_SATA, .start = 0x70, .len = 2, .flags = 0, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0x50, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x13, + .id = PCI_CAP_ID_AF, .start = 0xd0, .len = 2, .flags = 0, @@ -721,27 +721,27 @@ struct { /* PCIDevice: 00:12.2 */ /* PCIDevice: 00:13.2 */ { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0xc0, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0xa, + .id = PCI_CAP_ID_DBG, .start = 0xe4, .len = 2, .flags = 0, }, /* PCIDevice: 00:14.2 */ { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0x50, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, /* PCIDevice: 00:18.3 */ { - .id = 0xf, + .id = PCI_CAP_ID_SECDEV, .start = 0xf0, .len = 2, .flags = 0, @@ -752,31 +752,31 @@ struct { /* PCIDevice: 01:00.3 */ /* PCIDevice: 02:00.0 */ { - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0x40, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0x50, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x10, + .id = PCI_CAP_ID_EXP, .start = 0x70, .len = 2, .flags = 0, }, { - .id = 0x11, + .id = PCI_CAP_ID_MSIX, .start = 0xb0, .len = 12, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x3, + .id = PCI_CAP_ID_VPD, .start = 0xd0, .len = 2, .flags = 0, diff --git a/configs/x86/linux-x86-demo.c b/configs/x86/linux-x86-demo.c index c8f18701..cb89ec0a 100644 --- a/configs/x86/linux-x86-demo.c +++ b/configs/x86/linux-x86-demo.c @@ -178,37 +178,37 @@ struct { .pci_caps = { { /* e1000e */ - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0xc8, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0xd0, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x10, + .id = PCI_CAP_ID_EXP, .start = 0xe0, .len = 20, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x11, + .id = PCI_CAP_ID_MSIX, .start = 0xa0, .len = 12, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x1 | JAILHOUSE_PCI_EXT_CAP, + .id = PCI_EXT_CAP_ID_ERR | JAILHOUSE_PCI_EXT_CAP, .start = 0x100, .len = 4, .flags = 0, }, { - .id = 0x3 | JAILHOUSE_PCI_EXT_CAP, + .id = PCI_EXT_CAP_ID_DSN | JAILHOUSE_PCI_EXT_CAP, .start = 0x140, .len = 4, .flags = 0, diff --git a/configs/x86/pci-demo.c b/configs/x86/pci-demo.c index 0b8c1aad..c7a5527a 100644 --- a/configs/x86/pci-demo.c +++ b/configs/x86/pci-demo.c @@ -94,7 +94,7 @@ struct { .pci_caps = { { /* Intel HDA @00:1b.0 */ - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0x60, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, diff --git a/configs/x86/qemu-x86.c b/configs/x86/qemu-x86.c index 4d671cb2..fdfa8915 100644 --- a/configs/x86/qemu-x86.c +++ b/configs/x86/qemu-x86.c @@ -314,7 +314,7 @@ struct { .pci_caps = { { /* ICH HD audio */ - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0x60, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, @@ -325,55 +325,55 @@ struct { .flags = JAILHOUSE_PCICAPS_WRITE, }, { /* AHCI */ - .id = 0x12, + .id = PCI_CAP_ID_SATA, .start = 0xa8, .len = 2, .flags = 0, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0x80, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, { /* virtio-9p-pci */ - .id = 0x11, + .id = PCI_CAP_ID_MSIX, .start = 0x98, .len = 12, .flags = JAILHOUSE_PCICAPS_WRITE, }, { /* e1000e */ - .id = 0x1, + .id = PCI_CAP_ID_PM, .start = 0xc8, .len = 8, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x5, + .id = PCI_CAP_ID_MSI, .start = 0xd0, .len = 14, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x10, + .id = PCI_CAP_ID_EXP, .start = 0xe0, .len = 20, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x11, + .id = PCI_CAP_ID_MSIX, .start = 0xa0, .len = 12, .flags = JAILHOUSE_PCICAPS_WRITE, }, { - .id = 0x1 | JAILHOUSE_PCI_EXT_CAP, + .id = PCI_EXT_CAP_ID_ERR | JAILHOUSE_PCI_EXT_CAP, .start = 0x100, .len = 4, .flags = 0, }, { - .id = 0x3 | JAILHOUSE_PCI_EXT_CAP, + .id = PCI_EXT_CAP_ID_DSN | JAILHOUSE_PCI_EXT_CAP, .start = 0x140, .len = 4, .flags = 0, diff --git a/include/jailhouse/cell-config.h b/include/jailhouse/cell-config.h index 63eb5fa5..e90cd25e 100644 --- a/include/jailhouse/cell-config.h +++ b/include/jailhouse/cell-config.h @@ -182,6 +182,22 @@ struct jailhouse_pci_device { #define JAILHOUSE_PCICAPS_WRITE 0x0001 +#define PCI_CAP_ID_PM 0x01 /* Power Management */ +#define PCI_CAP_ID_VPD 0x03 /* Vital Product Data */ +#define PCI_CAP_ID_MSI 0x05 /* Message Signalled Interrupts */ +#define PCI_CAP_ID_HT 0x08 /* HyperTransport */ +#define PCI_CAP_ID_VNDR 0x09 /* Vendor-Specific */ +#define PCI_CAP_ID_DBG 0x0A /* Debug port */ +#define PCI_CAP_ID_SSVID 0x0D /* Bridge subsystem vendor/device ID */ +#define PCI_CAP_ID_SECDEV 0x0F /* Secure Device */ +#define PCI_CAP_ID_EXP 0x10 /* PCI Express */ +#define PCI_CAP_ID_MSIX 0x11 /* MSI-X */ +#define PCI_CAP_ID_SATA 0x12 /* SATA Data/Index Conf. */ +#define PCI_CAP_ID_AF 0x13 /* PCI Advanced Features */ + +#define PCI_EXT_CAP_ID_ERR 0x01 /* Advanced Error Reporting */ +#define PCI_EXT_CAP_ID_DSN 0x03 /* Device Serial Number */ + struct jailhouse_pci_capability { __u16 id; __u16 start; -- 2.21.0 -- 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]. For more options, visit https://groups.google.com/d/optout.
