diff for duplicates of <87h7bgrn0j.fsf@intel.com> diff --git a/a/1.txt b/N1/1.txt index 10d38f9..9c3a823 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,11 +34,3 @@ i225-V models have PTM support but don't have any PTP support). Cheers, -- Vinicius - --------------- next part -------------- -A non-text attachment was scrubbed... -Name: 0001-igc-Do-not-enable-crosstimestamping-for-i225-V-model.patch -Type: text/x-patch -Size: 1164 bytes -Desc: test patch for deadlock in igc -URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20211210/e0ce035c/attachment.bin> diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..66302c2 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,4 @@ +Content-Type: text/x-patch +Content-Disposition: attachment; + filename=0001-igc-Do-not-enable-crosstimestamping-for-i225-V-model.patch +Content-Description: test patch for deadlock in igc diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..c0e4841 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,33 @@ +From bc78a215cd3a68375ec62a05080070876e31d733 Mon Sep 17 00:00:00 2001 +From: Vinicius Costa Gomes <vinicius.gomes@intel.com> +Date: Fri, 10 Dec 2021 16:23:42 -0800 +Subject: [TEST ONLY] igc: Do not enable crosstimestamping for i225-V models + +WIP WIP WIP + +Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com> +--- + drivers/net/ethernet/intel/igc/igc_ptp.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c +index 30568e3544cd..b525035a8a2b 100644 +--- a/drivers/net/ethernet/intel/igc/igc_ptp.c ++++ b/drivers/net/ethernet/intel/igc/igc_ptp.c +@@ -768,7 +768,13 @@ int igc_ptp_get_ts_config(struct net_device *netdev, struct ifreq *ifr) + */ + static bool igc_is_crosststamp_supported(struct igc_adapter *adapter) + { +- return IS_ENABLED(CONFIG_X86_TSC) ? pcie_ptm_enabled(adapter->pdev) : false; ++ if (!IS_ENABLED(CONFIG_X86_TSC)) ++ return false; ++ ++ if (adapter->pdev->device == IGC_DEV_ID_I225_V) ++ return false; ++ ++ return pcie_ptm_enabled(adapter->pdev); + } + + static struct system_counterval_t igc_device_tstamp_to_system(u64 tstamp) +-- +2.33.1 diff --git a/a/content_digest b/N1/content_digest index 6b22a96..8f29a6b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,10 +7,16 @@ "ref\05c5b606a-4694-be1b-0d4b-80aad1999bd9@leemhuis.info\0" "ref\0d4c9bb101aa79c5acaaa6dd7b42159fb0c91a341.camel@gmx.de\0" "From\0Vinicius Costa Gomes <vinicius.gomes@intel.com>\0" - "Subject\0[Intel-wired-lan] [PATCH] igc: Avoid possible deadlock during suspend/resume\0" + "Subject\0Re: [PATCH] igc: Avoid possible deadlock during suspend/resume\0" "Date\0Fri, 10 Dec 2021 16:41:32 -0800\0" - "To\0intel-wired-lan@osuosl.org\0" - "\00:1\0" + "To\0Stefan Dietrich <roots@gmx.de>" + " Thorsten Leemhuis <regressions@leemhuis.info>\0" + "Cc\0kuba@kernel.org" + greg@kroah.com + netdev@vger.kernel.org + intel-wired-lan@lists.osuosl.org + " regressions@lists.linux.dev\0" + "\01:1\0" "b\0" "Hi Stefan,\n" "\n" @@ -47,14 +53,43 @@ "\n" "Cheers,\n" "-- \n" - "Vinicius\n" - "\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: 0001-igc-Do-not-enable-crosstimestamping-for-i225-V-model.patch\n" - "Type: text/x-patch\n" - "Size: 1164 bytes\n" - "Desc: test patch for deadlock in igc\n" - URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20211210/e0ce035c/attachment.bin> + Vinicius + "\01:2\0" + "fn\00001-igc-Do-not-enable-crosstimestamping-for-i225-V-model.patch\0" + "d\0test patch for deadlock in igc\0" + "b\0" + "From bc78a215cd3a68375ec62a05080070876e31d733 Mon Sep 17 00:00:00 2001\n" + "From: Vinicius Costa Gomes <vinicius.gomes@intel.com>\n" + "Date: Fri, 10 Dec 2021 16:23:42 -0800\n" + "Subject: [TEST ONLY] igc: Do not enable crosstimestamping for i225-V models\n" + "\n" + "WIP WIP WIP\n" + "\n" + "Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>\n" + "---\n" + " drivers/net/ethernet/intel/igc/igc_ptp.c | 8 +++++++-\n" + " 1 file changed, 7 insertions(+), 1 deletion(-)\n" + "\n" + "diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c\n" + "index 30568e3544cd..b525035a8a2b 100644\n" + "--- a/drivers/net/ethernet/intel/igc/igc_ptp.c\n" + "+++ b/drivers/net/ethernet/intel/igc/igc_ptp.c\n" + "@@ -768,7 +768,13 @@ int igc_ptp_get_ts_config(struct net_device *netdev, struct ifreq *ifr)\n" + " */\n" + " static bool igc_is_crosststamp_supported(struct igc_adapter *adapter)\n" + " {\n" + "-\treturn IS_ENABLED(CONFIG_X86_TSC) ? pcie_ptm_enabled(adapter->pdev) : false;\n" + "+\tif (!IS_ENABLED(CONFIG_X86_TSC))\n" + "+\t\treturn false;\n" + "+\n" + "+\tif (adapter->pdev->device == IGC_DEV_ID_I225_V)\n" + "+\t\treturn false;\n" + "+\n" + "+\treturn pcie_ptm_enabled(adapter->pdev);\n" + " }\n" + " \n" + " static struct system_counterval_t igc_device_tstamp_to_system(u64 tstamp)\n" + "-- \n" + 2.33.1 -14fd4afdac4cc5a3a5247a6a092cd6b74b2723224199c78ef97562b9df3c2cd6 +8b0c6efd26f74baa68d122d76dbceaa93e8d8a5f94b1ce106ca14c941b610d32
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.