From patchwork Sat Dec 15 00:17:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 1881991 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6DBA9DF230 for ; Sat, 15 Dec 2012 00:17:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756880Ab2LOAR4 (ORCPT ); Fri, 14 Dec 2012 19:17:56 -0500 Received: from cantor2.suse.de ([195.135.220.15]:34840 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756797Ab2LOARz (ORCPT ); Fri, 14 Dec 2012 19:17:55 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 5EBB1A398D; Sat, 15 Dec 2012 01:17:54 +0100 (CET) Date: Sat, 15 Dec 2012 11:17:38 +1100 From: NeilBrown To: Cc: Kishon Vijay Abraham I , Subject: Re: twl4030_charger seems to be broken by switch from 'notifier' to 'mailbox'. Message-ID: <20121215111738.1be514af@notabene.brown> In-Reply-To: <20121214093659.GB14997@arwen.pp.htv.fi> References: <20121214200427.2405f30a@notabene.brown> <20121214093659.GB14997@arwen.pp.htv.fi> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.10; x86_64-suse-linux-gnu) Mime-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org On Fri, 14 Dec 2012 11:36:59 +0200 Felipe Balbi wrote: > Hi, > > On Fri, Dec 14, 2012 at 08:04:27PM +1100, NeilBrown wrote: > > this commit: > > > > commit c9721438c009adf8e81d376839ed037c53b9b8d9 > > Author: Kishon Vijay Abraham I > > Date: Fri Jun 22 17:40:52 2012 +0530 > > > > usb: musb: twl: use mailbox API to send VBUS or ID events > > > > The atomic notifier from twl4030/twl6030 to notifiy VBUS and ID events, > > is replaced by a direct call to omap musb blue. > > > > Signed-off-by: Kishon Vijay Abraham I > > Signed-off-by: Felipe Balbi > > > > > > Seems to have broken twl4030_charger.c. > > This code relies on the notifier to know when the USB has been plugged in and > > so it should consider enabling the charger. > > > > now that the notification has gone, the charger never turns on. > > > > If I put the atomic_notifier_call_chain() calls back in, then the charger is > > activated as appropriate. > > > > What is the plan here? Should the calls go back, or is there some way for > > twl4030_charger to hook into the "mailbox"? Or is there some other way it > > should work? > > hmmm, tricky situation. Maybe we add back the notifer calls but keep the > mailbox API ? > Maybe. This is my current patch. I'm not entirely confident about the mapping from omap_musb_vbus_id_status to usb_phy_events. Thanks, NeilBrown From ffafe1fe4da3c848631c082f70745017c03e23bf Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Sat, 15 Dec 2012 10:35:37 +1100 Subject: [PATCH] twl4030-usb - re-instate event notifications commit c9721438c009adf8e81d376839ed037c53b9b8d9 usb: musb: twl: use mailbox API to send VBUS or ID events went a bit too far in removing all event notification from twl4030-usb. The notifications are still needed for twl4030_charger.c to know when to enable the charger. Signed-off-by: NeilBrown diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c index f0d2e75..15733f9 100644 --- a/drivers/usb/otg/twl4030-usb.c +++ b/drivers/usb/otg/twl4030-usb.c @@ -38,6 +38,7 @@ #include #include #include +#include #include /* Register defines */ @@ -388,6 +389,28 @@ static void twl4030_phy_power(struct twl4030_usb *twl, int on) } } +static void do_notify(struct twl4030_usb *twl, + enum omap_musb_vbus_id_status status) +{ + enum usb_phy_events event; + + switch (status) { + case OMAP_MUSB_UNKNOWN: + event = USB_EVENT_NONE; break; + case OMAP_MUSB_ID_GROUND: + event = USB_EVENT_ID; break; + case OMAP_MUSB_ID_FLOAT: + event = USB_EVENT_NONE; break; + case OMAP_MUSB_VBUS_VALID: + event = USB_EVENT_VBUS; break; + case OMAP_MUSB_VBUS_OFF: + event = USB_EVENT_NONE; break; + } + + atomic_notifier_call_chain(&twl->phy.notifier, event, + twl->phy.otg->gadget); +} + static void twl4030_phy_suspend(struct twl4030_usb *twl, int controller_off) { if (twl->asleep) @@ -514,6 +537,7 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl) twl4030_phy_suspend(twl, 0); else twl4030_phy_resume(twl); + do_notify(twl, status); omap_musb_mailbox(twl->linkstat); } @@ -537,6 +561,7 @@ static void twl4030_usb_phy_init(struct twl4030_usb *twl) twl->asleep = 0; } + do_notify(twl, status); omap_musb_mailbox(twl->linkstat); } sysfs_notify(&twl->dev->kobj, NULL, "vbus"); @@ -634,6 +659,8 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev) if (device_create_file(&pdev->dev, &dev_attr_vbus)) dev_warn(&pdev->dev, "could not create sysfs file\n"); + ATOMIC_INIT_NOTIFIER_HEAD(&twl->phy.notifier); + /* Our job is to use irqs and status from the power module * to keep the transceiver disabled when nothing's connected. *