From patchwork Wed Nov 27 08:00:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1201399 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47NCsN1cdTz9sSw; Wed, 27 Nov 2019 19:01:44 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iZsGa-0001UD-4u; Wed, 27 Nov 2019 08:01:40 +0000 Received: from mail-pg1-f194.google.com ([209.85.215.194]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iZsFz-0000z3-Sm for kernel-team@lists.ubuntu.com; Wed, 27 Nov 2019 08:01:04 +0000 Received: by mail-pg1-f194.google.com with SMTP id l26so250670pgb.8 for ; Wed, 27 Nov 2019 00:01:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gB4oP0Zt1VbpIb6rJCiNYVfcXAuy+D8p6TgJfasUHIA=; b=RKPJS9+Rilt5BMZEuyRhhUhxUCTK1vQVIcFL8pP40pGWD+fygUV9stdEGp89HymbAX 38QckdFzelitO/A6+Ph6GlHvWr+O18mpfFDxTs/Oh+XY8jjnBPLWOXTqshdcfO5N/Mhf BGJucU1O1dMbdYYsRtj+xhH9k9vu8a/mJ+pJotNJ1Gca6yHtInwxXTypbBV2+zGKc6WJ wOSxNPTAVF9wa3rpd0ZSrkN4cWrb0hatx6MkwxsZsEqkEWIuRmZeK29hMZ4RD13Q1l+k ktWKsPmQzDV22D/l4wRL5qVRCsLBdLmPbCAJXCH2vS3zi4eKPbdVh/7GQtDTffgjcPKp MLYQ== X-Gm-Message-State: APjAAAXcz6Znvj0Z7Es3p3ynPkL6c6n0fZh/C47+r0VPZ3O+MHitQ0iC kNC6ufgdv3gbYk2hkG9U796FxNRU X-Google-Smtp-Source: APXvYqyT9evLjIKagREHI8YUktm3ldeyjPPfhXb8OEOFDrQoCZaP871H3ndrLeYxDZrh5g8fWp5FOw== X-Received: by 2002:a63:ec4e:: with SMTP id r14mr3385011pgj.235.1574841660107; Wed, 27 Nov 2019 00:01:00 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id w26sm15821589pfj.123.2019.11.27.00.00.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 00:00:59 -0800 (PST) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [SRU][D/OEM-OSP1-B][PATCH v2 12/20] perf/x86: Add Intel Ice Lake NNPI uncore support Date: Wed, 27 Nov 2019 16:00:20 +0800 Message-Id: <20191127080028.200261-13-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127080028.200261-1-vicamo.yang@canonical.com> References: <20191127080028.200261-1-vicamo.yang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Rajneesh Bhardwaj Intel Ice Lake uncore support already included IMC PCI ID but ICL-NNPI CPUID is missing so add it to fix the probe function. Fixes: e39875d15ad6 ("perf/x86: add Intel Icelake uncore support") Signed-off-by: Rajneesh Bhardwaj Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra Cc: alexander.shishkin@linux.intel.com Cc: Dave Hansen Cc: Andy Shevchenko Cc: "H. Peter Anvin" Cc: Kan Liang Cc: Qiuxu Zhuo Cc: Srinivas Pandruvada Cc: Len Brown Cc: Linux PM Link: https://lkml.kernel.org/r/20190614081701.13828-1-rajneesh.bhardwaj@linux.intel.com (cherry picked from commit 5f4318c1b1d23a9290e4def78ee76017c288bf60) Signed-off-by: You-Sheng Yang --- arch/x86/events/intel/uncore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 31abdd6a3832..39c9d35eddeb 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -1406,6 +1406,7 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = { X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_MOBILE, skl_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_KABYLAKE_DESKTOP, skl_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_MOBILE, icl_uncore_init), + X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ICELAKE_NNPI, icl_uncore_init), {}, };