From patchwork Thu Dec 8 02:39:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David E. Box" X-Patchwork-Id: 31118 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp524652wrr; Wed, 7 Dec 2022 18:42:09 -0800 (PST) X-Google-Smtp-Source: AA0mqf5BLcCoAVJGidYuubcdSVfxIQXnyJIrVr2D/k37zxWM/ltzzN5VWhZe0U36eMs++TqZKfCy X-Received: by 2002:aa7:d911:0:b0:46b:c156:9945 with SMTP id a17-20020aa7d911000000b0046bc1569945mr29920404edr.350.1670467329153; Wed, 07 Dec 2022 18:42:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670467329; cv=none; d=google.com; s=arc-20160816; b=PMT9Ep796Yhlz9+RLZUo9BEbKJ6fC+XB/NlSbxRR5Qi+BcJINo0pHo0bi/ltJYtrl+ 7x2rNl/kWel8OWL+xLAa+qbSEdcM2NgEBTSAqaPUg2jlj3TU6eL6oXKPG5U3qEJiiL9u pFfvhG80UIZMquWtlvNf30rbIYCKED6PkSDbxO/bQqxqHwJ+thGwGh7KgiWW/fzKwbcp H87EzD5uvBpHTopFTMrQ8341R7CzEZV/iPsrftCtpfuDe7Gtn1W4ycegEd4mntTw1CUw MiVBP6qBAckjmqsngzP6XOkwWZ+tmi5aU5iWb9tCLvWA0Oadxrnu8MjrirzWMlcp6hRs ovSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GlgP4Zm7iPhcibnCe0q1di5+ktDn6U/ox4oxpJwGHZw=; b=dj2ocw1EPxreMPXP3iyH4TRLTk7RjNIiIbZIwR8J7Bd73bTD5PuffxGKwMtlC8jk8G HiTFwKMEWoOtMmkfDBgwpeKr5yjBwgaDlKzpmWMIencDtchxpVQwI5FWYdopI/oQan5a wQKtb9ajSYGL5AIN9lO+w3bLDX/+B3Js7HW0gcTQ8dDqA3qlnHmONikW8QJ0C7dUp203 pEa5lPreeOIv3IlTXu7AEJ4s4yiV0D6rEqmjCSzSZRwzToyizfZWYOej5lhb4q0CxRlt NiCJp/5wLDlgYaRl9mcqkR3jEmeYYCz1APPpro/EXa2PwHOJpQ8UIO07QPmIWH6BxAoT x5oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SMZxoU9p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mp6-20020a1709071b0600b007b43ef7c08fsi18494070ejc.501.2022.12.07.18.41.46; Wed, 07 Dec 2022 18:42:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SMZxoU9p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229774AbiLHCkC (ORCPT + 99 others); Wed, 7 Dec 2022 21:40:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229793AbiLHCjs (ORCPT ); Wed, 7 Dec 2022 21:39:48 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 537C2D2DA; Wed, 7 Dec 2022 18:39:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670467187; x=1702003187; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=n2kbEHfcByHaWIZQ1y7JTsLS9250kq92PDDaSZGQ45k=; b=SMZxoU9pTiO8MNJLoiKu2tbAIdw5nthFGEntwCLjPPuDo8wkH9p5CNKr jTa1Qg4NgclQ94RKevds/ZaSKM8XUI6DQk+1XnzJydSRbG48MhHgoqNBU M1347SVkijkBhAbmJMpEV/W3QVP9NlffG3hhXM45McPpTTASzG4XkzmRk IhO6l0XKUlCvh5guQngClpO/o5bQwgnATI0Hpq/RmZOFGLtLZsm+4sMYh HWdFQ6atAQrqQb6IuD/x1DSmLaAGVhbMvN56XS1XWNniMDyBtoHGDjv9p XF6wPUeyQ9jiCEMABoglPIkc0XCihSTxPRwW2QNHmTFCHLY4OoBX/dkef w==; X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="318194610" X-IronPort-AV: E=Sophos;i="5.96,226,1665471600"; d="scan'208";a="318194610" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2022 18:39:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10554"; a="624530641" X-IronPort-AV: E=Sophos;i="5.96,226,1665471600"; d="scan'208";a="624530641" Received: from linux.intel.com ([10.54.29.200]) by orsmga006.jf.intel.com with ESMTP; 07 Dec 2022 18:39:43 -0800 Received: from debox1-desk4.intel.com (unknown [10.212.164.201]) by linux.intel.com (Postfix) with ESMTP id 23039580DA1; Wed, 7 Dec 2022 18:39:43 -0800 (PST) From: "David E. Box" To: nirmal.patel@linux.intel.com, jonathan.derrick@linux.dev, lorenzo.pieralisi@arm.com, hch@infradead.org, kw@linux.com, robh@kernel.org, bhelgaas@google.com, michael.a.bottini@intel.com, rafael@kernel.org, sathyanarayanan.kuppuswamy@linux.intel.com, me@adhityamohan.in Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V9 2/4] PCI: vmd: Use PCI_VDEVICE in device list Date: Wed, 7 Dec 2022 18:39:40 -0800 Message-Id: <20221208023942.491721-3-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221208023942.491721-1-david.e.box@linux.intel.com> References: <20221208023942.491721-1-david.e.box@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, UPPERCASE_50_75 autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751611950077976266?= X-GMAIL-MSGID: =?utf-8?q?1751611950077976266?= Refactor the PCI ID list to use PCI_VDEVICE. Signed-off-by: David E. Box Reviewed-by: Jon Derrick Reviewed-by: Nirmal Patel --- V9 - No change V8 - No change V7 - New Patch. Separate patch suggested by Lorenzo drivers/pci/controller/vmd.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c index e06e9f4fc50f..9dedca714c18 100644 --- a/drivers/pci/controller/vmd.c +++ b/drivers/pci/controller/vmd.c @@ -994,33 +994,33 @@ static int vmd_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(vmd_dev_pm_ops, vmd_suspend, vmd_resume); static const struct pci_device_id vmd_ids[] = { - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VMD_201D), + {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_201D), .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP,}, - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VMD_28C0), + {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_28C0), .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW | VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_CAN_BYPASS_MSI_REMAP,}, - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x467f), + {PCI_VDEVICE(INTEL, 0x467f), .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_OFFSET_FIRST_VECTOR,}, - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4c3d), + {PCI_VDEVICE(INTEL, 0x4c3d), .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_OFFSET_FIRST_VECTOR,}, - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa77f), + {PCI_VDEVICE(INTEL, 0xa77f), .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_OFFSET_FIRST_VECTOR,}, - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7d0b), + {PCI_VDEVICE(INTEL, 0x7d0b), .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_OFFSET_FIRST_VECTOR,}, - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xad0b), + {PCI_VDEVICE(INTEL, 0xad0b), .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_OFFSET_FIRST_VECTOR,}, - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B), + {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B), .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP | VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_OFFSET_FIRST_VECTOR,},