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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BC4BECE57A for ; Mon, 9 Sep 2024 11:40:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 587706B0161; Mon, 9 Sep 2024 07:40:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 537986B0162; Mon, 9 Sep 2024 07:40:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3FEE16B0163; Mon, 9 Sep 2024 07:40:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 221816B0161 for ; Mon, 9 Sep 2024 07:40:19 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 9887B1C4521 for ; Mon, 9 Sep 2024 11:40:18 +0000 (UTC) X-FDA: 82545006516.11.7055747 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf30.hostedemail.com (Postfix) with ESMTP id 803A180015 for ; Mon, 9 Sep 2024 11:40:15 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GVFvhuCW; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of hdegoede@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=hdegoede@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725881940; a=rsa-sha256; cv=none; b=lEUPytBAWJ+k+844CpY3SWRRZCXl6Q8txUySk3MoXBs3wgdSDmXBhar7yb0dcL0KYhhgDM ASa1yfzSWURqoMzB838BKKBgXqLMgplNOI9fqulx3mhPGW3Tekw3qrB5GTtyIwXyI9BsfT 9C4+XReUx/v5ryORpbfj66cTuP/+9pk= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GVFvhuCW; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf30.hostedemail.com: domain of hdegoede@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=hdegoede@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725881940; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=B9CDfCUPWyy8T8eCH3NbbeKvi6CvjR/Ke1Y5gIeSyoU=; b=ENEyCoobBj/knz1EpV7Uurwrf6yIMWAP3piZMHpiRqeOlb3WU8/iZHVISu/VYOQofGlyxN OEkJAPn/huKUlMA7eK46zbhdba9yW9TTIao3kzpxZ5bkxv4bDzWd+KfzDSZHEs6YB7Gzqt udLhjq9TS4EsBipSlgzNsRnc0JVEHW8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725882014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B9CDfCUPWyy8T8eCH3NbbeKvi6CvjR/Ke1Y5gIeSyoU=; b=GVFvhuCWmsXGfi4tt9ZnHG+/H1VKi2LlO++iUmpeCBijri1BiK8xoIXTVA9zUmcLdHVFem rcYTzrqOg4kvsE1qGzLoP2+676+A1RxmvUED7P4rBqNC3AX8YaYE7sSUzcKC1GhMHuvy9g QgF+R1Rxx+5+//hI9pxvv1SPZ8rZexI= Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-492-LhscLOeRNFim8lGBsqGRFg-1; Mon, 09 Sep 2024 07:40:10 -0400 X-MC-Unique: LhscLOeRNFim8lGBsqGRFg-1 Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2f661aaceadso30762281fa.3 for ; Mon, 09 Sep 2024 04:40:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725882009; x=1726486809; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=B9CDfCUPWyy8T8eCH3NbbeKvi6CvjR/Ke1Y5gIeSyoU=; b=FI5AWEl4rQbPJJqiaCK8mfwZX1uaE1qtDi82ok75kEx5QyLk/aCSjNPXl1WZkVGAEM gsyVVnAW0sAhmqEyVlZ+QfWnPDIayDMui27pY72i1OUhzh3++O4TQc8jOMQ+KPUcu5rl qKxmQtqEd1K8xJuVV8eJIa1qic5Pj1S6AlrVcsuTLlo4kx+4x47I3JhRjx9MvhzczcxG s36O4t8cwL0bKPimBUw/4BPxdJYVkDn7lgN/tkXGF3Y+m+xoTU59CGgXAhRbMv6rQ5oL 8wEXRSko/hejyRyKYA00Vo3B3sJ+OYTu3qUxe81IVns/BasiLzBrzo45e3t+8WsZ60aF x2UQ== X-Forwarded-Encrypted: i=1; AJvYcCXWjCmLw0h9qh/cGFmnRsLnY9fv8lqBjTGhNeQx5dSQ2yBtgaStJ479DwCkOTLdVkVifAy/XUPydg==@kvack.org X-Gm-Message-State: AOJu0Yx8Zk35e9JFqR4HShHBQ3HE4zgcNckEoGszThELiqn0CMbesQOi 00NXzVrFowCGzCS/7yLquoUCGZ9enlAX/DLJ8G3R59y2Xfb4fJU8LNqoRCPNZvPga2iD0GNlkJ0 lZGygugW7P0ydytt6jmBzk+PHXl8jHDfWSqGEAqHNzEG64Dy8 X-Received: by 2002:a2e:511a:0:b0:2f2:9f26:ce96 with SMTP id 38308e7fff4ca-2f75b94e3famr39536701fa.40.1725882009230; Mon, 09 Sep 2024 04:40:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENg0cqrzz8j0LWpuGJOnSIckBcQeO1OoAKo63WWsuBOQWfprIbu3PvNa7hmLnPYtRbCsLzaA== X-Received: by 2002:a2e:511a:0:b0:2f2:9f26:ce96 with SMTP id 38308e7fff4ca-2f75b94e3famr39536441fa.40.1725882008637; Mon, 09 Sep 2024 04:40:08 -0700 (PDT) Received: from [192.168.171.203] ([109.38.234.69]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c3ebd46733sm2888959a12.27.2024.09.09.04.40.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 09 Sep 2024 04:40:08 -0700 (PDT) Message-ID: <8bd11a7b-d227-4f21-9ba5-5494e22f3761@redhat.com> Date: Mon, 9 Sep 2024 13:40:06 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] platform/x86:intel/pmc: Encapsulate callbacks registration in CONFIG_X86_PM_TIMER check To: Marek Maslanka , lkp@intel.com, Arnd Bergmann Cc: daniel.lezcano@linaro.org, linux-mm@kvack.org, oe-kbuild-all@lists.linux.dev References: <202409090259.6vsS5Bni-lkp@intel.com> <20240908200127.1848844-1-mmaslanka@google.com> From: Hans de Goede In-Reply-To: <20240908200127.1848844-1-mmaslanka@google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 803A180015 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: ra8n6ufr7kh57htgjqn3pimjqefz1heb X-HE-Tag: 1725882015-975920 X-HE-Meta: U2FsdGVkX1+DpGTUVGe34QahJXbT+X+Mrc9kse4JFykAt4gJrE7k9Qpmqmlhizn0+bR+TN4prkv7+qfRXsV1ENfy6nJ5NeKizrZFYt9CwHTwHD4ZsKsSRhGgGuM31s1b7PAVZXVcFS3f5pxmN1DmE2tZ5nXH27LmHhVllZsbDrVPa7inBv5qyjJCVqFPANwntm2f+3ukLF/dpsKyStT54ZtVZhoaAyKKeWLEPK+7lOnifXL6+UlVu/HShkIG9kbm/VWNWYnBXf+hE+XdND+qIt/5rUBpQGO0poEipkJgLk/obgW8avhaNuf0YDtcxs42tUyTt/6A2Bxs2q78mdn2ChTRuG/rkMgbV8SmDohs7HnEQCVovM+1GPD67w69/yz1qEUFGd8fV5smPuT41dKpY3UtnT6rmXIclfpvQlbDZVWbvajESgTn1AuI/NJg6j9IQd1V6H4mQa220ewTavh1cPpWDIamHGh6AUQ895GDBU2Hw/0kAZUCTh7iRHcUeIXSw4XmfKLLuUIFb1TX/KIZPhqi6yoJqe+cLik49ebFWm2MBn3Xl0WRDkmzv/WUNEATHyeJfaHfRDH5kv8pkJ33KFDymBpa5WApTxY2fcxkcg68qd6Ui+yKRDP6G85Raa5KVqME1g0MMaj/WTrhY1LoTc6AdsWX3EYT0IScr6j6qEvjOP9yNgtJZBah6UbkXE4HMlncqs/CmglHo7bdGrSkC/ukiokLrSeGOAkgQlN03WeY7tH7OzI4PQMYcGssuKlpZ4RqUwSdisILtvwUaw20AbSj1HEa6R4Lnmh0d0ZetIaYtQTAJBKfLtziDuhlkaVWLFy9w6OchxB/apFTAA4AWSsVJ65QQPhWM4Q/p7rgCiaqprgXV+Q8LmGCFDLokp/9e3FhnPKN0Mc48Q90c0IGiXhqV3Pb/xPSIjec/b20+io6jN9h68hldPX8A5WfOPJMWh7cdiP1vzFlBVm+vx+ YuvB4/rS AOgOy3mY+K1eAedt6gJHZtTk+6CNiKpAAkC0VnCTMY9wmt5DP3spw2IDfu5VXJaDUZbhJTJDwTU0tvs6j0GyyqCo7gwvL+oQNHpwhgTTioxrOZtUMCHy+Um7fzNzVUmmNYf/KHtPfs3Qt168pIXisY9dfeN6SBaWvWSvFq7qxBWtAMphDu7Jra39lc5PlJtT1+TM+9Tq2aVU1GEy7KApzlp7uwruuqZ4ZYGZf59+dm3/Tdg73uFqQs4rBINsaBn99n2Brsmh46fFOSP4Bh+g/mlulGuHqv5HDxFkFRXbdzOoD+uWlCDhe2fYRbF0awCmEjvoucDKd76Pe0I+to61C8yySraNmmOE0w9NF9UGQbrqScIj8smuSX5VTm8QH2D5o3EjEFQtMwXReLiKfkuBV+34qOpIlrdjiOXaQLE8VNaRgmNlT6iQUijLTarBfKwWREqfIaHL/MRA/GN9iTr5kk5Zf12vgXRF0soeZt6CamqN8+nQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Hi Marek, On 9/8/24 10:01 PM, Marek Maslanka wrote: > Encapsulate the code that registers and unregisters the ACPI PM Timer > suspend/resume callback to checks that CONFIG_X86_PM_TIMER is enabled. > > Reported-by: kernel test robot > Closes: https://lore.kernel.org/oe-kbuild-all/202409090259.6vsS5Bni-lkp@intel.com/ > Signed-off-by: Marek Maslanka Thank you for the quick fix. Arnd has submitted a cleaner fix for this, which looks better so I think we should go with Arnd's fix: https://lore.kernel.org/platform-driver-x86/20240909111644.248756-1-arnd@kernel.org/ Regards, Hans > --- > drivers/platform/x86/intel/pmc/core.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c > index 695804ca8de4..0c6392eeacee 100644 > --- a/drivers/platform/x86/intel/pmc/core.c > +++ b/drivers/platform/x86/intel/pmc/core.c > @@ -1215,6 +1215,7 @@ static bool pmc_core_is_pson_residency_enabled(struct pmc_dev *pmcdev) > return val == 1; > } > > +#ifdef CONFIG_X86_PM_TIMER > /* > * Enable or disable ACPI PM Timer > * > @@ -1247,6 +1248,7 @@ static void pmc_core_acpi_pm_timer_suspend_resume(void *data, bool suspend) > > pmcdev->enable_acpi_pm_timer_on_resume = suspend && enabled; > } > +#endif > > static void pmc_core_dbgfs_unregister(struct pmc_dev *pmcdev) > { > @@ -1443,9 +1445,11 @@ static int pmc_core_probe(struct platform_device *pdev) > struct pmc_dev *pmcdev; > const struct x86_cpu_id *cpu_id; > int (*core_init)(struct pmc_dev *pmcdev); > - const struct pmc_reg_map *map; > struct pmc *primary_pmc; > int ret; > +#ifdef CONFIG_X86_PM_TIMER > + const struct pmc_reg_map *map; > +#endif > > if (device_initialized) > return -ENODEV; > @@ -1502,10 +1506,12 @@ static int pmc_core_probe(struct platform_device *pdev) > pm_report_max_hw_sleep(FIELD_MAX(SLP_S0_RES_COUNTER_MASK) * > pmc_core_adjust_slp_s0_step(primary_pmc, 1)); > > +#ifdef CONFIG_X86_PM_TIMER > map = primary_pmc->map; > if (map->acpi_pm_tmr_ctl_offset) > acpi_pmtmr_register_suspend_resume_callback(pmc_core_acpi_pm_timer_suspend_resume, > - pmcdev); > + pmcdev); > +#endif > > device_initialized = true; > dev_info(&pdev->dev, " initialized\n"); > @@ -1516,11 +1522,13 @@ static int pmc_core_probe(struct platform_device *pdev) > static void pmc_core_remove(struct platform_device *pdev) > { > struct pmc_dev *pmcdev = platform_get_drvdata(pdev); > +#ifdef CONFIG_X86_PM_TIMER > const struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN]; > const struct pmc_reg_map *map = pmc->map; > > if (map->acpi_pm_tmr_ctl_offset) > acpi_pmtmr_unregister_suspend_resume_callback(); > +#endif > > pmc_core_dbgfs_unregister(pmcdev); > pmc_core_clean_structure(pdev);