From patchwork Mon May 9 16:24:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 9047581 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 C93499F30C for ; Mon, 9 May 2016 16:25:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F295820114 for ; Mon, 9 May 2016 16:25:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C49DE20145 for ; Mon, 9 May 2016 16:25:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751613AbcEIQZJ (ORCPT ); Mon, 9 May 2016 12:25:09 -0400 Received: from ausc60ps301.us.dell.com ([143.166.148.206]:24323 "EHLO ausc60ps301.us.dell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751072AbcEIQZI (ORCPT ); Mon, 9 May 2016 12:25:08 -0400 DomainKey-Signature: s=smtpout; d=dell.com; c=nofws; q=dns; h=X-LoopCount0:X-IronPort-AV:From:To:Cc:Subject:Date: Message-Id:X-Mailer:In-Reply-To:References; b=UUma9RQsTtv12TSEgOYjIir7q5DtTfgbDodRLjFwbjxeh9wdQ8e5L6IT IxdUyJ3Vl1YFHmtmqkOB6/+ABpFvAg7ORbu7SpHOZ/U3r+BNIkdk/gXsM xQew5LS4cyAc7hq6pw3/ffLWVG2OMmyGOlitfVPx7Ki8gcd+WWhubCOG3 g=; DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=dell.com; i=@dell.com; q=dns/txt; s=smtpout; t=1462811108; x=1494347108; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=NZNeFxI0PwoSeOAcr/lKzZpQGC2sMN/aLpYP0/bbldg=; b=a8wfZ6/1aYS8UNx/BK08VG6r8Qrtf3Eiq+DfcWBjSqqeMUm7z71yaAPb JgvWCLSdk9/F0VvvHXPcyloNKgJdTWxFyYGC+Bmpwpe5pg9vrK9TZEnnH +9Z7sgTgU1raKxgmj0I3QA8i13aM7gH8YxH0hX4lzHDeEXrGKP5z4ZDPA 8=; X-LoopCount0: from 10.209.151.17 X-IronPort-AV: E=Sophos;i="5.24,601,1454997600"; d="scan'208";a="819657579" From: Mario Limonciello To: dvhart@infradead.org Cc: LKML , platform-driver-x86@vger.kernel.org, Mario Limonciello Subject: [PATCH v3 2/2] dell-laptop: Expose auxiliary MAC address if available Date: Mon, 9 May 2016 11:24:59 -0500 Message-Id: <1462811099-16897-2-git-send-email-mario_limonciello@dell.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462811099-16897-1-git-send-email-mario_limonciello@dell.com> References: <1462811099-16897-1-git-send-email-mario_limonciello@dell.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=-8.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 System with Type-C ports have a feature to expose an auxiliary persistent MAC address. This address is burned in at the factory. The intention of this address is to update the MAC address on Type-C docks containing an ethernet adapter to match the auxiliary address of the system connected to them. Signed-off-by: Mario Limonciello --- drivers/platform/x86/dell-laptop.c | 61 +++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index 2c2f02b..7d29690 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -87,6 +87,7 @@ static struct rfkill *wifi_rfkill; static struct rfkill *bluetooth_rfkill; static struct rfkill *wwan_rfkill; static bool force_rfkill; +static char *auxiliary_mac_address; module_param(force_rfkill, bool, 0444); MODULE_PARM_DESC(force_rfkill, "enable rfkill on non whitelisted models"); @@ -273,6 +274,54 @@ static const struct dmi_system_id dell_quirks[] __initconst = { { } }; +/* get_aux_mac + * returns the auxiliary mac address + * for assigning to a Type-C ethernet device + * such as that found in the Dell TB15 dock + */ +static int get_aux_mac(void) +{ + struct calling_interface_buffer *buffer; + unsigned char *extended_buffer; + size_t length; + int ret; + + buffer = dell_smbios_get_buffer(); + length = 17; + extended_buffer = dell_smbios_send_extended_request(11, 6, &length); + ret = buffer->output[0]; + if (ret != 0 || !extended_buffer) { + pr_debug("get_aux_mac: ext buffer: %p, len: %lu, ret: %d\n", + extended_buffer, length, ret); + auxiliary_mac_address = NULL; + goto auxout; + } + + /* address will be stored in byte 4-> */ + auxiliary_mac_address = kmalloc(length, GFP_KERNEL); + memcpy(auxiliary_mac_address, extended_buffer, length); + + auxout: + dell_smbios_release_buffer(); + return dell_smbios_error(ret); +} + +static ssize_t auxiliary_mac_show(struct device *dev, + struct device_attribute *attr, char *page) +{ + return sprintf(page, "%s\n", auxiliary_mac_address); +} + +static DEVICE_ATTR_RO(auxiliary_mac); +static struct attribute *dell_attributes[] = { + &dev_attr_auxiliary_mac.attr, + NULL +}; + +static const struct attribute_group dell_attr_group = { + .attrs = dell_attributes, +}; + /* * Derived from information in smbios-wireless-ctl: * @@ -392,7 +441,6 @@ static const struct dmi_system_id dell_quirks[] __initconst = { * cbArg1, byte0 = 0x13 * cbRes1 Standard return codes (0, -1, -2) */ - static int dell_rfkill_set(void *data, bool blocked) { struct calling_interface_buffer *buffer; @@ -2003,6 +2051,12 @@ static int __init dell_init(void) goto fail_rfkill; } + ret = get_aux_mac(); + if (!ret) { + sysfs_create_group(&platform_device->dev.kobj, + &dell_attr_group); + } + if (quirks && quirks->touchpad_led) touchpad_led_init(&platform_device->dev); @@ -2064,6 +2118,11 @@ fail_platform_driver: static void __exit dell_exit(void) { + if (auxiliary_mac_address) { + sysfs_remove_group(&platform_device->dev.kobj, + &dell_attr_group); + kfree(auxiliary_mac_address); + } debugfs_remove_recursive(dell_laptop_dir); if (quirks && quirks->touchpad_led) touchpad_led_exit();