From patchwork Tue Nov 14 10:08:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 164807 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1760768vqg; Tue, 14 Nov 2023 02:14:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IGSEU1CwX0oUynl+hMzSz9k8Cj+Y79hlZlmgmK/pOU5o6aoprX/SSJ0+8c+2cvxj/+dstou X-Received: by 2002:aa7:939a:0:b0:68e:3bc8:17d1 with SMTP id t26-20020aa7939a000000b0068e3bc817d1mr7144790pfe.29.1699956853318; Tue, 14 Nov 2023 02:14:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699956853; cv=none; d=google.com; s=arc-20160816; b=yUiWeSRDN026Ntwl1uiRnmbHF+6VjGCOay7w0gn2nZs2UF+z7G29FLC5q1tQ0Yj1SB XMjsn3jMKd2WE5mQ3ExJBDbTZihgZ5ksEl5l4DkRk+F899Q6JrPhczD215jLru7D8bff gdiwu0zvWjAwnm/gPROldrVpuzgVENZAu7IK9RLlTpjWwDE9P6RAqTvPk4MaB+Lf8Uis 6qBDXnCniWbH7ymBl+g/ccW2y2a6p9RjhMGC3K0IVigI0+aodLXW1kfWIeO8LLp7cLxL 0WB/wh7FDb7ENT8wpNl534CwiudJIT56TDhJGEwgpfl6sGzVDOQxpVWEWriS8VGiATO1 gDfg== 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=K9FFyL348qF77D3SxVWZzh87kzhWQNZD+lAfykr5DCQ=; fh=7xjKU1xkhmTazBlAQtMk+Chl7JSt/CUyagAgyiLWmTI=; b=su5B2uG+Z9eLbvBiw/zM7iMFTSj2474rxMuqHNf4lDAhGbiOplAa8CvT9bSbKIQUcm fv2wh90fVvblWEEmQ1ICma+9V563Iz5r8SgYp0ScIrg16NidmFZR2JaQwp0FqVdMv20U YyN3/dIezWAhVPbMWQZjhJcqZibOdz6LU2BkLAdrOjo7oYi0XlwRGn9FhkA7E0YJHaYH nhUIo47cCpfjrbaD4pmuAbJs+VTVoxo0AWLeLz8Dea3igIHwahgBuDgEVef3n2NCCYwX D8s0sjQX3SbaUaw8nP0W4g7DiulRS4y6eKsl4UKEbpWbRIH7hwchuIsAtXfp7r1fPuQZ V/ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TxTSKYPB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id d7-20020a056a00244700b006c4d3cd9132si7861910pfj.0.2023.11.14.02.14.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 02:14:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TxTSKYPB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 5F353803E49A; Tue, 14 Nov 2023 02:14:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232621AbjKNKOG (ORCPT + 30 others); Tue, 14 Nov 2023 05:14:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232278AbjKNKOD (ORCPT ); Tue, 14 Nov 2023 05:14:03 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7542F19F for ; Tue, 14 Nov 2023 02:14:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699956840; x=1731492840; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vxaiLcGzfNk0ddfcrq6pq99BkBv8gE1W9AOZ6yAzypg=; b=TxTSKYPBQo0AIJ1FHiQXlix7v/sH0Zwgh6GLahDQq6LGNZj+fzozSap2 sZ8hJj490eJpJ+OsGklxJ86R2ueMAce7RrdJV9LiO3/m8nZQrSAlVfCmF mx6Xd6zXgdb5P9cuUWUSnX8V7Q6cehUejeE0TLXjWJ2FYeYQXQ7mmnUxr YSClDoAqTXUgTepo7mU3r9xT/IB2de1X4EEjDJslPq4fGYYoGS1FKtVzW duA9YGHaoUXaoTUxYvZuQYFZggcI4lH3L+iQwgHWq/YKOFjYPg/zvHasK dIqgifI7G8MQiH9AQk656vJs/KWtq5+YF9OAhAODwUJUhzbpIACEo2vGP w==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="375669087" X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="375669087" 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:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="5974150" 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:13:58 -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 2/5] mei: hdcp: match without driver name Date: Tue, 14 Nov 2023 12:08:40 +0200 Message-Id: <20231114100843.1923977-3-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=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 02:14:12 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782533957455109437 X-GMAIL-MSGID: 1782533957455109437 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/hdcp/mei_hdcp.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index 51359cc5ece9..f8759a6c9ed3 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -781,9 +782,18 @@ static int mei_hdcp_component_match(struct device *dev, int subcomponent, void *data) { struct device *base = data; + struct pci_dev *pdev; - if (!dev->driver || strcmp(dev->driver->name, "i915") || - subcomponent != I915_COMPONENT_HDCP) + 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_HDCP) return 0; base = base->parent;