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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,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 2BEE9C43381 for ; Wed, 6 Mar 2019 09:13:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F063C21019 for ; Wed, 6 Mar 2019 09:13:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729565AbfCFJNb (ORCPT ); Wed, 6 Mar 2019 04:13:31 -0500 Received: from relmlor2.renesas.com ([210.160.252.172]:9706 "EHLO relmlie6.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729307AbfCFJNa (ORCPT ); Wed, 6 Mar 2019 04:13:30 -0500 X-IronPort-AV: E=Sophos;i="5.58,447,1544454000"; d="scan'208";a="9391012" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 06 Mar 2019 18:13:28 +0900 Received: from be1yocto.ree.adwin.renesas.com (unknown [172.29.43.62]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id AB09B4209848; Wed, 6 Mar 2019 18:13:25 +0900 (JST) From: Biju Das To: Felipe Balbi Cc: Biju Das , Greg Kroah-Hartman , Heikki Krogerus , Yoshihiro Shimoda , Simon Horman , Fabrizio Castro , Kees Cook , linux-usb@vger.kernel.org, Simon Horman , Geert Uytterhoeven , Chris Paterson , linux-renesas-soc@vger.kernel.org Subject: [PATCH 4/9] usb: gadget: udc: renesas_usb3: use extcon framework to receive connect/disconnect Date: Wed, 6 Mar 2019 09:07:21 +0000 Message-Id: <1551863246-11656-5-git-send-email-biju.das@bp.renesas.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1551863246-11656-1-git-send-email-biju.das@bp.renesas.com> References: <1551863246-11656-1-git-send-email-biju.das@bp.renesas.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org RZ/G2E cat874 board is capable of detecting cable connect and disconnect events. Add support for renesas_usb3 to receive connect and disconnect notification using extcon framework. Signed-off-by: Biju Das --- drivers/usb/gadget/udc/renesas_usb3.c | 115 +++++++++++++++++++++++++++++----- 1 file changed, 99 insertions(+), 16 deletions(-) diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c index 7dc2485..2c69d5d 100644 --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c @@ -351,6 +351,11 @@ struct renesas_usb3 { int disabled_count; struct usb_request *ep0_req; + + struct extcon_dev *edev; + struct notifier_block ufp_nb; + struct notifier_block dfp_nb; + u16 test_mode; u8 ep0_buf[USB3_EP0_BUF_SIZE]; bool softconnect; @@ -644,22 +649,6 @@ static void usb3_disconnect(struct renesas_usb3 *usb3) usb3->driver->disconnect(&usb3->gadget); } -static void usb3_check_vbus(struct renesas_usb3 *usb3) -{ - if (usb3->workaround_for_vbus) { - usb3_connect(usb3); - } else { - usb3->extcon_usb = !!(usb3_read(usb3, USB3_USB_STA) & - USB_STA_VBUS_STA); - if (usb3->extcon_usb) - usb3_connect(usb3); - else - usb3_disconnect(usb3); - - schedule_work(&usb3->extcon_work); - } -} - static void renesas_usb3_role_work(struct work_struct *work) { struct renesas_usb3 *usb3 = @@ -724,6 +713,32 @@ static void usb3_check_id(struct renesas_usb3 *usb3) schedule_work(&usb3->extcon_work); } +static void usb3_check_vbus(struct renesas_usb3 *usb3) +{ + if (usb3->workaround_for_vbus) { + if (usb3->edev) { + if (extcon_get_state(usb3->edev, EXTCON_USB) == true) { + usb3->forced_b_device = true; + usb3->start_to_connect = true; + usb3_disconnect(usb3); + usb3_check_id(usb3); + } else if (extcon_get_state(usb3->edev, + EXTCON_USB_HOST) == false) + usb3_vbus_out(usb3, false); + } else + usb3_connect(usb3); + } else { + usb3->extcon_usb = !!(usb3_read(usb3, USB3_USB_STA) & + USB_STA_VBUS_STA); + if (usb3->extcon_usb) + usb3_connect(usb3); + else + usb3_disconnect(usb3); + + schedule_work(&usb3->extcon_work); + } +} + static void renesas_usb3_init_controller(struct renesas_usb3 *usb3) { usb3_init_axi_bridge(usb3); @@ -2656,6 +2671,47 @@ static const struct usb_role_switch_desc renesas_usb3_role_switch_desc = { .allow_userspace_control = true, }; +static int renesas_usb3_ufp_notifier(struct notifier_block *nb, + unsigned long event, void *ptr) +{ + struct renesas_usb3 *usb3 = container_of(nb, + struct renesas_usb3, ufp_nb); + + usb3->start_to_connect = false; + if (event && usb3->driver) { + usb3->forced_b_device = true; + usb3->start_to_connect = true; + } + + if (usb3->driver) { + usb3_disconnect(usb3); + usb3_check_id(usb3); + } + + usb3_vbus_out(usb3, false); + dev_dbg(usb3_to_dev(usb3), "ufp_notifier event=%ld", event); + + return NOTIFY_DONE; +} + +static int renesas_usb3_dfp_notifier(struct notifier_block *nb, + unsigned long event, void *ptr) +{ + struct renesas_usb3 *usb3 = container_of(nb, + struct renesas_usb3, dfp_nb); + + if (event) { + usb3->forced_b_device = false; + usb3_disconnect(usb3); + usb3_check_id(usb3); + } else + usb3_vbus_out(usb3, false); + + dev_dbg(usb3_to_dev(usb3), "dfp_notifier event=%ld", event); + + return NOTIFY_DONE; +} + static int renesas_usb3_probe(struct platform_device *pdev) { struct renesas_usb3 *usb3; @@ -2703,6 +2759,33 @@ static int renesas_usb3_probe(struct platform_device *pdev) return ret; INIT_WORK(&usb3->extcon_work, renesas_usb3_extcon_work); + + if (priv->workaround_for_vbus && + of_property_read_bool(pdev->dev.of_node, "extcon")) { + usb3->edev = extcon_get_edev_by_phandle(&pdev->dev, 0); + if (IS_ERR(usb3->edev)) + return PTR_ERR(usb3->edev); + + usb3->ufp_nb.notifier_call = renesas_usb3_ufp_notifier; + ret = devm_extcon_register_notifier(&pdev->dev, usb3->edev, + EXTCON_USB, &usb3->ufp_nb); + if (ret < 0) + dev_dbg(&pdev->dev, "USB register notifier failed\n"); + + usb3->dfp_nb.notifier_call = renesas_usb3_dfp_notifier; + ret = devm_extcon_register_notifier(&pdev->dev, usb3->edev, + EXTCON_USB_HOST, &usb3->dfp_nb); + if (ret < 0) + dev_dbg(&pdev->dev, + "USB-HOST register notifier failed\n"); + if (extcon_get_state(usb3->edev, EXTCON_USB) == true) { + usb3->forced_b_device = true; + usb3->start_to_connect = true; + } else if (extcon_get_state(usb3->edev, + EXTCON_USB_HOST) == false) + usb3_vbus_out(usb3, false); + } + usb3->extcon = devm_extcon_dev_allocate(&pdev->dev, renesas_usb3_cable); if (IS_ERR(usb3->extcon)) return PTR_ERR(usb3->extcon); -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4/9] usb: gadget: udc: renesas_usb3: use extcon framework to receive connect/disconnect From: Biju Das Message-Id: <1551863246-11656-5-git-send-email-biju.das@bp.renesas.com> Date: Wed, 6 Mar 2019 09:07:21 +0000 To: Felipe Balbi Cc: Biju Das , Greg Kroah-Hartman , Heikki Krogerus , Yoshihiro Shimoda , Simon Horman , Fabrizio Castro , Kees Cook , linux-usb@vger.kernel.org, Simon Horman , Geert Uytterhoeven , Chris Paterson , linux-renesas-soc@vger.kernel.org List-ID: UlovRzJFIGNhdDg3NCBib2FyZCBpcyBjYXBhYmxlIG9mIGRldGVjdGluZyBjYWJsZSBjb25uZWN0 IGFuZCBkaXNjb25uZWN0CmV2ZW50cy4gQWRkIHN1cHBvcnQgZm9yIHJlbmVzYXNfdXNiMyB0byBy ZWNlaXZlIGNvbm5lY3QgYW5kIGRpc2Nvbm5lY3QKbm90aWZpY2F0aW9uIHVzaW5nIGV4dGNvbiBm cmFtZXdvcmsuCgpTaWduZWQtb2ZmLWJ5OiBCaWp1IERhcyA8YmlqdS5kYXNAYnAucmVuZXNhcy5j b20+Ci0tLQogZHJpdmVycy91c2IvZ2FkZ2V0L3VkYy9yZW5lc2FzX3VzYjMuYyB8IDExNSArKysr KysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgOTkgaW5zZXJ0 aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvZ2FkZ2V0 L3VkYy9yZW5lc2FzX3VzYjMuYyBiL2RyaXZlcnMvdXNiL2dhZGdldC91ZGMvcmVuZXNhc191c2Iz LmMKaW5kZXggN2RjMjQ4NS4uMmM2OWQ1ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvZ2FkZ2V0 L3VkYy9yZW5lc2FzX3VzYjMuYworKysgYi9kcml2ZXJzL3VzYi9nYWRnZXQvdWRjL3JlbmVzYXNf dXNiMy5jCkBAIC0zNTEsNiArMzUxLDExIEBAIHN0cnVjdCByZW5lc2FzX3VzYjMgewogCWludCBk aXNhYmxlZF9jb3VudDsKIAogCXN0cnVjdCB1c2JfcmVxdWVzdCAqZXAwX3JlcTsKKworCXN0cnVj dCBleHRjb25fZGV2ICplZGV2OworCXN0cnVjdCBub3RpZmllcl9ibG9jayB1ZnBfbmI7CisJc3Ry dWN0IG5vdGlmaWVyX2Jsb2NrIGRmcF9uYjsKKwogCXUxNiB0ZXN0X21vZGU7CiAJdTggZXAwX2J1 ZltVU0IzX0VQMF9CVUZfU0laRV07CiAJYm9vbCBzb2Z0Y29ubmVjdDsKQEAgLTY0NCwyMiArNjQ5 LDYgQEAgc3RhdGljIHZvaWQgdXNiM19kaXNjb25uZWN0KHN0cnVjdCByZW5lc2FzX3VzYjMgKnVz YjMpCiAJCXVzYjMtPmRyaXZlci0+ZGlzY29ubmVjdCgmdXNiMy0+Z2FkZ2V0KTsKIH0KIAotc3Rh dGljIHZvaWQgdXNiM19jaGVja192YnVzKHN0cnVjdCByZW5lc2FzX3VzYjMgKnVzYjMpCi17Ci0J aWYgKHVzYjMtPndvcmthcm91bmRfZm9yX3ZidXMpIHsKLQkJdXNiM19jb25uZWN0KHVzYjMpOwot CX0gZWxzZSB7Ci0JCXVzYjMtPmV4dGNvbl91c2IgPSAhISh1c2IzX3JlYWQodXNiMywgVVNCM19V U0JfU1RBKSAmCi0JCQkJCQkJVVNCX1NUQV9WQlVTX1NUQSk7Ci0JCWlmICh1c2IzLT5leHRjb25f dXNiKQotCQkJdXNiM19jb25uZWN0KHVzYjMpOwotCQllbHNlCi0JCQl1c2IzX2Rpc2Nvbm5lY3Qo dXNiMyk7Ci0KLQkJc2NoZWR1bGVfd29yaygmdXNiMy0+ZXh0Y29uX3dvcmspOwotCX0KLX0KLQog c3RhdGljIHZvaWQgcmVuZXNhc191c2IzX3JvbGVfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndv cmspCiB7CiAJc3RydWN0IHJlbmVzYXNfdXNiMyAqdXNiMyA9CkBAIC03MjQsNiArNzEzLDMyIEBA IHN0YXRpYyB2b2lkIHVzYjNfY2hlY2tfaWQoc3RydWN0IHJlbmVzYXNfdXNiMyAqdXNiMykKIAlz Y2hlZHVsZV93b3JrKCZ1c2IzLT5leHRjb25fd29yayk7CiB9CiAKK3N0YXRpYyB2b2lkIHVzYjNf Y2hlY2tfdmJ1cyhzdHJ1Y3QgcmVuZXNhc191c2IzICp1c2IzKQoreworCWlmICh1c2IzLT53b3Jr YXJvdW5kX2Zvcl92YnVzKSB7CisJCWlmICh1c2IzLT5lZGV2KSB7CisJCQlpZiAoZXh0Y29uX2dl dF9zdGF0ZSh1c2IzLT5lZGV2LCBFWFRDT05fVVNCKSA9PSB0cnVlKSB7CisJCQkJdXNiMy0+Zm9y Y2VkX2JfZGV2aWNlID0gdHJ1ZTsKKwkJCQl1c2IzLT5zdGFydF90b19jb25uZWN0ID0gdHJ1ZTsK KwkJCQl1c2IzX2Rpc2Nvbm5lY3QodXNiMyk7CisJCQkJdXNiM19jaGVja19pZCh1c2IzKTsKKwkJ CX0gZWxzZSBpZiAoZXh0Y29uX2dldF9zdGF0ZSh1c2IzLT5lZGV2LAorCQkJCQkJRVhUQ09OX1VT Ql9IT1NUKSA9PSBmYWxzZSkKKwkJCQl1c2IzX3ZidXNfb3V0KHVzYjMsIGZhbHNlKTsKKwkJfSBl bHNlCisJCQl1c2IzX2Nvbm5lY3QodXNiMyk7CisJfSBlbHNlIHsKKwkJdXNiMy0+ZXh0Y29uX3Vz YiA9ICEhKHVzYjNfcmVhZCh1c2IzLCBVU0IzX1VTQl9TVEEpICYKKwkJCQkJCQlVU0JfU1RBX1ZC VVNfU1RBKTsKKwkJaWYgKHVzYjMtPmV4dGNvbl91c2IpCisJCQl1c2IzX2Nvbm5lY3QodXNiMyk7 CisJCWVsc2UKKwkJCXVzYjNfZGlzY29ubmVjdCh1c2IzKTsKKworCQlzY2hlZHVsZV93b3JrKCZ1 c2IzLT5leHRjb25fd29yayk7CisJfQorfQorCiBzdGF0aWMgdm9pZCByZW5lc2FzX3VzYjNfaW5p dF9jb250cm9sbGVyKHN0cnVjdCByZW5lc2FzX3VzYjMgKnVzYjMpCiB7CiAJdXNiM19pbml0X2F4 aV9icmlkZ2UodXNiMyk7CkBAIC0yNjU2LDYgKzI2NzEsNDcgQEAgc3RhdGljIGNvbnN0IHN0cnVj dCB1c2Jfcm9sZV9zd2l0Y2hfZGVzYyByZW5lc2FzX3VzYjNfcm9sZV9zd2l0Y2hfZGVzYyA9IHsK IAkuYWxsb3dfdXNlcnNwYWNlX2NvbnRyb2wgPSB0cnVlLAogfTsKIAorc3RhdGljIGludCByZW5l c2FzX3VzYjNfdWZwX25vdGlmaWVyKHN0cnVjdCBub3RpZmllcl9ibG9jayAqbmIsCisJCQkJCXVu c2lnbmVkIGxvbmcgZXZlbnQsIHZvaWQgKnB0cikKK3sKKwlzdHJ1Y3QgcmVuZXNhc191c2IzICp1 c2IzID0gY29udGFpbmVyX29mKG5iLAorCQkJCQlzdHJ1Y3QgcmVuZXNhc191c2IzLCB1ZnBfbmIp OworCisJdXNiMy0+c3RhcnRfdG9fY29ubmVjdCA9IGZhbHNlOworCWlmIChldmVudCAmJiB1c2Iz LT5kcml2ZXIpIHsKKwkJdXNiMy0+Zm9yY2VkX2JfZGV2aWNlID0gdHJ1ZTsKKwkJdXNiMy0+c3Rh cnRfdG9fY29ubmVjdCA9IHRydWU7CisJfQorCisJaWYgKHVzYjMtPmRyaXZlcikgeworCQl1c2Iz X2Rpc2Nvbm5lY3QodXNiMyk7CisJCXVzYjNfY2hlY2tfaWQodXNiMyk7CisJfQorCisJdXNiM192 YnVzX291dCh1c2IzLCBmYWxzZSk7CisJZGV2X2RiZyh1c2IzX3RvX2Rldih1c2IzKSwgInVmcF9u b3RpZmllciBldmVudD0lbGQiLCBldmVudCk7CisKKwlyZXR1cm4gTk9USUZZX0RPTkU7Cit9CisK K3N0YXRpYyBpbnQgcmVuZXNhc191c2IzX2RmcF9ub3RpZmllcihzdHJ1Y3Qgbm90aWZpZXJfYmxv Y2sgKm5iLAorCQkJCQl1bnNpZ25lZCBsb25nIGV2ZW50LCB2b2lkICpwdHIpCit7CisJc3RydWN0 IHJlbmVzYXNfdXNiMyAqdXNiMyA9IGNvbnRhaW5lcl9vZihuYiwKKwkJCQkJc3RydWN0IHJlbmVz YXNfdXNiMywgZGZwX25iKTsKKworCWlmIChldmVudCkgeworCQl1c2IzLT5mb3JjZWRfYl9kZXZp Y2UgPSBmYWxzZTsKKwkJdXNiM19kaXNjb25uZWN0KHVzYjMpOworCQl1c2IzX2NoZWNrX2lkKHVz YjMpOworCX0gZWxzZQorCQl1c2IzX3ZidXNfb3V0KHVzYjMsIGZhbHNlKTsKKworCWRldl9kYmco dXNiM190b19kZXYodXNiMyksICJkZnBfbm90aWZpZXIgZXZlbnQ9JWxkIiwgZXZlbnQpOworCisJ cmV0dXJuIE5PVElGWV9ET05FOworfQorCiBzdGF0aWMgaW50IHJlbmVzYXNfdXNiM19wcm9iZShz dHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogewogCXN0cnVjdCByZW5lc2FzX3VzYjMgKnVz YjM7CkBAIC0yNzAzLDYgKzI3NTksMzMgQEAgc3RhdGljIGludCByZW5lc2FzX3VzYjNfcHJvYmUo c3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAkJcmV0dXJuIHJldDsKIAogCUlOSVRfV09S SygmdXNiMy0+ZXh0Y29uX3dvcmssIHJlbmVzYXNfdXNiM19leHRjb25fd29yayk7CisKKwlpZiAo cHJpdi0+d29ya2Fyb3VuZF9mb3JfdmJ1cyAmJgorCQkJb2ZfcHJvcGVydHlfcmVhZF9ib29sKHBk ZXYtPmRldi5vZl9ub2RlLCAiZXh0Y29uIikpIHsKKwkJdXNiMy0+ZWRldiA9IGV4dGNvbl9nZXRf ZWRldl9ieV9waGFuZGxlKCZwZGV2LT5kZXYsIDApOworCQlpZiAoSVNfRVJSKHVzYjMtPmVkZXYp KQorCQkJcmV0dXJuIFBUUl9FUlIodXNiMy0+ZWRldik7CisKKwkJdXNiMy0+dWZwX25iLm5vdGlm aWVyX2NhbGwgPSByZW5lc2FzX3VzYjNfdWZwX25vdGlmaWVyOworCQlyZXQgPSBkZXZtX2V4dGNv bl9yZWdpc3Rlcl9ub3RpZmllcigmcGRldi0+ZGV2LCB1c2IzLT5lZGV2LAorCQkJCQkJRVhUQ09O X1VTQiwgJnVzYjMtPnVmcF9uYik7CisJCWlmIChyZXQgPCAwKQorCQkJZGV2X2RiZygmcGRldi0+ ZGV2LCAiVVNCIHJlZ2lzdGVyIG5vdGlmaWVyIGZhaWxlZFxuIik7CisKKwkJdXNiMy0+ZGZwX25i Lm5vdGlmaWVyX2NhbGwgPSByZW5lc2FzX3VzYjNfZGZwX25vdGlmaWVyOworCQlyZXQgPSBkZXZt X2V4dGNvbl9yZWdpc3Rlcl9ub3RpZmllcigmcGRldi0+ZGV2LCB1c2IzLT5lZGV2LAorCQkJCQkJ RVhUQ09OX1VTQl9IT1NULCAmdXNiMy0+ZGZwX25iKTsKKwkJaWYgKHJldCA8IDApCisJCQlkZXZf ZGJnKCZwZGV2LT5kZXYsCisJCQkJCSJVU0ItSE9TVCByZWdpc3RlciBub3RpZmllciBmYWlsZWRc biIpOworCQlpZiAoZXh0Y29uX2dldF9zdGF0ZSh1c2IzLT5lZGV2LCBFWFRDT05fVVNCKSA9PSB0 cnVlKSB7CisJCQl1c2IzLT5mb3JjZWRfYl9kZXZpY2UgPSB0cnVlOworCQkJdXNiMy0+c3RhcnRf dG9fY29ubmVjdCA9IHRydWU7CisJCX0gZWxzZQlpZiAoZXh0Y29uX2dldF9zdGF0ZSh1c2IzLT5l ZGV2LAorCQkJCQkJIEVYVENPTl9VU0JfSE9TVCkgPT0gZmFsc2UpCisJCQl1c2IzX3ZidXNfb3V0 KHVzYjMsIGZhbHNlKTsKKwl9CisKIAl1c2IzLT5leHRjb24gPSBkZXZtX2V4dGNvbl9kZXZfYWxs b2NhdGUoJnBkZXYtPmRldiwgcmVuZXNhc191c2IzX2NhYmxlKTsKIAlpZiAoSVNfRVJSKHVzYjMt PmV4dGNvbikpCiAJCXJldHVybiBQVFJfRVJSKHVzYjMtPmV4dGNvbik7Cg==