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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 689CAECAAD5 for ; Thu, 1 Sep 2022 17:32:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233057AbiIARcZ (ORCPT ); Thu, 1 Sep 2022 13:32:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232038AbiIARcW (ORCPT ); Thu, 1 Sep 2022 13:32:22 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5364190833; Thu, 1 Sep 2022 10:32:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662053541; x=1693589541; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=O9murFNnf7yd+h4pRFCxdy6du3N7zy8u2YJxy89V9Aw=; b=ksVoPni7b+P9nC6E6pno8LdPjqu7gRPDcxitwsrhqSK0tDi9l1HeRd5f kq2FHyrBqy9kwkep5da80kM3IizSJVDuZYrbG9WbmbkGrUwfbwkSRqXJa wKfafAmeQiF05VrUXiyv286RGnv2gD/Vt3q4t+GbkOHdF0otROm9sWbiW 0T6Y5XqBiA27X+27W+aNGUqIFLl9htopTXLLrmhsalzdwarU8yqEGkgse 1ICzw8N014fnsykCW2/lARG/3QPdKW2/2p+SiqUhaKTnn1bshk67R1gsJ UD3CtJE7VhJ1M1FBTct4Itt2Ie/btvYBmqWkOBDWQoXO6PLc/boq2Ki+m Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10457"; a="297064805" X-IronPort-AV: E=Sophos;i="5.93,281,1654585200"; d="scan'208";a="297064805" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2022 10:32:20 -0700 X-IronPort-AV: E=Sophos;i="5.93,281,1654585200"; d="scan'208";a="642431191" Received: from gkammela-mobl.amr.corp.intel.com (HELO [10.212.21.24]) ([10.212.21.24]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2022 10:32:16 -0700 Message-ID: <8d1dec22-72e2-8297-9dbd-6b2904349fda@linux.intel.com> Date: Thu, 1 Sep 2022 10:32:15 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 Subject: Re: [PATCH v1] platform/x86/intel: pmc/core: Add Raptor Lake support to pmc core driver Content-Language: en-US To: Hans de Goede Cc: markgross@kernel.org, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, irenic.rajneesh@gmail.com, Srinivas Pandruvada , Andy Shevchenko , David Box References: <20220830182001.3693030-1-gayatri.kammela@linux.intel.com> From: "Kammela, Gayatri" In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9/1/2022 8:47 AM, Hans de Goede wrote: > Hi, > > On 9/1/22 17:43, Hans de Goede wrote: >> Hi, >> >> On 8/30/22 20:20, Gayatri Kammela wrote: >>> Add Raptor Lake client parts (both RPL and RPL_S) support to pmc core >>> driver. Raptor Lake client parts reuse all the Alder Lake PCH IPs. >>> >>> Cc: Srinivas Pandruvada >>> Cc: Andy Shevchenko >>> Cc: David Box >>> Signed-off-by: Gayatri Kammela >> Thank you for your patch, I've applied this patch to my review-hans >> branch: >> https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans > In file included from drivers/platform/x86/intel/pmc/core.c:29: > ./arch/x86/include/asm/cpu_device_id.h:161:46: error: ‘INTEL_FAM6_RAPTORLAKE_S’ undeclared here (not in a function); did you mean ‘INTEL_FAM6_RAPTORLAKE_P’? > 161 | X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, INTEL_FAM6_##model, data) > | ^~~~~~~~~~~ > ./arch/x86/include/asm/cpu_device_id.h:46:27: note: in definition of macro ‘X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE’ > 46 | .model = _model, \ > | ^~~~~~ > ./arch/x86/include/asm/cpu_device_id.h:129:9: note: in expansion of macro ‘X86_MATCH_VENDOR_FAM_MODEL_FEATURE’ > 129 | X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, model, \ > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > ./arch/x86/include/asm/cpu_device_id.h:161:9: note: in expansion of macro ‘X86_MATCH_VENDOR_FAM_MODEL’ > 161 | X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, INTEL_FAM6_##model, data) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/platform/x86/intel/pmc/core.c:1918:9: note: in expansion of macro ‘X86_MATCH_INTEL_FAM6_MODEL’ > 1918 | X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_reg_map), > | ^~~~~~~~~~~~~~~~~~~~~~~~~~ > make[5]: *** [scripts/Makefile.build:249: drivers/platform/x86/intel/pmc/core.o] Error 1 > > And dropped again, please upstream this through the tree which also has the new > INTEL_FAM6_RAPTORLAKE* macros. > > Here is my Acked-by for merging this through another tree: > > Acked-by: Hans de Goede > > Regards, > > Hans Hi Hans! Thank you for your Acked-by! The cpuid patch has been merged in to v6.0-rc3. I am not sure why its complaining about INTEL_FAM6_RAPTORLAKE_S being undeclared. patch - ea902bcc1943f7539200ec464de3f54335588774 : "x86/cpu: Add new Raptor Lake CPU model number". I made sure its built without errors before sending it out. > > > >>> --- >>> drivers/platform/x86/intel/pmc/core.c | 2 ++ >>> 1 file changed, 2 insertions(+) >>> >>> diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c >>> index a1fe1e0dcf4a..17ec5825d13d 100644 >>> --- a/drivers/platform/x86/intel/pmc/core.c >>> +++ b/drivers/platform/x86/intel/pmc/core.c >>> @@ -1914,6 +1914,8 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = { >>> X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N, &tgl_reg_map), >>> X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &adl_reg_map), >>> X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &tgl_reg_map), >>> + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &adl_reg_map), >>> + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_reg_map), >>> {} >>> }; >>> >>> >>> base-commit: b90cb1053190353cc30f0fef0ef1f378ccc063c5