From patchwork Tue Nov 7 13:46:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 162507 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp246625vqo; Tue, 7 Nov 2023 05:53:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IFEVeRT4xfcDqqD2nVOx1rlYNlM321QXErWk44ZnZazZcgr2FadLlMzdAf9VrlzQsQ2R4MV X-Received: by 2002:a05:6a20:1595:b0:17b:3822:e5ea with SMTP id h21-20020a056a20159500b0017b3822e5eamr32426269pzj.19.1699365234357; Tue, 07 Nov 2023 05:53:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699365234; cv=none; d=google.com; s=arc-20160816; b=mTFGuCS7OEVdbuDhwng5GJCxDHQYQ2QNWW3/K5wCJ4EsxHZGjd/bijbSKBrkUmKqnn Q1Xs73ay63orKCR9EWoHGIywHv78Q2ul40De8Kos/ZoPmcUot10qL5Xw3znLJv+L8KCl EdK+VIP4rkP8bUaf2PGXGEJ/9b0M+MZynklK9LTRSxdEjbGtN2VGHRHoQjAVpAvM7Fz1 jlE7Dtmb7o9w7N5j3W3PkcfYyCIUT2OUgepalGN4O7TYg9i5R+Cyy12lltD7Edm7XEXX WzHR80ZCo/qwdNNiYRjD+D1+BbMC1XZFauxuMwWx/KcevvNDNztcUSAgxg8+ZPFsWtdA MGqw== 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=RYTm6HF08LlV6rId4huNYiO76a/1tb52QFkOrrboC7M=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=08kO3TqXRrI0feRF9tjTLMw8lSiJYl+i8wMBVxSEE0snD4Kg/aa/jHbBz4A0RoyRh2 3N7WeolGClHzFnjbQOZt/90K4tm1dsZJ3VuSchLIG+nd3TYtrvJ/zlrw7FLqlqqHgCKW 79hhtxvORx/aatAQ1wmJRU/rBqU7bC4iM0i38KugcmfUD2pVjpCfYvm5w+pDLQ7H+kFU rmJ4AyTmaG/Zh5ibmdc/eKbLT42Y4WmyYGBYrZV6PKp65n1FkQy/DpQeydAZWyAt2av3 1yEw3PK0HVFts3ik1G6R+POFy3Wl4jSsx8haXxM7DIb3kmatgFjda2o+bpz7geB0LyHM +Mfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UQXXwmHm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id x15-20020a170902ec8f00b001cc54873f98si11546351plg.149.2023.11.07.05.53.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 05:53:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UQXXwmHm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 6B4CB8074045; Tue, 7 Nov 2023 05:53:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234430AbjKGNxA (ORCPT + 32 others); Tue, 7 Nov 2023 08:53:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234671AbjKGNwq (ORCPT ); Tue, 7 Nov 2023 08:52:46 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FE6D30C5 for ; Tue, 7 Nov 2023 05:51:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699365093; x=1730901093; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ok+C5VgX/V+ECchmrjizFZBWxdoj6QGhMwgM03J/+rE=; b=UQXXwmHm7Ryr8nkYuU+FDYLjDppQbmxhglkZmP69RT3NsGahOuVMnfK2 af+GRzPmM5ir0QzkuWvZkFpM3b4Apv/BBbL7vDI0N5adPjxRYJZuD3uax iACefUcsX2ihpVz4KezwqXf88WhQJardq6hIEVBFOOqcjazy1t75sp2Wz dXgRv5qD6sjkWYzrU30BGA0fqIPBxjijCy4MFwbm8/vIjTXMU6dMgJgAX KNN+ApYI/5psangjbNEb7OiDgnRYrEOkJsgqQw9S6I7G3IiG7xcjNTGZB dATVhYP+1re7PIEUDnUBoR2D6JRuw4InAKjJepbDdgZqvLAmhR7Uwtr/1 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="420618983" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="420618983" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 05:51:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="762705126" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="762705126" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Nov 2023 05:51:30 -0800 From: Alexander Usyskin To: Greg Kroah-Hartman , Lucas De Marchi , Daniele Ceraolo Spurio , Rodrigo Vivi Cc: Tomas Winkler , Alexander Usyskin , Vitaly Lubart , intel-xe@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] mei: pxp: match without driver name Date: Tue, 7 Nov 2023 15:46:04 +0200 Message-Id: <20231107134606.316651-4-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231107134606.316651-1-alexander.usyskin@intel.com> References: <20231107134606.316651-1-alexander.usyskin@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 07 Nov 2023 05:53:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781913600111017530 X-GMAIL-MSGID: 1781913600111017530 Remove dependency on i915 driver name in component_match function. Use PCI header information to match Intel graphics device. Signed-off-by: Alexander Usyskin --- drivers/misc/mei/pxp/mei_pxp.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c index 2dcb9169e404..e74b2facfdf9 100644 --- a/drivers/misc/mei/pxp/mei_pxp.c +++ b/drivers/misc/mei/pxp/mei_pxp.c @@ -12,6 +12,7 @@ */ #include +#include #include #include #include @@ -154,12 +155,21 @@ static int mei_pxp_component_match(struct device *dev, int subcomponent, void *data) { struct device *base = data; + struct pci_dev *pdev; if (!dev) return 0; - if (!dev->driver || strcmp(dev->driver->name, "i915") || - subcomponent != I915_COMPONENT_PXP) + if (!dev_is_pci(dev)) + return 0; + + pdev = to_pci_dev(dev); + + if (pdev->class != (PCI_CLASS_DISPLAY_VGA << 8) || + pdev->vendor != PCI_VENDOR_ID_INTEL) + return 0; + + if (subcomponent != I915_COMPONENT_PXP) return 0; base = base->parent;