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=-0.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 32A4CC76188 for ; Fri, 19 Jul 2019 11:28:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 09DBE2173B for ; Fri, 19 Jul 2019 11:28:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726076AbfGSL2L convert rfc822-to-8bit (ORCPT ); Fri, 19 Jul 2019 07:28:11 -0400 Received: from mga03.intel.com ([134.134.136.65]:25845 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726075AbfGSL2L (ORCPT ); Fri, 19 Jul 2019 07:28:11 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Jul 2019 04:28:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,282,1559545200"; d="scan'208";a="168533118" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga008.fm.intel.com with ESMTP; 19 Jul 2019 04:28:10 -0700 Received: from fmsmsx156.amr.corp.intel.com (10.18.116.74) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 19 Jul 2019 04:28:10 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx156.amr.corp.intel.com (10.18.116.74) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 19 Jul 2019 04:28:09 -0700 Received: from shsmsx108.ccr.corp.intel.com ([169.254.8.174]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.55]) with mapi id 14.03.0439.000; Fri, 19 Jul 2019 19:28:07 +0800 From: "Zhang, Rui" To: "Rafael J. Wysocki" , "Kenneth R. Crudup" CC: Linux PM list , Srinivas Pandruvada Subject: RE: [Fwd: Commit 555c45fe0d0 ("int340X/processor_thermal_device: add support for MMIO RAPL") boot failure] Thread-Topic: [Fwd: Commit 555c45fe0d0 ("int340X/processor_thermal_device: add support for MMIO RAPL") boot failure] Thread-Index: AQHVPfk4xv+J6oZLOE2BKIB9x1Q0cabRFlwAgAC3l4A= Date: Fri, 19 Jul 2019 11:28:08 +0000 Message-ID: <744357E9AAD1214791ACBA4B0B909263775CFC4D@SHSMSX108.ccr.corp.intel.com> References: <1563514893.2433.3.camel@intel.com> <1780736.Kzs3HF7DM6@kreacher> In-Reply-To: <1780736.Kzs3HF7DM6@kreacher> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYjQzMDc1NmEtODY3OS00YTUzLWJhOWUtYzMxYzRjOWUwOWJjIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoieE4zc0JJNzduVWJSTDFcL2ZlZ29KNnhURmdjVXdhMnVycW5UeThCelk3QXZkOWxBZU50aUFuTzg2TDNXV28yQmIifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org > -----Original Message----- > From: linux-pm-owner@vger.kernel.org [mailto:linux-pm- > owner@vger.kernel.org] On Behalf Of Rafael J. Wysocki > Sent: Friday, July 19, 2019 4:30 PM > To: Kenneth R. Crudup > Cc: Zhang, Rui ; Linux PM list pm@vger.kernel.org>; Srinivas Pandruvada > > Subject: Re: [Fwd: Commit 555c45fe0d0 ("int340X/processor_thermal_device: > add support for MMIO RAPL") boot failure] > Importance: High > > On Friday, July 19, 2019 8:13:22 AM CEST Kenneth R. Crudup wrote: > > > > On Fri, 19 Jul 2019, Zhang Rui wrote: > > > > > Are you using the latest Linus' tree today? > > > > Yeah, Linus' master tree, as of the time of this E-mail (no new > > commits since mid-afternoon Thursday PDT). > > > > "lspci --vvnn" is attached. > > Also please let me know if the appended patch helps. > I can reproduce the issue with the config attached, and this patch does not help. I'm still working on it. Thanks, rui > --- > drivers/thermal/intel/int340x_thermal/processor_thermal_device.c | 4 > ++++ > 1 file changed, 4 insertions(+) > > Index: linux- > pm/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > ================================================================ > === > --- linux- > pm.orig/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c > +++ linux- > pm/drivers/thermal/intel/int340x_thermal/processor_thermal_dev > +++ ice.c > @@ -487,6 +487,7 @@ static int proc_thermal_rapl_add(struct > rapl_mmio_cpu_online, > rapl_mmio_cpu_down_prep); > if (ret < 0) { > > powercap_unregister_control_type(rapl_mmio_priv.control_type); > + rapl_mmio_priv.control_type = NULL: > return ret; > } > rapl_mmio_priv.pcap_rapl_online = ret; @@ -496,6 +497,9 @@ > static int proc_thermal_rapl_add(struct > > static void proc_thermal_rapl_remove(void) { > + if (IS_ERR_OR_NULL(rapl_mmio_priv.control_type)) > + return; > + > cpuhp_remove_state(rapl_mmio_priv.pcap_rapl_online); > powercap_unregister_control_type(rapl_mmio_priv.control_type); > } > >