diff options
| -rw-r--r-- | drivers/pci/switch/switchtec.c | 3 | ||||
| -rw-r--r-- | include/linux/switchtec.h | 3 | ||||
| -rw-r--r-- | include/uapi/linux/switchtec_ioctl.h | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c index 730cc897b94d..a0f8373f3b5f 100644 --- a/drivers/pci/switch/switchtec.c +++ b/drivers/pci/switch/switchtec.c | |||
| @@ -707,6 +707,7 @@ static const struct event_reg { | |||
| 707 | EV_GLB(SWITCHTEC_IOCTL_EVENT_CLI_MRPC_COMP_ASYNC, | 707 | EV_GLB(SWITCHTEC_IOCTL_EVENT_CLI_MRPC_COMP_ASYNC, |
| 708 | cli_mrpc_comp_async_hdr), | 708 | cli_mrpc_comp_async_hdr), |
| 709 | EV_GLB(SWITCHTEC_IOCTL_EVENT_GPIO_INT, gpio_interrupt_hdr), | 709 | EV_GLB(SWITCHTEC_IOCTL_EVENT_GPIO_INT, gpio_interrupt_hdr), |
| 710 | EV_GLB(SWITCHTEC_IOCTL_EVENT_GFMS, gfms_event_hdr), | ||
| 710 | EV_PAR(SWITCHTEC_IOCTL_EVENT_PART_RESET, part_reset_hdr), | 711 | EV_PAR(SWITCHTEC_IOCTL_EVENT_PART_RESET, part_reset_hdr), |
| 711 | EV_PAR(SWITCHTEC_IOCTL_EVENT_MRPC_COMP, mrpc_comp_hdr), | 712 | EV_PAR(SWITCHTEC_IOCTL_EVENT_MRPC_COMP, mrpc_comp_hdr), |
| 712 | EV_PAR(SWITCHTEC_IOCTL_EVENT_MRPC_COMP_ASYNC, mrpc_comp_async_hdr), | 713 | EV_PAR(SWITCHTEC_IOCTL_EVENT_MRPC_COMP_ASYNC, mrpc_comp_async_hdr), |
| @@ -1352,6 +1353,8 @@ static const struct pci_device_id switchtec_pci_tbl[] = { | |||
| 1352 | SWITCHTEC_PCI_DEVICE(0x8534), //PFX 64xG3 | 1353 | SWITCHTEC_PCI_DEVICE(0x8534), //PFX 64xG3 |
| 1353 | SWITCHTEC_PCI_DEVICE(0x8535), //PFX 80xG3 | 1354 | SWITCHTEC_PCI_DEVICE(0x8535), //PFX 80xG3 |
| 1354 | SWITCHTEC_PCI_DEVICE(0x8536), //PFX 96xG3 | 1355 | SWITCHTEC_PCI_DEVICE(0x8536), //PFX 96xG3 |
| 1356 | SWITCHTEC_PCI_DEVICE(0x8541), //PSX 24xG3 | ||
| 1357 | SWITCHTEC_PCI_DEVICE(0x8542), //PSX 32xG3 | ||
| 1355 | SWITCHTEC_PCI_DEVICE(0x8543), //PSX 48xG3 | 1358 | SWITCHTEC_PCI_DEVICE(0x8543), //PSX 48xG3 |
| 1356 | SWITCHTEC_PCI_DEVICE(0x8544), //PSX 64xG3 | 1359 | SWITCHTEC_PCI_DEVICE(0x8544), //PSX 64xG3 |
| 1357 | SWITCHTEC_PCI_DEVICE(0x8545), //PSX 80xG3 | 1360 | SWITCHTEC_PCI_DEVICE(0x8545), //PSX 80xG3 |
diff --git a/include/linux/switchtec.h b/include/linux/switchtec.h index 09d73d0d1aa8..42d121174fe2 100644 --- a/include/linux/switchtec.h +++ b/include/linux/switchtec.h | |||
| @@ -100,6 +100,9 @@ struct sw_event_regs { | |||
| 100 | u32 gpio_interrupt_hdr; | 100 | u32 gpio_interrupt_hdr; |
| 101 | u32 gpio_interrupt_data; | 101 | u32 gpio_interrupt_data; |
| 102 | u32 reserved16[4]; | 102 | u32 reserved16[4]; |
| 103 | u32 gfms_event_hdr; | ||
| 104 | u32 gfms_event_data; | ||
| 105 | u32 reserved17[4]; | ||
| 103 | } __packed; | 106 | } __packed; |
| 104 | 107 | ||
| 105 | enum { | 108 | enum { |
diff --git a/include/uapi/linux/switchtec_ioctl.h b/include/uapi/linux/switchtec_ioctl.h index 75df44373034..4f4daf8db954 100644 --- a/include/uapi/linux/switchtec_ioctl.h +++ b/include/uapi/linux/switchtec_ioctl.h | |||
| @@ -88,7 +88,8 @@ struct switchtec_ioctl_event_summary { | |||
| 88 | #define SWITCHTEC_IOCTL_EVENT_FORCE_SPEED 26 | 88 | #define SWITCHTEC_IOCTL_EVENT_FORCE_SPEED 26 |
| 89 | #define SWITCHTEC_IOCTL_EVENT_CREDIT_TIMEOUT 27 | 89 | #define SWITCHTEC_IOCTL_EVENT_CREDIT_TIMEOUT 27 |
| 90 | #define SWITCHTEC_IOCTL_EVENT_LINK_STATE 28 | 90 | #define SWITCHTEC_IOCTL_EVENT_LINK_STATE 28 |
| 91 | #define SWITCHTEC_IOCTL_MAX_EVENTS 29 | 91 | #define SWITCHTEC_IOCTL_EVENT_GFMS 29 |
| 92 | #define SWITCHTEC_IOCTL_MAX_EVENTS 30 | ||
| 92 | 93 | ||
| 93 | #define SWITCHTEC_IOCTL_EVENT_LOCAL_PART_IDX -1 | 94 | #define SWITCHTEC_IOCTL_EVENT_LOCAL_PART_IDX -1 |
| 94 | #define SWITCHTEC_IOCTL_EVENT_IDX_ALL -2 | 95 | #define SWITCHTEC_IOCTL_EVENT_IDX_ALL -2 |
