From patchwork Thu Sep 8 22:05:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 12970717 X-Patchwork-Delegate: kuba@kernel.org 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 90FD9C6FA8B for ; Thu, 8 Sep 2022 22:06:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229793AbiIHWGO (ORCPT ); Thu, 8 Sep 2022 18:06:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229636AbiIHWGL (ORCPT ); Thu, 8 Sep 2022 18:06:11 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E27B3A3469; Thu, 8 Sep 2022 15:06:10 -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 9CF5C20B929C; Thu, 8 Sep 2022 15:06:10 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9CF5C20B929C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1662674770; bh=ch/5/cm2aut8sVA7LsCY7bS7GtYymUIOxpzSvQK1PWQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=jCCnNfQVhM9/unHCtZWNTvR6KP1h6I7SWG0furjlcpc0QvmkyMA/i9FMRrrJGlq2U yZCSJ5Uvy8rukE5Fhip0TtfdoqDakhHDhqFlRI9WcBbvz1N4f+A6Oco0caqQZgxk4M nLS9KdKZ22JVd4K1KQfse+l0e5d5toqAlbllDCVk= From: eahariha@linux.microsoft.com To: 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 2/3] pci_ids: Add Microsoft PCI Vendor ID, and remove redundant definitions Date: Thu, 8 Sep 2022 15:05:56 -0700 Message-Id: <1662674757-31945-2-git-send-email-eahariha@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1662674757-31945-1-git-send-email-eahariha@linux.microsoft.com> References: <1662674757-31945-1-git-send-email-eahariha@linux.microsoft.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Easwar Hariharan Move the Microsoft PCI Vendor ID from the various drivers to the pci_ids file Signed-off-by: Easwar Hariharan --- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 1 - drivers/net/ethernet/microsoft/mana/gdma_main.c | 4 ---- drivers/video/fbdev/hyperv_fb.c | 3 --- include/linux/pci_ids.h | 2 ++ 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c index 6d11e79..61083c7 100644 --- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c +++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c @@ -23,7 +23,6 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 -#define PCI_VENDOR_ID_MICROSOFT 0x1414 #define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353 DEFINE_DRM_GEM_FOPS(hv_fops); diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c index 5f92401..00d8198 100644 --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c @@ -1465,10 +1465,6 @@ static void mana_gd_shutdown(struct pci_dev *pdev) pci_disable_device(pdev); } -#ifndef PCI_VENDOR_ID_MICROSOFT -#define PCI_VENDOR_ID_MICROSOFT 0x1414 -#endif - 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) }, diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index 886c564..a502c80 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -58,7 +58,6 @@ #include - /* Hyper-V Synthetic Video Protocol definitions and structures */ #define MAX_VMBUS_PKT_SIZE 0x4000 @@ -74,10 +73,8 @@ #define SYNTHVID_DEPTH_WIN8 32 #define SYNTHVID_FB_SIZE_WIN8 (8 * 1024 * 1024) -#define PCI_VENDOR_ID_MICROSOFT 0x1414 #define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353 - enum pipe_msg_type { PIPE_MSG_INVALID, PIPE_MSG_DATA, diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 6feade6..c008fda 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2079,6 +2079,8 @@ #define PCI_DEVICE_ID_ICE_1712 0x1712 #define PCI_DEVICE_ID_VT1724 0x1724 +#define PCI_VENDOR_ID_MICROSOFT 0x1414 + #define PCI_VENDOR_ID_OXSEMI 0x1415 #define PCI_DEVICE_ID_OXSEMI_12PCI840 0x8403 #define PCI_DEVICE_ID_OXSEMI_PCIe840 0xC000 From patchwork Thu Sep 8 22:05:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 12970718 X-Patchwork-Delegate: kuba@kernel.org 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 C5A68C6FA8B for ; Thu, 8 Sep 2022 22:06:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230126AbiIHWGg (ORCPT ); Thu, 8 Sep 2022 18:06:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230072AbiIHWG3 (ORCPT ); Thu, 8 Sep 2022 18:06:29 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D1CF6D2B1C; Thu, 8 Sep 2022 15:06:27 -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 7928E204A5AD; Thu, 8 Sep 2022 15:06:27 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 7928E204A5AD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1662674787; bh=clRlDW/UKU55qy4Nhd5brXYsUV02HVnxKRgDRmJFpXM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Z9VWtNQUK23jDB0GlWl74m51KMrqh0BhgccO2813dJAJmVKZrheyjY1er6b5u4WVH WVEuz9ykp2wJgiWMnGERBZOCcnZl9ONv9mPMnG/E4jaEuxxYp1MYq+vcT4ZW/bjMxE L402v8AfZ3/4KZVxkTXrxz9RqBjRapos5kNm6GsU= From: eahariha@linux.microsoft.com To: 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 3/3] pci_ids: Add the various Microsoft PCI device IDs Date: Thu, 8 Sep 2022 15:05:57 -0700 Message-Id: <1662674757-31945-3-git-send-email-eahariha@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1662674757-31945-1-git-send-email-eahariha@linux.microsoft.com> References: <1662674757-31945-1-git-send-email-eahariha@linux.microsoft.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Easwar Hariharan Signed-off-by: Easwar Hariharan --- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +--- drivers/net/ethernet/microsoft/mana/gdma.h | 3 --- drivers/net/ethernet/microsoft/mana/gdma_main.c | 6 +++--- drivers/video/fbdev/hyperv_fb.c | 6 ++---- include/linux/pci_ids.h | 3 +++ 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c index 61083c7..695d3a7 100644 --- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c +++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c @@ -23,8 +23,6 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 -#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353 - DEFINE_DRM_GEM_FOPS(hv_fops); static struct drm_driver hyperv_driver = { @@ -53,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 a502c80..b9277e5 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -73,8 +73,6 @@ #define SYNTHVID_DEPTH_WIN8 32 #define SYNTHVID_FB_SIZE_WIN8 (8 * 1024 * 1024) -#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353 - enum pipe_msg_type { PIPE_MSG_INVALID, PIPE_MSG_DATA, @@ -998,7 +996,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; @@ -1312,7 +1310,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 c008fda..0bef8e6 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2080,6 +2080,9 @@ #define PCI_DEVICE_ID_VT1724 0x1724 #define PCI_VENDOR_ID_MICROSOFT 0x1414 +#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