From patchwork Fri Jun 30 10:17:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sui Jingfeng X-Patchwork-Id: 114654 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10253732vqr; Fri, 30 Jun 2023 03:33:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6iF4k/4pBu0OjEGpY+1R33g+LEpNgG3U0I3tms7nXS0a84ACmllmx6ryg48XeRIf5in7hY X-Received: by 2002:a05:6a20:244c:b0:105:66d3:8572 with SMTP id t12-20020a056a20244c00b0010566d38572mr3493374pzc.24.1688121239078; Fri, 30 Jun 2023 03:33:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688121239; cv=none; d=google.com; s=arc-20160816; b=mTkwZW6tTmK73hJf7UTE5uzgvnc0OFuU46GHcWQPGSBaVLGmNzg+Er+O9Oa2Tdoh9d o1jdVJR0dmIGP7LDrFxAqEWyspKk+8e9Q7JA/uI5SMuZwLe9C2Hd2PzNGbmhUSJLVJa1 TChilpHTi+Ej9DFUUU1a5debqdHvT2sWMcCvsmn767RjSaf0duyqk9Qn/Rquaxw8xpOF BBSE+q9WMLszzSHwQPaeveW5EIQBUHwrOQvZQiL/sR20VqVcZwmUDC/l+hF4ZRv2f/eB VwZTjODuZojkyS+BCNGSQJWJJ1gsGM9/vRI0OvYXOevbJeMFgl86OKw0e8+2WUjJ0SR/ cz7A== 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=3Ml7rkVkU9dTc0+Xfj7L5gDY8LPJxmXh8rcpwPh2b98=; fh=WWmia8JvzzPNpMfXf/CSyfcD/7g4YnnsUrYkO3Hf4M0=; b=pIMWeyenFMig7AtqgdV8l+teaW4Bf9nlCV/u1lYRyus8pR52wZ4I406eIgpIrYstrh iRCJ/CIAE8KsyY3w+N3cQdKaR+5rRfAWCmoIIHZ0doOQ/urlaHcSKHQz4TlLD3oxisqV /1dpya9zkdWyTgwO5tdatbDxPQ/LFrOubiPobuobSQahAmJ1+NhonEgkig16m4clIXN7 UxR/VkFDYCxDqScdxEedc7yx2x6CS4vb9WKU6lEzmSe8viwsZKI4U/pRWnWC7bJxuHIQ HqWwHttx+DgA2D9w1RiDZYxpyI87XI4T9qkPvpX4X96rMokzFsNm7ce7Mi+T+MSD+sN7 wF/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=BGaslFGf; 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=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s186-20020a632cc3000000b0055ad2d6c8aesi7351869pgs.772.2023.06.30.03.33.46; Fri, 30 Jun 2023 03:33:59 -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; dkim=pass header.i=@linux.dev header.s=key1 header.b=BGaslFGf; 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=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232853AbjF3KRu (ORCPT + 99 others); Fri, 30 Jun 2023 06:17:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232454AbjF3KRs (ORCPT ); Fri, 30 Jun 2023 06:17:48 -0400 Received: from out-51.mta0.migadu.com (out-51.mta0.migadu.com [91.218.175.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 755001FE7 for ; Fri, 30 Jun 2023 03:17:47 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1688120266; 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=3Ml7rkVkU9dTc0+Xfj7L5gDY8LPJxmXh8rcpwPh2b98=; b=BGaslFGf5MzqKg8hmjZQCbuFcW8ysx9xCnhDgdWOUZJyDhIpqCppGx4MdN0PN3JEm09nqk IXICgDA0TFnSpwMSzsvHUKky+eQnGOyURH6hEuDAWTxLZSMO+84otNiFMoM30NBFdK97j1 iEulAEIbzcJr8RYBCQAmeihTHD6DaWo= From: Sui Jingfeng To: Bjorn Helgaas , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Sui Jingfeng , Mario Limonciello Subject: [PATCH 2/4] PCI/VGA: Deal only with PCI VGA class devices Date: Fri, 30 Jun 2023 18:17:29 +0800 Message-Id: <20230630101731.134375-2-sui.jingfeng@linux.dev> In-Reply-To: <20230630101731.134375-1-sui.jingfeng@linux.dev> References: <20230630101731.134375-1-sui.jingfeng@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1770123416663446301?= X-GMAIL-MSGID: =?utf-8?q?1770123416663446301?= From: Sui Jingfeng VGAARB should only care about PCI VGA class devices (pdev->class == 0x0300) since only those devices might have VGA routed to them.      PCI_CLASS_DISPLAY_3D and PCI_CLASS_DISPLAY_OTHER are used to annotate the render-only GPU. Render-only GPUs shouldn't decode the fixed VGA address. For example, nvidia render-only GPU typically has 0x0380 as its PCI class. A render-only GPU cannot be used to display something on the screen. Hence, it should not be the default boot device in normal cases. Cc: Bjorn Helgaas Reviewed-by: Mario Limonciello 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;