From 631fbcff8f79f1d77b2141c9d76c1cae98a8e6fe Mon Sep 17 00:00:00 2001 From: Dongdong Liu Date: Mon, 27 Jul 2020 11:11:23 -0400 Subject: [PATCH] PCI/AER: Initialize aer_fifo task #29600094 commit d95f20c4f07020ebc605f3b46af4b6db9eb5fc99 upstream. Backport summary: for 4.19 kernel ICX PCIe Gen4 support. Previously we did not call INIT_KFIFO() for aer_fifo. This leads to kfifo_put() sometimes returning 0 (queue full) when in fact it is not. It is easy to reproduce the problem by using aer-inject: $ aer-inject -s :82:00.0 multiple-corr-nonfatal The content of the multiple-corr-nonfatal file is as below: AER COR RCVR HL 0 1 2 3 AER UNCOR POISON_TLP HL 4 5 6 7 Fixes: 27c1ce8bbed7 ("PCI/AER: Use kfifo for tracking events instead of reimplementing it") Link: https://lore.kernel.org/r/1579767991-103898-1-git-send-email-liudongdong3@huawei.com Signed-off-by: Dongdong Liu Signed-off-by: Bjorn Helgaas (cherry picked from commit d95f20c4f07020ebc605f3b46af4b6db9eb5fc99) Signed-off-by: Ethan Zhao Signed-off-by: Artie Ding Acked-by: Caspar Zhang --- drivers/pci/pcie/aer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c index 1a8c3a0b3ce9..e401ffc34b14 100644 --- a/drivers/pci/pcie/aer.c +++ b/drivers/pci/pcie/aer.c @@ -1448,6 +1448,7 @@ static int aer_probe(struct pcie_device *dev) } rpc->rpd = port; + INIT_KFIFO(rpc->aer_fifo); set_service_data(dev, rpc); status = devm_request_threaded_irq(device, dev->irq, aer_irq, aer_isr, -- GitLab