Received: by 10.213.65.68 with SMTP id h4csp550661imn; Thu, 22 Mar 2018 03:24:52 -0700 (PDT) X-Google-Smtp-Source: AG47ELsd8zaxCfnQ8cc85mg2jb6OKr3hmzoJylkmsbBURg+iFr8inFGul7d97Jml/cMkFXhfsJl4 X-Received: by 10.98.180.13 with SMTP id h13mr19727145pfn.139.1521714292635; Thu, 22 Mar 2018 03:24:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521714292; cv=none; d=google.com; s=arc-20160816; b=oWkYoQDoCvnW8cxzUFNyq+Rd4rGfEAdICx8gmT3jsWvv/vieTt7KyOAOTAbR440EHk gV1R4zix4eVsVQ80r9ag33YcpbM1q7uUySOo3E+xeYJl4gDpx2awQkTtWtji6bI/led2 9anA0qvOGVwexzWlv6+nriVcR24AeprYwqWLBZKjm84wkYZ61Nxk/syEpC264Jnhl96K 0Y3aJhDkqlPo7Z6hkx7RndHRd2hXSraHXGO0+rCpysG4mjpy9+nW9ynii7JLyKBMjSRr FHGcNXaSIP9WteiKcItJvkn0sxOBS7BfYBNefRe65Y6Ad5Q2o4hPjZq3ReTNTOKfWdjC KXcg== 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:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=af7jqBv7RnOXxF1NYAh17aZN5mpa/8XgZKv9377B25Y=; b=IvuBN+sqGT4dTF5l+O51KD5U6uVjY3eBxTQmWMBeLvAjT2qsKG2678isQM42QCzXbp 0n/nt5Hi8RT/uKdu1wsT4oeyZGxSliSzRF8eJCXi041ymge/T5dycHNow63u+gtzueXO RBVzbEX5D2yCWqIhTwM7vXs2Fe+IMKI/qGA5tRb3df2/HSL+Xfdj2q3ENiQX32ruzMwa p8l9/3iDEKoi0ia1B/9uzlF79tmv4BEYZYjm4AuDArg3Yo9PQPm1YQw4fGbT4c/XdGbj albcTRts2VGac9YQPZHoubWujU6iSoPQ445x05VLi5zxYHzHcQWT6L+0/2HLloQ2XJHg wMrw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k11-v6si5787140pls.58.2018.03.22.03.24.37; Thu, 22 Mar 2018 03:24:52 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753969AbeCVKX1 (ORCPT + 99 others); Thu, 22 Mar 2018 06:23:27 -0400 Received: from mga06.intel.com ([134.134.136.31]:40579 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753546AbeCVKXV (ORCPT ); Thu, 22 Mar 2018 06:23:21 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Mar 2018 03:23:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,344,1517904000"; d="scan'208";a="44342154" Received: from anshuma1-pnp-server.iind.intel.com ([10.223.107.119]) by orsmga002.jf.intel.com with ESMTP; 22 Mar 2018 03:23:17 -0700 From: Anshuman Gupta To: glx@linutronix.de Cc: x86@kernel.org, mingo@redhat.com, hpa@zytor.com, rjw@rjwysocki.net, andriy.shevchenko@linux.intel.com, alan@linux.intel.com, linux-kernel@vger.kernel.org, rajneesh.bhardwaj@intel.com, anshuman.gupta@intel.com Subject: [PATCH v3] x86: i8237: Register based on FADT legacy boot flag Date: Thu, 22 Mar 2018 15:51:58 +0530 Message-Id: <1521714118-31282-1-git-send-email-anshuman.gupta@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rajneesh Bhardwaj From Skylake onwards, the platform controller hub (Sunrisepoint PCH) does not support legacy DMA operations to IO ports 81h-83h, 87h, 89h-8Bh, 8Fh. Currently this driver registers as syscore ops and its resume function is called on every resume from S3. On Skylake and Kabylake, this causes a resume delay of around 100ms due to port IO operations, which is a problem. This change allows to load the driver only when the platform bios explicitly supports such devices or has a cut-off date earlier than 2017. For example open source system firmware like coreboot started unsetting ACPI_FADT_LEGACY_DEVICES field in FADT table very recently. https://github.com/coreboot/coreboot/blob/05132707ca1e13a11cd13c77326bc65011b09feb/src/soc/intel/skylake/acpi.c#L271 Please refer to chapter 21 of 6th Generation Intel® Core™ Processor Platform Controller Hub Family: BIOS Specification. https://www.intel.in/content/www/in/en/embedded/products/skylake/u-mobile/software-and-drivers.html Cc: Alan Cox Reviewed-by: Andy Shevchenko Signed-off-by: Anshuman Gupta Signed-off-by: Rajneesh Bhardwaj --- Changes in v3: * Added x86_pnpbios_disabled and using it instead of pnpbios. * Modified the commit message. Changes in v2: * changed to dma_inb() --- arch/x86/include/asm/x86_init.h | 1 + arch/x86/kernel/i8237.c | 25 +++++++++++++++++++++++++ arch/x86/kernel/platform-quirks.c | 7 ++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index fc2f082..b6ceac0 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h @@ -286,6 +286,7 @@ extern struct x86_msi_ops x86_msi; extern struct x86_io_apic_ops x86_io_apic_ops; extern void x86_early_init_platform_quirks(void); +extern bool x86_pnpbios_disabled(void); extern void x86_init_noop(void); extern void x86_init_uint_noop(unsigned int unused); diff --git a/arch/x86/kernel/i8237.c b/arch/x86/kernel/i8237.c index 8eeaa81..0a3e70f 100644 --- a/arch/x86/kernel/i8237.c +++ b/arch/x86/kernel/i8237.c @@ -9,10 +9,12 @@ * your option) any later version. */ +#include #include #include #include +#include /* * This module just handles suspend/resume issues with the @@ -49,6 +51,29 @@ static struct syscore_ops i8237_syscore_ops = { static int __init i8237A_init_ops(void) { + /* + * From SKL PCH onwards, the legacy DMA device is removed in which the + * I/O ports (81h-83h, 87h, 89h-8Bh, 8Fh) related to it are removed + * as well. All removed ports must return 0xff for a inb() request. + * + * Note: DMA_PAGE_2 (port 0x81) should not be checked for detecting + * the presence of DMA device since it may be used by BIOS to decode + * LPC traffic for POST codes. Original LPC only decodes one byte of + * port 0x80 but some BIOS may choose to enhance PCH LPC port 0x8x + * decoding. + */ + if (dma_inb(DMA_PAGE_0) == 0xFF) + return -ENODEV; + + /* + * It is not required to load this driver as newer SoC may not + * support 8237 DMA or bus mastering from LPC. Platform firmware + * must announce the support for such legacy devices via + * ACPI_FADT_LEGACY_DEVICES field in FADT table. + */ + if (x86_pnpbios_disabled() && dmi_get_bios_year() >= 2017) + return -ENODEV; + register_syscore_ops(&i8237_syscore_ops); return 0; } diff --git a/arch/x86/kernel/platform-quirks.c b/arch/x86/kernel/platform-quirks.c index 235fe60..b348a67 100644 --- a/arch/x86/kernel/platform-quirks.c +++ b/arch/x86/kernel/platform-quirks.c @@ -33,9 +33,14 @@ void __init x86_early_init_platform_quirks(void) x86_platform.set_legacy_features(); } +bool __init x86_pnpbios_disabled(void) +{ + return x86_platform.legacy.devices.pnpbios == 0; +} + #if defined(CONFIG_PNPBIOS) bool __init arch_pnpbios_disabled(void) { - return x86_platform.legacy.devices.pnpbios == 0; + return x86_pnpbios_disabled(); } #endif -- 2.7.4