Skip to content
Permalink
Browse files
PCI: Add reset quirk for Huawei Intelligent NIC virtual function
When multiple VFs do FLR at the same time, the firmware is
processed serially, resulting in some VF FLRs being delayed more
than 100ms, when the virtual machine restarts and the device
driver is loaded, the firmware is doing the corresponding VF
FLR, causing the driver to fail to load.

To solve this problem, add host and firmware status synchronization
during FLR.

Signed-off-by: Chiqijun <chiqijun@huawei.com>
  • Loading branch information
Chiqijun authored and intel-lab-lkp committed Mar 13, 2021
1 parent 9c70dfb commit 2ee50cef940514cc4b80bf8d550cb4f28e257d7a
Showing 1 changed file with 69 additions and 0 deletions.
@@ -3913,6 +3913,73 @@ static int delay_250ms_after_flr(struct pci_dev *dev, int probe)
return 0;
}

#define PCI_DEVICE_ID_HINIC_VF 0x375E
#define HINIC_VF_FLR_TYPE 0x1000
#define HINIC_VF_FLR_CAP_BIT_SHIFT 30
#define HINIC_VF_OP 0xE80
#define HINIC_VF_FLR_PROC_BIT_SHIFT 18
#define HINIC_OPERATION_TIMEOUT 15000 /* 15 seconds */

/* Device-specific reset method for Huawei Intelligent NIC virtual functions */
static int reset_hinic_vf_dev(struct pci_dev *pdev, int probe)
{
unsigned long timeout;
void __iomem *bar;
u32 val;

if (probe)
return 0;

bar = pci_iomap(pdev, 0, 0);
if (!bar)
return -ENOTTY;

/* Get and check firmware capabilities. */
val = be32_to_cpu(readl(bar + HINIC_VF_FLR_TYPE));
if (!(val & (1UL << HINIC_VF_FLR_CAP_BIT_SHIFT))) {
pci_iounmap(pdev, bar);
return -ENOTTY;
}

/*
* Set the processing bit for the start of FLR, which will be cleared
* by the firmware after FLR is completed.
*/
val = be32_to_cpu(readl(bar + HINIC_VF_OP));
val = val | (1UL << HINIC_VF_FLR_PROC_BIT_SHIFT);
writel(cpu_to_be32(val), bar + HINIC_VF_OP);

/* Perform the actual device function reset */
pcie_flr(pdev);

/*
* The device must learn BDF after FLR in order to respond to BAR's
* read request, therefore, we issue a configure write request to let
* the device capture BDF.
*/
pci_write_config_word(pdev, PCI_VENDOR_ID, 0);

/* Waiting for device reset complete */
timeout = jiffies + msecs_to_jiffies(HINIC_OPERATION_TIMEOUT);
do {
val = be32_to_cpu(readl(bar + HINIC_VF_OP));
if (!(val & (1UL << HINIC_VF_FLR_PROC_BIT_SHIFT)))
goto reset_complete;
msleep(20);
} while (time_before(jiffies, timeout));

val = be32_to_cpu(readl(bar + HINIC_VF_OP));
if (!(val & (1UL << HINIC_VF_FLR_PROC_BIT_SHIFT)))
goto reset_complete;

pci_warn(pdev, "Reset dev timeout, flr ack reg: %#010x\n", val);

reset_complete:
pci_iounmap(pdev, bar);

return 0;
}

static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82599_SFP_VF,
reset_intel_82599_sfp_virtfn },
@@ -3924,6 +3991,8 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = {
{ PCI_VENDOR_ID_INTEL, 0x0953, delay_250ms_after_flr },
{ PCI_VENDOR_ID_CHELSIO, PCI_ANY_ID,
reset_chelsio_generic_dev },
{ PCI_VENDOR_ID_HUAWEI, PCI_DEVICE_ID_HINIC_VF,
reset_hinic_vf_dev },
{ 0 }
};

0 comments on commit 2ee50ce

Please sign in to comment.