From patchwork Sat Nov 19 02:14:09 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: 23184 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp520086wrr; Fri, 18 Nov 2022 18:23:08 -0800 (PST) X-Google-Smtp-Source: AA0mqf6TOblh8Ux8NsF10HCl4NxVvZi4Puq44ZYuiy92BslJR/DpCSns7u5Om7Hg4L9mlQi9Kbmg X-Received: by 2002:a17:902:7402:b0:188:a51c:b581 with SMTP id g2-20020a170902740200b00188a51cb581mr2223967pll.55.1668824587895; Fri, 18 Nov 2022 18:23:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668824587; cv=none; d=google.com; s=arc-20160816; b=j4CMEwtzXrtqu6zz8ma3rq9Ry5n7pFO98r1Ji6KuAXR9IMz9SGuBZ0L6g2pxSKrB4l mDxOtxV49yrBjD/0zBQXbOJdMWBVqEYF2Awv6foJjzhuC83oIFx72jZIYOFpRKgF2HC1 uVb7L+kcOICjdHmNQ3nw9KLffI25PSKWDaKJ+1u5xisXazoNurMV7NsrcQEzq4LUlGBI 785w/DTecLbCPrBmLXUqx4Ax3V/lFlit966qNqZqKE+gfo4q+ZDqG57prCyvRO7fjAe2 XynhDtl4ab2qKIlCuxB4lvVZgd7hicCCSw0hawWkQe/tjnjfmaqAbWN6PDsKvg2RWvI9 dC+Q== 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=0gZCoampUooYkztnEDrMgimVqQDHJaNqFDvOc4OrnVw=; b=wjXH2YAZ+COn7qMy7a9Rg24ZoMPzUz56yExChDKniN2Y58C5F02jDCc1VTy9elSO+c ZMcImjTMV8oOvwGWZLlYMXKhqb3ll0NKHc3i6QdxxdkqwKMNxPZ/KVNzfPCOnRSWlyiC uf3XHUjUCGi9Iy4G41SGP+oRo9Y93z4jVn8ojcThSiR3UgB0rP3fUep0JqKmdZa4SxPA FrNgUCkxhZeNUz2FqoOmCRxfaklVYrFMyI9nqMWf9YQwvZVnZnhXAv01A09kI+ERxVK3 qXMlAi7AXbihoVYh61oGJuQ4AI+t8nS2BzBybNRE6hnZlCBhJPsuEyx3aLlZzZ/Qfgkt fkKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HsD+8euC; 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 o13-20020a056a001bcd00b005638dc03ab3si4731865pfw.323.2022.11.18.18.22.55; Fri, 18 Nov 2022 18:23:07 -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=HsD+8euC; 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 S235628AbiKSCVs (ORCPT + 99 others); Fri, 18 Nov 2022 21:21:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235067AbiKSCVC (ORCPT ); Fri, 18 Nov 2022 21:21:02 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55C78C5616; Fri, 18 Nov 2022 18:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668824082; x=1700360082; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rwsEQa82RGEY35/kVIyEKXcQKfXvSrWD1YVUMbGBB/c=; b=HsD+8euCxtgPhfPXD8M7kJ7TZIqQcyJHjQnbecmJOkA4NLqMa0YPEdGB NtZARpwjyGAHGoOxPy4g2irtGmZ6WPgKQM5e0SebsGKb4HV5I9A1+aN4J 0eVXkRPC3D6wiYAG3qwIUHcAa4WOcIkybKHvlg1kVKQPIw403JzprRTD8 DgNyOcKqieWH5iFhwDqAZVD5Mpur82DbHAMiMpxI3Bsjq0cYuEKgWgIm9 wyQyApfdVeJ17XS8JgQhFA+N3nzZRqvnNj1hCoYJ43TrWWk3iJzKIcZAk cDtxiEvjEC5/WxPDZeqwa1xuJk5kUO7j/LMIAM3PU3QHst6fqjOSqa97G Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10535"; a="313310239" X-IronPort-AV: E=Sophos;i="5.96,175,1665471600"; d="scan'208";a="313310239" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2022 18:14:12 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10535"; a="815129819" X-IronPort-AV: E=Sophos;i="5.96,175,1665471600"; d="scan'208";a="815129819" Received: from linux.intel.com ([10.54.29.200]) by orsmga005.jf.intel.com with ESMTP; 18 Nov 2022 18:14:12 -0800 Received: from debox1-desk4.lan (unknown [10.252.138.169]) by linux.intel.com (Postfix) with ESMTP id 1E738580DFA; Fri, 18 Nov 2022 18:14:12 -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, david.e.box@linux.intel.com, michael.a.bottini@intel.com, rafael@kernel.org, me@adhityamohan.in Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V8 RESEND 2/4] PCI: vmd: Use PCI_VDEVICE in device list Date: Fri, 18 Nov 2022 18:14:09 -0800 Message-Id: <20221119021411.1383248-3-david.e.box@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221119021411.1383248-1-david.e.box@linux.intel.com> References: <20221119021411.1383248-1-david.e.box@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,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?1749889411354541751?= X-GMAIL-MSGID: =?utf-8?q?1749889411354541751?= Refactor the PCI ID list to use PCI_VDEVICE. Signed-off-by: David E. Box Reviewed-by: Jon Derrick Reviewed-by: Nirmal Patel --- 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,},