From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AF37C04A6B for ; Mon, 6 May 2019 14:42:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3C94A2087F for ; Mon, 6 May 2019 14:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557153752; bh=UaMv/+/IrZ2+xZVxw/x43g3nED7ocOW0JouwMEKT7+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gCzFJJDr+vjXKm8OCNUe4x6MYPKypn2TmvPflAZ9wUA/p6q4GntkJIc1KenesRnWv CQ6VxZ2HtYTk7VpstvvSUhaxCE938xrSEUAgXQ4qmsgkfFl5zt6syfUXVeHXY0TzML HAEYdd5ynzNxlTwei8DiAkIPUbvyP5VIrGrEoVQ0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727480AbfEFOmb (ORCPT ); Mon, 6 May 2019 10:42:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:37378 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726761AbfEFOma (ORCPT ); Mon, 6 May 2019 10:42:30 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A4C4920449; Mon, 6 May 2019 14:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557153750; bh=UaMv/+/IrZ2+xZVxw/x43g3nED7ocOW0JouwMEKT7+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PVDTl1MM5jE5Ux7YjTyQI1m/knINokqhpvO5Oobvab8u/CFeT39Vi8DSnjXA1Yucq z5qL9JphbSxF8U3Q1960wUeuFaZ757Ki1fMPxR/m0u5Ucc9bHYDxPBXcLP5JA4Wzrv LJvbRojqq3QzjC7crGwZt9ympRWZZcnuFucmX0Y0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "David E. Box" , Srinivas Pandruvada , "David E. Box" , Rajneesh Bhardwaj , Andy Shevchenko Subject: [PATCH 4.19 82/99] platform/x86: intel_pmc_core: Handle CFL regmap properly Date: Mon, 6 May 2019 16:32:55 +0200 Message-Id: <20190506143101.471445067@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190506143053.899356316@linuxfoundation.org> References: <20190506143053.899356316@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rajneesh Bhardwaj commit e50af8332785355de3cb40d9f5e8c45dbfc86f53 upstream. Only Coffeelake should use Cannonlake regmap other than Cannonlake platform. This allows Coffeelake special handling only when there is no matching PCI device and default reg map selected as per CPUID is for Sunrisepoint PCH. This change is needed to enable support for newer SoCs such as Icelake. Cc: "David E. Box" Cc: Srinivas Pandruvada Fixes: 661405bd817b ("platform/x86: intel_pmc_core: Special case for Coffeelake") Acked-by: "David E. Box" Signed-off-by: Rajneesh Bhardwaj Signed-off-by: Andy Shevchenko Signed-off-by: Greg Kroah-Hartman --- drivers/platform/x86/intel_pmc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/platform/x86/intel_pmc_core.c +++ b/drivers/platform/x86/intel_pmc_core.c @@ -682,7 +682,7 @@ static int __init pmc_core_probe(void) * Sunrisepoint PCH regmap can't be used. Use Cannonlake PCH regmap * in this case. */ - if (!pci_dev_present(pmc_pci_ids)) + if (pmcdev->map == &spt_reg_map && !pci_dev_present(pmc_pci_ids)) pmcdev->map = &cnp_reg_map; if (lpit_read_residency_count_address(&slp_s0_addr))