From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932155AbcHBB71 (ORCPT ); Mon, 1 Aug 2016 21:59:27 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:41587 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755709AbcHBB6c (ORCPT ); Mon, 1 Aug 2016 21:58:32 -0400 X-AuditID: cbfee68d-f79286d000007a9a-35-579ffe440ed3 From: Chanwoo Choi To: linux-kernel@vger.kernel.org Cc: cw00.choi@samsung.com, myungjoo.ham@samsung.com, zyw@rock-chips.com, groeck@chromium.org, rogerq@ti.com, chanwoo@kernel.org Subject: [PATCH v3 3/6] extcon: Add the support for the capability of each property Date: Tue, 02 Aug 2016 10:58:22 +0900 Message-id: <1470103105-5992-4-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.0 In-reply-to: <1470103105-5992-1-git-send-email-cw00.choi@samsung.com> References: <1470103105-5992-1-git-send-email-cw00.choi@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHLMWRmVeSWpSXmKPExsWyRsSkQNfl3/xwg6X7BS0m3rjCYnH9y3NW i1OvljFbXN41h83iduMKNoueR1oW8x/sYHZg95jdcJHFY9OqTjaPv7P2s3j0bVnF6HH8xnYm j8+b5ALYorhsUlJzMstSi/TtErgy7k0SLFhmV7H52zrGBsZfRl2MnBwSAiYSu9/OY4SwxSQu 3FvP1sXIxSEksIJR4vfZFewwRW2/FjFDJGYxSqw9M5cZJCEk8IVR4tXTGhCbTUBLYv+LG2wg toiAgsTm3mesIDazQCOjxO0lCSC2sECoxKNbF5lAbBYBVYnPZ3rA5vAKuEgc/tHADLFMTuLD nkdgizkFXCV2793KCrHLRWL78T2sIEdICCxil/h36zobxCABiW+TD7F0MXIAJWQlNh2AmiMp cXDFDZYJjMILGBlWMYqmFiQXFCelFxnqFSfmFpfmpesl5+duYgQG++l/z3p3MN4+YH2IUYCD UYmHNyB3frgQa2JZcWXuIUZToA0TmaVEk/OBMZVXEm9obGZkYWpiamxkbmmmJM6rKPUzWEgg PbEkNTs1tSC1KL6oNCe1+BAjEwenVAPjgRfhp1+VvFtv7Kzc9fAwp++OpMpY2/JXnLNZef5+ Xtzrtilf47HRqsK9ZRw/+mebn9PKCjW+my70sVC166TuUUfu25N4JoeJdO94m37JvYHX5uxh gwNtPd+jc3hSklK35k7N+5egYGi4Y9FnCf3XXhKxzTNMu0Wzdvk9ZlrL9uFL+apZD/4qsRRn JBpqMRcVJwIA3X/u5nECAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRmVeSWpSXmKPExsVy+t9jQV2Xf/PDDd7N4LaYeOMKi8X1L89Z LU69WsZscXnXHDaL240r2Cx6HmlZzH+wg9mB3WN2w0UWj02rOtk8/s7az+LRt2UVo8fxG9uZ PD5vkgtgi2pgtMlITUxJLVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLxCdB1 y8wBukVJoSwxpxQoFJBYXKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjDmHFvkmDBMruKzd/W MTYw/jLqYuTkkBAwkWj7tYgZwhaTuHBvPVsXIxeHkMAsRom1Z+aCJYQEvjBKvHpaA2KzCWhJ 7H9xgw3EFhFQkNjc+4wVxGYWaGSUuL0kAcQWFgiVeHTrIhOIzSKgKvH5TA/YHF4BF4nDPxqg lslJfNjziB3E5hRwldi9dysrxC4Xie3H97BOYORdwMiwilEitSC5oDgpPdcwL7Vcrzgxt7g0 L10vOT93EyM4op5J7WA8uMv9EKMAB6MSD6/Fu/nhQqyJZcWVuYcYJTiYlUR4M/4AhXhTEiur Uovy44tKc1KLDzGaAh02kVlKNDkfGO15JfGGxiZmRpZG5oYWRsbmSuK8j/+vCxMSSE8sSc1O TS1ILYLpY+LglGpg9JhZUN978aFqr9Sfdg1T/4vrY1KZ7Lc/X/FD1UzGa/rMIzsWVK9J/DNz gYJfpnDziemvQ3+eFm2fFN3merGD5fHvw3uXWPXxfPM5Ffi0uvl/0uQ/fWv3bt3id7Qx4/O/ wDqzGeYxGke3av7y3c165facEyH72APX2Mz+t2BDUL1D9qv9NnamQkosxRmJhlrMRcWJAARO F6e+AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Tested-by: Chris Zhong Tested-by: Guenter Roeck Reviewed-by: Guenter Roeck --- drivers/extcon/extcon.c | 141 ++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/extcon.h | 22 ++++++++ 2 files changed, 163 insertions(+) diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c index bb6e99fe84c8..7ae0771f29e7 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,97 @@ 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; + + /* 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: + __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 fe583fca7732..ffd32a8975d5 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -240,6 +240,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, @@ -325,6 +335,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.9.1