From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CC2BC63777 for ; Mon, 30 Nov 2020 23:09:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB3B52076C for ; Mon, 30 Nov 2020 23:09:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731135AbgK3XJo (ORCPT ); Mon, 30 Nov 2020 18:09:44 -0500 Received: from mga14.intel.com ([192.55.52.115]:58432 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730406AbgK3XJn (ORCPT ); Mon, 30 Nov 2020 18:09:43 -0500 IronPort-SDR: fEG9BHuoDWqKtklrbR+EW1XV7PYlrcfMJ/lPZxOfkVGdL6etciar65abF/NzZcKBBoUkFrfrc7 V8gip67WxpYQ== X-IronPort-AV: E=McAfee;i="6000,8403,9821"; a="171941909" X-IronPort-AV: E=Sophos;i="5.78,382,1599548400"; d="scan'208";a="171941909" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2020 15:07:11 -0800 IronPort-SDR: /AXY+sFS6tCv/Y1zXDuYn4aeD8rIgKEGlFKE8RAhKXhyCiNGqTo29ja5nWDUhUTNCmv0o5QGM3 iLgRZvQ56ZIg== X-IronPort-AV: E=Sophos;i="5.78,382,1599548400"; d="scan'208";a="364436864" Received: from smtp.ostc.intel.com ([10.54.29.231]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2020 15:07:10 -0800 Received: from mtg-dev (mtg-dev.jf.intel.com [10.54.74.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.ostc.intel.com (Postfix) with ESMTPS id CA81A636E; Mon, 30 Nov 2020 15:07:10 -0800 (PST) Received: from mgross by mtg-dev with local (Exim 4.90_1) (envelope-from ) id 1kjsGE-000C5N-Lx; Mon, 30 Nov 2020 15:07:10 -0800 From: mgross@linux.intel.com To: linux-kernel@vger.kernel.org Cc: markgross@kernel.org, mgross@linux.intel.com, adam.r.gretzinger@intel.com, Srikanth Thokala , Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH 14/22] misc: xlink-pcie: Add asynchronous event notification support for XLink Date: Mon, 30 Nov 2020 15:06:59 -0800 Message-Id: <20201130230707.46351-15-mgross@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201130230707.46351-1-mgross@linux.intel.com> References: <20201130230707.46351-1-mgross@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srikanth Thokala Add support to notify XLink layer upon PCIe link UP/DOWN events Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Reviewed-by: Mark Gross Signed-off-by: Srikanth Thokala --- drivers/misc/xlink-pcie/common/core.h | 3 ++ drivers/misc/xlink-pcie/common/interface.c | 17 ++++++++++ drivers/misc/xlink-pcie/local_host/core.c | 11 +++++++ drivers/misc/xlink-pcie/remote_host/main.c | 3 ++ drivers/misc/xlink-pcie/remote_host/pci.c | 36 ++++++++++++++++++++++ drivers/misc/xlink-pcie/remote_host/pci.h | 3 ++ include/linux/xlink_drv_inf.h | 12 ++++++++ 7 files changed, 85 insertions(+) diff --git a/drivers/misc/xlink-pcie/common/core.h b/drivers/misc/xlink-pcie/common/core.h index eec8566c19d9..34b6c268aac5 100644 --- a/drivers/misc/xlink-pcie/common/core.h +++ b/drivers/misc/xlink-pcie/common/core.h @@ -241,4 +241,7 @@ int intel_xpcie_pci_connect_device(u32 id); int intel_xpcie_pci_read(u32 id, void *data, size_t *size, u32 timeout); int intel_xpcie_pci_write(u32 id, void *data, size_t *size, u32 timeout); int intel_xpcie_pci_reset_device(u32 id); +int intel_xpcie_pci_register_device_event(u32 sw_device_id, + xlink_device_event event_notif_fn); +int intel_xpcie_pci_unregister_device_event(u32 sw_device_id); #endif /* XPCIE_CORE_HEADER_ */ diff --git a/drivers/misc/xlink-pcie/common/interface.c b/drivers/misc/xlink-pcie/common/interface.c index 56c1d9ed9d8f..4ad291ff97c8 100644 --- a/drivers/misc/xlink-pcie/common/interface.c +++ b/drivers/misc/xlink-pcie/common/interface.c @@ -107,3 +107,20 @@ int xlink_pcie_reset_device(u32 sw_device_id) return intel_xpcie_pci_reset_device(sw_device_id); } EXPORT_SYMBOL(xlink_pcie_reset_device); + +int xlink_pcie_register_device_event(u32 sw_device_id, + xlink_device_event event_notif_fn) +{ + if (!event_notif_fn) + return -EINVAL; + + return intel_xpcie_pci_register_device_event(sw_device_id, + event_notif_fn); +} +EXPORT_SYMBOL(xlink_pcie_register_device_event); + +int xlink_pcie_unregister_device_event(u32 sw_device_id) +{ + return intel_xpcie_pci_unregister_device_event(sw_device_id); +} +EXPORT_SYMBOL(xlink_pcie_unregister_device_event); diff --git a/drivers/misc/xlink-pcie/local_host/core.c b/drivers/misc/xlink-pcie/local_host/core.c index 0f83b5ffc4f2..628c383113ca 100644 --- a/drivers/misc/xlink-pcie/local_host/core.c +++ b/drivers/misc/xlink-pcie/local_host/core.c @@ -892,3 +892,14 @@ int intel_xpcie_pci_reset_device(u32 id) { return 0; } + +int intel_xpcie_pci_register_device_event(u32 sw_device_id, + xlink_device_event event_notif_fn) +{ + return 0; +} + +int intel_xpcie_pci_unregister_device_event(u32 sw_device_id) +{ + return 0; +} diff --git a/drivers/misc/xlink-pcie/remote_host/main.c b/drivers/misc/xlink-pcie/remote_host/main.c index 810da1509418..421635321f1b 100644 --- a/drivers/misc/xlink-pcie/remote_host/main.c +++ b/drivers/misc/xlink-pcie/remote_host/main.c @@ -55,6 +55,8 @@ static int intel_xpcie_probe(struct pci_dev *pdev, if (new_device) intel_xpcie_list_add_device(xdev); + intel_xpcie_pci_notify_event(xdev, NOTIFY_DEVICE_CONNECTED); + return ret; } @@ -64,6 +66,7 @@ static void intel_xpcie_remove(struct pci_dev *pdev) if (xdev) { intel_xpcie_pci_cleanup(xdev); + intel_xpcie_pci_notify_event(xdev, NOTIFY_DEVICE_DISCONNECTED); intel_xpcie_remove_device(xdev); } } diff --git a/drivers/misc/xlink-pcie/remote_host/pci.c b/drivers/misc/xlink-pcie/remote_host/pci.c index f92a78f41324..0046bff5f604 100644 --- a/drivers/misc/xlink-pcie/remote_host/pci.c +++ b/drivers/misc/xlink-pcie/remote_host/pci.c @@ -8,6 +8,7 @@ ****************************************************************************/ #include +#include #include #include #include @@ -487,3 +488,38 @@ int intel_xpcie_pci_reset_device(u32 id) return intel_xpcie_pci_prepare_dev_reset(xdev, true); } + +int intel_xpcie_pci_register_device_event(u32 sw_device_id, + xlink_device_event event_notif_fn) +{ + struct xpcie_dev *xdev = intel_xpcie_get_device_by_id(sw_device_id); + + if (!xdev) + return -ENOMEM; + + xdev->event_fn = event_notif_fn; + + return 0; +} + +int intel_xpcie_pci_unregister_device_event(u32 sw_device_id) +{ + struct xpcie_dev *xdev = intel_xpcie_get_device_by_id(sw_device_id); + + if (!xdev) + return -ENOMEM; + + xdev->event_fn = NULL; + + return 0; +} + +void intel_xpcie_pci_notify_event(struct xpcie_dev *xdev, + enum xlink_device_event_type event_type) +{ + if (event_type >= NUM_EVENT_TYPE) + return; + + if (xdev->event_fn) + xdev->event_fn(xdev->devid, event_type); +} diff --git a/drivers/misc/xlink-pcie/remote_host/pci.h b/drivers/misc/xlink-pcie/remote_host/pci.h index 72de3701f83a..a05dedf36a12 100644 --- a/drivers/misc/xlink-pcie/remote_host/pci.h +++ b/drivers/misc/xlink-pcie/remote_host/pci.h @@ -38,6 +38,7 @@ struct xpcie_dev { irq_handler_t core_irq_callback; struct xpcie xpcie; + xlink_device_event event_fn; }; static inline struct device *xpcie_to_dev(struct xpcie *xpcie) @@ -60,5 +61,7 @@ struct xpcie_dev *intel_xpcie_create_device(u32 sw_device_id, void intel_xpcie_remove_device(struct xpcie_dev *xdev); void intel_xpcie_list_add_device(struct xpcie_dev *xdev); void intel_xpcie_list_del_device(struct xpcie_dev *xdev); +void intel_xpcie_pci_notify_event(struct xpcie_dev *xdev, + enum xlink_device_event_type event_type); #endif /* XPCIE_PCI_HEADER_ */ diff --git a/include/linux/xlink_drv_inf.h b/include/linux/xlink_drv_inf.h index ffe8f4c253e6..5ca0ae1ae2e3 100644 --- a/include/linux/xlink_drv_inf.h +++ b/include/linux/xlink_drv_inf.h @@ -44,6 +44,15 @@ enum _xlink_device_status { _XLINK_DEV_READY }; +enum xlink_device_event_type { + NOTIFY_DEVICE_DISCONNECTED, + NOTIFY_DEVICE_CONNECTED, + NUM_EVENT_TYPE +}; + +typedef int (*xlink_device_event)(u32 sw_device_id, + enum xlink_device_event_type event_type); + int xlink_pcie_get_device_list(u32 *sw_device_id_list, u32 *num_devices); int xlink_pcie_get_device_name(u32 sw_device_id, char *device_name, @@ -57,4 +66,7 @@ int xlink_pcie_read(u32 sw_device_id, void *data, size_t *const size, int xlink_pcie_write(u32 sw_device_id, void *data, size_t *const size, u32 timeout); int xlink_pcie_reset_device(u32 sw_device_id); +int xlink_pcie_register_device_event(u32 sw_device_id, + xlink_device_event event_notif_fn); +int xlink_pcie_unregister_device_event(u32 sw_device_id); #endif -- 2.17.1