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 5B4522517A6; Tue, 29 Apr 2025 17:50:56 +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=1745949056; cv=none; b=LyiapY0R0i9c8BJg4FrWbSH7CHsr+riacMuvAUyc1Vg5a5EZfu/pb0S2mcYV96/gOLeQWnsFZVL4KhgG5/mdwq4Fc1GuNcgs3hk1cMYUcJDbiXJvbXOEishlaTFlvMYNmTtD14Q78T/9bfUqi3rYRooYDaGpuQYwrfe+OwnB+h0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745949056; c=relaxed/simple; bh=IBi5DBzvNGc21STObI5dq6quhDr/ttRsgWFR/qLIpdo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MZPijBV+EzRCXir79o2RJgrbNMDD9gD9Ub+Vz3/Cq7ZxD6yp1KDJuT3Gncb32wtE96YvjwLgEFpj17bUZ85DoswBMGbw9fXpEwlFxmBFlmng5dgVWV5E7mJzlIwjkLfNb/RyGIwhjE54n/91e2ROV6Z/FD+lCiwV8CQyE58HJnw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rNzVmrMO; 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="rNzVmrMO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA9FEC4CEE3; Tue, 29 Apr 2025 17:50:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745949056; bh=IBi5DBzvNGc21STObI5dq6quhDr/ttRsgWFR/qLIpdo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rNzVmrMOAJ5RE09TPCtDBppWFoumpl4zlsYYoqA+zPOK3Rgf8rLMq2XcNfVnVowhm mksenW6quzFI69WgJY89aJLsqR79nm0uYsbgC+Yu4PYJjx2yRkFdrMrYWxLelyRzgP iN32t7lwOYt4hCw+hvzGP+Eyv+wmMNSYKeJvpbVs= 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 5.15 201/373] misc: pci_endpoint_test: Fix displaying irq_type after request_irq error Date: Tue, 29 Apr 2025 18:41:18 +0200 Message-ID: <20250429161131.435505563@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250429161123.119104857@linuxfoundation.org> References: <20250429161123.119104857@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.15-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: Kunihiko Hayashi 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 @@ -245,7 +245,7 @@ static bool pci_endpoint_test_request_ir return true; fail: - switch (irq_type) { + switch (test->irq_type) { case IRQ_TYPE_LEGACY: dev_err(dev, "Failed to request IRQ %d for Legacy\n", pci_irq_vector(pdev, i));