From patchwork Tue Feb 27 21:15:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 10246059 X-Patchwork-Delegate: dvhart@infradead.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E6D3860362 for ; Tue, 27 Feb 2018 21:15:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4B7828A9C for ; Tue, 27 Feb 2018 21:15:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C63A628AB6; Tue, 27 Feb 2018 21:15:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9AD0228A9C for ; Tue, 27 Feb 2018 21:15:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752000AbeB0VPv (ORCPT ); Tue, 27 Feb 2018 16:15:51 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:35425 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751880AbeB0VPt (ORCPT ); Tue, 27 Feb 2018 16:15:49 -0500 Received: by mail-lf0-f65.google.com with SMTP id 70so378634lfw.2 for ; Tue, 27 Feb 2018 13:15:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gnuBNtGJsaFYpwRfZQFmuyBz2qd/p/BhPm+SjjF9ToU=; b=wSg/tDeiEGFgYvLYgCg5OUCKN4RSOeaVFCWiOD1At2oOdlwqdqbatKUVXJWqM7dNtV o20ZSYfC+WyliudinOd8ekhb9S/JFitp5OGNlj+ZaaVyJR69BlidSLH9uatrN33S536R X6gnw96BJzp7A1TvM5s+vAcIy/0BnrPpEWKgY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gnuBNtGJsaFYpwRfZQFmuyBz2qd/p/BhPm+SjjF9ToU=; b=e2L39CYabs1JHdSrvxJq0clO8TUIsFGSJOCZ2nhRBnSokSh1wF7T+l+Bp1W+hadl6u HsbBdGIotzuXVigB0GsnldrNS7ioqP3nyqMr4I+6jPHh3NFm1DQD6qn+RIcR5aeTVYTY Wdr1R2AymoqthaaSraEOaJhBP3RsU0mwQN0qx2kMKqLm2Gk0Bjzg2jzNWPP5HX6tIDVn Pt9rHe8rMTH1+o3DoHIubDtJnxx/qZDVPBAmXSiIZh64Pc1bSTSE5Cz4hch+u4spisw1 SDlCorzaoGj9dVHSxmd4Wj55IoLbx5nsGV1s5RnnSaD5vWXrMPWp3qbAxFdhIXXkkt3u q8Nw== X-Gm-Message-State: APf1xPBcgvzuwbLW2rPa8aa/xStsZGqoPslqJx1RfgAWl9soXLc67aXP 7QhDC7381DMrl7oZxsI7kMVyvw== X-Google-Smtp-Source: AG47ELuDfH9qxgk2CREwkm+i5RXih2lIOnM3EdBSA2UodZRMJNxuWPMSGyctcZBbzXjnwQkJeOz9iA== X-Received: by 10.25.78.130 with SMTP id u2mr11624393lfk.131.1519766147728; Tue, 27 Feb 2018 13:15:47 -0800 (PST) Received: from kmp-mobile.hq.kempniu.pl (kmp-mobile.hq.kempniu.pl. [2001:470:64df:111::d0d7]) by smtp.googlemail.com with ESMTPSA id l5sm16288lje.58.2018.02.27.13.15.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Feb 2018 13:15:46 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Jonathan Woithe , Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/7] platform/x86: fujitsu-laptop: Define constants for FUNC operations Date: Tue, 27 Feb 2018 22:15:33 +0100 Message-Id: <20180227211539.5708-2-kernel@kempniu.pl> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180227211539.5708-1-kernel@kempniu.pl> References: <20180227211539.5708-1-kernel@kempniu.pl> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Various functions exposed by the firmware through the FUNC interface tend to use a consistent set of integers for denoting the type of operation to be performed for a specified feature. Use named constants instead of integers in each call_fext_func() invocation in order to more clearly convey the intent of each call. Note that FUNC_FLAGS is a bit peculiar: - operations 0x4 (OP_GET_EXT) and 0x5 (OP_SET_EXT) are used for, respectively, getting and setting feature states, instead of 0x2 and 0x1 used by other FUNC interfaces, - operation 0x1 is used for retrieving events (OP_GET_EVENTS). Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 103 ++++++++++++++++++++-------------- 1 file changed, 60 insertions(+), 43 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 13bcdfea5349..74775caeb609 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -87,6 +87,14 @@ /* FUNC interface - responses */ #define UNSUPPORTED_CMD BIT(31) +/* FUNC interface - operations */ +#define OP_GET BIT(1) +#define OP_GET_CAPS 0 +#define OP_GET_EVENTS BIT(0) +#define OP_GET_EXT BIT(2) +#define OP_SET BIT(0) +#define OP_SET_EXT (BIT(2) | BIT(0)) + /* FUNC interface - status flags */ #define FLAG_RFKILL BIT(5) #define FLAG_LID BIT(8) @@ -264,10 +272,10 @@ static int bl_update_status(struct backlight_device *b) if (fext) { if (b->props.power == FB_BLANK_POWERDOWN) - call_fext_func(fext, FUNC_BACKLIGHT, 0x1, + call_fext_func(fext, FUNC_BACKLIGHT, OP_SET, BACKLIGHT_PARAM_POWER, BACKLIGHT_OFF); else - call_fext_func(fext, FUNC_BACKLIGHT, 0x1, + call_fext_func(fext, FUNC_BACKLIGHT, OP_SET, BACKLIGHT_PARAM_POWER, BACKLIGHT_ON); } @@ -597,11 +605,13 @@ static int logolamp_set(struct led_classdev *cdev, if (brightness < LED_FULL) always = FUNC_LED_OFF; - ret = call_fext_func(device, FUNC_LEDS, 0x1, LOGOLAMP_POWERON, poweron); + ret = call_fext_func(device, FUNC_LEDS, OP_SET, + LOGOLAMP_POWERON, poweron); if (ret < 0) return ret; - return call_fext_func(device, FUNC_LEDS, 0x1, LOGOLAMP_ALWAYS, always); + return call_fext_func(device, FUNC_LEDS, OP_SET, + LOGOLAMP_ALWAYS, always); } static enum led_brightness logolamp_get(struct led_classdev *cdev) @@ -609,11 +619,11 @@ static enum led_brightness logolamp_get(struct led_classdev *cdev) struct acpi_device *device = to_acpi_device(cdev->dev->parent); int ret; - ret = call_fext_func(device, FUNC_LEDS, 0x2, LOGOLAMP_ALWAYS, 0x0); + ret = call_fext_func(device, FUNC_LEDS, OP_GET, LOGOLAMP_ALWAYS, 0x0); if (ret == FUNC_LED_ON) return LED_FULL; - ret = call_fext_func(device, FUNC_LEDS, 0x2, LOGOLAMP_POWERON, 0x0); + ret = call_fext_func(device, FUNC_LEDS, OP_GET, LOGOLAMP_POWERON, 0x0); if (ret == FUNC_LED_ON) return LED_HALF; @@ -626,11 +636,11 @@ static int kblamps_set(struct led_classdev *cdev, struct acpi_device *device = to_acpi_device(cdev->dev->parent); if (brightness >= LED_FULL) - return call_fext_func(device, FUNC_LEDS, 0x1, KEYBOARD_LAMPS, - FUNC_LED_ON); + return call_fext_func(device, FUNC_LEDS, OP_SET, + KEYBOARD_LAMPS, FUNC_LED_ON); else - return call_fext_func(device, FUNC_LEDS, 0x1, KEYBOARD_LAMPS, - FUNC_LED_OFF); + return call_fext_func(device, FUNC_LEDS, OP_SET, + KEYBOARD_LAMPS, FUNC_LED_OFF); } static enum led_brightness kblamps_get(struct led_classdev *cdev) @@ -638,8 +648,8 @@ static enum led_brightness kblamps_get(struct led_classdev *cdev) struct acpi_device *device = to_acpi_device(cdev->dev->parent); enum led_brightness brightness = LED_OFF; - if (call_fext_func(device, - FUNC_LEDS, 0x2, KEYBOARD_LAMPS, 0x0) == FUNC_LED_ON) + if (call_fext_func(device, FUNC_LEDS, OP_GET, + KEYBOARD_LAMPS, 0x0) == FUNC_LED_ON) brightness = LED_FULL; return brightness; @@ -651,11 +661,11 @@ static int radio_led_set(struct led_classdev *cdev, struct acpi_device *device = to_acpi_device(cdev->dev->parent); if (brightness >= LED_FULL) - return call_fext_func(device, FUNC_FLAGS, 0x5, RADIO_LED_ON, - RADIO_LED_ON); + return call_fext_func(device, FUNC_FLAGS, OP_SET_EXT, + RADIO_LED_ON, RADIO_LED_ON); else - return call_fext_func(device, FUNC_FLAGS, 0x5, RADIO_LED_ON, - 0x0); + return call_fext_func(device, FUNC_FLAGS, OP_SET_EXT, + RADIO_LED_ON, 0x0); } static enum led_brightness radio_led_get(struct led_classdev *cdev) @@ -663,7 +673,8 @@ static enum led_brightness radio_led_get(struct led_classdev *cdev) struct acpi_device *device = to_acpi_device(cdev->dev->parent); enum led_brightness brightness = LED_OFF; - if (call_fext_func(device, FUNC_FLAGS, 0x4, 0x0, 0x0) & RADIO_LED_ON) + if (call_fext_func(device, FUNC_FLAGS, OP_GET_EXT, + 0x0, 0x0) & RADIO_LED_ON) brightness = LED_FULL; return brightness; @@ -675,13 +686,13 @@ static int eco_led_set(struct led_classdev *cdev, struct acpi_device *device = to_acpi_device(cdev->dev->parent); int curr; - curr = call_fext_func(device, FUNC_LEDS, 0x2, ECO_LED, 0x0); + curr = call_fext_func(device, FUNC_LEDS, OP_GET, ECO_LED, 0x0); if (brightness >= LED_FULL) - return call_fext_func(device, FUNC_LEDS, 0x1, ECO_LED, - curr | ECO_LED_ON); + return call_fext_func(device, FUNC_LEDS, OP_SET, + ECO_LED, curr | ECO_LED_ON); else - return call_fext_func(device, FUNC_LEDS, 0x1, ECO_LED, - curr & ~ECO_LED_ON); + return call_fext_func(device, FUNC_LEDS, OP_SET, + ECO_LED, curr & ~ECO_LED_ON); } static enum led_brightness eco_led_get(struct led_classdev *cdev) @@ -689,7 +700,8 @@ static enum led_brightness eco_led_get(struct led_classdev *cdev) struct acpi_device *device = to_acpi_device(cdev->dev->parent); enum led_brightness brightness = LED_OFF; - if (call_fext_func(device, FUNC_LEDS, 0x2, ECO_LED, 0x0) & ECO_LED_ON) + if (call_fext_func(device, FUNC_LEDS, OP_GET, + ECO_LED, 0x0) & ECO_LED_ON) brightness = LED_FULL; return brightness; @@ -701,8 +713,8 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) struct led_classdev *led; int ret; - if (call_fext_func(device, - FUNC_LEDS, 0x0, 0x0, 0x0) & LOGOLAMP_POWERON) { + if (call_fext_func(device, FUNC_LEDS, OP_GET_CAPS, + 0x0, 0x0) & LOGOLAMP_POWERON) { led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL); if (!led) return -ENOMEM; @@ -715,9 +727,10 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) return ret; } - if ((call_fext_func(device, - FUNC_LEDS, 0x0, 0x0, 0x0) & KEYBOARD_LAMPS) && - (call_fext_func(device, FUNC_BUTTONS, 0x0, 0x0, 0x0) == 0x0)) { + if ((call_fext_func(device, FUNC_LEDS, OP_GET_CAPS, + 0x0, 0x0) & KEYBOARD_LAMPS) && + (call_fext_func(device, FUNC_BUTTONS, OP_GET_CAPS, + 0x0, 0x0) == 0x0)) { led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL); if (!led) return -ENOMEM; @@ -758,9 +771,10 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) * bit 14 seems to indicate presence of said led as well. * Confirm by testing the status. */ - if ((call_fext_func(device, FUNC_LEDS, 0x0, 0x0, 0x0) & BIT(14)) && - (call_fext_func(device, - FUNC_LEDS, 0x2, ECO_LED, 0x0) != UNSUPPORTED_CMD)) { + if ((call_fext_func(device, FUNC_LEDS, OP_GET_CAPS, + 0x0, 0x0) & BIT(14)) && + (call_fext_func(device, FUNC_LEDS, OP_GET, + ECO_LED, 0x0) != UNSUPPORTED_CMD)) { led = devm_kzalloc(&device->dev, sizeof(*led), GFP_KERNEL); if (!led) return -ENOMEM; @@ -802,14 +816,15 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) pr_info("ACPI: %s [%s]\n", acpi_device_name(device), acpi_device_bid(device)); - while (call_fext_func(device, FUNC_BUTTONS, 0x1, 0x0, 0x0) != 0 && + while (call_fext_func(device, FUNC_BUTTONS, OP_GET_EVENTS, + 0x0, 0x0) != 0 && i++ < MAX_HOTKEY_RINGBUFFER_SIZE) ; /* No action, result is discarded */ acpi_handle_debug(device->handle, "Discarded %i ringbuffer entries\n", i); - priv->flags_supported = call_fext_func(device, FUNC_FLAGS, 0x0, 0x0, - 0x0); + priv->flags_supported = call_fext_func(device, FUNC_FLAGS, OP_GET_CAPS, + 0x0, 0x0); /* Make sure our bitmask of supported functions is cleared if the RFKILL function block is not implemented, like on the S7020. */ @@ -817,17 +832,18 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) priv->flags_supported = 0; if (priv->flags_supported) - priv->flags_state = call_fext_func(device, FUNC_FLAGS, 0x4, 0x0, - 0x0); + priv->flags_state = call_fext_func(device, FUNC_FLAGS, + OP_GET_EXT, 0x0, 0x0); /* Suspect this is a keymap of the application panel, print it */ acpi_handle_info(device->handle, "BTNI: [0x%x]\n", - call_fext_func(device, FUNC_BUTTONS, 0x0, 0x0, 0x0)); + call_fext_func(device, FUNC_BUTTONS, OP_GET_CAPS, + 0x0, 0x0)); /* Sync backlight power status */ if (fujitsu_bl && fujitsu_bl->bl_device && acpi_video_get_backlight_type() == acpi_backlight_vendor) { - if (call_fext_func(fext, FUNC_BACKLIGHT, 0x2, + if (call_fext_func(fext, FUNC_BACKLIGHT, OP_GET, BACKLIGHT_PARAM_POWER, 0x0) == BACKLIGHT_OFF) fujitsu_bl->bl_device->props.power = FB_BLANK_POWERDOWN; else @@ -912,11 +928,11 @@ static void acpi_fujitsu_laptop_notify(struct acpi_device *device, u32 event) } if (priv->flags_supported) - priv->flags_state = call_fext_func(device, FUNC_FLAGS, 0x4, 0x0, - 0x0); + priv->flags_state = call_fext_func(device, FUNC_FLAGS, + OP_GET_EXT, 0x0, 0x0); - while ((irb = call_fext_func(device, - FUNC_BUTTONS, 0x1, 0x0, 0x0)) != 0 && + while ((irb = call_fext_func(device, FUNC_BUTTONS, OP_GET_EVENTS, + 0x0, 0x0)) != 0 && i++ < MAX_HOTKEY_RINGBUFFER_SIZE) { scancode = irb & 0x4ff; if (sparse_keymap_entry_from_scancode(priv->input, scancode)) @@ -933,7 +949,8 @@ static void acpi_fujitsu_laptop_notify(struct acpi_device *device, u32 event) * handled in software; its state is queried using FUNC_FLAGS */ if ((priv->flags_supported & BIT(26)) && - (call_fext_func(device, FUNC_FLAGS, 0x1, 0x0, 0x0) & BIT(26))) + (call_fext_func(device, FUNC_FLAGS, OP_GET_EVENTS, + 0x0, 0x0) & BIT(26))) sparse_keymap_report_event(priv->input, BIT(26), 1, true); }