From patchwork Tue Sep 25 19:34:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stuart hayes X-Patchwork-Id: 10614721 X-Patchwork-Delegate: andy.shevchenko@gmail.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C152C913 for ; Tue, 25 Sep 2018 19:34:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACE0C2AB94 for ; Tue, 25 Sep 2018 19:34:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A11B42AB98; Tue, 25 Sep 2018 19:34:54 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,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 09AD22AB94 for ; Tue, 25 Sep 2018 19:34:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727381AbeIZBnw (ORCPT ); Tue, 25 Sep 2018 21:43:52 -0400 Received: from mail-ot1-f68.google.com ([209.85.210.68]:42579 "EHLO mail-ot1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727751AbeIZBnl (ORCPT ); Tue, 25 Sep 2018 21:43:41 -0400 Received: by mail-ot1-f68.google.com with SMTP id h26-v6so25627223otl.9; Tue, 25 Sep 2018 12:34:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ldPFbZGJQbzog/8y4w+xAEWL9nwdHNU4DHu1seOmDX4=; b=qivGYmLIg9Q5YfPWJKc5MELCa0uzJ/2FXQkkZFc3Kq+K9ucVH+1EZ4rsjoLVF9t7Mk Nh7znewi1lFmDzsrJwH88lzlVjr2YMo279qaXsOEWOvYf4F5MGKsDaPwgn9ZDmQN4ZX4 6RklPsG1Kq5m9TRv4ZBH4TTALLvsh2B4GtDMfb2x255SB64BVbn1BKgh3gHtuqmpxOGy RO847WsXd50R4epa04/gFcEk0RhgiPU9pFZSFNhdSfqjKmrAHLzCNBEv9PAOezCSdrGf y/5Uj54YW3wuai5uSlL5Xzn7G4yxuvTJnzTuinsNXUJj5QJeYlD2X0TOj7QwFXJV4BzH ClXA== 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=ldPFbZGJQbzog/8y4w+xAEWL9nwdHNU4DHu1seOmDX4=; b=HgWSW2TWjBGUhQLait8ridflSwaEzrZpyWYB5b6SwB64BHY2zu3QTEAbP0kHdJAMVV xJF85zerXL3LSca+MZVP70M7H+jk5AELsnlRmnfoAwZL4/Epd0JikDf9y1yiK+pu337f 2kO/4/BsbHdO7PepECarh5/j1Hy+y76n0/xyUxVJ7kjpjEOUwqh4f6+9Davd8pTXaSVq yCQY3dIrqXyP9EmP5yU8rj5Tsc2AvEPvPsb8n9DjRhY7ghw/I3gvOUkA1Ug4xTe61ysM 8aVqRKhbl1bk9N3Gqocfog/OsxxeLwYsmph4VlEOZjsLmIwsWY0HEAQmZlBapuUAkI8A wwkw== X-Gm-Message-State: ABuFfojSUWm/UZg7uZSYYGe1tv6pQuaBh61aZ6HDS5HMFwsrny7Q9nHm NafHBV8SVHVVcveO40SwtEM= X-Google-Smtp-Source: ACcGV62OpV4SuUObZwaMkHd0uCEh9gbjq2WcfRfxkeGXz6yNwaEoGBQSyLe4xhGr+/Yf6sRGBzjZUg== X-Received: by 2002:a9d:3cb9:: with SMTP id z54-v6mr1722194otc.22.1537904076005; Tue, 25 Sep 2018 12:34:36 -0700 (PDT) Received: from localhost.localdomain ([143.166.81.254]) by smtp.gmail.com with ESMTPSA id q15-v6sm1049193otl.43.2018.09.25.12.34.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Sep 2018 12:34:35 -0700 (PDT) From: Stuart Hayes X-Google-Original-From: Stuart Hayes To: dvhart@infradead.org, Andy Shevchenko Cc: Mario Limonciello , LKML , platform-driver-x86@vger.kernel.org, Stuart Hayes Subject: [PATCH 4/5] firmware: dcdbas: Move dcdbas to drivers/platform/x86 Date: Tue, 25 Sep 2018 14:34:17 -0500 Message-Id: <20180925193418.28493-5-stuart.hayes@dell.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180925193418.28493-1-stuart.hayes@dell.com> References: <20180925193418.28493-1-stuart.hayes@dell.com> 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 From: Stuart Hayes Signed-off-by: Stuart Hayes --- drivers/firmware/Kconfig | 16 ---------------- drivers/firmware/Makefile | 1 - drivers/platform/x86/Kconfig | 16 ++++++++++++++++ drivers/platform/x86/Makefile | 1 + drivers/{firmware => platform/x86}/dcdbas.c | 0 drivers/{firmware => platform/x86}/dcdbas.h | 0 drivers/platform/x86/dell-smbios-smm.c | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) rename drivers/{firmware => platform/x86}/dcdbas.c (100%) rename drivers/{firmware => platform/x86}/dcdbas.h (100%) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 02f39d20efce..6d0c28fd3bad 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -145,22 +145,6 @@ config EFI_PCDP See DIG64_HCDPv20_042804.pdf available from -config DCDBAS - tristate "Dell Systems Management Base Driver" - depends on X86 - help - The Dell Systems Management Base Driver provides a sysfs interface - for systems management software to perform System Management - Interrupts (SMIs) and Host Control Actions (system power cycle or - power off after OS shutdown) on certain Dell systems. - - See for more details on the driver - and the Dell systems on which Dell systems management software makes - use of this driver. - - Say Y or M here to enable the driver for use by Dell systems - management software such as Dell OpenManage. - config DMIID bool "Export DMI identification via sysfs to userspace" depends on DMI diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index 61887ba9df1d..edda4206d8fc 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -11,7 +11,6 @@ obj-$(CONFIG_DMI) += dmi_scan.o obj-$(CONFIG_DMI_SYSFS) += dmi-sysfs.o obj-$(CONFIG_EDD) += edd.o obj-$(CONFIG_EFI_PCDP) += pcdp.o -obj-$(CONFIG_DCDBAS) += dcdbas.o obj-$(CONFIG_DMIID) += dmi-id.o obj-$(CONFIG_ISCSI_IBFT_FIND) += iscsi_ibft_find.o obj-$(CONFIG_ISCSI_IBFT) += iscsi_ibft.o diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index cb037da32107..1c7e553c28ce 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -105,6 +105,22 @@ config ASUS_LAPTOP If you have an ACPI-compatible ASUS laptop, say Y or M here. +config DCDBAS + tristate "Dell Systems Management Base Driver" + depends on X86 + help + The Dell Systems Management Base Driver provides a sysfs interface + for systems management software to perform System Management + Interrupts (SMIs) and Host Control Actions (system power cycle or + power off after OS shutdown) on certain Dell systems. + + See for more details on the driver + and the Dell systems on which Dell systems management software makes + use of this driver. + + Say Y or M here to enable the driver for use by Dell systems + management software such as Dell OpenManage. + # # The DELL_SMBIOS driver depends on ACPI_WMI and/or DCDBAS if those # backends are selected. The "depends" line prevents a configuration diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 8843f8e22127..4e2712c9c0b0 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_EEEPC_WMI) += eeepc-wmi.o obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o obj-$(CONFIG_ACPI_CMPC) += classmate-laptop.o obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o +obj-$(CONFIG_DCDBAS) += dcdbas.o obj-$(CONFIG_DELL_SMBIOS) += dell-smbios.o dell-smbios-objs := dell-smbios-base.o dell-smbios-$(CONFIG_DELL_SMBIOS_WMI) += dell-smbios-wmi.o diff --git a/drivers/firmware/dcdbas.c b/drivers/platform/x86/dcdbas.c similarity index 100% rename from drivers/firmware/dcdbas.c rename to drivers/platform/x86/dcdbas.c diff --git a/drivers/firmware/dcdbas.h b/drivers/platform/x86/dcdbas.h similarity index 100% rename from drivers/firmware/dcdbas.h rename to drivers/platform/x86/dcdbas.h diff --git a/drivers/platform/x86/dell-smbios-smm.c b/drivers/platform/x86/dell-smbios-smm.c index 97a90bebc360..ab9b822a6dfe 100644 --- a/drivers/platform/x86/dell-smbios-smm.c +++ b/drivers/platform/x86/dell-smbios-smm.c @@ -18,7 +18,7 @@ #include #include #include -#include "../../firmware/dcdbas.h" +#include "dcdbas.h" #include "dell-smbios.h" static int da_command_address;