From mboxrd@z Thu Jan 1 00:00:00 1970 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 1F4D4ECAAD3 for ; Fri, 9 Sep 2022 14:04:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231779AbiIIOEr (ORCPT ); Fri, 9 Sep 2022 10:04:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232304AbiIIOES (ORCPT ); Fri, 9 Sep 2022 10:04:18 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46EAF14A51A for ; Fri, 9 Sep 2022 07:02:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662732102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mmurUuPfY4CSsGXMopu3kXzx5e5l7+stCxGfg5MZbeg=; b=hsm99hw1afdrSnTKRdeuLEzm4lXmpJvxctp6d6Eap0S9/bk2F5P2Bb3YZ5lFNQO+PCJVz/ Ksra4to1tgw3th0fKy2W6AKtFGITFa2XLjGRvYVRDIWT/xE4zO8/Vfu7d+ag+14DACmjKV AotnPUWEgPlupJfxuWjtC3gwxiuKNkA= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-269-6-92ToJtN0CN7qcaQheOHw-1; Fri, 09 Sep 2022 10:01:41 -0400 X-MC-Unique: 6-92ToJtN0CN7qcaQheOHw-1 Received: by mail-ej1-f70.google.com with SMTP id sb14-20020a1709076d8e00b0073d48a10e10so1074437ejc.16 for ; Fri, 09 Sep 2022 07:01:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date; bh=mmurUuPfY4CSsGXMopu3kXzx5e5l7+stCxGfg5MZbeg=; b=BaRdyHmtGN15fJ1DxQYjhkLP/hHlPAnm84TUxnFwXNjm6bZtHeXcOhSNwI24Sh5HdZ IJkmrPp6GUgC8bESr1Vb0bXwZi/JabOd5TPlMZA4V1V6tR9eEEtRIKIq10GUMhwJmfw2 lrtauLiVqn+bgFkdpEKDotqjfyJU1zyP0rNY0cvLPgc7oTrIl3LkqBJEzp1oNiEPV8KN cqYhihVzpPqQo8gEjAbCyzx2345vwbL7rWsaaHjwZ7m0qFQ+rMpHuknKW2zH5VsELMuB 9aq9ki73pV8xw6UmNNyPTHvawTamfVPTRG5/xGwtYJWeOEeaQD+/n6DqqTyCaXRB+K8T lEAA== X-Gm-Message-State: ACgBeo1omHyOxFviNC/Z/8TUcb1Pei4ekxCCVSW0cDE6yl6h3hY/ZSKI pCignnEgGDmOVyrm4atICN9PTEAfQwNFNqaxrNY/XOh3fHpSWAonCgB2HljihaXtzxA8rvKcXP5 7NftyRZcA855UaMDE X-Received: by 2002:a17:906:846b:b0:770:82e5:1519 with SMTP id hx11-20020a170906846b00b0077082e51519mr9690596ejc.221.1662732100553; Fri, 09 Sep 2022 07:01:40 -0700 (PDT) X-Google-Smtp-Source: AA6agR5cRBPXdEZPFZlONtBxXbkVKluQAB+eqr/N7QwxhdMBwFCwN/QJRPkdLZUifQ+2NbWPIwNn1Q== X-Received: by 2002:a17:906:846b:b0:770:82e5:1519 with SMTP id hx11-20020a170906846b00b0077082e51519mr9690572ejc.221.1662732100345; Fri, 09 Sep 2022 07:01:40 -0700 (PDT) Received: from fedora (nat-2.ign.cz. [91.219.240.2]) by smtp.gmail.com with ESMTPSA id f4-20020a17090631c400b0073d6093ac93sm353806ejf.16.2022.09.09.07.01.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Sep 2022 07:01:39 -0700 (PDT) From: Vitaly Kuznetsov To: eahariha@linux.microsoft.com Cc: 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" , "open list:DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE" , "open list:DRM DRIVER FOR HYPERV SYNTHETIC VIDEO DEVICE" , open list , "open list:NETWORKING DRIVERS" , "open list:FRAMEBUFFER LAYER" , "open list:PCI SUBSYSTEM" Subject: Re: [PATCH 2/3] pci_ids: Add Microsoft PCI Vendor ID, and remove redundant definitions In-Reply-To: <1662674757-31945-2-git-send-email-eahariha@linux.microsoft.com> References: <1662674757-31945-1-git-send-email-eahariha@linux.microsoft.com> <1662674757-31945-2-git-send-email-eahariha@linux.microsoft.com> Date: Fri, 09 Sep 2022 16:01:37 +0200 Message-ID: <87leqsr6im.fsf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org eahariha@linux.microsoft.com writes: > 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 I've sent a similar patch recently: https://lore.kernel.org/linux-hyperv/20220827130345.1320254-2-vkuznets@redhat.com/ which Wei has already queued to hyperv/fixes. Moving PCI_DEVICE_ID_MICROSOFT_MANA_PF/VF definitions to 'pci_ids.h' does make sense but please rebase first. -- Vitaly