From nobody Sun Apr 19 07:15:58 2026 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 00DCBC433EF for ; Tue, 5 Jul 2022 08:27:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230142AbiGEI1E (ORCPT ); Tue, 5 Jul 2022 04:27:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230082AbiGEI1B (ORCPT ); Tue, 5 Jul 2022 04:27:01 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18B78D70 for ; Tue, 5 Jul 2022 01:27:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657009620; x=1688545620; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZwgOyO8x7ekBRoriCEMkMwJo2RJQ5YECyfn3XeLMN74=; b=ioaSGYagOltySpJ5dA5pUq5GItIpeCT784WTatKgdTDaK3IrX763DIqN fyKocAWrAN3UiT2U18wAK3Nyfjfg7CXYtIzXgKK27cy7mnm1UDOh9CoyW ahvgO9vZoUfdqgmmG0glznZy9M8un3Ol/gWtb571wM0CRvl/gDbQHfWBA xW3HmsarzYD2AEikM3yPrxto15pe4wMqO1Rbn91xr59GedSAY4nLGE1GD 6RhiI6hZvwJvBt3YtFlUH3DwDG5VIgV7sVWKi93MTTl2+W6NhqGByMsWi pPIETtpIqiLn90tzI84kqmrljK7F9PyrHZx7MyNBQGAT+ansDKSajJsPk Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10398"; a="263713127" X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="263713127" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 01:26:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="592834128" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 05 Jul 2022 01:26:58 -0700 From: Alexander Shishkin To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Christophe JAILLET , Alexander Shishkin , Andy Shevchenko Subject: [PATCH 1/6] intel_th: Fix a resource leak in an error handling path Date: Tue, 5 Jul 2022 11:26:32 +0300 Message-Id: <20220705082637.59979-2-alexander.shishkin@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220705082637.59979-1-alexander.shishkin@linux.intel.com> References: <20220705082637.59979-1-alexander.shishkin@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Christophe JAILLET If an error occurs after calling 'pci_alloc_irq_vectors()', 'pci_free_irq_vectors()' must be called as already done in the remove function. Fixes: 7b7036d47c35 ("intel_th: pci: Use MSI interrupt signalling") Signed-off-by: Christophe JAILLET Signed-off-by: Alexander Shishkin Reviewed-by: Andy Shevchenko --- drivers/hwtracing/intel_th/pci.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/= pci.c index 7da4f298ed01..fcd0aca75007 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c @@ -100,8 +100,10 @@ static int intel_th_pci_probe(struct pci_dev *pdev, } =20 th =3D intel_th_alloc(&pdev->dev, drvdata, resource, r); - if (IS_ERR(th)) - return PTR_ERR(th); + if (IS_ERR(th)) { + err =3D PTR_ERR(th); + goto err_free_irq; + } =20 th->activate =3D intel_th_pci_activate; th->deactivate =3D intel_th_pci_deactivate; @@ -109,6 +111,10 @@ static int intel_th_pci_probe(struct pci_dev *pdev, pci_set_master(pdev); =20 return 0; + +err_free_irq: + pci_free_irq_vectors(pdev); + return err; } =20 static void intel_th_pci_remove(struct pci_dev *pdev) --=20 2.35.1 From nobody Sun Apr 19 07:15:58 2026 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 56768C433EF for ; Tue, 5 Jul 2022 08:27:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230191AbiGEI1J (ORCPT ); Tue, 5 Jul 2022 04:27:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230106AbiGEI1D (ORCPT ); Tue, 5 Jul 2022 04:27:03 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02B2D13DF2 for ; Tue, 5 Jul 2022 01:27:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657009622; x=1688545622; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Pk/nLLbRif9CyhqZ57jXCfpvtviOivRYEd3l24T9MmM=; b=fiGbEpPaKxuAHWalLnLmZTkhYJwhj9Jr1HQvEr1VtfL3jJpmxyGQltvN JvMiEcvseI9Z5Y5evP5gdzKY1HwmUpgLq+LpmC3wU9q7shTm+r1XHI/bn Ce4xC2mtchM3cM5yG9aOuy5hJCsZjswqZjGejklNdcSVLCeTGo/Le/ai+ XXVGdlO84o89tOx6Cd+Z52IjTEbNgAT787mz1kUIXNKvirIWt5HzzDvQh MNiqk2R1F2BtFtBknpz9qqFBdPjvpDf2s2efk5hCg6X5R4Scn4vKBnSdF +Sz9ofzLvSxdwpSqsqLWqLNUJz94ZjOiSQWdOS5ix4T9fJ0YKoeaEPDcl A==; X-IronPort-AV: E=McAfee;i="6400,9594,10398"; a="263713129" X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="263713129" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 01:27:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="592834136" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 05 Jul 2022 01:27:00 -0700 From: Alexander Shishkin To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Jiasheng Jiang , Alexander Shishkin , Andy Shevchenko Subject: [PATCH 2/6] intel_th: msu-sink: Potential dereference of null pointer Date: Tue, 5 Jul 2022 11:26:33 +0300 Message-Id: <20220705082637.59979-3-alexander.shishkin@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220705082637.59979-1-alexander.shishkin@linux.intel.com> References: <20220705082637.59979-1-alexander.shishkin@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jiasheng Jiang The return value of dma_alloc_coherent() needs to be checked. To avoid use of null pointer in sg_set_buf() in case of the failure of alloc. Fixes: f220df66f676 ("intel_th: msu-sink: An example msu buffer "sink"") Signed-off-by: Jiasheng Jiang Signed-off-by: Alexander Shishkin Reviewed-by: Andy Shevchenko --- drivers/hwtracing/intel_th/msu-sink.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/hwtracing/intel_th/msu-sink.c b/drivers/hwtracing/inte= l_th/msu-sink.c index 2c7f5116be12..891b28ea25fe 100644 --- a/drivers/hwtracing/intel_th/msu-sink.c +++ b/drivers/hwtracing/intel_th/msu-sink.c @@ -71,6 +71,9 @@ static int msu_sink_alloc_window(void *data, struct sg_ta= ble **sgt, size_t size) block =3D dma_alloc_coherent(priv->dev->parent->parent, PAGE_SIZE, &sg_dma_address(sg_ptr), GFP_KERNEL); + if (!block) + return -ENOMEM; + sg_set_buf(sg_ptr, block, PAGE_SIZE); } =20 --=20 2.35.1 From nobody Sun Apr 19 07:15:58 2026 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 E6CCBC43334 for ; Tue, 5 Jul 2022 08:27:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230136AbiGEI1O (ORCPT ); Tue, 5 Jul 2022 04:27:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230152AbiGEI1F (ORCPT ); Tue, 5 Jul 2022 04:27:05 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A50C13E01 for ; Tue, 5 Jul 2022 01:27:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657009623; x=1688545623; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=87nKChQAMSt/8e7Pv+us8zTUekQ9gM88+8g8bJ3bwvA=; b=cjyi44yTh6I4BLjkccO1ua2DmLRvVWMwDYaryjPprUhvl1VSyvhDR5wt 0F5aVYcnQjSgDi6FN/N1tmI41sBcLbDjoragTBh6/fpYDPXDNkjXIxq9C +BXprmNBwhftpKQyOJPaUs13Y5lmbRd+GixO8xT3MmYLsqWv16JJoVHGd gqvbPpp52XbfzlUMzZOExCYCsZvn6USJ8quRxW0P62YsG/xqjyxU32/wB oT3J7kNwOnpMTGlKaBkNukC5aA/IsVfcKXakCdu/uhjW+iyKwdbTB1LS2 RNE3sXMojKJHeeUsbojA/BFXdHcaQeZ/SWQF2CnXVJDXwDIodxzjnJnoh A==; X-IronPort-AV: E=McAfee;i="6400,9594,10398"; a="263713136" X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="263713136" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 01:27:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="592834150" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 05 Jul 2022 01:27:02 -0700 From: Alexander Shishkin To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Alexander Shishkin , Andy Shevchenko Subject: [PATCH 3/6] intel_th: msu: Fix vmalloced buffers Date: Tue, 5 Jul 2022 11:26:34 +0300 Message-Id: <20220705082637.59979-4-alexander.shishkin@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220705082637.59979-1-alexander.shishkin@linux.intel.com> References: <20220705082637.59979-1-alexander.shishkin@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" After commit f5ff79fddf0e ("dma-mapping: remove CONFIG_DMA_REMAP") there's a chance of DMA buffer getting allocated via vmalloc(), which messes up the mmapping code: > RIP: msc_mmap_fault [intel_th_msu] > Call Trace: > > __do_fault > do_fault ... Fix this by accounting for vmalloc possibility. Signed-off-by: Alexander Shishkin Reviewed-by: Andy Shevchenko Fixes: ba39bd830605 ("intel_th: msu: Switch over to scatterlist") --- drivers/hwtracing/intel_th/msu.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/= msu.c index 70a07b4e9967..6c8215a47a60 100644 --- a/drivers/hwtracing/intel_th/msu.c +++ b/drivers/hwtracing/intel_th/msu.c @@ -1067,6 +1067,16 @@ msc_buffer_set_uc(struct msc *msc) {} static inline void msc_buffer_set_wb(struct msc *msc) {} #endif /* CONFIG_X86 */ =20 +static struct page *msc_sg_page(struct scatterlist *sg) +{ + void *addr =3D sg_virt(sg); + + if (is_vmalloc_addr(addr)) + return vmalloc_to_page(addr); + + return sg_page(sg); +} + /** * msc_buffer_win_alloc() - alloc a window for a multiblock mode * @msc: MSC device @@ -1137,7 +1147,7 @@ static void __msc_buffer_win_free(struct msc *msc, st= ruct msc_window *win) int i; =20 for_each_sg(win->sgt->sgl, sg, win->nr_segs, i) { - struct page *page =3D sg_page(sg); + struct page *page =3D msc_sg_page(sg); =20 page->mapping =3D NULL; dma_free_coherent(msc_dev(win->msc)->parent->parent, PAGE_SIZE, @@ -1401,7 +1411,7 @@ static struct page *msc_buffer_get_page(struct msc *m= sc, unsigned long pgoff) pgoff -=3D win->pgoff; =20 for_each_sg(win->sgt->sgl, sg, win->nr_segs, blk) { - struct page *page =3D sg_page(sg); + struct page *page =3D msc_sg_page(sg); size_t pgsz =3D PFN_DOWN(sg->length); =20 if (pgoff < pgsz) --=20 2.35.1 From nobody Sun Apr 19 07:15:58 2026 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 D6C05C43334 for ; Tue, 5 Jul 2022 08:27:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230170AbiGEI1V (ORCPT ); Tue, 5 Jul 2022 04:27:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230217AbiGEI1K (ORCPT ); Tue, 5 Jul 2022 04:27:10 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 697CB25C5 for ; Tue, 5 Jul 2022 01:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657009625; x=1688545625; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=x0lxDjcDLuc3pmkNAvUdZCCwRxq8TG2xShirzHncHRU=; b=H+qbl2YNbE5A4sFmG3BtnBDRX/ZckrG/cuV4726OtcVXD+Awkhbc9f41 JyG1xU0R3e3rxntlux+seaPWx024nW9aR59vX7VNVC0bgh7oaXcTJx5xi 2LKkyHD9rtHDXbRp/eK6b/GZldNwNrir6owiZ0umiVdtuzunze2Xn7jZy va2WtUtaV4Z9Fnq0LQKUJth/KGsVPF4EkP9veoX+DIWVHrBr+NeC1b4ds Tjohb9ObY/4mg/Bp1hwrkZmZaQWU6HernjPjgmXQMhqRKa8ox9seBxXAU cg/Zf6va2PT21NUxjbLxIO11zd0AZIYkJF+xMHfiR7Iubn43HdztwnMNW A==; X-IronPort-AV: E=McAfee;i="6400,9594,10398"; a="263713143" X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="263713143" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 01:27:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="592834155" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 05 Jul 2022 01:27:03 -0700 From: Alexander Shishkin To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Alexander Shishkin , Andy Shevchenko Subject: [PATCH 4/6] intel_th: pci: Add Meteor Lake-P support Date: Tue, 5 Jul 2022 11:26:35 +0300 Message-Id: <20220705082637.59979-5-alexander.shishkin@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220705082637.59979-1-alexander.shishkin@linux.intel.com> References: <20220705082637.59979-1-alexander.shishkin@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add support for the Trace Hub in Meteor Lake-P. Signed-off-by: Alexander Shishkin Reviewed-by: Andy Shevchenko --- 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 fcd0aca75007..41a31c7f505f 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c @@ -284,6 +284,11 @@ static const struct pci_device_id intel_th_pci_id_tabl= e[] =3D { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x54a6), .driver_data =3D (kernel_ulong_t)&intel_th_2x, }, + { + /* Meteor Lake-P */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7e24), + .driver_data =3D (kernel_ulong_t)&intel_th_2x, + }, { /* Alder Lake CPU */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f), --=20 2.35.1 From nobody Sun Apr 19 07:15:58 2026 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 89FAEC433EF for ; Tue, 5 Jul 2022 08:27:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230360AbiGEI10 (ORCPT ); Tue, 5 Jul 2022 04:27:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230283AbiGEI1M (ORCPT ); Tue, 5 Jul 2022 04:27:12 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F03B613E16 for ; Tue, 5 Jul 2022 01:27:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657009626; x=1688545626; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eqKZjDbOL+WYvX7nzhqPnjkKi0Nr4XUAIF1Wn9yRswQ=; b=Y1hj8Eif4H7md877YbTT8L9LXgjlbPageNQSiifH12+jhNXe6IaeE0rK lCDO0BeaYeiGg/LHoJBKQxLyp0S/UwiB9jDpax9HAf1qvFzmtQi14bQNs D3FQogfWluTIiiqNYWqsRijxKqJpOBBpcWIIthu4rp00EzVmK3oB/RYMJ hpKWJ/T3JY2wVT1vcKcPOVF+NRWXSJinRv3F74pCI1pr4mZS4pQRAE3fY YUyBBodM7k9T/XUZD2XlE2dz0UkqGGDZ4+y3uv7L+2Jc8l/ewWtTO7+ld v7mPpHf+EdjaU/ncae2P5WNfDFXnJu9iSqoGc6Eds0sqdpItoCdK/3RcJ A==; X-IronPort-AV: E=McAfee;i="6400,9594,10398"; a="263713145" X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="263713145" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 01:27:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="592834157" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 05 Jul 2022 01:27:05 -0700 From: Alexander Shishkin To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Alexander Shishkin , Andy Shevchenko Subject: [PATCH 5/6] intel_th: pci: Add Raptor Lake-S PCH support Date: Tue, 5 Jul 2022 11:26:36 +0300 Message-Id: <20220705082637.59979-6-alexander.shishkin@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220705082637.59979-1-alexander.shishkin@linux.intel.com> References: <20220705082637.59979-1-alexander.shishkin@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add support for the Trace Hub in Raptor Lake-S PCH. Signed-off-by: Alexander Shishkin Reviewed-by: Andy Shevchenko --- 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 41a31c7f505f..5b6da26f1b63 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c @@ -289,6 +289,11 @@ static const struct pci_device_id intel_th_pci_id_tabl= e[] =3D { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7e24), .driver_data =3D (kernel_ulong_t)&intel_th_2x, }, + { + /* Raptor Lake-S */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7a26), + .driver_data =3D (kernel_ulong_t)&intel_th_2x, + }, { /* Alder Lake CPU */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f), --=20 2.35.1 From nobody Sun Apr 19 07:15:58 2026 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 9603CC433EF for ; Tue, 5 Jul 2022 08:27:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230390AbiGEI11 (ORCPT ); Tue, 5 Jul 2022 04:27:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230106AbiGEI1O (ORCPT ); Tue, 5 Jul 2022 04:27:14 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD6CD13E26 for ; Tue, 5 Jul 2022 01:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657009628; x=1688545628; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dV+J8qua43jZlCjSZFhYr46PEO8sg8DFk//W4PGTeTY=; b=mWpxbEtLB7oWNzVrEJkonIMbe0+e3vOWrgtwoeQfHFKyUjUcsnUc2Ds8 vGD/125ZELBuOrmVKW76y3iVSweEMILycQYc33hAgw7XfYAfZnADzoRoF ci9mSaUSgo0LCev+2HQXPE2WQfqwvhPCwZ8M8WqhxbeyyUyC0sbaI5nOF VzXMxupJY5PWNFJHch/8N1w9xFZIvdWWf1EbIQPq8kTpiW/sJXj0d7FPz suALjDtWGDO9YjC57Dq1ss/9Rl1LGXl6Myx/rdCTTVCmTDxqZkzWBeSj7 K6IcCtbUwQejzQ0rbub15/UCxq1fOf/ZXeEylviEYROYv0veilZlDyqwU w==; X-IronPort-AV: E=McAfee;i="6400,9594,10398"; a="263713151" X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="263713151" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 01:27:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,245,1650956400"; d="scan'208";a="592834162" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 05 Jul 2022 01:27:07 -0700 From: Alexander Shishkin To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Alexander Shishkin , Andy Shevchenko Subject: [PATCH 6/6] intel_th: pci: Add Raptor Lake-S CPU support Date: Tue, 5 Jul 2022 11:26:37 +0300 Message-Id: <20220705082637.59979-7-alexander.shishkin@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220705082637.59979-1-alexander.shishkin@linux.intel.com> References: <20220705082637.59979-1-alexander.shishkin@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add support for the Trace Hub in Raptor Lake-S CPU. Signed-off-by: Alexander Shishkin Reviewed-by: Andy Shevchenko --- 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 5b6da26f1b63..147d338c191e 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c @@ -294,6 +294,11 @@ static const struct pci_device_id intel_th_pci_id_tabl= e[] =3D { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7a26), .driver_data =3D (kernel_ulong_t)&intel_th_2x, }, + { + /* Raptor Lake-S CPU */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa76f), + .driver_data =3D (kernel_ulong_t)&intel_th_2x, + }, { /* Alder Lake CPU */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x466f), --=20 2.35.1