From patchwork Thu Aug 24 01:48:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Wentong" X-Patchwork-Id: 13363365 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C00BC3DA6F for ; Thu, 24 Aug 2023 01:50:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239139AbjHXBuS (ORCPT ); Wed, 23 Aug 2023 21:50:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239235AbjHXBtr (ORCPT ); Wed, 23 Aug 2023 21:49:47 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A729172C for ; Wed, 23 Aug 2023 18:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692841767; x=1724377767; h=from:to:cc:subject:date:message-id; bh=abiapyY0Iirm/LrpuuFmZdHpQr46pg9G1aABbmWT5FY=; b=i4V8/z9d7SR3Tw0DeCqP/o9tTFoh2PbSfQoq2rzeshFVDIQTDu8pm4Np gMKDkFmC38o3xhEMN3wMp9roLODKsIhwzEs/e+mCSkgobF47mQ12iPBIS HuXMYUgLxmfLgX00NEaTSeDxfpl0qkTy5NqdmfquW5/iepdmuFI2hOC61 GUOJFMYT/FnQjJ4r5hS5MKrrlzgJ6harGj2rhEKbZJTC3UfSS+Cms3j/k oyQBs/jtpSW9xh1od8IXHPENxHCCVmRP2XbACRDAEbGsA7O7CLz3POLzE GP7ayXzS2KUSauOFlyDu6uq4igdG+76C2j2LE24ZQigAB/X6uEBRb+HkL g==; X-IronPort-AV: E=McAfee;i="6600,9927,10811"; a="364491538" X-IronPort-AV: E=Sophos;i="6.01,195,1684825200"; d="scan'208";a="364491538" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2023 18:49:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10811"; a="806909384" X-IronPort-AV: E=Sophos;i="6.01,195,1684825200"; d="scan'208";a="806909384" Received: from shsensorbuild2.sh.intel.com ([10.239.134.197]) by fmsmga004.fm.intel.com with ESMTP; 23 Aug 2023 18:49:21 -0700 From: Wentong Wu To: sakari.ailus@linux.intel.com, linux-media@vger.kernel.org Cc: Wentong Wu Subject: [PATCH v1 1/3] media: ivsc: csi: remove name identifier Date: Thu, 24 Aug 2023 09:48:51 +0800 Message-Id: <1692841733-20766-1-git-send-email-wentong.wu@intel.com> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Remove name identifier to match the device with the defined UUID when load driver module. Signed-off-by: Wentong Wu --- drivers/media/pci/intel/ivsc/mei_csi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/pci/intel/ivsc/mei_csi.c b/drivers/media/pci/intel/ivsc/mei_csi.c index 264b85b..648c6a8 100644 --- a/drivers/media/pci/intel/ivsc/mei_csi.c +++ b/drivers/media/pci/intel/ivsc/mei_csi.c @@ -30,7 +30,6 @@ #include #include -#define MEI_CSI_DRIVER_NAME "ivsc_csi" #define MEI_CSI_ENTITY_NAME "Intel IVSC CSI" #define MEI_CSI_LINK_FREQ_400MHZ 400000000ULL @@ -804,14 +803,14 @@ static void mei_csi_remove(struct mei_cl_device *cldev) 0xAF, 0x93, 0x7b, 0x44, 0x53, 0xAC, 0x29, 0xDA) static const struct mei_cl_device_id mei_csi_tbl[] = { - { MEI_CSI_DRIVER_NAME, MEI_CSI_UUID, MEI_CL_VERSION_ANY }, + { .uuid = MEI_CSI_UUID, .version = MEI_CL_VERSION_ANY }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(mei, mei_csi_tbl); static struct mei_cl_driver mei_csi_driver = { .id_table = mei_csi_tbl, - .name = MEI_CSI_DRIVER_NAME, + .name = KBUILD_MODNAME, .probe = mei_csi_probe, .remove = mei_csi_remove, From patchwork Thu Aug 24 01:48:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Wentong" X-Patchwork-Id: 13363367 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DA8FC71153 for ; Thu, 24 Aug 2023 01:50:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239145AbjHXBuS (ORCPT ); Wed, 23 Aug 2023 21:50:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239237AbjHXBtr (ORCPT ); Wed, 23 Aug 2023 21:49:47 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E35B1733 for ; Wed, 23 Aug 2023 18:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692841767; x=1724377767; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=UJW4vGbeRBFsjcVSbIjIcDp4j+qb7q2e3F+Im+sDJes=; b=hwFbQlnIg8tmW5yscdMBoSJutLXVsxDSumyoUDD9l0tU5ias1e4oZn8G 3vIWyjdIqSzjL+yTQhFXnQ5dYevN3QkDA/dijNab00uGZod4EsGJNvKX9 NeihlvaWmUG3ljFGhuLhhZPaarVwkoHPFgSma3duOwVLp9hGIXoZ3dJCB DIWivlWm7p0QYHW71B6BG+O/Dx1o3M6T3tdvKarZmo9YZ2zm7NnpVHO6q aMmGu3RuTe4vAckqFpozuhasMRyC3ihaoaWP5md1q6Axz3zPPwcM4e//p s4ThxeNz8B0FhJiHHCr3BOHPP3HxPjxSClcjNiPEI39DFjZY2OcSAlMIs A==; X-IronPort-AV: E=McAfee;i="6600,9927,10811"; a="364491546" X-IronPort-AV: E=Sophos;i="6.01,195,1684825200"; d="scan'208";a="364491546" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2023 18:49:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10811"; a="806909395" X-IronPort-AV: E=Sophos;i="6.01,195,1684825200"; d="scan'208";a="806909395" Received: from shsensorbuild2.sh.intel.com ([10.239.134.197]) by fmsmga004.fm.intel.com with ESMTP; 23 Aug 2023 18:49:24 -0700 From: Wentong Wu To: sakari.ailus@linux.intel.com, linux-media@vger.kernel.org Cc: Wentong Wu Subject: [PATCH v1 2/3] media: ivsc: ace: remove name identifier Date: Thu, 24 Aug 2023 09:48:52 +0800 Message-Id: <1692841733-20766-2-git-send-email-wentong.wu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1692841733-20766-1-git-send-email-wentong.wu@intel.com> References: <1692841733-20766-1-git-send-email-wentong.wu@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Remove name identifier to match the device with the defined UUID when load driver module. Signed-off-by: Wentong Wu --- drivers/media/pci/intel/ivsc/mei_ace.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/pci/intel/ivsc/mei_ace.c b/drivers/media/pci/intel/ivsc/mei_ace.c index bc37f6d..7879f1f 100644 --- a/drivers/media/pci/intel/ivsc/mei_ace.c +++ b/drivers/media/pci/intel/ivsc/mei_ace.c @@ -30,8 +30,6 @@ #include #include -#define MEI_ACE_DRIVER_NAME "ivsc_ace" - /* indicating driver message */ #define ACE_DRV_MSG 1 /* indicating set command */ @@ -554,14 +552,14 @@ static const struct dev_pm_ops mei_ace_pm_ops = { 0x9B, 0x78, 0x03, 0x61, 0x63, 0x5E, 0x24, 0x47) static const struct mei_cl_device_id mei_ace_tbl[] = { - { MEI_ACE_DRIVER_NAME, MEI_ACE_UUID, MEI_CL_VERSION_ANY }, + { .uuid = MEI_ACE_UUID, .version = MEI_CL_VERSION_ANY }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(mei, mei_ace_tbl); static struct mei_cl_driver mei_ace_driver = { .id_table = mei_ace_tbl, - .name = MEI_ACE_DRIVER_NAME, + .name = KBUILD_MODNAME, .probe = mei_ace_probe, .remove = mei_ace_remove, From patchwork Thu Aug 24 01:48:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Wentong" X-Patchwork-Id: 13363366 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04E2BC6FA8F for ; Thu, 24 Aug 2023 01:50:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239151AbjHXBuT (ORCPT ); Wed, 23 Aug 2023 21:50:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239240AbjHXBtt (ORCPT ); Wed, 23 Aug 2023 21:49:49 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C9C5173C for ; Wed, 23 Aug 2023 18:49:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692841768; x=1724377768; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=WxEWwFHNYbneuY5PWO+87c3B+iFsJ163HcRWnFTiXFg=; b=CZi6tuwzhs/D9Nx/A4Ky8g6B56Dt0/JDGLhmcFuXFAgPyRCQrtxo/2qQ wUMWyQXcFGT2blDUPiFvTb39W3kRtuff2q3Cyj6IrRSVj+ZQGSvxj2nuO jaecwChOK6vuxSMDL6d9UvgCSc6UCHvR/CqUSp5aucqrXKAMT/ZusNGWC cqSCvt8NzNcrx1bxm4xwe25SUU6nxdHhkAOP8VwITrtx6hUtrMZdkUZoJ JfhTZBEkj+paBcRMYiQey4xG9cedaJ13KxxGRErPO5xeJ52uJjnu0IZq7 GauuICwKuHYkzeAu4nym6afHkzifgjTJzIOUr0Hw7q2JNwe/8nQ25AoMC g==; X-IronPort-AV: E=McAfee;i="6600,9927,10811"; a="364491555" X-IronPort-AV: E=Sophos;i="6.01,195,1684825200"; d="scan'208";a="364491555" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2023 18:49:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10811"; a="806909399" X-IronPort-AV: E=Sophos;i="6.01,195,1684825200"; d="scan'208";a="806909399" Received: from shsensorbuild2.sh.intel.com ([10.239.134.197]) by fmsmga004.fm.intel.com with ESMTP; 23 Aug 2023 18:49:26 -0700 From: Wentong Wu To: sakari.ailus@linux.intel.com, linux-media@vger.kernel.org Cc: Wentong Wu Subject: [PATCH v1 3/3] media: ivsc: ace: probe ace device after init IPU bridge Date: Thu, 24 Aug 2023 09:48:53 +0800 Message-Id: <1692841733-20766-3-git-send-email-wentong.wu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1692841733-20766-1-git-send-email-wentong.wu@intel.com> References: <1692841733-20766-1-git-send-email-wentong.wu@intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Probe ivsc ace device after IPU bridge has been initialized. Signed-off-by: Wentong Wu --- drivers/media/pci/intel/ivsc/mei_ace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/intel/ivsc/mei_ace.c b/drivers/media/pci/intel/ivsc/mei_ace.c index 7879f1f..504e96f 100644 --- a/drivers/media/pci/intel/ivsc/mei_ace.c +++ b/drivers/media/pci/intel/ivsc/mei_ace.c @@ -403,7 +403,7 @@ static int mei_ace_setup_dev_link(struct mei_ace *ace) snprintf(name, sizeof(name), "%s-%pUl", dev_name(dev->parent), &uuid); csi_dev = device_find_child_by_name(dev->parent, name); - if (!csi_dev) { + if (!csi_dev || !dev_fwnode(csi_dev)) { ret = -EPROBE_DEFER; goto err; }