Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp2047348imm; Wed, 16 May 2018 07:07:42 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpmbjZEcoXfbu+5vASG9J3xYBQ1rNiLA7qPzgeOJanxSrgcumAk27Lqx/7uoZrYM+H+n9h5 X-Received: by 2002:a17:902:8a95:: with SMTP id p21-v6mr1098260plo.325.1526479662393; Wed, 16 May 2018 07:07:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526479662; cv=none; d=google.com; s=arc-20160816; b=ijK6LpTUVzjfSLBEMTZhKtlcaOc0FqQnMQBOWBASrOMMJFMi8KHg15tt1eHWfSUHMX Seihw7ht8oRLizKqouK6D/Z+d/9UQWxUL4w4gALKCfpwvwN+YxrPmGqiFBVeR4W230m8 7fzdX7Ss+2qQqGZJxAWSRPaPQbEHforjNMxziVqUxdXCYFL+ytP48Ctqo2jYqwA7mGdx y+bQLTPWoWHRzZaxK28Leg/vmclAKKtF3aMW4LBMEyzmAvGRCT2wJqea+tv1wKNSPY0/ lM8avjfLQHykIRtFJ4VfXdQh+FhwbUKBYYIw8tcvNRN3QUgCdlZG4mYGnhRA3YrAYlqD ExjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:mime-version:user-agent:date:message-id:cc:to :subject:from:dkim-signature:arc-authentication-results; bh=jWIDHac/cIGhsEOWYmpMkOzEcMdfFb+eiQ/KxagKrbw=; b=ef4NzulVRk7KCzOyz3QVYttfdnT8R2+B4MR2YME9jLq7HuIHY39F+MiSZ8SNt7FyiY wllgXlWgALjU4Kh1P53PXdSLMcbqw6sWMTKHeaZh7/Fh8qFpnGlbkG5JBkQU0OMWpcwW MFFr+UC0rTnWN8z8iBS2Q9UQ65UCFEw+GCdhTsojSNVw0YMXjvoEpAnod8pqR8D+n2Ms pHRqVj/a2YaI+0DeH84ypL6dxB72171nonni48yK8tSanpK4eiqeT8zZxFi0sayIMjdX fY+kGi90ldY2oV4ZROZxSTXDO8XZ55+1tKjuxei1GQMRLMDCk8h/ffVVLwY/YxindNS/ fqqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=SDxVaP4M; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d90-v6si2664721pld.92.2018.05.16.07.07.27; Wed, 16 May 2018 07:07:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=SDxVaP4M; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752666AbeEPOFu (ORCPT + 99 others); Wed, 16 May 2018 10:05:50 -0400 Received: from mail-ot0-f194.google.com ([74.125.82.194]:36468 "EHLO mail-ot0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752205AbeEPOFq (ORCPT ); Wed, 16 May 2018 10:05:46 -0400 Received: by mail-ot0-f194.google.com with SMTP id m11-v6so1039284otf.3 for ; Wed, 16 May 2018 07:05:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=jWIDHac/cIGhsEOWYmpMkOzEcMdfFb+eiQ/KxagKrbw=; b=SDxVaP4M4cXEyqJVkGrbvjKilKVrmhrp9J7iBkZd1qO86ym24tOkEH6btF17uObSQ1 7ADY6s/MuijFCkX458pe0f17sOuCKsLvAmeDZn/TeLkjF80Id1m+SevkHvaM57cHINhw 4OvUuecKq/Tc0+ZPtot3Z4SbKeq3WB/ZawbsES1ToziNgfuim7456Z8KVmXz6Tu4wH/L hWsbWbMu0jxMvTieDpLsSG/28BO6S4VbixC/IEE+itEx/i8Q2/0Ht/2nH4SYE2pcyiur Ru5eW70snBL9XT+jC/5XHp3sGBoOpV80IHQooXZ2kxEb8fFy84Z6fNGPi8s7B2golyCM 2bkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=jWIDHac/cIGhsEOWYmpMkOzEcMdfFb+eiQ/KxagKrbw=; b=unLOK96mHbZi4ooX/0IOan0MahhaM6pIXoeJm2qQqU+Scu29Fn3V6WDYPXcl+XEZu5 QrKPUVAaNf9QhcnJrK+tvH6ZTP14Ll7Y8cAgRoJemBD8SJz7f87UH6+bAVWEP6tT+zzT RBO2U1xpABgaQw3VAl4v7v0zx7L5xyBFQU+xR12lAL6/F1smnKLSGIXwSIjOI7t2ad6V wNUH9o41IRgXwJ6C8IEQtgdNjbjqe1i+vOA6CAVUsD3Iqy/zwcQ31OAmPye+kkGKFoWv +a3vIvEshQNGyLBrBBJ84gvOOqld5krevMO54vWTU8V3+jAG8PS1z/+py6gQYv4DV+oF lcQg== X-Gm-Message-State: ALKqPwerM+RzFBRLMZRIkKFjRVW/je6AejJuWP0JioYA67qHoGXHEDpj qGAMOQc7WfQ2isnckGQorEF7OIbt X-Received: by 2002:a9d:2361:: with SMTP id k30-v6mr802385otd.195.1526479545564; Wed, 16 May 2018 07:05:45 -0700 (PDT) Received: from [192.168.0.2] (cpe-24-27-59-32.austin.res.rr.com. [24.27.59.32]) by smtp.gmail.com with ESMTPSA id c40-v6sm1666041ote.59.2018.05.16.07.05.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 May 2018 07:05:44 -0700 (PDT) From: Stuart Hayes Subject: [PATCH v2] dcdbas: Add support for WSMT ACPI table To: Douglas_Warzecha@Dell.com Cc: mario.limonciello@dell.com, Jared_Dominguez@dell.com, linux-kernel@vger.kernel.org Message-ID: <45b8bde6-aaa8-3f3f-0528-81e5e931751c@gmail.com> Date: Wed, 16 May 2018 09:05:42 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Antivirus: Avast (VPS 180515-2, 05/15/2018), Outbound message X-Antivirus-Status: Clean Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the WSMT ACPI table is present and indicates that a fixed communication buffer should be used, use the firmware-specified buffer instead of allocating a buffer in memory for communications between the dcdbas driver and firmare. Signed-off-by: Stuart Hayes --- v2 Bumped driver version to 5.6.0-3.3 drivers/firmware/Kconfig | 2 +- drivers/firmware/dcdbas.c | 102 +++++++++++++++++++++++++++++++++++++++++++--- drivers/firmware/dcdbas.h | 11 +++++ 3 files changed, 109 insertions(+), 6 deletions(-) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index b7c748248e53..a2bd6092bfa1 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -125,7 +125,7 @@ config DELL_RBU config DCDBAS tristate "Dell Systems Management Base Driver" - depends on X86 + depends on X86 && ACPI help The Dell Systems Management Base Driver provides a sysfs interface for systems management software to perform System Management diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c index 0bdea60c65dd..1699cfdcefe4 100644 --- a/drivers/firmware/dcdbas.c +++ b/drivers/firmware/dcdbas.c @@ -36,12 +36,13 @@ #include #include #include +#include #include #include "dcdbas.h" #define DRIVER_NAME "dcdbas" -#define DRIVER_VERSION "5.6.0-3.2" +#define DRIVER_VERSION "5.6.0-3.3" #define DRIVER_DESCRIPTION "Dell Systems Management Base Driver" static struct platform_device *dcdbas_pdev; @@ -49,19 +50,23 @@ static struct platform_device *dcdbas_pdev; static u8 *smi_data_buf; static dma_addr_t smi_data_buf_handle; static unsigned long smi_data_buf_size; +static unsigned long max_smi_data_buf_size = MAX_SMI_DATA_BUF_SIZE; static u32 smi_data_buf_phys_addr; static DEFINE_MUTEX(smi_data_lock); +static u8 *eps_buffer; static unsigned int host_control_action; static unsigned int host_control_smi_type; static unsigned int host_control_on_shutdown; +static bool wsmt_enabled; + /** * smi_data_buf_free: free SMI data buffer */ static void smi_data_buf_free(void) { - if (!smi_data_buf) + if (!smi_data_buf || wsmt_enabled) return; dev_dbg(&dcdbas_pdev->dev, "%s: phys: %x size: %lu\n", @@ -86,7 +91,7 @@ static int smi_data_buf_realloc(unsigned long size) if (smi_data_buf_size >= size) return 0; - if (size > MAX_SMI_DATA_BUF_SIZE) + if (size > max_smi_data_buf_size) return -EINVAL; /* new buffer is needed */ @@ -169,7 +174,7 @@ static ssize_t smi_data_write(struct file *filp, struct kobject *kobj, { ssize_t ret; - if ((pos + count) > MAX_SMI_DATA_BUF_SIZE) + if ((pos + count) > max_smi_data_buf_size) return -EINVAL; mutex_lock(&smi_data_lock); @@ -323,7 +328,8 @@ static ssize_t smi_request_store(struct device *dev, break; case 1: /* Calling Interface SMI */ - smi_cmd->ebx = (u32) virt_to_phys(smi_cmd->command_buffer); + smi_cmd->ebx = smi_data_buf_phys_addr + + offsetof(struct smi_cmd, command_buffer); ret = dcdbas_smi_request(smi_cmd); if (!ret) ret = count; @@ -482,6 +488,85 @@ static void dcdbas_host_control(void) } } +/* WSMT */ + +static u8 checksum(u8 *buffer, u8 length) +{ + u8 sum = 0; + u8 *end = buffer + length; + + while (buffer < end) + sum = (u8)(sum + *(buffer++)); + return sum; +} + +static inline struct smm_eps_table *check_eps_table(u8 *addr) +{ + struct smm_eps_table *eps = (struct smm_eps_table *)addr; + + if (strncmp(SMM_EPS_SIG, eps->smm_comm_buff_anchor, 4) != 0) + return NULL; + + if (checksum(addr, eps->length) != 0) + return NULL; + + return eps; +} + +static int dcdbas_check_wsmt(void) +{ + struct acpi_table_wsmt *wsmt = NULL; + struct smm_eps_table *eps = NULL; + u8 *addr; + + acpi_get_table(ACPI_SIG_WSMT, 0, (struct acpi_table_header **)&wsmt); + if (!wsmt) + return 0; + + /* Check if WSMT ACPI table shows that protection is enabled */ + if (!(wsmt->protection_flags & ACPI_WSMT_FIXED_COMM_BUFFERS) + || !(wsmt->protection_flags + & ACPI_WSMT_COMM_BUFFER_NESTED_PTR_PROTECTION)) + return 0; + + /* Scan for EPS (entry point structure) */ + for (addr = (u8 *)__va(0xf0000); + addr < (u8 *)__va(0x100000 - sizeof(struct smm_eps_table)) && !eps; + addr += 1) + eps = check_eps_table(addr); + + if (!eps) { + dev_dbg(&dcdbas_pdev->dev, "found WSMT, but no EPS found\n"); + return -ENODEV; + } + + /* + * Get physical address of buffer and map to virtual address. + * Table gives size in 4K pages, regardless of actual system page size. + */ + if (eps->smm_comm_buff_addr + 8 > U32_MAX) { + dev_warn(&dcdbas_pdev->dev, "found WSMT, but EPS buffer address is above 4GB\n"); + return -EINVAL; + } + eps_buffer = (u8 *)memremap(eps->smm_comm_buff_addr, + eps->num_of_4k_pages * 4096, MEMREMAP_WB); + if (!eps_buffer) { + dev_warn(&dcdbas_pdev->dev, "found WSMT, but failed to map EPS buffer\n"); + return -ENOMEM; + } + + /* First 8 bytes of buffer is for semaphore */ + smi_data_buf_phys_addr = (u32) eps->smm_comm_buff_addr + 8; + smi_data_buf = eps_buffer + 8; + smi_data_buf_size = (unsigned long) min(eps->num_of_4k_pages * 4096 - 8, + (u64) ULONG_MAX); + max_smi_data_buf_size = smi_data_buf_size; + wsmt_enabled = true; + dev_info(&dcdbas_pdev->dev, + "WSMT found, using firmware-provided SMI buffer.\n"); + return 1; +} + /** * dcdbas_reboot_notify: handle reboot notification for host control */ @@ -548,6 +633,11 @@ static int dcdbas_probe(struct platform_device *dev) dcdbas_pdev = dev; + /* Check if ACPI WSMT table specifies protected SMI buffer address */ + error = dcdbas_check_wsmt(); + if (error < 0) + return error; + /* * BIOS SMI calls require buffer addresses be in 32-bit address space. * This is done by setting the DMA mask below. @@ -635,6 +725,8 @@ static void __exit dcdbas_exit(void) */ if (dcdbas_pdev) smi_data_buf_free(); + if (eps_buffer) + memunmap(eps_buffer); platform_device_unregister(dcdbas_pdev_reg); platform_driver_unregister(&dcdbas_driver); } diff --git a/drivers/firmware/dcdbas.h b/drivers/firmware/dcdbas.h index ca3cb0a54ab6..7ea5b3e070b9 100644 --- a/drivers/firmware/dcdbas.h +++ b/drivers/firmware/dcdbas.h @@ -54,6 +54,8 @@ #define SMI_CMD_MAGIC (0x534D4931) +#define SMM_EPS_SIG "$SCB" + #define DCDBAS_DEV_ATTR_RW(_name) \ DEVICE_ATTR(_name,0600,_name##_show,_name##_store); @@ -103,5 +105,14 @@ struct apm_cmd { int dcdbas_smi_request(struct smi_cmd *smi_cmd); +struct smm_eps_table { + char smm_comm_buff_anchor[4]; + u8 length; + u8 checksum; + u8 version; + u64 smm_comm_buff_addr; + u64 num_of_4k_pages; +} __packed; + #endif /* _DCDBAS_H_ */ -- 2.14.2