pci: virtual channel save/restore support
Subsystems (2)
v2 cover pci: virtual channel save/restore support
v1->v2:
Address Bjorn's comments
- split code out to vc.c
- #defines for everything
- rename VC defines
- fix word access to PCI_VC_PORT_CTRL
It ended up getting a little bigger since I added function description comments, header, includes and misc lines here and there.
v1:
Turns out that even though we don't do much with virtual channel, we still need to save/restore it around reset. The case where this comes into play currently is a card with a switch and multiple devices, all supporting VC (Nvidia GRID). On some platforms the system firmware will leave all the virtual channel capabilities in their default state, where the VC0 TC/VC map is 0xff (TC0-7 enabled over VC0). Other systems decide to restrict the available traffic classes and configure 0x01 (only TC0 over VC0). At handoff, everything works, but as soon as we do a device reset, especially if done via bus reset, the endpoint can be returned to the spec defined default rather than the platform default. If such a device is then assigned to a guest, the guest driver sees multiple TCs enabled, attempts to use them, and it fails. The failure mode depends on the platform, ranging from the driver in the guest failing to work to host panic from an unsupported transaction.
This series attempts to implement full save/restore support for all types of virtual channel (VC, MFVC, and VC9). The buffer sizing code will execute for any device with these capabilities, but of couse the actual save/restore is only done if a reset is requested for the device, which typically means assignment to a VM. Thanks,
Alex
---
Alex Williamson (4):
pci: Generalize wait loop
pci: Add support for save/restore of extended capabilities
pci: Add Virtual Channel to save/restore support
pci: Rename PCI_VC_PORT_REG1/2 to PCI_VC_PORT_CAP1/2
drivers/pci/Makefile | 2 drivers/pci/pci.c | 102 ++++++-- drivers/pci/vc.c | 434 ++++++++++++++++++++++++++++++++++++ drivers/vfio/pci/vfio_pci_config.c | 12 - include/linux/pci.h | 15 + include/uapi/linux/pci_regs.h | 29 ++ 6 files changed, 549 insertions(+), 45 deletions(-) create mode 100644 drivers/pci/vc.c
PATCH v2 1/4 pci: Generalize wait loop
We currently have two instance of this loop which waits for a pending bit to clear in a status dword. Generalize the function for future users.
--- drivers/pci/pci.c | 54 +++++++++++++++++++++++++++++---------------------- include/linux/pci.h | 1 + 2 files changed, 32 insertions(+), 23 deletions(-)
drivers/pci/pci.c +31 -23
@@ -431,6 +431,32 @@ pci_find_parent_resource(const struct pci_dev *dev, struct resource *res) }/** +* pci_wait_for_pending - wait for @mask bit(s) to clear in status word @pos +* @dev: the PCI device to operate on +* @pos: config space offset of status word +* @mask: mask of bit(s) to care about in status word +* +* Return 1 when mask bit(s) in status word clear, 0 otherwise. +*/ +int pci_wait_for_pending (struct pci_dev *dev,int pos,u16 mask) +{ +int i; + +/* Wait for Transaction Pending bit clean */ +for (i =0 ; i <4 ; i++) { +u16 status; +if (i) +msleep ((1 << (i -1 )) *100 ); + +pci_read_config_word (dev, pos, &status); +if (!(status & mask)) +return 1 ; + } + +return 0 ; +} + +/** * pci_restore_bars - restore a devices BAR values (e.g. after wake-up) * @dev: PCI device to have its BARs restored *
@@ -3204,20 +3230,10 @@ EXPORT_SYMBOL(pci_set_dma_seg_boundary);*/ int pci_wait_for_pending_transaction (struct pci_dev *dev) { -int i; -u16 status; - -/* Wait for Transaction Pending bit clean */ -for (i =0 ; i <4 ; i++) { -if (i) -msleep ((1 << (i -1 )) *100 ); - -pcie_capability_read_word (dev,PCI_EXP_DEVSTA , &status); -if (!(status &PCI_EXP_DEVSTA_TRPND )) -return 1 ; - } +if (!pci_is_pcie (dev)) +return 1 ; -return 0 ; +return pci_wait_for_pending (dev,PCI_EXP_DEVSTA ,PCI_EXP_DEVSTA_TRPND ); }EXPORT_SYMBOL (pci_wait_for_pending_transaction);
@@ -3244,10 +3260,8 @@ static int pcie_flr(struct pci_dev *dev, int probe)static int pci_af_flr (struct pci_dev *dev,int probe) { -int i;int pos;u8 cap; -u8 status; pos =pci_find_capability (dev,PCI_CAP_ID_AF );if (!pos)
@@ -3261,14 +3275,8 @@ static int pci_af_flr(struct pci_dev *dev, int probe)return 0 ;/* Wait for Transaction Pending bit clean */ -for (i =0 ; i <4 ; i++) { -if (i) -msleep ((1 << (i -1 )) *100 ); - -pci_read_config_byte (dev, pos +PCI_AF_STATUS , &status); -if (!(status &PCI_AF_STATUS_TP )) - goto clear; - } +if (pci_wait_for_pending (dev,PCI_AF_STATUS ,PCI_AF_STATUS_TP )) + goto clear;dev_err (&dev->dev,"transaction is not cleared; " "proceeding with reset anyway\n" );
include/linux/pci.h +1 -0
@@ -938,6 +938,7 @@ bool pci_check_and_unmask_intx(struct pci_dev *dev);void pci_msi_off (struct pci_dev *dev);int pci_set_dma_max_seg_size (struct pci_dev *dev,unsigned int size);int pci_set_dma_seg_boundary (struct pci_dev *dev,unsigned long mask); +int pci_wait_for_pending (struct pci_dev *dev,int pos,u16 mask);int pci_wait_for_pending_transaction (struct pci_dev *dev);int pcix_get_max_mmrbc (struct pci_dev *dev);int pcix_get_mmrbc (struct pci_dev *dev);
PATCH v2 2/4 pci: Add support for save/restore of extended capabilities
In reply to Alex WilliamsonCurrent save/restore is specific to standard capabilities.
--- drivers/pci/pci.c | 43 +++++++++++++++++++++++++++++++++++-------- include/linux/pci.h | 9 ++++++++- 2 files changed, 43 insertions(+), 9 deletions(-)
drivers/pci/pci.c +35 -8
@@ -861,18 +861,28 @@ EXPORT_SYMBOL(pci_choose_state);#define PCI_EXP_SAVE_REGS 7 -static struct pci_cap_saved_state *pci_find_saved_cap ( -struct pci_dev *pci_dev,char cap) +static struct pci_cap_saved_state *_pci_find_saved_cap (struct pci_dev *pci_dev, +u16 cap,bool extended) {struct pci_cap_saved_state *tmp;hlist_for_each_entry (tmp, &pci_dev->saved_cap_space, next) { -if (tmp->cap.cap_nr == cap) +if (tmp->cap.cap_extended == extended && tmp->cap.cap_nr == cap)return tmp; }return NULL ; } +struct pci_cap_saved_state *pci_find_saved_cap (struct pci_dev *dev,char cap) +{ +return _pci_find_saved_cap (dev, cap, false); +} + +struct pci_cap_saved_state *pci_find_saved_ext_cap (struct pci_dev *dev,u16 cap) +{ +return _pci_find_saved_cap (dev, cap, true); +} +static int pci_save_pcie_state (struct pci_dev *dev) {int i =0 ;
@@ -1113,7 +1123,7 @@ int pci_load_saved_state(struct pci_dev *dev, struct pci_saved_state *state)while (cap->size) {struct pci_cap_saved_state *tmp; - tmp =pci_find_saved_cap (dev, cap->cap_nr); + tmp =_pci_find_saved_cap (dev, cap->cap_nr, cap->cap_extended);if (!tmp || tmp->cap.size != cap->size)return -EINVAL ;
@@ -2047,18 +2057,24 @@ static void pci_add_saved_cap(struct pci_dev *pci_dev, }/** -* pci_add_cap_save_buffer - allocate buffer for saving given capability registers +* _pci_add_cap_save_buffer - allocate buffer for saving given +* capability registers * @dev: the PCI device * @cap: the capability to allocate the buffer for +* @extended: Standard or Extended capability ID * @size: requested size of the buffer */ -static int pci_add_cap_save_buffer ( -struct pci_dev *dev,char cap,unsigned int size) +static int _pci_add_cap_save_buffer (struct pci_dev *dev,u16 cap, +bool extended,unsigned int size) {int pos;struct pci_cap_saved_state *save_state; - pos =pci_find_capability (dev, cap); +if (extended) + pos =pci_find_ext_capability (dev, cap); +else + pos =pci_find_capability (dev, cap); +if (pos <=0 )return 0 ;
@@ -2067,12 +2083,23 @@ static int pci_add_cap_save_buffer(return -ENOMEM ; save_state->cap.cap_nr = cap; + save_state->cap.cap_extended = extended; save_state->cap.size = size;pci_add_saved_cap (dev, save_state);return 0 ; } +int pci_add_cap_save_buffer (struct pci_dev *dev,char cap,unsigned int size) +{ +return _pci_add_cap_save_buffer (dev, cap, false, size); +} + +int pci_add_ext_cap_save_buffer (struct pci_dev *dev,u16 cap,unsigned int size) +{ +return _pci_add_cap_save_buffer (dev, cap, true, size); +} +/** * pci_allocate_cap_save_buffers - allocate buffers for saving capabilities * @dev: the PCI device
include/linux/pci.h +8 -1
@@ -224,7 +224,8 @@ enum pci_bus_speed { };struct pci_cap_saved_data { -char cap_nr; +u16 cap_nr; +bool cap_extended;unsigned int size;u32 data[0 ]; };
@@ -978,6 +979,12 @@ struct pci_saved_state *pci_store_saved_state(struct pci_dev *dev);int pci_load_saved_state (struct pci_dev *dev,struct pci_saved_state *state);int pci_load_and_free_saved_state (struct pci_dev *dev,struct pci_saved_state **state); +struct pci_cap_saved_state *pci_find_saved_cap (struct pci_dev *dev,char cap); +struct pci_cap_saved_state *pci_find_saved_ext_cap (struct pci_dev *dev, +u16 cap); +int pci_add_cap_save_buffer (struct pci_dev *dev,char cap,unsigned int size); +int pci_add_ext_cap_save_buffer (struct pci_dev *dev, +u16 cap,unsigned int size);int __pci_complete_power_transition (struct pci_dev *dev,pci_power_t state);int pci_set_power_state (struct pci_dev *dev,pci_power_t state);pci_power_t pci_choose_state (struct pci_dev *dev,pm_message_t state);
PATCH v2 3/4 pci: Add Virtual Channel to save/restore support
In reply to Alex WilliamsonWhile we don't really have any infrastructure for making use of VC support, the system BIOS can configure the topology to non-default VC values prior to boot. This may be due to silicon bugs, desire to reserve traffic classes, or perhaps just BIOS bugs. When we reset devices, the VC configuration may return to default values, which can be incompatible with devices upstream. For instance, Nvidia GRID cards provide a PCIe switch and some number of GPUs, all supporting VC. The power-on default for VC is to support TC0-7 across VC0, however some platforms will only enable TC0/VC0 mapping across the topology. When we do a secondary bus reset on the downstream switch port, the GPU is reset to a TC0-7/VC0 mapping while the opposite end of the link only enables TC0/VC0. If the GPU attempts to use TC1-7, it fails.
This patch attempts to provide complete support for VC save/restore, even beyond the minimally required use case above. This includes save/restore and reload of the arbitration table, save/restore and reload of the port arbitration tables, and re-enabling of the channels for VC, VC9, and MFVC capabilities.
--- drivers/pci/Makefile | 2 drivers/pci/pci.c | 5 drivers/pci/vc.c | 434 +++++++++++++++++++++++++++++++++++++++++ include/linux/pci.h | 5 include/uapi/linux/pci_regs.h | 25 ++ 5 files changed, 466 insertions(+), 5 deletions(-) create mode 100644 drivers/pci/vc.c
drivers/pci/Makefile +1 -1
@@ -4,7 +4,7 @@ obj-y += access.o bus.o probe.o host-bridge.o remove.o pci.o \ pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \ - irq.o vpd.o setup-bus.o + irq.o vpd.o setup-bus.o vc.o obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_SYSFS) += slot.o
drivers/pci/pci.c +5 -0
@@ -984,6 +984,8 @@ pci_save_state(struct pci_dev *dev)return i;if ((i =pci_save_pcix_state (dev)) !=0 )return i; +if ((i =pci_save_vc_state (dev)) !=0 ) +return i;return 0 ; }
@@ -1046,6 +1048,7 @@ void pci_restore_state(struct pci_dev *dev)/* PCI Express register must be restored first */ pci_restore_pcie_state (dev);pci_restore_ats_state (dev); +pci_restore_vc_state (dev);pci_restore_config_space (dev);
@@ -2118,6 +2121,8 @@ void pci_allocate_cap_save_buffers(struct pci_dev *dev)if (error)dev_err (&dev->dev,"unable to preallocate PCI-X save buffer\n" ); + +pci_allocate_vc_save_buffers (dev); }void pci_free_cap_save_buffers (struct pci_dev *dev)
drivers/pci/vc.c new file +434 -0
434 lines not on this page · raw message
include/linux/pci.h +5 -0
@@ -1006,6 +1006,11 @@ static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state,return __pci_enable_wake (dev, state, false, enable); } +/* PCI Virtual Channel */ +int pci_save_vc_state (struct pci_dev *dev); +void pci_restore_vc_state (struct pci_dev *dev); +void pci_allocate_vc_save_buffers (struct pci_dev *dev); +#define PCI_EXP_IDO_REQUEST (1<<0)#define PCI_EXP_IDO_COMPLETION (1<<1)void pci_enable_ido (struct pci_dev *dev,unsigned long type);
include/uapi/linux/pci_regs.h +21 -4
@@ -678,16 +678,33 @@/* Virtual Channel */ #define PCI_VC_PORT_REG1 4 -#define PCI_VC_REG1_EVCC 0x7/* extended VC count */ +#define PCI_VC_REG1_EVCC 0x00000007/* extended VC count */ +#define PCI_VC_REG1_LPEVCC 0x00000070/* low prio extended VC count */ +#define PCI_VC_REG1_ARB_SIZE 0x00000c00#define PCI_VC_PORT_REG2 8 -#define PCI_VC_REG2_32_PHASE 0x2 -#define PCI_VC_REG2_64_PHASE 0x4 -#define PCI_VC_REG2_128_PHASE 0x8 +#define PCI_VC_REG2_32_PHASE 0x00000002 +#define PCI_VC_REG2_64_PHASE 0x00000004 +#define PCI_VC_REG2_128_PHASE 0x00000008 +#define PCI_VC_REG2_ARB_OFF 0xff000000#define PCI_VC_PORT_CTRL 12 +#define PCI_VC_PORT_CTRL_LOAD_TABLE 0x00000001#define PCI_VC_PORT_STATUS 14 +#define PCI_VC_PORT_STATUS_TABLE 0x00000001#define PCI_VC_RES_CAP 16 +#define PCI_VC_RES_CAP_32_PHASE 0x00000002 +#define PCI_VC_RES_CAP_64_PHASE 0x00000004 +#define PCI_VC_RES_CAP_128_PHASE 0x00000008 +#define PCI_VC_RES_CAP_128_PHASE_TB 0x00000010 +#define PCI_VC_RES_CAP_256_PHASE 0x00000020 +#define PCI_VC_RES_CAP_ARB_OFF 0xff000000#define PCI_VC_RES_CTRL 20 +#define PCI_VC_RES_CTRL_LOAD_TABLE 0x00010000 +#define PCI_VC_RES_CTRL_ARB_SELECT 0x000e0000 +#define PCI_VC_RES_CTRL_ID 0x07000000 +#define PCI_VC_RES_CTRL_ENABLE 0x80000000#define PCI_VC_RES_STATUS 26 +#define PCI_VC_RES_STATUS_TABLE 0x00000001 +#define PCI_VC_RES_STATUS_NEGO 0x00000002#define PCI_CAP_VC_BASE_SIZEOF 0x10#define PCI_CAP_VC_PER_VC_SIZEOF 0x0C
PATCH v2 4/4 pci: Rename PCI_VC_PORT_REG1/2 to PCI_VC_PORT_CAP1/2
In reply to Alex WilliamsonThese are set of two capability registers, it's pretty much given that they're registers, so reflect their purpose in the name.
--- drivers/pci/vc.c | 28 ++++++++++++++-------------- drivers/vfio/pci/vfio_pci_config.c | 12 ++++++------ include/uapi/linux/pci_regs.h | 18 +++++++++--------- 3 files changed, 29 insertions(+), 29 deletions(-)
drivers/pci/vc.c +14 -14
@@ -104,7 +104,7 @@ static void pci_vc_load_port_arb_table(struct pci_dev *dev, int pos, int res)static void pci_vc_enable (struct pci_dev *dev,int pos,int res) {int ctrl_pos, status_pos, id, pos2, evcc, i, ctrl_pos2, status_pos2; -u32 ctrl, header, reg1, ctrl2; +u32 ctrl, header, cap1, ctrl2;struct pci_dev *link =NULL ;/* Enable VCs from the downstream device */
@@ -129,8 +129,8 @@ static void pci_vc_enable(struct pci_dev *dev, int pos, int res)if (!pos2) goto enable; -pci_read_config_dword (dev->bus->self, pos2 +PCI_VC_PORT_REG1 , ®1); - evcc = reg1 &PCI_VC_REG1_EVCC ; +pci_read_config_dword (dev->bus->self, pos2 +PCI_VC_PORT_CAP1 , &cap1); + evcc = cap1 &PCI_VC_CAP1_EVCC ;/* VC0 is hardwired enabled, so we can start with 1 */ for (i =1 ; i < evcc +1 ; i++) {
@@ -188,7 +188,7 @@ static int pci_vc_do_save_buffer(struct pci_dev *dev, int pos, struct pci_cap_saved_state *save_state, bool save) { -u32 reg1; +u32 cap1;char evcc, lpevcc, parb_size;int i, len =0 ;u8 *buf = save_state ? (u8 *)save_state->cap.data :NULL ;
@@ -201,13 +201,13 @@ static int pci_vc_do_save_buffer(struct pci_dev *dev, int pos,return -ENOMEM ; } -pci_read_config_dword (dev, pos +PCI_VC_PORT_REG1 , ®1); +pci_read_config_dword (dev, pos +PCI_VC_PORT_CAP1 , &cap1);/* Extended VC Count (not counting VC0) */ - evcc = reg1 &PCI_VC_REG1_EVCC ; + evcc = cap1 &PCI_VC_CAP1_EVCC ;/* Low Priority Extended VC Count (not counting VC0) */ - lpevcc = (reg1 &PCI_VC_REG1_LPEVCC ) >>4 ; + lpevcc = (cap1 &PCI_VC_CAP1_LPEVCC ) >>4 ;/* Port Arbitration Table Entry Size (bits) */ - parb_size =1 << ((reg1 &PCI_VC_REG1_ARB_SIZE ) >>10 ); + parb_size =1 << ((cap1 &PCI_VC_CAP1_ARB_SIZE ) >>10 );/* * Port VC Control Register contains VC Arbitration Select, which
@@ -231,20 +231,20 @@ static int pci_vc_do_save_buffer(struct pci_dev *dev, int pos,* in Port VC Capability Register 2 then save/restore it next. */ if (lpevcc) { -u32 reg2; +u32 cap2;int vcarb_offset; -pci_read_config_dword (dev, pos +PCI_VC_PORT_REG2 , ®2); - vcarb_offset = ((reg2 &PCI_VC_REG2_ARB_OFF ) >>24 ) *16 ; +pci_read_config_dword (dev, pos +PCI_VC_PORT_CAP2 , &cap2); + vcarb_offset = ((cap2 &PCI_VC_CAP2_ARB_OFF ) >>24 ) *16 ;if (vcarb_offset) {int size, vcarb_phases =0 ; -if (reg2 &PCI_VC_REG2_128_PHASE ) +if (cap2 &PCI_VC_CAP2_128_PHASE ) vcarb_phases =128 ; -else if (reg2 &PCI_VC_REG2_64_PHASE ) +else if (cap2 &PCI_VC_CAP2_64_PHASE ) vcarb_phases =64 ; -else if (reg2 &PCI_VC_REG2_32_PHASE ) +else if (cap2 &PCI_VC_CAP2_32_PHASE ) vcarb_phases =32 ;/* Fixed 4 bits per phase per lpevcc (plus VC0) */
drivers/vfio/pci/vfio_pci_config.c +6 -6
@@ -975,20 +975,20 @@ static int vfio_vc_cap_len(struct vfio_pci_device *vdev, u16 pos)int ret, evcc, phases, vc_arb;int len =PCI_CAP_VC_BASE_SIZEOF ; - ret =pci_read_config_dword (pdev, pos +PCI_VC_PORT_REG1 , &tmp); + ret =pci_read_config_dword (pdev, pos +PCI_VC_PORT_CAP1 , &tmp);if (ret)return pcibios_err_to_errno (ret); - evcc = tmp &PCI_VC_REG1_EVCC ;/* extended vc count */ - ret =pci_read_config_dword (pdev, pos +PCI_VC_PORT_REG2 , &tmp); + evcc = tmp &PCI_VC_CAP1_EVCC ;/* extended vc count */ + ret =pci_read_config_dword (pdev, pos +PCI_VC_PORT_CAP2 , &tmp);if (ret)return pcibios_err_to_errno (ret); -if (tmp &PCI_VC_REG2_128_PHASE ) +if (tmp &PCI_VC_CAP2_128_PHASE ) phases =128 ; -else if (tmp &PCI_VC_REG2_64_PHASE ) +else if (tmp &PCI_VC_CAP2_64_PHASE ) phases =64 ; -else if (tmp &PCI_VC_REG2_32_PHASE ) +else if (tmp &PCI_VC_CAP2_32_PHASE ) phases =32 ;else phases =0 ;
include/uapi/linux/pci_regs.h +9 -9
@@ -677,15 +677,15 @@#define PCI_ERR_ROOT_ERR_SRC 52/* Error Source Identification */ /* Virtual Channel */ -#define PCI_VC_PORT_REG1 4 -#define PCI_VC_REG1_EVCC 0x00000007/* extended VC count */ -#define PCI_VC_REG1_LPEVCC 0x00000070/* low prio extended VC count */ -#define PCI_VC_REG1_ARB_SIZE 0x00000c00 -#define PCI_VC_PORT_REG2 8 -#define PCI_VC_REG2_32_PHASE 0x00000002 -#define PCI_VC_REG2_64_PHASE 0x00000004 -#define PCI_VC_REG2_128_PHASE 0x00000008 -#define PCI_VC_REG2_ARB_OFF 0xff000000 +#define PCI_VC_PORT_CAP1 4 +#define PCI_VC_CAP1_EVCC 0x00000007/* extended VC count */ +#define PCI_VC_CAP1_LPEVCC 0x00000070/* low prio extended VC count */ +#define PCI_VC_CAP1_ARB_SIZE 0x00000c00 +#define PCI_VC_PORT_CAP2 8 +#define PCI_VC_CAP2_32_PHASE 0x00000002 +#define PCI_VC_CAP2_64_PHASE 0x00000004 +#define PCI_VC_CAP2_128_PHASE 0x00000008 +#define PCI_VC_CAP2_ARB_OFF 0xff000000#define PCI_VC_PORT_CTRL 12#define PCI_VC_PORT_CTRL_LOAD_TABLE 0x00000001#define PCI_VC_PORT_STATUS 14