From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0714D22E3E6; Thu, 17 Apr 2025 18:14:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744913671; cv=none; b=N4E88+8Xatp3JQllyhULX8sJ2WdOGMVbdVrTV2OZhN92OOV+dtnihr3YtWfoeV8O0q0tZimWaw9DuYboA8qf1JDx5TMDkfS4mSuItYwVkhXr38Ib2XMeCTTkdzkzMJ4MwPkl8sggKrkSoXmU/XKTECoytdxQqfZyG8yroBvdfH0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744913671; c=relaxed/simple; bh=KWQQNX6rudQXs0gcxnopRtj+2rvkmjsmECwpwkrZBNg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mrZGvjYWXF0FuAghhYlzAZyPYYpfIoIDST8k3rYiq88b5Nqt4vE3B5bSWU7+ZyOcdHfSYpOD/yU3PC45oqqOnwhKBSYBC5to3Hlxk9yC30e/rJ8BNj+Iwu/7tqMp3TDvoieJAcP1htatjRaLd57ROz4AmqjDPjZz7W0e9NiQ6BE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JRMGTtlt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="JRMGTtlt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1988C4CEEC; Thu, 17 Apr 2025 18:14:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744913670; bh=KWQQNX6rudQXs0gcxnopRtj+2rvkmjsmECwpwkrZBNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JRMGTtltO5UfKqCO5x2Fpi7N22T/+/RxGa8DIsEczTVBgEUi9So/VgAzneO0SaxI4 nJ7wmKvkCEOoK0nhomT+WDuKxaiT15fIHjkOUnBGj+3mDTlud3WH/rAQRWEdpALAVH oRz74nB91gz2tEZJ72LnxqUb9ZtxJC2VF3p4ZyV4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Manivannan Sadhasivam , Kunihiko Hayashi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= Subject: [PATCH 6.14 414/449] misc: pci_endpoint_test: Fix displaying irq_type after request_irq error Date: Thu, 17 Apr 2025 19:51:42 +0200 Message-ID: <20250417175134.948998000@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250417175117.964400335@linuxfoundation.org> References: <20250417175117.964400335@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kunihiko Hayashi commit 919d14603dab6a9cf03ebbeb2cfa556df48737c8 upstream. There are two variables that indicate the interrupt type to be used in the next test execution, global "irq_type" and "test->irq_type". The former is referenced from pci_endpoint_test_get_irq() to preserve the current type for ioctl(PCITEST_GET_IRQTYPE). In the pci_endpoint_test_request_irq(), since this global variable is referenced when an error occurs, the unintended error message is displayed. For example, after running "pcitest -i 2", the following message shows "MSI 3" even if the current IRQ type becomes "MSI-X": pci-endpoint-test 0000:01:00.0: Failed to request IRQ 30 for MSI 3 SET IRQ TYPE TO MSI-X: NOT OKAY Fix this issue by using "test->irq_type" instead of global "irq_type". Cc: stable@vger.kernel.org Fixes: b2ba9225e031 ("misc: pci_endpoint_test: Avoid using module parameter to determine irqtype") Reviewed-by: Manivannan Sadhasivam Signed-off-by: Kunihiko Hayashi Link: https://lore.kernel.org/r/20250225110252.28866-4-hayashi.kunihiko@socionext.com [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński Signed-off-by: Greg Kroah-Hartman --- drivers/misc/pci_endpoint_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/misc/pci_endpoint_test.c +++ b/drivers/misc/pci_endpoint_test.c @@ -241,7 +241,7 @@ static int pci_endpoint_test_request_irq return 0; fail: - switch (irq_type) { + switch (test->irq_type) { case IRQ_TYPE_INTX: dev_err(dev, "Failed to request IRQ %d for Legacy\n", pci_irq_vector(pdev, i));