From patchwork Fri Sep 9 18:50:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 604411 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA272ECAAD3 for ; Fri, 9 Sep 2022 18:50:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229813AbiIISuw (ORCPT ); Fri, 9 Sep 2022 14:50:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229847AbiIISut (ORCPT ); Fri, 9 Sep 2022 14:50:49 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B1A39EA607; Fri, 9 Sep 2022 11:50:46 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 3003820B929D; Fri, 9 Sep 2022 11:50:46 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 3003820B929D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1662749446; bh=EtvSqWtgoW9XjfTZfdIifuNdlSp5udD/dIkF7/nioQk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=X3IxfAszm2Tvg2c8SQfbLxujX6DJJ7U/jVNltwRSGOsrutaORNKRpBZc/MQpH2qN0 XyVl0zGQ7JtbG/7vA5KQeuzmNw1jTw99eRCjUD3S01EK+hkE7yYfA3KvSr9g3ahpI+ P1iQAId4gbeLJLl1KQ71x7kaYQ6GAMHFcDEA9v0I= From: Easwar Hariharan To: vkuznets@redhat.com, Deepak Rawat , David Airlie , Daniel Vetter , "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , Wei Liu , Dexuan Cui , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Helge Deller , Bjorn Helgaas , Easwar Hariharan , Colin Ian King , "Gustavo A. R. Silva" , linux-hyperv@vger.kernel.org (open list:DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE), dri-devel@lists.freedesktop.org (open list:DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE), linux-kernel@vger.kernel.org (open list), netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-fbdev@vger.kernel.org (open list:FRAMEBUFFER LAYER), linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM) Subject: [PATCH v2 2/2] pci_ids: Add the various Microsoft PCI device IDs Date: Fri, 9 Sep 2022 11:50:25 -0700 Message-Id: <1662749425-3037-3-git-send-email-eahariha@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1662749425-3037-1-git-send-email-eahariha@linux.microsoft.com> References: <87leqsr6im.fsf@redhat.com> <1662749425-3037-1-git-send-email-eahariha@linux.microsoft.com> Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org From: Easwar Hariharan Signed-off-by: Easwar Hariharan Reported-by: kernel test robot --- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 2 +- drivers/net/ethernet/microsoft/mana/gdma.h | 3 --- drivers/net/ethernet/microsoft/mana/gdma_main.c | 6 +++--- drivers/video/fbdev/hyperv_fb.c | 4 ++-- include/linux/pci_ids.h | 4 +++- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c index f84d397..24c2def 100644 --- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c +++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c @@ -51,7 +51,7 @@ static void hyperv_pci_remove(struct pci_dev *pdev) static const struct pci_device_id hyperv_pci_tbl[] = { { .vendor = PCI_VENDOR_ID_MICROSOFT, - .device = PCI_DEVICE_ID_HYPERV_VIDEO, + .device = PCI_DEVICE_ID_MICROSOFT_HYPERV_VIDEO, }, { /* end of list */ } }; diff --git a/drivers/net/ethernet/microsoft/mana/gdma.h b/drivers/net/ethernet/microsoft/mana/gdma.h index 4a6efe6..9d3a9f7 100644 --- a/drivers/net/ethernet/microsoft/mana/gdma.h +++ b/drivers/net/ethernet/microsoft/mana/gdma.h @@ -476,9 +476,6 @@ struct gdma_eqe { #define GDMA_SRIOV_REG_CFG_BASE_OFF 0x108 -#define MANA_PF_DEVICE_ID 0x00B9 -#define MANA_VF_DEVICE_ID 0x00BA - struct gdma_posted_wqe_info { u32 wqe_size_in_bu; }; diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c index 00d8198..18cf168 100644 --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c @@ -1333,7 +1333,7 @@ static void mana_gd_cleanup(struct pci_dev *pdev) static bool mana_is_pf(unsigned short dev_id) { - return dev_id == MANA_PF_DEVICE_ID; + return dev_id == PCI_DEVICE_ID_MICROSOFT_MANA_PF; } static int mana_gd_probe(struct pci_dev *pdev, const struct pci_device_id *ent) @@ -1466,8 +1466,8 @@ static void mana_gd_shutdown(struct pci_dev *pdev) } static const struct pci_device_id mana_id_table[] = { - { PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, MANA_PF_DEVICE_ID) }, - { PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, MANA_VF_DEVICE_ID) }, + { PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, PCI_DEVICE_ID_MICROSOFT_MANA_PF) }, + { PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, PCI_DEVICE_ID_MICROSOFT_MANA_VF) }, { } }; diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index b58b445..118e244 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -997,7 +997,7 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) if (!gen2vm) { pdev = pci_get_device(PCI_VENDOR_ID_MICROSOFT, - PCI_DEVICE_ID_HYPERV_VIDEO, NULL); + PCI_DEVICE_ID_MICROSOFT_HYPERV_VIDEO, NULL); if (!pdev) { pr_err("Unable to find PCI Hyper-V video\n"); return -ENODEV; @@ -1311,7 +1311,7 @@ static int hvfb_resume(struct hv_device *hdev) static const struct pci_device_id pci_stub_id_table[] = { { .vendor = PCI_VENDOR_ID_MICROSOFT, - .device = PCI_DEVICE_ID_HYPERV_VIDEO, + .device = PCI_DEVICE_ID_MICROSOFT_HYPERV_VIDEO, }, { /* end of list */ } }; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 15b49e6..fe3517f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2080,7 +2080,9 @@ #define PCI_DEVICE_ID_VT1724 0x1724 #define PCI_VENDOR_ID_MICROSOFT 0x1414 -#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353 +#define PCI_DEVICE_ID_MICROSOFT_HYPERV_VIDEO 0x5353 +#define PCI_DEVICE_ID_MICROSOFT_MANA_PF 0x00B9 +#define PCI_DEVICE_ID_MICROSOFT_MANA_VF 0x00BA #define PCI_VENDOR_ID_OXSEMI 0x1415 #define PCI_DEVICE_ID_OXSEMI_12PCI840 0x8403