diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-27 13:28:36 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-28 13:28:10 -0400 |
| commit | c0b4b3815d4e65c082d6e85d0fccf25b230e7890 (patch) | |
| tree | 54491cb7a01307c78e913cab1a50e4ebdd84739c /include/uapi/linux | |
| parent | 1b121c24dd4a9bb7156f10c7da3f39515a9fa6f0 (diff) | |
PCI: Tidy bitmasks and spacing of PCIe capability definitions
The convention of showing bits in a mask of the full register width, e.g.,
"0x00000007" instead of "0x07" for a field in a 32-bit register, is common
but not universal in this file. This patch makes it consistently used at
least for the PCIe capability.
Whitespace and zero-extension changes only; no functional change.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/pci_regs.h | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index 591bb3b2ee4a..28c83eceefe3 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h | |||
| @@ -428,17 +428,17 @@ | |||
| 428 | #define PCI_EXP_FLAGS_SLOT 0x0100 /* Slot implemented */ | 428 | #define PCI_EXP_FLAGS_SLOT 0x0100 /* Slot implemented */ |
| 429 | #define PCI_EXP_FLAGS_IRQ 0x3e00 /* Interrupt message number */ | 429 | #define PCI_EXP_FLAGS_IRQ 0x3e00 /* Interrupt message number */ |
| 430 | #define PCI_EXP_DEVCAP 4 /* Device capabilities */ | 430 | #define PCI_EXP_DEVCAP 4 /* Device capabilities */ |
| 431 | #define PCI_EXP_DEVCAP_PAYLOAD 0x07 /* Max_Payload_Size */ | 431 | #define PCI_EXP_DEVCAP_PAYLOAD 0x00000007 /* Max_Payload_Size */ |
| 432 | #define PCI_EXP_DEVCAP_PHANTOM 0x18 /* Phantom functions */ | 432 | #define PCI_EXP_DEVCAP_PHANTOM 0x00000018 /* Phantom functions */ |
| 433 | #define PCI_EXP_DEVCAP_EXT_TAG 0x20 /* Extended tags */ | 433 | #define PCI_EXP_DEVCAP_EXT_TAG 0x00000020 /* Extended tags */ |
| 434 | #define PCI_EXP_DEVCAP_L0S 0x1c0 /* L0s Acceptable Latency */ | 434 | #define PCI_EXP_DEVCAP_L0S 0x000001c0 /* L0s Acceptable Latency */ |
| 435 | #define PCI_EXP_DEVCAP_L1 0xe00 /* L1 Acceptable Latency */ | 435 | #define PCI_EXP_DEVCAP_L1 0x00000e00 /* L1 Acceptable Latency */ |
| 436 | #define PCI_EXP_DEVCAP_ATN_BUT 0x1000 /* Attention Button Present */ | 436 | #define PCI_EXP_DEVCAP_ATN_BUT 0x00001000 /* Attention Button Present */ |
| 437 | #define PCI_EXP_DEVCAP_ATN_IND 0x2000 /* Attention Indicator Present */ | 437 | #define PCI_EXP_DEVCAP_ATN_IND 0x00002000 /* Attention Indicator Present */ |
| 438 | #define PCI_EXP_DEVCAP_PWR_IND 0x4000 /* Power Indicator Present */ | 438 | #define PCI_EXP_DEVCAP_PWR_IND 0x00004000 /* Power Indicator Present */ |
| 439 | #define PCI_EXP_DEVCAP_RBER 0x8000 /* Role-Based Error Reporting */ | 439 | #define PCI_EXP_DEVCAP_RBER 0x00008000 /* Role-Based Error Reporting */ |
| 440 | #define PCI_EXP_DEVCAP_PWR_VAL 0x3fc0000 /* Slot Power Limit Value */ | 440 | #define PCI_EXP_DEVCAP_PWR_VAL 0x03fc0000 /* Slot Power Limit Value */ |
| 441 | #define PCI_EXP_DEVCAP_PWR_SCL 0xc000000 /* Slot Power Limit Scale */ | 441 | #define PCI_EXP_DEVCAP_PWR_SCL 0x0c000000 /* Slot Power Limit Scale */ |
| 442 | #define PCI_EXP_DEVCAP_FLR 0x10000000 /* Function Level Reset */ | 442 | #define PCI_EXP_DEVCAP_FLR 0x10000000 /* Function Level Reset */ |
| 443 | #define PCI_EXP_DEVCTL 8 /* Device Control */ | 443 | #define PCI_EXP_DEVCTL 8 /* Device Control */ |
| 444 | #define PCI_EXP_DEVCTL_CERE 0x0001 /* Correctable Error Reporting En. */ | 444 | #define PCI_EXP_DEVCTL_CERE 0x0001 /* Correctable Error Reporting En. */ |
| @@ -454,16 +454,16 @@ | |||
| 454 | #define PCI_EXP_DEVCTL_READRQ 0x7000 /* Max_Read_Request_Size */ | 454 | #define PCI_EXP_DEVCTL_READRQ 0x7000 /* Max_Read_Request_Size */ |
| 455 | #define PCI_EXP_DEVCTL_BCR_FLR 0x8000 /* Bridge Configuration Retry / FLR */ | 455 | #define PCI_EXP_DEVCTL_BCR_FLR 0x8000 /* Bridge Configuration Retry / FLR */ |
| 456 | #define PCI_EXP_DEVSTA 10 /* Device Status */ | 456 | #define PCI_EXP_DEVSTA 10 /* Device Status */ |
| 457 | #define PCI_EXP_DEVSTA_CED 0x01 /* Correctable Error Detected */ | 457 | #define PCI_EXP_DEVSTA_CED 0x0001 /* Correctable Error Detected */ |
| 458 | #define PCI_EXP_DEVSTA_NFED 0x02 /* Non-Fatal Error Detected */ | 458 | #define PCI_EXP_DEVSTA_NFED 0x0002 /* Non-Fatal Error Detected */ |
| 459 | #define PCI_EXP_DEVSTA_FED 0x04 /* Fatal Error Detected */ | 459 | #define PCI_EXP_DEVSTA_FED 0x0004 /* Fatal Error Detected */ |
| 460 | #define PCI_EXP_DEVSTA_URD 0x08 /* Unsupported Request Detected */ | 460 | #define PCI_EXP_DEVSTA_URD 0x0008 /* Unsupported Request Detected */ |
| 461 | #define PCI_EXP_DEVSTA_AUXPD 0x10 /* AUX Power Detected */ | 461 | #define PCI_EXP_DEVSTA_AUXPD 0x0010 /* AUX Power Detected */ |
| 462 | #define PCI_EXP_DEVSTA_TRPND 0x20 /* Transactions Pending */ | 462 | #define PCI_EXP_DEVSTA_TRPND 0x0020 /* Transactions Pending */ |
| 463 | #define PCI_EXP_LNKCAP 12 /* Link Capabilities */ | 463 | #define PCI_EXP_LNKCAP 12 /* Link Capabilities */ |
| 464 | #define PCI_EXP_LNKCAP_SLS 0x0000000f /* Supported Link Speeds */ | 464 | #define PCI_EXP_LNKCAP_SLS 0x0000000f /* Supported Link Speeds */ |
| 465 | #define PCI_EXP_LNKCAP_SLS_2_5GB 0x1 /* LNKCAP2 SLS Vector bit 0 (2.5GT/s) */ | 465 | #define PCI_EXP_LNKCAP_SLS_2_5GB 0x00000001 /* LNKCAP2 SLS Vector bit 0 */ |
| 466 | #define PCI_EXP_LNKCAP_SLS_5_0GB 0x2 /* LNKCAP2 SLS Vector bit 1 (5.0GT/s) */ | 466 | #define PCI_EXP_LNKCAP_SLS_5_0GB 0x00000002 /* LNKCAP2 SLS Vector bit 1 */ |
| 467 | #define PCI_EXP_LNKCAP_MLW 0x000003f0 /* Maximum Link Width */ | 467 | #define PCI_EXP_LNKCAP_MLW 0x000003f0 /* Maximum Link Width */ |
| 468 | #define PCI_EXP_LNKCAP_ASPMS 0x00000c00 /* ASPM Support */ | 468 | #define PCI_EXP_LNKCAP_ASPMS 0x00000c00 /* ASPM Support */ |
| 469 | #define PCI_EXP_LNKCAP_L0SEL 0x00007000 /* L0s Exit Latency */ | 469 | #define PCI_EXP_LNKCAP_L0SEL 0x00007000 /* L0s Exit Latency */ |
| @@ -475,21 +475,21 @@ | |||
| 475 | #define PCI_EXP_LNKCAP_PN 0xff000000 /* Port Number */ | 475 | #define PCI_EXP_LNKCAP_PN 0xff000000 /* Port Number */ |
| 476 | #define PCI_EXP_LNKCTL 16 /* Link Control */ | 476 | #define PCI_EXP_LNKCTL 16 /* Link Control */ |
| 477 | #define PCI_EXP_LNKCTL_ASPMC 0x0003 /* ASPM Control */ | 477 | #define PCI_EXP_LNKCTL_ASPMC 0x0003 /* ASPM Control */ |
| 478 | #define PCI_EXP_LNKCTL_ASPM_L0S 0x01 /* L0s Enable */ | 478 | #define PCI_EXP_LNKCTL_ASPM_L0S 0x0001 /* L0s Enable */ |
| 479 | #define PCI_EXP_LNKCTL_ASPM_L1 0x02 /* L1 Enable */ | 479 | #define PCI_EXP_LNKCTL_ASPM_L1 0x0002 /* L1 Enable */ |
| 480 | #define PCI_EXP_LNKCTL_RCB 0x0008 /* Read Completion Boundary */ | 480 | #define PCI_EXP_LNKCTL_RCB 0x0008 /* Read Completion Boundary */ |
| 481 | #define PCI_EXP_LNKCTL_LD 0x0010 /* Link Disable */ | 481 | #define PCI_EXP_LNKCTL_LD 0x0010 /* Link Disable */ |
| 482 | #define PCI_EXP_LNKCTL_RL 0x0020 /* Retrain Link */ | 482 | #define PCI_EXP_LNKCTL_RL 0x0020 /* Retrain Link */ |
| 483 | #define PCI_EXP_LNKCTL_CCC 0x0040 /* Common Clock Configuration */ | 483 | #define PCI_EXP_LNKCTL_CCC 0x0040 /* Common Clock Configuration */ |
| 484 | #define PCI_EXP_LNKCTL_ES 0x0080 /* Extended Synch */ | 484 | #define PCI_EXP_LNKCTL_ES 0x0080 /* Extended Synch */ |
| 485 | #define PCI_EXP_LNKCTL_CLKREQ_EN 0x100 /* Enable clkreq */ | 485 | #define PCI_EXP_LNKCTL_CLKREQ_EN 0x0100 /* Enable clkreq */ |
| 486 | #define PCI_EXP_LNKCTL_HAWD 0x0200 /* Hardware Autonomous Width Disable */ | 486 | #define PCI_EXP_LNKCTL_HAWD 0x0200 /* Hardware Autonomous Width Disable */ |
| 487 | #define PCI_EXP_LNKCTL_LBMIE 0x0400 /* Link Bandwidth Management Interrupt Enable */ | 487 | #define PCI_EXP_LNKCTL_LBMIE 0x0400 /* Link Bandwidth Management Interrupt Enable */ |
| 488 | #define PCI_EXP_LNKCTL_LABIE 0x0800 /* Lnk Autonomous Bandwidth Interrupt Enable */ | 488 | #define PCI_EXP_LNKCTL_LABIE 0x0800 /* Lnk Autonomous Bandwidth Interrupt Enable */ |
| 489 | #define PCI_EXP_LNKSTA 18 /* Link Status */ | 489 | #define PCI_EXP_LNKSTA 18 /* Link Status */ |
| 490 | #define PCI_EXP_LNKSTA_CLS 0x000f /* Current Link Speed */ | 490 | #define PCI_EXP_LNKSTA_CLS 0x000f /* Current Link Speed */ |
| 491 | #define PCI_EXP_LNKSTA_CLS_2_5GB 0x01 /* Current Link Speed 2.5GT/s */ | 491 | #define PCI_EXP_LNKSTA_CLS_2_5GB 0x0001 /* Current Link Speed 2.5GT/s */ |
| 492 | #define PCI_EXP_LNKSTA_CLS_5_0GB 0x02 /* Current Link Speed 5.0GT/s */ | 492 | #define PCI_EXP_LNKSTA_CLS_5_0GB 0x0002 /* Current Link Speed 5.0GT/s */ |
| 493 | #define PCI_EXP_LNKSTA_NLW 0x03f0 /* Nogotiated Link Width */ | 493 | #define PCI_EXP_LNKSTA_NLW 0x03f0 /* Nogotiated Link Width */ |
| 494 | #define PCI_EXP_LNKSTA_NLW_SHIFT 4 /* start of NLW mask in link status */ | 494 | #define PCI_EXP_LNKSTA_NLW_SHIFT 4 /* start of NLW mask in link status */ |
| 495 | #define PCI_EXP_LNKSTA_LT 0x0800 /* Link Training */ | 495 | #define PCI_EXP_LNKSTA_LT 0x0800 /* Link Training */ |
| @@ -534,15 +534,15 @@ | |||
| 534 | #define PCI_EXP_SLTSTA_EIS 0x0080 /* Electromechanical Interlock Status */ | 534 | #define PCI_EXP_SLTSTA_EIS 0x0080 /* Electromechanical Interlock Status */ |
| 535 | #define PCI_EXP_SLTSTA_DLLSC 0x0100 /* Data Link Layer State Changed */ | 535 | #define PCI_EXP_SLTSTA_DLLSC 0x0100 /* Data Link Layer State Changed */ |
| 536 | #define PCI_EXP_RTCTL 28 /* Root Control */ | 536 | #define PCI_EXP_RTCTL 28 /* Root Control */ |
| 537 | #define PCI_EXP_RTCTL_SECEE 0x01 /* System Error on Correctable Error */ | 537 | #define PCI_EXP_RTCTL_SECEE 0x0001 /* System Error on Correctable Error */ |
| 538 | #define PCI_EXP_RTCTL_SENFEE 0x02 /* System Error on Non-Fatal Error */ | 538 | #define PCI_EXP_RTCTL_SENFEE 0x0002 /* System Error on Non-Fatal Error */ |
| 539 | #define PCI_EXP_RTCTL_SEFEE 0x04 /* System Error on Fatal Error */ | 539 | #define PCI_EXP_RTCTL_SEFEE 0x0004 /* System Error on Fatal Error */ |
| 540 | #define PCI_EXP_RTCTL_PMEIE 0x08 /* PME Interrupt Enable */ | 540 | #define PCI_EXP_RTCTL_PMEIE 0x0008 /* PME Interrupt Enable */ |
| 541 | #define PCI_EXP_RTCTL_CRSSVE 0x10 /* CRS Software Visibility Enable */ | 541 | #define PCI_EXP_RTCTL_CRSSVE 0x0010 /* CRS Software Visibility Enable */ |
| 542 | #define PCI_EXP_RTCAP 30 /* Root Capabilities */ | 542 | #define PCI_EXP_RTCAP 30 /* Root Capabilities */ |
| 543 | #define PCI_EXP_RTSTA 32 /* Root Status */ | 543 | #define PCI_EXP_RTSTA 32 /* Root Status */ |
| 544 | #define PCI_EXP_RTSTA_PME 0x10000 /* PME status */ | 544 | #define PCI_EXP_RTSTA_PME 0x00010000 /* PME status */ |
| 545 | #define PCI_EXP_RTSTA_PENDING 0x20000 /* PME pending */ | 545 | #define PCI_EXP_RTSTA_PENDING 0x00020000 /* PME pending */ |
| 546 | /* | 546 | /* |
| 547 | * The Device Capabilities 2, Device Status 2, Device Control 2, | 547 | * The Device Capabilities 2, Device Status 2, Device Control 2, |
| 548 | * Link Capabilities 2, Link Status 2, Link Control 2, | 548 | * Link Capabilities 2, Link Status 2, Link Control 2, |
| @@ -552,25 +552,25 @@ | |||
| 552 | * safely. | 552 | * safely. |
| 553 | */ | 553 | */ |
| 554 | #define PCI_EXP_DEVCAP2 36 /* Device Capabilities 2 */ | 554 | #define PCI_EXP_DEVCAP2 36 /* Device Capabilities 2 */ |
| 555 | #define PCI_EXP_DEVCAP2_ARI 0x20 /* Alternative Routing-ID */ | 555 | #define PCI_EXP_DEVCAP2_ARI 0x00000020 /* Alternative Routing-ID */ |
| 556 | #define PCI_EXP_DEVCAP2_LTR 0x800 /* Latency tolerance reporting */ | 556 | #define PCI_EXP_DEVCAP2_LTR 0x00000800 /* Latency tolerance reporting */ |
| 557 | #define PCI_EXP_DEVCAP2_OBFF_MASK 0xc0000 /* OBFF support mechanism */ | 557 | #define PCI_EXP_DEVCAP2_OBFF_MASK 0x000c0000 /* OBFF support mechanism */ |
| 558 | #define PCI_EXP_DEVCAP2_OBFF_MSG 0x40000 /* New message signaling */ | 558 | #define PCI_EXP_DEVCAP2_OBFF_MSG 0x00040000 /* New message signaling */ |
| 559 | #define PCI_EXP_DEVCAP2_OBFF_WAKE 0x80000 /* Re-use WAKE# for OBFF */ | 559 | #define PCI_EXP_DEVCAP2_OBFF_WAKE 0x00080000 /* Re-use WAKE# for OBFF */ |
| 560 | #define PCI_EXP_DEVCTL2 40 /* Device Control 2 */ | 560 | #define PCI_EXP_DEVCTL2 40 /* Device Control 2 */ |
| 561 | #define PCI_EXP_DEVCTL2_ARI 0x20 /* Alternative Routing-ID */ | 561 | #define PCI_EXP_DEVCTL2_ARI 0x20 /* Alternative Routing-ID */ |
| 562 | #define PCI_EXP_DEVCTL2_IDO_REQ_EN 0x100 /* ID-based ordering request enable */ | 562 | #define PCI_EXP_DEVCTL2_IDO_REQ_EN 0x0100 /* Allow IDO for requests */ |
| 563 | #define PCI_EXP_DEVCTL2_IDO_CMP_EN 0x200 /* ID-based ordering completion enable */ | 563 | #define PCI_EXP_DEVCTL2_IDO_CMP_EN 0x0200 /* Allow IDO for completions */ |
| 564 | #define PCI_EXP_DEVCTL2_LTR_EN 0x400 /* Latency tolerance reporting */ | 564 | #define PCI_EXP_DEVCTL2_LTR_EN 0x0400 /* Enable LTR mechanism */ |
| 565 | #define PCI_EXP_DEVCTL2_OBFF_MSGA_EN 0x2000 /* OBFF enable with Message type A */ | 565 | #define PCI_EXP_DEVCTL2_OBFF_MSGA_EN 0x2000 /* Enable OBFF Message type A */ |
| 566 | #define PCI_EXP_DEVCTL2_OBFF_MSGB_EN 0x4000 /* OBFF enable with Message type B */ | 566 | #define PCI_EXP_DEVCTL2_OBFF_MSGB_EN 0x4000 /* Enable OBFF Message type B */ |
| 567 | #define PCI_EXP_DEVCTL2_OBFF_WAKE_EN 0x6000 /* OBFF using WAKE# signaling */ | 567 | #define PCI_EXP_DEVCTL2_OBFF_WAKE_EN 0x6000 /* OBFF using WAKE# signaling */ |
| 568 | #define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 44 /* v2 endpoints end here */ | 568 | #define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2 44 /* v2 endpoints end here */ |
| 569 | #define PCI_EXP_LNKCAP2 44 /* Link Capability 2 */ | 569 | #define PCI_EXP_LNKCAP2 44 /* Link Capability 2 */ |
| 570 | #define PCI_EXP_LNKCAP2_SLS_2_5GB 0x02 /* Supported Link Speed 2.5GT/s */ | 570 | #define PCI_EXP_LNKCAP2_SLS_2_5GB 0x00000002 /* Supported Speed 2.5GT/s */ |
| 571 | #define PCI_EXP_LNKCAP2_SLS_5_0GB 0x04 /* Supported Link Speed 5.0GT/s */ | 571 | #define PCI_EXP_LNKCAP2_SLS_5_0GB 0x00000004 /* Supported Speed 5.0GT/s */ |
| 572 | #define PCI_EXP_LNKCAP2_SLS_8_0GB 0x08 /* Supported Link Speed 8.0GT/s */ | 572 | #define PCI_EXP_LNKCAP2_SLS_8_0GB 0x00000008 /* Supported Speed 8.0GT/s */ |
| 573 | #define PCI_EXP_LNKCAP2_CROSSLINK 0x100 /* Crosslink supported */ | 573 | #define PCI_EXP_LNKCAP2_CROSSLINK 0x00000100 /* Crosslink supported */ |
| 574 | #define PCI_EXP_LNKCTL2 48 /* Link Control 2 */ | 574 | #define PCI_EXP_LNKCTL2 48 /* Link Control 2 */ |
| 575 | #define PCI_EXP_LNKSTA2 50 /* Link Status 2 */ | 575 | #define PCI_EXP_LNKSTA2 50 /* Link Status 2 */ |
| 576 | #define PCI_EXP_SLTCTL2 56 /* Slot Control 2 */ | 576 | #define PCI_EXP_SLTCTL2 56 /* Slot Control 2 */ |