public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Kishon Vijay Abraham I <kishon@ti.com>
To: <gregkh@linuxfoundation.org>
Cc: <kishon@ti.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 30/51] extcon: Add the support for the capability of each property
Date: Wed, 14 Sep 2016 13:14:11 +0530	[thread overview]
Message-ID: <1473839072-5673-31-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1473839072-5673-1-git-send-email-kishon@ti.com>

From: Chanwoo Choi <cw00.choi@samsung.com>

This patch adds the support of the property capability setting. This function
decides the supported properties of each external connector on extcon provider
driver.

Ths list of new extcon APIs to get/set the capability of property as following:
- int extcon_get_property_capability(struct extcon_dev *edev,
					unsigned int id, unsigned int prop);
- int extcon_set_property_capability(struct extcon_dev *edev,
					unsigned int id, unsigned int prop);

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Tested-by: Chris Zhong <zyw@rock-chips.com>
Tested-by: Guenter Roeck <groeck@chromium.org>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/extcon/extcon.c |  140 +++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/extcon.h  |   22 ++++++++
 2 files changed, 162 insertions(+)

diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c
index 37fa4b5..599fc37 100644
--- a/drivers/extcon/extcon.c
+++ b/drivers/extcon/extcon.c
@@ -201,6 +201,11 @@ struct extcon_cable {
 	union extcon_property_value chg_propval[EXTCON_PROP_CHG_CNT];
 	union extcon_property_value jack_propval[EXTCON_PROP_JACK_CNT];
 	union extcon_property_value disp_propval[EXTCON_PROP_DISP_CNT];
+
+	unsigned long usb_bits[BITS_TO_LONGS(EXTCON_PROP_USB_CNT)];
+	unsigned long chg_bits[BITS_TO_LONGS(EXTCON_PROP_CHG_CNT)];
+	unsigned long jack_bits[BITS_TO_LONGS(EXTCON_PROP_JACK_CNT)];
+	unsigned long disp_bits[BITS_TO_LONGS(EXTCON_PROP_DISP_CNT)];
 };
 
 static struct class *extcon_class;
@@ -297,6 +302,39 @@ static bool is_extcon_property_supported(unsigned int id, unsigned int prop)
 	return !!(extcon_info[id].type & type);
 }
 
