From patchwork Mon Nov 16 03:26:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Azael Avalos X-Patchwork-Id: 7620651 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 729519F2E2 for ; Mon, 16 Nov 2015 03:27:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8BFE02053A for ; Mon, 16 Nov 2015 03:27:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B273203AB for ; Mon, 16 Nov 2015 03:27:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752597AbbKPD1e (ORCPT ); Sun, 15 Nov 2015 22:27:34 -0500 Received: from mail-oi0-f52.google.com ([209.85.218.52]:35336 "EHLO mail-oi0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752783AbbKPD1c (ORCPT ); Sun, 15 Nov 2015 22:27:32 -0500 Received: by oige206 with SMTP id e206so77198171oig.2; Sun, 15 Nov 2015 19:27:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xAdMLm6tXni4xi9rghYmyWIm14GR8lqghTWncmgSw30=; b=FqIgoE4lNfE1ugN8J1TdvpFACqFsLt6PMROSyTQAH2zrVTs/O6PBhp5oW7aW2RqHBo Kw8igwXBxJ2hCdJfB28tCkf6TUvChgtY7ePlb+hq5Gkgt2QvP1VGeNF2R9xNPy6emDzt YlsSbbXhLIj8ruWm9hLuQ0uRFPrkbzX1nqmc1HrZ2Af2Z5Hyq1/XAeXS1L+/eg4jtyXl Qi/6H+hDaEEQzp4IrxHWYZOc0jEq0FPWWqeBCNSbjkQQ6bWjyKGRFkni17PiEP3lKjok jQY5Kr5YU/85BjPefEwADbwpZ70aEKD+D+tNIeS/6z+oHOsOBAWOW3cZJba/+CQ8Lp5b LZ/A== X-Received: by 10.202.184.138 with SMTP id i132mr259585oif.62.1447644451649; Sun, 15 Nov 2015 19:27:31 -0800 (PST) Received: from Shakuras.scurra.org (148-240-193-100.ftth.dynamic.axtel.net. [148.240.193.100]) by smtp.gmail.com with ESMTPSA id xh10sm11229749oeb.16.2015.11.15.19.27.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 15 Nov 2015 19:27:31 -0800 (PST) From: Azael Avalos To: Darren Hart , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Fabian Koester , Azael Avalos Subject: [PATCH 2/2] toshiba_acpi: Add WWAN RFKill support Date: Sun, 15 Nov 2015 20:26:50 -0700 Message-Id: <1447644410-32665-3-git-send-email-coproscefalo@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1447644410-32665-1-git-send-email-coproscefalo@gmail.com> References: <1447644410-32665-1-git-send-email-coproscefalo@gmail.com> Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A previuos patch added WWAN support to the driver, allowing to query and set the device status. This patch adds RFKill support for the recently introduced WWAN device, making use of the WWAN and *wireless_status functions to query the killswitch and (de)activate the device accordingly to its status. Signed-off-by: Fabian Koester Signed-off-by: Azael Avalos --- drivers/platform/x86/toshiba_acpi.c | 74 +++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index 60d1ad9..2da4dea 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -174,6 +175,7 @@ struct toshiba_acpi_dev { struct led_classdev kbd_led; struct led_classdev eco_led; struct miscdevice miscdev; + struct rfkill *wwan_rfk; int force_fan; int last_key_event; @@ -2330,6 +2332,67 @@ static const struct file_operations toshiba_acpi_fops = { }; /* + * WWAN RFKill handlers + */ +static int toshiba_acpi_wwan_set_block(void *data, bool blocked) +{ + struct toshiba_acpi_dev *dev = data; + int ret; + + ret = toshiba_wireless_status(dev); + if (ret) + return ret; + + if (!dev->killswitch) + return 0; + + return toshiba_wwan_set(dev, blocked ? 0 : 1); +} + +static void toshiba_acpi_wwan_poll(struct rfkill *rfkill, void *data) +{ + struct toshiba_acpi_dev *dev = data; + + if (toshiba_wireless_status(dev)) + return; + + rfkill_set_hw_state(dev->wwan_rfk, !dev->killswitch); +} + +static const struct rfkill_ops wwan_rfk_ops = { + .set_block = toshiba_acpi_wwan_set_block, + .poll = toshiba_acpi_wwan_poll, +}; + +static int toshiba_acpi_setup_wwan_rfkill(struct toshiba_acpi_dev *dev) +{ + int ret = toshiba_wireless_status(dev); + + if (ret) + return ret; + + dev->wwan_rfk = rfkill_alloc("Toshiba WWAN", + &dev->acpi_dev->dev, + RFKILL_TYPE_WWAN, + &wwan_rfk_ops, + dev); + if (!dev->wwan_rfk) { + pr_err("Unable to allocate WWAN rfkill device\n"); + return -ENOMEM; + } + + rfkill_set_hw_state(dev->wwan_rfk, !dev->killswitch); + + ret = rfkill_register(dev->wwan_rfk); + if (ret) { + pr_err("Unable to register WWAN rfkill device\n"); + rfkill_destroy(dev->wwan_rfk); + } + + return ret; +} + +/* * Hotkeys */ static int toshiba_acpi_enable_hotkeys(struct toshiba_acpi_dev *dev) @@ -2827,6 +2890,8 @@ static int toshiba_acpi_add(struct acpi_device *acpi_dev) dev->fan_supported = !ret; toshiba_wwan_available(dev); + if (dev->wwan_supported) + toshiba_acpi_setup_wwan_rfkill(dev); print_supported_features(dev); @@ -2930,6 +2995,15 @@ static int toshiba_acpi_resume(struct device *device) pr_info("Unable to re-enable hotkeys\n"); } + if (dev->wwan_rfk) { + int error = toshiba_wireless_status(dev); + + if (error) + return error; + + rfkill_set_hw_state(dev->wwan_rfk, !dev->killswitch); + } + return 0; } #endif