From patchwork Fri Dec 6 07:01:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiongfeng Wang X-Patchwork-Id: 1204938 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=huawei.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47TkCV04CZz9sPJ for ; Fri, 6 Dec 2019 18:06:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726352AbfLFHGX (ORCPT ); Fri, 6 Dec 2019 02:06:23 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:53498 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726214AbfLFHGX (ORCPT ); Fri, 6 Dec 2019 02:06:23 -0500 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 73E079205C7F6D23921B; Fri, 6 Dec 2019 15:06:18 +0800 (CST) Received: from linux-ibm.site (10.175.102.37) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.439.0; Fri, 6 Dec 2019 15:06:08 +0800 From: Xiongfeng Wang To: , CC: , , , , , Subject: [PATCH v2] PCI: Add quirk for HiSilicon NP 5896 devices Date: Fri, 6 Dec 2019 15:01:45 +0800 Message-ID: <1575615705-30716-1-git-send-email-wangxiongfeng2@huawei.com> X-Mailer: git-send-email 1.7.12.4 MIME-Version: 1.0 X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org HiSilicon PCI Network Processor 5896 devices misreport the class type as 'NOT_DEFINED', but it is actually a network device. Also the size of BAR3 is reported as 265T, but this BAR is actually unused. This patch modify the class type to 'CLASS_NETWORK' and disable the unused BAR3. Signed-off-by: Xiongfeng Wang --- drivers/pci/quirks.c | 29 +++++++++++++++++++++++++++++ include/linux/pci_ids.h | 1 + 2 files changed, 30 insertions(+) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 4937a08..b9adebb 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -5431,3 +5431,32 @@ static void quirk_reset_lenovo_thinkpad_p50_nvgpu(struct pci_dev *pdev) DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_NVIDIA, 0x13b1, PCI_CLASS_DISPLAY_VGA, 8, quirk_reset_lenovo_thinkpad_p50_nvgpu); + +static void quirk_hisi_fixup_np_class(struct pci_dev *pdev) +{ + u32 class = pdev->class; + + pdev->class = PCI_BASE_CLASS_NETWORK << 8; + pci_info(pdev, "PCI class overriden (%#08x -> %#08x)\n", + class, pdev->class); +} +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_HUAWEI, PCI_DEVICE_ID_HISI_5896, + quirk_hisi_fixup_np_class); + +/* + * HiSilicon NP 5896 devices BAR3 size is reported as 256T and causes problem + * when assigning the resources. But this BAR is actually unused by the driver, + * so let's disable it. + */ +static void quirk_hisi_fixup_np_bar(struct pci_dev *pdev) +{ + struct resource *r = &pdev->resource[3]; + + r->start = 0; + r->end = 0; + r->flags = 0; + + pci_info(pdev, "Disabling invalid BAR 3\n"); +} +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HUAWEI, PCI_DEVICE_ID_HISI_5896, + quirk_hisi_fixup_np_bar); diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 2302d133..f21cd8b 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2558,6 +2558,7 @@ #define PCI_DEVICE_ID_KORENIX_JETCARDF3 0x17ff #define PCI_VENDOR_ID_HUAWEI 0x19e5 +#define PCI_DEVICE_ID_HISI_5896 0x5896 /* HiSilicon NP 5896 devices */ #define PCI_VENDOR_ID_NETRONOME 0x19ee #define PCI_DEVICE_ID_NETRONOME_NFP4000 0x4000