From patchwork Sun Mar 11 00:28:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Hart X-Patchwork-Id: 10274459 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 44DF160594 for ; Sun, 11 Mar 2018 00:29:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 215CF292F6 for ; Sun, 11 Mar 2018 00:29:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15E13294FB; Sun, 11 Mar 2018 00:29:08 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 465A3292F6 for ; Sun, 11 Mar 2018 00:29:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751164AbeCKA3G (ORCPT ); Sat, 10 Mar 2018 19:29:06 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:56008 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751161AbeCKA3F (ORCPT ); Sat, 10 Mar 2018 19:29:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Type:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=7WHr9EJ/PmtQN6unWm/f/YiE1b7Dp1++QKw3K/D5rF4=; b=Z6bwcwqHYi61V+3+eGsfQclejZ L/axEBl/l9EwcDhlh0/sphwkAkUNJiWp9V5JbcAHNGSDt1r8YTzmDvux/TzaW0jriK0xTGaBpY4eF XA3aPLZKXAUM9RFGEOBnY1849RAoxyHhVx+rrtO4GbEkG6EcniOkCEB0zwltfXnWYUDMtE9t6NJ18 G+BIVQeKvEpLFp+OzXiRG3CqpbjerkSzRiJq+NexPd3jSzxdyubbKZvnkfQedo1oeaCz8+hhUb7/N +Mn0uz6xHeDWKfXE7zkI1pYhPqHWFkTm43aQkv/BeAht/yDTnbP0E/3EsvTHheNNBqPZ11S8sjNMv f+L1oMXA==; Received: from dvhart by bombadil.infradead.org with local (Exim 4.89 #1 (Red Hat Linux)) id 1euorH-0001LD-2k; Sun, 11 Mar 2018 00:29:03 +0000 Date: Sat, 10 Mar 2018 16:28:59 -0800 From: Darren Hart To: platform-driver-x86@vger.kernel.org, LKML Cc: Andy Shevchenko , Mario Limonciello , Linus Torvalds Subject: [PATCH] platform/x86: dell_smbios: Resolve dependency error on ACPI_WMI Message-ID: <7eb3f317a876a6255aeb0abfd0137894ef8b5166.1520727789.git.dvhart@infradead.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.0 (2017-02-23) 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 Similarly to DCDBAS for DELL_SMBIOS_SMM, if DELL_SMBIOS_WMI is enabled, DELL_SMBIOS becomes dependent on ACPI_WMI. Update the depends line to prevent a configuration where DELL_SMBIOS=y and either backend dependency =m. Update the comment accordingly. Cc: Mario Limonciello Cc: Andy Shevchenko Signed-off-by: Darren Hart (VMware) --- Linus, just a heads up on this. Unlikely you would encounter this in your builds, but just in case, I wanted you to know we (0-day) caught it and are verifying the fix. drivers/platform/x86/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index e55b008..eef5eef 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -106,13 +106,13 @@ config ASUS_LAPTOP If you have an ACPI-compatible ASUS laptop, say Y or M here. # -# If the DELL_SMBIOS_SMM feature is enabled, the DELL_SMBIOS driver -# becomes dependent on the DCDBAS driver. The "depends" line prevents a -# configuration where DELL_SMBIOS=y while DCDBAS=m. +# The DELL_SMBIOS driver depends on ACPI_WMI and/or DCDBAS if those +# backends are selected. The "depends" line prevents a configuration +# where DELL_SMBIOS=y while either of those dependencies =m. # config DELL_SMBIOS tristate "Dell SMBIOS driver" - depends on DCDBAS || DCDBAS=n + depends on (DCDBAS || DCDBAS=n) && (ACPI_WMI || ACPI_WMI=n) ---help--- This provides support for the Dell SMBIOS calling interface. If you have a Dell computer you should enable this option.