From patchwork Tue Nov 7 13:46:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Usyskin, Alexander" X-Patchwork-Id: 162504 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp246279vqo; Tue, 7 Nov 2023 05:53:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IE65cE87jWBZmcwGU5h3pW3cCGceny4cou6K6gIkDWwvyK6uuvi4Jh8JJiNd3YzKivKF536 X-Received: by 2002:a17:903:246:b0:1cc:7a8e:606b with SMTP id j6-20020a170903024600b001cc7a8e606bmr15571961plh.43.1699365192479; Tue, 07 Nov 2023 05:53:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699365192; cv=none; d=google.com; s=arc-20160816; b=bLckIwHFLBpEAkPIyj9G05mIqvL2WVhSLnfPFaO0SU7DCzBmauFoZHh1njqxd+5G6R LtAhZpUxllk6LldLS1SL4xMAOxc3zl+G4trg5EXSrMfAEXqUOjysskXcUuAxOkC8oJx1 cD+PjDtaM1zG4KpEe+Ml6k1sSQmGbip0ZO82fdTU3M42N/eWEBiWX7TbLksXkN+EH4CU 7gBvgZTn0h/yRXQT24xZ26uQmrJ8tjQJk+dySgyFeKbN35pUrs7Xjd9jLOrNUu2rhTS4 1bfObXu3iT6bcK4cWst6ClNCxV4posKhVqH5KiEg7Jk6o0WfOOkqOLn7zSNB+ugh08/c myOw== 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=0lezzjJlWK2ZNGTeCBXVbTNVsnv130babYsbg4SFAYLQqKy+ijZV1GGPcONWQHxxjV Tg8O9jdCXHjJ8wbG5s8BbSR5zndE/+MS19Hs46B2q1HlMzPHPJH4IrsGBn7WaGX34fGI EOjt1XtlDoDHWYT2DNU4ResxxvsBn+pzYam81ROqEZfLphtm6xwZfD+FbuqdO3dvjuz4 W6OvH/21i2/wjS3funJN1640SWnTUEvv/yyFnXQTQexHUY6CY0XxZJ9S5N89MRkCKpmX E+/UALvAU0C85S0NZaObN3RuXJ0ywODDkr6+L+efY1/P0npnchzWEqBhJ4WUslmBKZIg eK8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=IMzGqsf0; 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 o18-20020a170902d4d200b001ca3cd7ead6si10897804plg.452.2023.11.07.05.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 05:53:12 -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=IMzGqsf0; 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 921E58212A9E; Tue, 7 Nov 2023 05:53:11 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235050AbjKGNxF (ORCPT + 32 others); Tue, 7 Nov 2023 08:53:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235030AbjKGNwp (ORCPT ); Tue, 7 Nov 2023 08:52:45 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 679C6D7C for ; Tue, 7 Nov 2023 05:51:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699365090; x=1730901090; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vxaiLcGzfNk0ddfcrq6pq99BkBv8gE1W9AOZ6yAzypg=; b=IMzGqsf0TgogrycIHP8SP+g5jbuQ1k83TA1lvUMBTf0L3wv7599dEwqC HN5AISENPR4dU/xp0tjGOyQVyV1WOCgQI5THj35PIEVvV4EhpTPm+oJdb mG1S7uPmemlxsnFmR9fvX+ls4hSBruedpbvtGfCjITqcTHHTpLnGjoM0H sd2j//+FJQLi9IOx2/6GRx+JvlJ+BV6La4AI+4B0QoDZo5NDns4NEVL7g zw6cs5JrISH5lJc1TTZJXy6n0H9CyNWfcz4m+a3sEUjM5Pa6uFS0hnI5n YqsAOtmGLWCcK+0fhj6ve8jLmx616mF+kohATaQ185vQU+nXKqwazQS2B w==; X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="420618978" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="420618978" 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:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10886"; a="762705107" X-IronPort-AV: E=Sophos;i="6.03,283,1694761200"; d="scan'208";a="762705107" 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:27 -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 2/5] mei: hdcp: match without driver name Date: Tue, 7 Nov 2023 15:46:03 +0200 Message-Id: <20231107134606.316651-3-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=-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,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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, 07 Nov 2023 05:53:11 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781913555956029513 X-GMAIL-MSGID: 1781913555956029513 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;