+static int is_extcon_property_capability(struct extcon_dev *edev,
+				unsigned int id, int index,unsigned int prop)
+{
+	struct extcon_cable *cable;
+	int type, ret;
+
+	/* Check whether the property is supported or not. */
+	type = get_extcon_type(prop);
+	if (type < 0)
+		return type;
+
+	cable = &edev->cables[index];
+
+	switch (type) {
+	case EXTCON_TYPE_USB:
+		ret = test_bit(prop - EXTCON_PROP_USB_MIN, cable->usb_bits);
+		break;
+	case EXTCON_TYPE_CHG:
+		ret = test_bit(prop - EXTCON_PROP_CHG_MIN, cable->chg_bits);
+		break;
+	case EXTCON_TYPE_JACK:
+		ret = test_bit(prop - EXTCON_PROP_JACK_MIN, cable->jack_bits);
+		break;
+	case EXTCON_TYPE_DISP:
+		ret = test_bit(prop - EXTCON_PROP_DISP_MIN, cable->disp_bits);
+		break;
+	default:
+		ret = -EINVAL;
+	}
+
+	return ret;
+}
+
 static void init_property(struct extcon_dev *edev, unsigned int id, int index)
 {
 	unsigned int type = extcon_info[id].type;
@@ -554,6 +592,12 @@ int extcon_get_property(struct extcon_dev *edev, unsigned int id,
 
 	spin_lock_irqsave(&edev->lock, flags);
 
+	/* Check whether the property is available or not. */
+	if (!is_extcon_property_capability(edev, id, index, prop)) {
+		spin_unlock_irqrestore(&edev->lock, flags);
+		return -EPERM;
+	}
+
 	/*
 	 * Check whether the external connector is attached.
 	 * If external connector is detached, the user can not
@@ -626,6 +670,12 @@ int extcon_set_property(struct extcon_dev *edev, unsigned int id,
 
 	spin_lock_irqsave(&edev->lock, flags);
 
+	/* Check whether the property is available or not. */
+	if (!is_extcon_property_capability(edev, id, index, prop)) {
+		spin_unlock_irqrestore(&edev->lock, flags);
+		return -EPERM;
+	}
+
 	cable = &edev->cables[index];
 
 	/* Set the property value according to extcon type */
@@ -654,6 +704,96 @@ int extcon_set_property(struct extcon_dev *edev, unsigned int id,
 EXPORT_SYMBOL_GPL(extcon_set_property);
 
 /**
+ * extcon_get_property_capability() - Get the capability of property
+ *			of an external connector.
+ * @edev:		the extcon device that has the cable.
+ * @id:			the unique id of each external connector
+ *			in extcon enumeration.
+ * @prop:		the property id among enum extcon_property.
+ *
+ * Returns 1 if the property is available or 0 if not available.
+ */
+int extcon_get_property_capability(struct extcon_dev *edev, unsigned int id,
+					unsigned int prop)
+{
+	int index;
+
+	if (!edev)
+		return -EINVAL;
+
+	/* Check whether the property is supported or not */
+	if (!is_extcon_property_supported(id, prop))
+		return -EINVAL;
+
+	/* Find the cable index of external connector by using id */
+	index = find_cable_index_by_id(edev, id);
+	if (index < 0)
+		return index;
+
+	return is_extcon_property_capability(edev, id, index, prop);
+}
+EXPORT_SYMBOL_GPL(extcon_get_property_capability);
+
+/**
+ * extcon_set_property_capability() - Set the capability of a property
+ *			of an external connector.
+ * @edev:		the extcon device that has the cable.
+ * @id:			the unique id of each external connector
+ *			in extcon enumeration.
+ * @prop:		the property id among enum extcon_property.
+ *
+ * This function set the capability of a property for an external connector
+ * to mark the bit in capability bitmap which mean the available state of
+ * a property.
+ *
+ * Returns 0 if success or error number if fail
+ */
+int extcon_set_property_capability(struct extcon_dev *edev, unsigned int id,
+					unsigned int prop)
+{
+	struct extcon_cable *cable;
+	int index, type, ret = 0;
+
+	if (!edev)
+		return -EINVAL;
+
+	/* Check whether the property is supported or not. */
+	if (!is_extcon_property_supported(id, prop))
+		return -EINVAL;
+
+	/* Find the cable index of external connector by using id. */
+	index = find_cable_index_by_id(edev, id);
+	if (index < 0)
+		return index;
+
+	type = get_extcon_type(prop);
+	if (type < 0)
+		return type;
+
+	cable = &edev->cables[index];
+
+	switch (type) {
+	case EXTCON_TYPE_USB:
+		__set_bit(prop - EXTCON_PROP_USB_MIN, cable->usb_bits);
+		break;
+	case EXTCON_TYPE_CHG:
+		__set_bit(prop - EXTCON_PROP_CHG_MIN, cable->chg_bits);
+		break;
+	case EXTCON_TYPE_JACK:
+		__set_bit(prop - EXTCON_PROP_JACK_MIN, cable->jack_bits);
+		break;
+	case EXTCON_TYPE_DISP:
+		__set_bit(prop - EXTCON_PROP_DISP_MIN, cable->disp_bits);
+		break;
+	default:
+		ret = -EINVAL;
+	}
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(extcon_set_property_capability);
+
+/**
  * extcon_get_extcon_dev() - Get the extcon device instance from the name
  * @extcon_name:	The extcon name provided with extcon_dev_register()
  */
diff --git a/include/linux/extcon.h b/include/linux/extcon.h
index f9d4a44..f084690 100644
--- a/include/linux/extcon.h
+++ b/include/linux/extcon.h
@@ -235,6 +235,16 @@ extern int extcon_set_property(struct extcon_dev *edev, unsigned int id,
 				union extcon_property_value prop_val);
 
 /*
+ * get/set_property_capability set the capability of the property for each
+ * external connector. They are used to set the capability of the property
+ * of each external connector based on the id and property.
+ */
+extern int extcon_get_property_capability(struct extcon_dev *edev,
+				unsigned int id, unsigned int prop);
+extern int extcon_set_property_capability(struct extcon_dev *edev,
+				unsigned int id, unsigned int prop);
+
+/*
  * Following APIs are to monitor every action of a notifier.
  * Registrar gets notified for every external port of a connection device.
  * Probably this could be used to debug an action of notifier; however,
@@ -320,6 +330,18 @@ static inline int extcon_set_property(struct extcon_dev *edev, unsigned int id,
 	return 0;
 }
 
+static inline int extcon_get_property_capability(struct extcon_dev *edev,
+					unsigned int id, unsigned int prop)
+{
+	return 0;
+}
+
+static inline int extcon_set_property_capability(struct extcon_dev *edev,
+					unsigned int id, unsigned int prop)
+{
+	return 0;
+}
+
 static inline struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name)
 {
 	return NULL;
-- 
1.7.9.5

  parent reply	other threads:[~2016-09-14  7:50 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-14  7:43 [GIT PULL] phy: for 4.9 Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 01/51] phy: exynos5-usbdrd: Remove "static" from local variable Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 02/51] dt: bindings: add bindings for Allwinner A64 usb phy Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 03/51] phy: sun4i: add support for " Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 04/51] phy: bcm-ns-usb3: new driver for USB 3.0 PHY on Northstar Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 05/51] phy: qcom-ufs: use of_property_read_bool Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 06/51] Documentation: bindings: add DT documentation for Rockchip USB2PHY Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 07/51] phy: rockchip-inno-usb2: add a new driver for Rockchip usb2phy Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 08/51] Documentation: bindings: add dt documentation for Rockchip PCIe PHY Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 09/51] phy: add a driver for the Rockchip SoC internal " Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 10/51] phy: tegra: add missing header dependencies Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 11/51] phy: tegra: mark tegra_xusb_lane_lookup_function() static Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 12/51] phy: bcm-ns2-pcie: Get rid of struct ns2_pci_phy Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 13/51] phy: bcm-ns2-pcie: Set missing .owner field in ns2_pci_phy_ops Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 14/51] phy: rcar-gen3-usb2: revise the example of device tree doc Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 15/51] phy: rcar-gen3-usb2: Add a compatible string for r8a7796 Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 16/51] phy: omap-usb2: support suspend/resume Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 17/51] dt-bindings: phy: ti: add documentation for ti,dra7x-usb2 Kishon Vijay Abraham I
2016-09-14  7:43 ` [PATCH 18/51] phy: rockchip-inno-usb2: add COMMON_CLK dependency Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 19/51] extcon: adc-jack: update cable state during boot Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 20/51] extcon: Move extcon_get_edev_by_phandle() errors to dbg level Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 21/51] extcon: arizona: Remove unneeded semi-colon Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 22/51] extcon: arizona: Remove the usage of extcon_update_state() Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 23/51] extcon: adc-jack: Remove the usage of extcon_set_state() Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 24/51] extcon: gpio: " Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 25/51] extcon: Remove the state_store() to prevent the wrong access Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 26/51] extcon: Block the bit masking operation for cable state except for extcon core Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 27/51] extcon: Fix compile time warning Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 28/51] extcon: Add the extcon_type to gather each connector into five category Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 29/51] extcon: Add the support for extcon property according to extcon type Kishon Vijay Abraham I
2016-09-14  7:44 ` Kishon Vijay Abraham I [this message]
2016-09-14  7:44 ` [PATCH 31/51] extcon: Rename the extcon_set/get_state() to maintain the function naming pattern Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 32/51] extcon: Add the synchronization extcon APIs to support the notification Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 33/51] extcon: Add EXTCON_DISP_DP and the property for USB Type-C Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 34/51] extcon: Add new EXTCON_DISP_HMD for Head-mounted Display device Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 35/51] extcon: Add new EXTCON_CHG_WPT for Wireless Power Transfer device Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 36/51] extcon: Introduce EXTCON_PROP_USB_SS property for SuperSpeed mode Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 37/51] phy: da8xx-usb: Fix syscon device name Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 38/51] phy: Add USB Type-C PHY driver for rk3399 Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 39/51] Documentation: bindings: add dt doc for Rockchip USB Type-C PHY Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 40/51] usb: phy: add USB_SUPPORT dependency Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 41/51] phy: rockchip-typec: add pm runtime support Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 42/51] phy-sun4i-usb: Use bool where appropriate Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 43/51] phy-sun4i-usb: Refactor forced session ending Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 44/51] phy-sun4i-usb: Simplify missing dr_mode handling Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 45/51] phy-sun4i-usb: Add support for phy_set_mode Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 46/51] phy-sun4i-usb: Warn when external vbus is detected Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 47/51] phy: Add reset callback Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 48/51] phy: rockchip-usb: use rockchip_usb_phy_reset to reset phy during wakeup Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 49/51] phy: sun4i-usb: Use spinlock to guard phyctl register access Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 50/51] phy-twl4030-usb: better handle musb_mailbox() failure Kishon Vijay Abraham I
2016-09-14  7:44 ` [PATCH 51/51] phy-twl4030-usb: initialize charging-related stuff via pm_runtime Kishon Vijay Abraham I
2016-09-15  8:38 ` [GIT PULL] phy: for 4.9 Greg KH
2016-09-15 10:22   ` Kishon Vijay Abraham I
2016-09-15 10:36     ` Greg KH
2016-09-15 10:56       ` Kishon Vijay Abraham I
2016-09-15 11:13         ` Kishon Vijay Abraham I

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1473839072-5673-31-git-send-email-kishon@ti.com \
    --to=kishon@ti.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox