Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a436fa8 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

Merge branch 'pci/switchtec' into next 

* pci/switchtec:
  switchtec: Add device IDs for PSX 24xG3 and PSX 48xG3
  switchtec: Add Global Fabric Manager Server (GFMS) event
parents 414ae760 bb6b42b4

drivers/pci/switch/switchtec.c

+3 −0
Original line number Diff line number Diff line
@@ -707,6 +707,7 @@ static const struct event_reg { 
	EV_GLB(SWITCHTEC_IOCTL_EVENT_CLI_MRPC_COMP_ASYNC,

	       cli_mrpc_comp_async_hdr),

	EV_GLB(SWITCHTEC_IOCTL_EVENT_GPIO_INT, gpio_interrupt_hdr),

	EV_GLB(SWITCHTEC_IOCTL_EVENT_GFMS, gfms_event_hdr),

	EV_PAR(SWITCHTEC_IOCTL_EVENT_PART_RESET, part_reset_hdr),

	EV_PAR(SWITCHTEC_IOCTL_EVENT_MRPC_COMP, mrpc_comp_hdr),

	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[] = { 
	SWITCHTEC_PCI_DEVICE(0x8534),  //PFX 64xG3

	SWITCHTEC_PCI_DEVICE(0x8535),  //PFX 80xG3

	SWITCHTEC_PCI_DEVICE(0x8536),  //PFX 96xG3

	SWITCHTEC_PCI_DEVICE(0x8541),  //PSX 24xG3

	SWITCHTEC_PCI_DEVICE(0x8542),  //PSX 32xG3

	SWITCHTEC_PCI_DEVICE(0x8543),  //PSX 48xG3

	SWITCHTEC_PCI_DEVICE(0x8544),  //PSX 64xG3

	SWITCHTEC_PCI_DEVICE(0x8545),  //PSX 80xG3

include/linux/switchtec.h

+3 −0
Original line number Diff line number Diff line
@@ -100,6 +100,9 @@ struct sw_event_regs { 
	u32 gpio_interrupt_hdr;

	u32 gpio_interrupt_data;

	u32 reserved16[4];

	u32 gfms_event_hdr;

	u32 gfms_event_data;

	u32 reserved17[4];

} __packed;



enum {

include/uapi/linux/switchtec_ioctl.h

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ struct switchtec_ioctl_event_summary { 
#define SWITCHTEC_IOCTL_EVENT_FORCE_SPEED		26

#define SWITCHTEC_IOCTL_EVENT_CREDIT_TIMEOUT		27

#define SWITCHTEC_IOCTL_EVENT_LINK_STATE		28

#define SWITCHTEC_IOCTL_MAX_EVENTS			29

#define SWITCHTEC_IOCTL_EVENT_GFMS			29

#define SWITCHTEC_IOCTL_MAX_EVENTS			30



#define SWITCHTEC_IOCTL_EVENT_LOCAL_PART_IDX -1

#define SWITCHTEC_IOCTL_EVENT_IDX_ALL -2