From patchwork Mon Apr 28 14:04:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Pan X-Patchwork-Id: 4082791 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A7CB8C0ACC for ; Mon, 28 Apr 2014 22:06:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB75A201EC for ; Mon, 28 Apr 2014 22:06:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF290201F7 for ; Mon, 28 Apr 2014 22:06:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933268AbaD1WFz (ORCPT ); Mon, 28 Apr 2014 18:05:55 -0400 Received: from mga02.intel.com ([134.134.136.20]:58602 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932200AbaD1WFZ (ORCPT ); Mon, 28 Apr 2014 18:05:25 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 28 Apr 2014 15:04:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,946,1389772800"; d="scan'208";a="502535828" Received: from jacob-desktop.jf.intel.com ([10.7.198.88]) by orsmga001.jf.intel.com with ESMTP; 28 Apr 2014 15:04:07 -0700 From: Jacob Pan To: Linux PM , Rafael Wysocki , LKML Cc: "David E. Box" , Alan Cox , Durgadoss R , Kristen Carlson Accardi , Jacob Pan Subject: [PATCH 4/5] x86/iosf: kconfig and used by other drivers Date: Mon, 28 Apr 2014 07:04:39 -0700 Message-Id: <1398693880-13428-5-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1398693880-13428-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1398693880-13428-1-git-send-email-jacob.jun.pan@linux.intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.0 required=5.0 tests=BAYES_00, DATE_IN_PAST_06_12, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Allow Kconfig selection for IOSF driver. Fix warning condition when MBI interface dummy functions are called at runtime. Signed-off-by: Jacob Pan --- arch/x86/Kconfig | 2 +- arch/x86/include/asm/iosf_mbi.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 25d2c6f..cda587b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2375,7 +2375,7 @@ config X86_DMA_REMAP depends on STA2X11 config IOSF_MBI - bool + bool "Intel OnChip System Fabric mailbox" depends on PCI ---help--- To be selected by modules requiring access to the Intel OnChip System diff --git a/arch/x86/include/asm/iosf_mbi.h b/arch/x86/include/asm/iosf_mbi.h index 9fc5402..74336f0 100644 --- a/arch/x86/include/asm/iosf_mbi.h +++ b/arch/x86/include/asm/iosf_mbi.h @@ -5,7 +5,6 @@ #ifndef IOSF_MBI_SYMS_H #define IOSF_MBI_SYMS_H -#ifdef CONFIG_IOSF_MBI #define MBI_MCR_OFFSET 0xD0 #define MBI_MDR_OFFSET 0xD4 @@ -52,6 +51,8 @@ #define BT_MBI_PCIE_READ 0x00 #define BT_MBI_PCIE_WRITE 0x01 +#ifdef CONFIG_IOSF_MBI + bool iosf_mbi_available(void); /** @@ -101,21 +102,21 @@ bool iosf_mbi_available(void) static inline int iosf_mbi_read(u8 port, u8 opcode, u32 offset, u32 *mdr) { - WARN(); + WARN(1, "MBI driver not available"); return -EPERM; } static inline int iosf_mbi_write(u8 port, u8 opcode, u32 offset, u32 mdr) { - WARN(); + WARN(1, "MBI driver not available"); return -EPERM; } static inline int iosf_mbi_modify(u8 port, u8 opcode, u32 offset, u32 mdr, u32 mask) { - WARN(); + WARN(1, "MBI driver not available"); return -EPERM; } #endif /* CONFIG_IOSF_MBI */