History

Merge branch 'pci/switchtec'

- Support all 255 PFF ports in switchtec driver (Wesley Sheng) - Fix unintentional switchtec MRPC event masking that degraded firmware update speed (Wesley Sheng) * pci/switchtec: switchtec: Fix unintended mask of MRPC event switchtec: Increase PFF limit from 48 to 255

Bjorn Helgaas committed 7 years ago

Commit da33ae02 parents db9d639 083c1b53 files · +42 −15Browse files

Showing the changes to include/uapi (1 of 3 files). Show all

Unified · Split

include/uapi/linux/switchtec_ioctl.h+12−1
@@ -50,7 +50,7 @@ struct switchtec_ioctl_flash_part_info { · 49 unmodified lines
50 __u32 active;50 __u32 active;
51};51};
52 52
53struct switchtec_ioctl_event_summary {53struct switchtec_ioctl_event_summary_legacy {
54 __u64 global;54 __u64 global;
55 __u64 part_bitmap;55 __u64 part_bitmap;
56 __u32 local_part;56 __u32 local_part;
@@ -59,6 +59,15 @@ struct switchtec_ioctl_event_summary { · 2 unmodified lines
59 __u32 pff[48];59 __u32 pff[48];
60};60};
61 61
62struct switchtec_ioctl_event_summary {
63 __u64 global;
64 __u64 part_bitmap;
65 __u32 local_part;
66 __u32 padding;
67 __u32 part[48];
68 __u32 pff[255];
69};
70
62#define SWITCHTEC_IOCTL_EVENT_STACK_ERROR 071#define SWITCHTEC_IOCTL_EVENT_STACK_ERROR 0
63#define SWITCHTEC_IOCTL_EVENT_PPU_ERROR 172#define SWITCHTEC_IOCTL_EVENT_PPU_ERROR 1
64#define SWITCHTEC_IOCTL_EVENT_ISP_ERROR 273#define SWITCHTEC_IOCTL_EVENT_ISP_ERROR 2
@@ -127,6 +136,8 @@ struct switchtec_ioctl_pff_port { · 62 unmodified lines
127 _IOWR('W', 0x41, struct switchtec_ioctl_flash_part_info)136 _IOWR('W', 0x41, struct switchtec_ioctl_flash_part_info)
128#define SWITCHTEC_IOCTL_EVENT_SUMMARY \137#define SWITCHTEC_IOCTL_EVENT_SUMMARY \
129 _IOR('W', 0x42, struct switchtec_ioctl_event_summary)138 _IOR('W', 0x42, struct switchtec_ioctl_event_summary)
139#define SWITCHTEC_IOCTL_EVENT_SUMMARY_LEGACY \
140 _IOR('W', 0x42, struct switchtec_ioctl_event_summary_legacy)
130#define SWITCHTEC_IOCTL_EVENT_CTL \141#define SWITCHTEC_IOCTL_EVENT_CTL \
131 _IOWR('W', 0x43, struct switchtec_ioctl_event_ctl)142 _IOWR('W', 0x43, struct switchtec_ioctl_event_ctl)
132#define SWITCHTEC_IOCTL_PFF_TO_PORT \143#define SWITCHTEC_IOCTL_PFF_TO_PORT \