From patchwork Tue Jun 13 03:01:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sui Jingfeng <15330273260@189.cn> X-Patchwork-Id: 107041 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp273556vqr; Mon, 12 Jun 2023 20:13:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4XgykcfeDiZiH32ZwCQPoFHHe6u1f9Ezmugtpk5TZGZu5l/XvmTpsKO6RSukMBJ/WMGpzx X-Received: by 2002:a17:907:318d:b0:96f:f6a6:58dd with SMTP id xe13-20020a170907318d00b0096ff6a658ddmr12655893ejb.5.1686626001728; Mon, 12 Jun 2023 20:13:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686626001; cv=none; d=google.com; s=arc-20160816; b=ipNkA4S1v9v7/en0ihiVEin5n2aIUMKLqPzsWFH+D39XwGQ4WCz+wQ8YVhS0VS725y EPHiOP1ZilFZkq+/cpDSbmwpPlgl5Bt4yEEwNflaJ69hqQRgH7NMnCuxrEdlNj+cVMLl nIqjaTKUnXfed+753Eb8rYXgS2+y+lygSKBRKMKNzMYL3nkJZ4g7bWBpo0ouaCf2jT9j whKVqx1cwVXTMld4IiQC8X7azaNieDKSSriIzFyZ9d3DDJvtibnyjIBd0ZDX2OMiQO16 z5tf2VISbsfqJHk2KCx5UhCo416w0VX3UnIL3RfzJcNHxMNekXxx5QSxAwHlW5AqMfC+ CEtg== 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:sender :hmm_source_type:hmm_attache_num:hmm_source_ip; bh=f47Z9RuNooiZx8SZc/firXqhfKa9GhxofPh7Tl0aIx4=; b=mCB+2FVOI0b/L7HiRaDTMn5+1wFn5cRo+aYhUeeRaGPPOEjvQmVHBFJCCOpRsplR9T fND7gu5QfxJPeRxiSRjA0hXktLoukntb9Y82DlqLncM6cMGnBKfXRERAutCY6ctSC3hE ih8roIgoqrT/wN0wlVMPf5OLKx7OYENG0b8KZykBnCy9VliMx5GnDXanaGCg4bypdWEV y6FAVXd/R2srLG+ztdoUTtIaIDFoktaI49+O3VIftFUXZ35zZqDx2Dl9/JVNLuaAkN6T i9Ri6qJO57I0ETkfpwYz6HCC9xpiJ84qgYMMXdO2ARb+Ja5PlflLbmTfOlf8JAdk783E b8XA== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hh14-20020a170906a94e00b00965fc6a72f7si6352091ejb.679.2023.06.12.20.12.58; Mon, 12 Jun 2023 20:13:21 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239505AbjFMDEV (ORCPT + 99 others); Mon, 12 Jun 2023 23:04:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233125AbjFMDDx (ORCPT ); Mon, 12 Jun 2023 23:03:53 -0400 Received: from 189.cn (ptr.189.cn [183.61.185.102]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 07CFC1BEE; Mon, 12 Jun 2023 20:02:39 -0700 (PDT) HMM_SOURCE_IP: 10.64.8.43:47948.1267835893 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP Received: from clientip-114.242.206.180 (unknown [10.64.8.43]) by 189.cn (HERMES) with SMTP id A70B21002F7; Tue, 13 Jun 2023 11:01:59 +0800 (CST) Received: from ([114.242.206.180]) by gateway-151646-dep-75648544bd-7vx9t with ESMTP id a017ae4872414e4aa6dd165875a604cc for bhelgaas@google.com; Tue, 13 Jun 2023 11:02:00 CST X-Transaction-ID: a017ae4872414e4aa6dd165875a604cc X-Real-From: 15330273260@189.cn X-Receive-IP: 114.242.206.180 X-MEDUSA-Status: 0 Sender: 15330273260@189.cn From: Sui Jingfeng <15330273260@189.cn> To: Bjorn Helgaas Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-fbdev@vger.kernel.org, Sui Jingfeng Subject: [PATCH v7 2/8] PCI/VGA: Deal only with VGA class devices Date: Tue, 13 Jun 2023 11:01:45 +0800 Message-Id: <20230613030151.216625-3-15330273260@189.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230613030151.216625-1-15330273260@189.cn> References: <20230613030151.216625-1-15330273260@189.cn> MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,FROM_LOCAL_DIGITS, FROM_LOCAL_HEX,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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?1768555546232436177?= X-GMAIL-MSGID: =?utf-8?q?1768555546232436177?= From: Sui Jingfeng Deal only with the VGA devcie(pdev->class == 0x0300), so replace the pci_get_subsys() function with pci_get_class(). Filter the non-PCI display device(pdev->class != 0x0300) out. There no need to process the non-display PCI device. Cc: Bjorn Helgaas Signed-off-by: Sui Jingfeng --- drivers/pci/vgaarb.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c index c1bc6c983932..22a505e877dc 100644 --- a/drivers/pci/vgaarb.c +++ b/drivers/pci/vgaarb.c @@ -754,10 +754,6 @@ static bool vga_arbiter_add_pci_device(struct pci_dev *pdev) struct pci_dev *bridge; u16 cmd; - /* Only deal with VGA class devices */ - if ((pdev->class >> 8) != PCI_CLASS_DISPLAY_VGA) - return false; - /* Allocate structure */ vgadev = kzalloc(sizeof(struct vga_device), GFP_KERNEL); if (vgadev == NULL) { @@ -1500,7 +1496,9 @@ static int pci_notify(struct notifier_block *nb, unsigned long action, struct pci_dev *pdev = to_pci_dev(dev); bool notify = false; - vgaarb_dbg(dev, "%s\n", __func__); + /* Only deal with VGA class devices */ + if (pdev->class != PCI_CLASS_DISPLAY_VGA << 8) + return 0; /* For now we're only intereted in devices added and removed. I didn't * test this thing here, so someone needs to double check for the @@ -1510,6 +1508,8 @@ static int pci_notify(struct notifier_block *nb, unsigned long action, else if (action == BUS_NOTIFY_DEL_DEVICE) notify = vga_arbiter_del_pci_device(pdev); + vgaarb_dbg(dev, "%s: action = %lu\n", __func__, action); + if (notify) vga_arbiter_notify_clients(); return 0; @@ -1534,8 +1534,8 @@ static struct miscdevice vga_arb_device = { static int __init vga_arb_device_init(void) { + struct pci_dev *pdev = NULL; int rc; - struct pci_dev *pdev; rc = misc_register(&vga_arb_device); if (rc < 0) @@ -1545,11 +1545,13 @@ static int __init vga_arb_device_init(void) /* We add all PCI devices satisfying VGA class in the arbiter by * default */ - pdev = NULL; - while ((pdev = - pci_get_subsys(PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, - PCI_ANY_ID, pdev)) != NULL) + while (1) { + pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev); + if (!pdev) + break; + vga_arbiter_add_pci_device(pdev); + } pr_info("loaded\n"); return rc;