From patchwork Tue Nov 14 10:08:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 164809 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1760869vqg; Tue, 14 Nov 2023 02:14:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IEPT0jsfN3wNb9KxaTEUbeF6gFLT8gfZpfaHPeIfmSKwidgmBMptF00WtJXozmf5PZVFOZa X-Received: by 2002:a17:902:dac6:b0:1cc:56a9:e8d5 with SMTP id q6-20020a170902dac600b001cc56a9e8d5mr1907333plx.15.1699956871458; Tue, 14 Nov 2023 02:14:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699956871; cv=none; d=google.com; s=arc-20160816; b=cvnywZsiiZ3Hx0kTwUp/u2v0uWesZWgOHnM2aMIMJjVowlKrtixPW/RLcFj3g3eBWA grhNUdlBr3H9Il6wGbWEeSZ10gZGGY7tihHil3X+UVki4iFlYACnKHA6OTs502+gQpxt 5kg4eFMIoGlPpN0UHyivT57QGXxn47OjFFjAOv0eCHlwKttbnJcR9fdD8rgTfs6J9IVn /pn8Jxh0wkIspSFFW79Rd6+uTwPgtHtDYActEWFsHnqrOMcyngIQ67xgddfvjO5OCIIP aZ7s98xB7RJeZU8FaQz1p3sKDW6CAo2AMZgLuwnj98Vzi75yclpwU71VFXTN4Sxwh9wd UmoA== 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=Q6n3P4OTJj9pXw9LW8rcXnkH79dXlVu2Tx+5237ZSM4Lv/7BCxH1ExXzGpHJG8hg4L ujOlfRNqFfpzNhvQ86SFg6bwZvJBStvvdtBCUcxmCBhOvq4Ie6fCACI3LqJwUmGVJq9i Z73KepgE5EkcHVE/wkepgKTMjDRZY2Xug3840LsBiR3gqCMes6pC+WxYxTLq1wH0dNwj 4s7OPYIOcox3eiWJf7CAjWoiFDYf2ilxQw7sVDkDfWP3dEOhf3TmczY/6T8lJSs0YTC6 ihZ7jflEDg42YoQoo8jp9sq3GtWBkENv8ofXckLWXYrYzZyQzv+UhhnlFRnGCg5Eq7AF mRUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SxDk257x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id u6-20020a170902e5c600b001ca85c6e508si8048187plf.558.2023.11.14.02.14.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 02:14:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SxDk257x; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id A8FEC806047B; Tue, 14 Nov 2023 02:14:27 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232620AbjKNKOM (ORCPT + 30 others); Tue, 14 Nov 2023 05:14:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232619AbjKNKOG (ORCPT ); Tue, 14 Nov 2023 05:14:06 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2BE51AB for ; Tue, 14 Nov 2023 02:14:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699956842; x=1731492842; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ok+C5VgX/V+ECchmrjizFZBWxdoj6QGhMwgM03J/+rE=; b=SxDk257xd9f2ShiWhSjugob7QztnbfL1padN5vKNEmnYvgA0my2XfwKm 49yYdZl1VBOQP9/3AIlrt4bebcj1YHxoSfRjELHSUuO2GNtUQHei//RJQ +MO6xrj4rPTzvpJYZ81RYbtWn9WK29/VN5TcihIgreCjIenVAkG/zFMFM 6mjKw5KWcWrtzAGY7LbDLUv/8LsRRAVNWzegIOqwPBKzyqfiWXqTskaMf TO0sfb9RPN5qOsPzIEWkAC7S9ufZ9dfmcblWIO01R7d6uRrEcJKXQyDEB IqMVbYJ60EXlZ8FgtTMXwgbhlZU6ysC/uDRfKUGW/EMo9S9szJp4hsD6C g==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="375669095" X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="375669095" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 02:14:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="5974154" Received: from sannilnx-dsk.jer.intel.com ([10.12.231.107]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 02:14:00 -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 v2 3/5] mei: pxp: match without driver name Date: Tue, 14 Nov 2023 12:08:41 +0200 Message-Id: <20231114100843.1923977-4-alexander.usyskin@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231114100843.1923977-1-alexander.usyskin@intel.com> References: <20231114100843.1923977-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 agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 14 Nov 2023 02:14:27 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782533976341557658 X-GMAIL-MSGID: 1782533976341557658 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;