LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Azael Avalos <coproscefalo@gmail.com>
To: Darren Hart <dvhart@infradead.org>
Cc: "platform-driver-x86@vger.kernel.org" 
	<platform-driver-x86@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 1/3] toshiba_acpi: Update and fix USB Sleep and Charge modes
Date: Thu, 2 Apr 2015 19:19:25 -0600	[thread overview]
Message-ID: <CAGdLNWHPQq6s9BqZecgZ8AfdYCpQqxu0Fv5FmOAgTY+jSbAcEQ@mail.gmail.com> (raw)
In-Reply-To: <20150402052125.GG37152@fury.dvhart.com>

Hi Darren,

2015-04-01 23:21 GMT-06:00 Darren Hart <dvhart@infradead.org>:
> On Sun, Mar 29, 2015 at 07:25:39PM -0600, Azael Avalos wrote:
>> This patch fixes the USB Sleep and Charge mode on certain models
>> where the value returned by the BIOS is different, and thus, making
>> this feature not to work for those models.
>>
>> Also, the "Typical" charging mode was added as a supported mode.
>>
>> Signed-off-by: Azael Avalos <coproscefalo@gmail.com>
>> ---
>>  drivers/platform/x86/toshiba_acpi.c | 69 ++++++++++++++++++++++++++++++++-----
>>  1 file changed, 60 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
>> index 17a259e..c8ad61c 100644
>> --- a/drivers/platform/x86/toshiba_acpi.c
>> +++ b/drivers/platform/x86/toshiba_acpi.c
>> @@ -150,9 +150,10 @@ MODULE_LICENSE("GPL");
>>  #define SCI_KBD_MODE_OFF             0x10
>>  #define SCI_KBD_TIME_MAX             0x3c001a
>>  #define SCI_USB_CHARGE_MODE_MASK     0xff
>> -#define SCI_USB_CHARGE_DISABLED              0x30000
>> -#define SCI_USB_CHARGE_ALTERNATE     0x30009
>> -#define SCI_USB_CHARGE_AUTO          0x30021
>> +#define SCI_USB_CHARGE_DISABLED              0x00
>> +#define SCI_USB_CHARGE_ALTERNATE     0x09
>> +#define SCI_USB_CHARGE_TYPICAL               0x11
>> +#define SCI_USB_CHARGE_AUTO          0x21
>>  #define SCI_USB_CHARGE_BAT_MASK              0x7
>>  #define SCI_USB_CHARGE_BAT_LVL_OFF   0x1
>>  #define SCI_USB_CHARGE_BAT_LVL_ON    0x4
>> @@ -177,6 +178,7 @@ struct toshiba_acpi_dev {
>>       int kbd_mode;
>>       int kbd_time;
>>       int usbsc_bat_level;
>> +     int usbsc_mode_base;
>>       int hotkey_event_type;
>>
>>       unsigned int illumination_supported:1;
>> @@ -800,6 +802,52 @@ static int toshiba_accelerometer_get(struct toshiba_acpi_dev *dev,
>>  }
>>
>>  /* Sleep (Charge and Music) utilities support */
>> +static void toshiba_usb_sleep_charge_available(struct toshiba_acpi_dev *dev)
>> +{
>> +     u32 in[TCI_WORDS] = { SCI_GET, SCI_USB_SLEEP_CHARGE, 0, 0, 0, 0 };
>> +     u32 out[TCI_WORDS];
>> +     acpi_status status;
>> +
>> +     /* Set the feature to "not supported" in case of error */
>> +     dev->usb_sleep_charge_supported = 0;
>> +
>> +     if (!sci_open(dev))
>> +             return;
>> +
>> +     status = tci_raw(dev, in, out);
>> +     if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
>> +             pr_err("ACPI call to get USB Sleep and Charge mode failed\n");
>> +             sci_close(dev);
>> +             return;
>> +     } else if (out[0] == TOS_NOT_SUPPORTED) {
>> +             pr_info("USB Sleep and Charge not supported\n");
>> +             sci_close(dev);
>> +             return;
>> +     }
>
> Sorry Azael for not asking the first time, and maybe this is just how it is -
> but it occurs to me that after the above tci_raw call, we check for 3 error
> cases, but we never test for success. Can we not check for out[0] == TOS_SUCCESS
> or similar? The above logic seems like the kind to lead to failure going
> unnoticed as success is assumed and not confirmed.
>

No problem, will send v3 in a few :-)

>> +     dev->usbsc_mode_base = out[4];
>> +
>> +     in[5] = SCI_USB_CHARGE_BAT_LVL;
>> +     status = tci_raw(dev, in, out);
>> +     if (ACPI_FAILURE(status) || out[0] == TOS_FAILURE) {
>> +             pr_err("ACPI call to get USB Sleep and Charge mode failed\n");
>> +             sci_close(dev);
>> +             return;
>> +     } else if (out[0] == TOS_NOT_SUPPORTED) {
>> +             pr_info("USB Sleep and Charge not supported\n");
>> +             sci_close(dev);
>> +             return;
>> +     }
>
> Here too.
>
> --
> Darren Hart
> Intel Open Source Technology Center


Cheers
Azael


-- 
-- El mundo apesta y vosotros apestais tambien --

  reply	other threads:[~2015-04-03  1:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-30  1:25 [PATCH v2 0/3] toshiba_acpi: Fix USB Sleep & Charge mode and documentation updates Azael Avalos
2015-03-30  1:25 ` [PATCH v2 1/3] toshiba_acpi: Update and fix USB Sleep and Charge modes Azael Avalos
2015-04-02  5:21   ` Darren Hart
2015-04-03  1:19     ` Azael Avalos [this message]
2015-03-30  1:25 ` [PATCH v2 2/3] toshiba_acpi: Fix pr_* messages from USB Sleep Functions Azael Avalos

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=CAGdLNWHPQq6s9BqZecgZ8AfdYCpQqxu0Fv5FmOAgTY+jSbAcEQ@mail.gmail.com \
    --to=coproscefalo@gmail.com \
    --cc=dvhart@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=platform-driver-x86@vger.kernel.org \
    --subject='Re: [PATCH v2 1/3] toshiba_acpi: Update and fix USB Sleep and Charge modes' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).