From patchwork Mon Jun 12 19:25:44 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: 106777 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp93459vqr; Mon, 12 Jun 2023 12:41:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ72ZaqJxEe+G+9fe0z8tXJRAgMKa7FfmwjLxqpbCcfrZLywCTxP2/N+EyFU6thfKX5oqwt6 X-Received: by 2002:a17:903:110e:b0:1b0:3637:384e with SMTP id n14-20020a170903110e00b001b03637384emr8266030plh.25.1686598905661; Mon, 12 Jun 2023 12:41:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686598905; cv=none; d=google.com; s=arc-20160816; b=moPBDGg82uGiKOpiqVjueauYjb4y1gHVu9csblXRR4iCfH5+z283nBzoORX0X5J0wl 1F75b6Uh0bNO9FdmKMH6jjEayh4ZemsBfWHERXYW9syg1ffVZTOP49CAoQfpQFyioaIn V+I/e8lmXI0AFGtiwyPVaQhdoKwiEsgkM9fL+YsJLThDPC+cZtqukLEPFhC+Zv1kVvYo 8Q9egknfopWIzBAgfBhfgDM4a19DnDqwK/R+Sli7rM1L8HdcM1nZ44KhEm62Q5JT7pWg fSjyHMDmBaWtS2W6t5uu9pZ4jgy4P/Mnv5V26ZPRdO9MsAHlrDEbY8hj6E18t2+TWKTG 0Bng== 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=XLgk9P7KAJvxdna3sEVCwLqHb7aGO47CpUGvfkrWgcM=; b=dMDn05vefyLf3pnqCB9jg3/yocg9rqKFQajHSPDIuimzaKCUj9kNzIFeaUv4F0JS55 3gR7k60HohtlEO7x5syaMZrBOxuhlBUECyP24Od3Vzfv7KcbTXhBNZ7HLHw0zAqU4DK3 jH+7INq8eWzvSya42cDCSeiZSeR0b6PNT9lmIWhYL5SOaM6e8bn1UF8G9/Dman9kzqcl W8Fnb1k1jNwcVOQzwVpbIGMuUYRqufTEkhpX/9w3925jgnIjpQYYlTLlMlP5EURN+D6t 59n3fGDPfBpoxSSxTtXXU7DRS3Nwoj32y7Jw1BH76s8MlyuSFJiQssxgtTmhGOI0dxVF zkfw== 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 h13-20020a170902f54d00b001b3a1845497si4173167plf.535.2023.06.12.12.41.32; Mon, 12 Jun 2023 12:41:45 -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 S238111AbjFLT0Q (ORCPT + 99 others); Mon, 12 Jun 2023 15:26:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237521AbjFLT0H (ORCPT ); Mon, 12 Jun 2023 15:26:07 -0400 Received: from 189.cn (ptr.189.cn [183.61.185.102]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 31A6910D9; Mon, 12 Jun 2023 12:26:04 -0700 (PDT) HMM_SOURCE_IP: 10.64.8.41:42778.1249123675 HMM_ATTACHE_NUM: 0000 HMM_SOURCE_TYPE: SMTP Received: from clientip-114.242.206.180 (unknown [10.64.8.41]) by 189.cn (HERMES) with SMTP id 311461002B2; Tue, 13 Jun 2023 03:25:59 +0800 (CST) Received: from ([114.242.206.180]) by gateway-151646-dep-75648544bd-xwndj with ESMTP id 6d29b3ab2b714ff0869e711772a8b3e0 for alexander.deucher@amd.com; Tue, 13 Jun 2023 03:26:04 CST X-Transaction-ID: 6d29b3ab2b714ff0869e711772a8b3e0 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: Alex Deucher , Christian Konig , Pan Xinhui , David Airlie , Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Ben Skeggs , Karol Herbst , Lyude Paul , Bjorn Helgaas , Alex Williamson , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Hawking Zhang , Mario Limonciello , Lijo Lazar , YiPeng Chai , Andrey Grodzovsky , Somalapuram Amaranath , Bokun Zhang , Ville Syrjala , Li Yi , Sui Jingfeng , Jason Gunthorpe , Kevin Tian , Cornelia Huck , Yishai Hadas , Abhishek Sahu , Yi Liu 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, loongson-kernel@lists.loongnix.cn Subject: [PATCH v6 2/8] PCI/VGA: Deal only with VGA class devices Date: Tue, 13 Jun 2023 03:25:44 +0800 Message-Id: <20230612192550.197053-3-15330273260@189.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230612192550.197053-1-15330273260@189.cn> References: <20230612192550.197053-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?1768527134271868886?= X-GMAIL-MSGID: =?utf-8?q?1768527134271868886?= 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. Signed-off-by: Sui Jingfeng Reviewed-by: Mario Limonciello --- 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;