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 3C7821A38DF; Tue, 30 Jul 2024 15:53:41 +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=1722354821; cv=none; b=kxjmvRyyAYIVkL79DqaaEqsjwryW1zLJnhB8w82SYh3BecGizAMrPdeO/0CSWZPJ4ko+nyHozZ8npV+X5ItXUNFtQ5BBRcCtfYR3ANWPQkCYG+sh9N8AxtqimzXIZkG8mLObwa6PDn7euH5u303RvrruW2ccShO1yj7fOg2dBj4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722354821; c=relaxed/simple; bh=QY4iZRtoIl8iO022eZ+Hdy1riH+qSLrPFXGT97XAxhs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hR4zXUT/3i61CU27sL/NotBGPILzYRD+kSYV9PPwLDDpahjLgBQk6DiOTzY5FPSwJ7BxIoCYKbFmpQsXhEkB/LMM/cs8Bdi85V0wVFOwIFXXOxwpEAsi5eSaI20+BzYRZC9g02q2OTFHZZPoV/7wB0yGllmUxlSbM31IrOmTDko= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rED51ll+; 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="rED51ll+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91F5AC4AF0C; Tue, 30 Jul 2024 15:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722354821; bh=QY4iZRtoIl8iO022eZ+Hdy1riH+qSLrPFXGT97XAxhs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rED51ll+G9kgVLVtwa3BNygejyRkI0YZqTeAk4hh5klm6alenV/E6QcAD6oEfVUr2 J3npdbAwYWl1jxRpU9ZpC87fwH6Kenucm67PvstbkauIhoachGNmBbFiyd2VI0q6g6 Kz6F1DitcvlizKHbXn+WzrvQHl5VPdOTjQqzA4Bw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , "Borislav Petkov (AMD)" , Juergen Gross , Sasha Levin Subject: [PATCH 6.1 015/440] x86/pci/xen: Fix PCIBIOS_* return code handling Date: Tue, 30 Jul 2024 17:44:08 +0200 Message-ID: <20240730151616.355637650@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240730151615.753688326@linuxfoundation.org> References: <20240730151615.753688326@linuxfoundation.org> User-Agent: quilt/0.67 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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilpo Järvinen [ Upstream commit e9d7b435dfaec58432f4106aaa632bf39f52ce9f ] xen_pcifront_enable_irq() uses pci_read_config_byte() that returns PCIBIOS_* codes. The error handling, however, assumes the codes are normal errnos because it checks for < 0. xen_pcifront_enable_irq() also returns the PCIBIOS_* code back to the caller but the function is used as the (*pcibios_enable_irq) function which should return normal errnos. Convert the error check to plain non-zero check which works for PCIBIOS_* return codes and convert the PCIBIOS_* return code using pcibios_err_to_errno() into normal errno before returning it. Fixes: 3f2a230caf21 ("xen: handled remapped IRQs when enabling a pcifront PCI device.") Signed-off-by: Ilpo Järvinen Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Juergen Gross Link: https://lore.kernel.org/r/20240527125538.13620-3-ilpo.jarvinen@linux.intel.com Signed-off-by: Sasha Levin --- arch/x86/pci/xen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index 5a4ecf0c2ac4d..b4621cc95e1fd 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -38,10 +38,10 @@ static int xen_pcifront_enable_irq(struct pci_dev *dev) u8 gsi; rc = pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &gsi); - if (rc < 0) { + if (rc) { dev_warn(&dev->dev, "Xen PCI: failed to read interrupt line: %d\n", rc); - return rc; + return pcibios_err_to_errno(rc); } /* In PV DomU the Xen PCI backend puts the PIRQ in the interrupt line.*/ pirq = gsi; -- 2.43.0