Received: by 2002:ac0:aed5:0:0:0:0:0 with SMTP id t21csp1049217imb; Sat, 2 Mar 2019 01:08:37 -0800 (PST) X-Google-Smtp-Source: APXvYqwVEmnvPMZREDmYbGLtiv7njncbJBXvOeieVLyoq0qQHPgld7I8U+M0nq1GrTEN3wsJDgHV X-Received: by 2002:a62:1283:: with SMTP id 3mr10228820pfs.122.1551517717602; Sat, 02 Mar 2019 01:08:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551517717; cv=none; d=google.com; s=arc-20160816; b=gtPJKFqBHUvL0D8SPASBjOYmSjymYXvRiwRE/W68vrAs9+JlDDoNATxOWpWFXnynB3 CxVq8y8IbD4svun22HszBRifazspJxq326aPLjq74MjPLFJdAfRfRewxqz8udp21yk5S D0drjrhEps9Gx14BXGTPWJkxmtUOdTmfHoOhsR0OLomkNTKwyRGuSspfZ5mh4sqfpWIS jykuDuw1d2qTWKZkbf6BLpKCh8wmjkloontN8LPtVN6qshLzVfaZUgE13aR4MDjagDZ6 +4TFkORl7iEWMIam1P+6BNc+DZ87i+Iqt5RVxkVU5k2f94Gln2EGrc5mrl/+EoRvLiIt zTDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=2F1+jDa7SVOoJoZMoiptFjFHfl7NxuamG32BcKIMG9c=; b=Gc2Rdw93bK+NouX4zvH7HpRz5AQD9QeEx8Rwxcx70Wy1KK7gK/ETqOYdb2F6bYqYH7 CDjDmy/IY7cigd8GB3Vj6fSP74IfFI5B4e4uSE1iUFjZc3oGUEcKoeZKmSsGOIlKfwYz SmK+HbzxCXZRR+M1mhzIGunjGj7LL/lkGLByByEhB/9dGnK3NHLaQjyeRwvGxLtGCwBR GB0IBwMGQb+UfVYHEGDgYGuZZWmMgbiqextxzWeV1h3jb4C96YcEXr4mPd/3whmX0o0j uDLCp9dz3gdzQdg6yy7nwPFx+EFlXthvG7J5pT3/ySvscvxxNvuqD1xvm40GmaSiN9Ts Xpjw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g4si278251plm.184.2019.03.02.01.08.22; Sat, 02 Mar 2019 01:08:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727954AbfCBJFo (ORCPT + 99 others); Sat, 2 Mar 2019 04:05:44 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:4196 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727721AbfCBJFk (ORCPT ); Sat, 2 Mar 2019 04:05:40 -0500 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id CC1CE67C0FBFF9400ED5; Sat, 2 Mar 2019 17:05:35 +0800 (CST) Received: from vm100-107-113-134.huawei.com (100.107.113.134) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.408.0; Sat, 2 Mar 2019 17:05:29 +0800 From: Yu Chen To: , , CC: , , , , , , , , , , , , , , Yu Chen , "Greg Kroah-Hartman" , Heikki Krogerus , Hans de Goede , "Andy Shevchenko" Subject: [PATCH v3 08/12] usb: roles: Add usb role switch notifier. Date: Sat, 2 Mar 2019 17:05:01 +0800 Message-ID: <20190302090505.65542-9-chenyu56@huawei.com> X-Mailer: git-send-email 2.15.0-rc2 In-Reply-To: <20190302090505.65542-1-chenyu56@huawei.com> References: <20190302090505.65542-1-chenyu56@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [100.107.113.134] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds notifier for drivers want to be informed of the usb role switch. Cc: Greg Kroah-Hartman Cc: Heikki Krogerus Cc: Hans de Goede Cc: Andy Shevchenko Cc: John Stultz Suggested-by: Heikki Krogerus Signed-off-by: Yu Chen --- drivers/usb/roles/class.c | 20 +++++++++++++++++++- include/linux/usb/role.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c index f45d8df5cfb8..e2caaa665d6e 100644 --- a/drivers/usb/roles/class.c +++ b/drivers/usb/roles/class.c @@ -20,6 +20,7 @@ struct usb_role_switch { struct device dev; struct mutex lock; /* device lock*/ enum usb_role role; + struct blocking_notifier_head nh; /* From descriptor */ struct device *usb2_port; @@ -49,8 +50,10 @@ int usb_role_switch_set_role(struct usb_role_switch *sw, enum usb_role role) mutex_lock(&sw->lock); ret = sw->set(sw->dev.parent, role); - if (!ret) + if (!ret) { sw->role = role; + blocking_notifier_call_chain(&sw->nh, role, NULL); + } mutex_unlock(&sw->lock); @@ -58,6 +61,20 @@ int usb_role_switch_set_role(struct usb_role_switch *sw, enum usb_role role) } EXPORT_SYMBOL_GPL(usb_role_switch_set_role); +int usb_role_switch_register_notifier(struct usb_role_switch *sw, + struct notifier_block *nb) +{ + return blocking_notifier_chain_register(&sw->nh, nb); +} +EXPORT_SYMBOL_GPL(usb_role_switch_register_notifier); + +int usb_role_switch_unregister_notifier(struct usb_role_switch *sw, + struct notifier_block *nb) +{ + return blocking_notifier_chain_unregister(&sw->nh, nb); +} +EXPORT_SYMBOL_GPL(usb_role_switch_unregister_notifier); + /** * usb_role_switch_get_role - Get the USB role for a switch * @sw: USB role switch @@ -271,6 +288,7 @@ usb_role_switch_register(struct device *parent, return ERR_PTR(-ENOMEM); mutex_init(&sw->lock); + BLOCKING_INIT_NOTIFIER_HEAD(&sw->nh); sw->allow_userspace_control = desc->allow_userspace_control; sw->usb2_port = desc->usb2_port; diff --git a/include/linux/usb/role.h b/include/linux/usb/role.h index 9684a8734757..9e1ca663387a 100644 --- a/include/linux/usb/role.h +++ b/include/linux/usb/role.h @@ -41,6 +41,8 @@ struct usb_role_switch_desc { bool allow_userspace_control; }; + +#if IS_ENABLED(CONFIG_USB_ROLE_SWITCH) int usb_role_switch_set_role(struct usb_role_switch *sw, enum usb_role role); enum usb_role usb_role_switch_get_role(struct usb_role_switch *sw); struct usb_role_switch *usb_role_switch_get(struct device *dev); @@ -50,5 +52,49 @@ struct usb_role_switch * usb_role_switch_register(struct device *parent, const struct usb_role_switch_desc *desc); void usb_role_switch_unregister(struct usb_role_switch *sw); +int usb_role_switch_register_notifier(struct usb_role_switch *sw, + struct notifier_block *nb); +int usb_role_switch_unregister_notifier(struct usb_role_switch *sw, + struct notifier_block *nb); +#else +static inline int usb_role_switch_set_role(struct usb_role_switch *sw, + enum usb_role role) +{ + return 0; +} + +static inline enum usb_role usb_role_switch_get_role(struct usb_role_switch *sw) +{ + return USB_ROLE_NONE; +} + +static inline struct usb_role_switch *usb_role_switch_get(struct device *dev) +{ + return ERR_PTR(-ENODEV); +} + +static inline void usb_role_switch_put(struct usb_role_switch *sw) { } + +static inline struct usb_role_switch * +usb_role_switch_register(struct device *parent, + const struct usb_role_switch_desc *desc) +{ + return ERR_PTR(-ENODEV); +} + +static inline void usb_role_switch_unregister(struct usb_role_switch *sw) { } + +static int usb_role_switch_register_notifier(struct usb_role_switch *sw, + struct notifier_block *nb) +{ + return -ENODEV; +} + +static int usb_role_switch_unregister_notifier(struct usb_role_switch *sw, + struct notifier_block *nb) +{ + return -ENODEV; +} +#endif #endif /* __LINUX_USB_ROLE_H */ -- 2.15.0-rc2