From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933771AbdC3MPu (ORCPT ); Thu, 30 Mar 2017 08:15:50 -0400 Received: from mga02.intel.com ([134.134.136.20]:25481 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933665AbdC3MPq (ORCPT ); Thu, 30 Mar 2017 08:15:46 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,246,1486454400"; d="scan'208";a="840018171" From: Wu Hao To: atull@kernel.org, moritz.fischer@ettus.com, linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org Cc: luwei.kang@intel.com, yi.z.zhang@intel.com, hao.wu@intel.com, Tim Whisonant , Enno Luebbers , Shiva Rao , Christopher Rauer , Xiao Guangrong Subject: [PATCH 06/16] fpga: intel: pcie: adds fpga_for_each_port callback for fme device Date: Thu, 30 Mar 2017 20:08:06 +0800 Message-Id: <1490875696-15145-7-git-send-email-hao.wu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490875696-15145-1-git-send-email-hao.wu@intel.com> References: <1490875696-15145-1-git-send-email-hao.wu@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For FPGA Management Engine (FME), it requires fpga_for_each_port callback for actions on ports, so export this function from PCIe driver by adding the callback to the platform data. Signed-off-by: Tim Whisonant Signed-off-by: Enno Luebbers Signed-off-by: Shiva Rao Signed-off-by: Christopher Rauer Signed-off-by: Xiao Guangrong Signed-off-by: Wu Hao --- drivers/fpga/intel/feature-dev.h | 9 +++++++++ drivers/fpga/intel/pcie.c | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/drivers/fpga/intel/feature-dev.h b/drivers/fpga/intel/feature-dev.h index d1723ff..38531f8 100644 --- a/drivers/fpga/intel/feature-dev.h +++ b/drivers/fpga/intel/feature-dev.h @@ -221,6 +221,9 @@ struct feature_platform_data { struct platform_device *dev; unsigned int disable_count; /* count for port disable */ + struct platform_device *(*fpga_for_each_port)(struct platform_device *, + void *, int (*match)(struct platform_device *, void *)); + int num; /* number of features */ struct feature features[0]; }; @@ -335,6 +338,12 @@ get_feature_ioaddr_by_index(struct device *dev, int index) return pdata->features[index].ioaddr; } +static inline struct device * +fpga_feature_dev_to_pcidev(struct platform_device *dev) +{ + return dev->dev.parent->parent; +} + /* * Wait register's _field to be changed to the given value (_expect's _field) * by polling with given interval and timeout. diff --git a/drivers/fpga/intel/pcie.c b/drivers/fpga/intel/pcie.c index e3440ca..f2b458d 100644 --- a/drivers/fpga/intel/pcie.c +++ b/drivers/fpga/intel/pcie.c @@ -211,6 +211,27 @@ static int parse_switch_to(struct build_feature_devs_info *binfo, int bar) return parse_start_from(binfo, bar); } +static struct platform_device *fpga_for_each_port(struct platform_device *pdev, + void *data, int (*match)(struct platform_device *, void *)) +{ + struct device *pci_dev = fpga_feature_dev_to_pcidev(pdev); + struct cci_drvdata *drvdata = dev_get_drvdata(pci_dev); + struct feature_platform_data *pdata; + struct platform_device *port_dev; + + mutex_lock(&drvdata->lock); + list_for_each_entry(pdata, &drvdata->port_dev_list, node) { + port_dev = pdata->dev; + + if (match(port_dev, data) && get_device(&port_dev->dev)) + goto exit; + } + port_dev = NULL; +exit: + mutex_unlock(&drvdata->lock); + return port_dev; +} + static struct build_feature_devs_info * build_info_alloc_and_init(struct pci_dev *pdev) { @@ -312,6 +333,9 @@ build_info_create_dev(struct build_feature_devs_info *binfo, if (!pdata) return -ENOMEM; + if (type == FME_ID) + pdata->fpga_for_each_port = fpga_for_each_port; + /* * the count should be initialized to 0 to make sure *__fpga_port_enable() following __fpga_port_disable() -- 2.7.4