From patchwork Mon Oct 5 07:13:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shishkin X-Patchwork-Id: 290682 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=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 24F75C4727E for ; Mon, 5 Oct 2020 07:13:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E56492080C for ; Mon, 5 Oct 2020 07:13:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726015AbgJEHNw (ORCPT ); Mon, 5 Oct 2020 03:13:52 -0400 Received: from mga07.intel.com ([134.134.136.100]:10321 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725943AbgJEHNp (ORCPT ); Mon, 5 Oct 2020 03:13:45 -0400 IronPort-SDR: /Su1NUr/Jymq1cG2JiMA6a5UDih6klicJp+DgBWVXYBVOV5e+wj8h2quTBpWFeFJc3fErNrXsB JaGibMtgkIWg== X-IronPort-AV: E=McAfee;i="6000,8403,9764"; a="227479280" X-IronPort-AV: E=Sophos;i="5.77,338,1596524400"; d="scan'208";a="227479280" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2020 00:13:44 -0700 IronPort-SDR: 2fgGBSpZc6W9S/cEpbagK3r66wvPu0ILY77b0ryC/wlJXYV+v1Y8hTsbaRH4ngckWjYbaYnAiR DWDmjkBLYJ3w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,338,1596524400"; d="scan'208";a="309718120" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 05 Oct 2020 00:13:43 -0700 From: Alexander Shishkin To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Alexander Shishkin , stable@vger.kernel.org Subject: [PATCH 7/8] intel_th: pci: Add Alder Lake-S support Date: Mon, 5 Oct 2020 10:13:18 +0300 Message-Id: <20201005071319.78508-8-alexander.shishkin@linux.intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005071319.78508-1-alexander.shishkin@linux.intel.com> References: <20201005071319.78508-1-alexander.shishkin@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This adds support for the Trace Hub in Alder Lake-S. Signed-off-by: Alexander Shishkin Cc: stable@vger.kernel.org # v4.14+ --- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c index 21fdf0b93516..dda4476b8553 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c @@ -263,6 +263,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x1bcc), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { + /* Alder Lake */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7aa6), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, { 0 }, }; From patchwork Mon Oct 5 07:13:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shishkin X-Patchwork-Id: 267864 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=-9.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, UNWANTED_LANGUAGE_BODY, 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 D0CE4C4363A for ; Mon, 5 Oct 2020 07:13:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A59ED2078E for ; Mon, 5 Oct 2020 07:13:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726000AbgJEHNr (ORCPT ); Mon, 5 Oct 2020 03:13:47 -0400 Received: from mga07.intel.com ([134.134.136.100]:10324 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725985AbgJEHNq (ORCPT ); Mon, 5 Oct 2020 03:13:46 -0400 IronPort-SDR: 9zMq96KavMRUAljmR9QtOhQg1zIiAZXigIc4VCzzGVM1vTDXMmF/15DT0VqTnwB/wsCjhJYRB+ +rzHZP19yI8A== X-IronPort-AV: E=McAfee;i="6000,8403,9764"; a="227479285" X-IronPort-AV: E=Sophos;i="5.77,338,1596524400"; d="scan'208";a="227479285" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Oct 2020 00:13:46 -0700 IronPort-SDR: VzslWaGbqcki17M5hQPJs4FO3AZaEmMXDy2Bya4woliFHJ8u5MH8/zKMQOxPqXtVw0wA5+Tvu1 gjCkpNvd4Sew== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,338,1596524400"; d="scan'208";a="309718123" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 05 Oct 2020 00:13:44 -0700 From: Alexander Shishkin To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Alexander Shishkin , stable@vger.kernel.org Subject: [PATCH 8/8] intel_th: pci: Add Alder Lake CPU support Date: Mon, 5 Oct 2020 10:13:19 +0300 Message-Id: <20201005071319.78508-9-alexander.shishkin@linux.intel.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005071319.78508-1-alexander.shishkin@linux.intel.com> References: <20201005071319.78508-1-alexander.shishkin@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This adds support for the Trace Hub in Alder Lake CPU. Signed-off-by: Alexander Shishkin Cc: stable@vger.kernel.org # v4.14+ --- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c index dda4476b8553..52acd77438ed 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c @@ -268,6 +268,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7aa6), .driver_data = (kernel_ulong_t)&intel_th_2x, }, + { + /* Alder Lake CPU */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, { 0 }, };