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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38985C433E2 for ; Fri, 10 Jul 2020 14:29:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 16CC22063A for ; Fri, 10 Jul 2020 14:29:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JeJkMxgh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726832AbgGJO3o (ORCPT ); Fri, 10 Jul 2020 10:29:44 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:57370 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727899AbgGJO3o (ORCPT ); Fri, 10 Jul 2020 10:29:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594391382; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tX5iNdDkKREb5eC682c495Xdf8tAVwyuaAtEmkGgwUw=; b=JeJkMxgh6QHlBgN8574izwd2ilKlieEcp9efRVn+B/951sKvPu8i1gKrVeT5wj7URMmnSy onQCAl+XLxsxzGLH7BS1CMcuRiUslDSBbJmNVGjLzEVZUcVrz9VPEaZxz1Jcg/JN9Zomeb Zk+24UKmQ7kw1aGVK3egX42wfu6ks/U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-210-R9jDj9pwMjaAZtxLZtrCeA-1; Fri, 10 Jul 2020 10:29:38 -0400 X-MC-Unique: R9jDj9pwMjaAZtxLZtrCeA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 501501082; Fri, 10 Jul 2020 14:29:37 +0000 (UTC) Received: from x1.home (ovpn-112-71.phx2.redhat.com [10.3.112.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 611CF10016DA; Fri, 10 Jul 2020 14:29:33 +0000 (UTC) Date: Fri, 10 Jul 2020 08:29:32 -0600 From: Alex Williamson To: Bjorn Helgaas Cc: Huacai Chen , Bjorn Helgaas , linux-pci@vger.kernel.org, Dave Airlie , Gerd Hoffmann , Jiri Pirko , Huacai Chen , Jiaxun Yang , Kirti Wankhede , kvm@vger.kernel.org Subject: Re: [PATCH] PCI: Move PCI_VENDOR_ID_REDHAT definition to pci_ids.h Message-ID: <20200710082932.65984c88@x1.home> In-Reply-To: <20200709220324.GA21641@bjorn-Precision-5520> References: <1594195170-11119-1-git-send-email-chenhc@lemote.com> <20200709220324.GA21641@bjorn-Precision-5520> Organization: Red Hat MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Thu, 9 Jul 2020 17:03:24 -0500 Bjorn Helgaas wrote: > [+cc Kirti, Alex, kvm] > > On Wed, Jul 08, 2020 at 03:59:30PM +0800, Huacai Chen wrote: > > Instead of duplicating the PCI_VENDOR_ID_REDHAT definition everywhere, > > move it to include/linux/pci_ids.h is better. > > > > Signed-off-by: Huacai Chen > > Applied with Gerd's ack to pci/misc for v5.9, thanks! > > I also updated this in samples/vfio-mdev/mdpy-defs.h: > > -#define MDPY_PCI_VENDOR_ID 0x1b36 /* redhat */ > +#define MDPY_PCI_VENDOR_ID PCI_VENDOR_ID_REDHAT Thanks, Bjorn! Alex > > --- > > drivers/gpu/drm/qxl/qxl_dev.h | 2 -- > > drivers/net/ethernet/rocker/rocker_hw.h | 1 - > > include/linux/pci_ids.h | 2 ++ > > 3 files changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/qxl/qxl_dev.h b/drivers/gpu/drm/qxl/qxl_dev.h > > index a0ee416..a7bc31f 100644 > > --- a/drivers/gpu/drm/qxl/qxl_dev.h > > +++ b/drivers/gpu/drm/qxl/qxl_dev.h > > @@ -131,8 +131,6 @@ enum SpiceCursorType { > > > > #pragma pack(push, 1) > > > > -#define REDHAT_PCI_VENDOR_ID 0x1b36 > > - > > /* 0x100-0x11f reserved for spice, 0x1ff used for unstable work */ > > #define QXL_DEVICE_ID_STABLE 0x0100 > > > > diff --git a/drivers/net/ethernet/rocker/rocker_hw.h b/drivers/net/ethernet/rocker/rocker_hw.h > > index 59f1f8b..62fd84c 100644 > > --- a/drivers/net/ethernet/rocker/rocker_hw.h > > +++ b/drivers/net/ethernet/rocker/rocker_hw.h > > @@ -25,7 +25,6 @@ enum { > > > > #define ROCKER_FP_PORTS_MAX 62 > > > > -#define PCI_VENDOR_ID_REDHAT 0x1b36 > > #define PCI_DEVICE_ID_REDHAT_ROCKER 0x0006 > > > > #define ROCKER_PCI_BAR0_SIZE 0x2000 > > diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h > > index 0ad5769..5c709a1 100644 > > --- a/include/linux/pci_ids.h > > +++ b/include/linux/pci_ids.h > > @@ -2585,6 +2585,8 @@ > > > > #define PCI_VENDOR_ID_ASMEDIA 0x1b21 > > > > +#define PCI_VENDOR_ID_REDHAT 0x1b36 > > + > > #define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS 0x1c36 > > > > #define PCI_VENDOR_ID_CIRCUITCO 0x1cc8 > > -- > > 2.7.0 > > >