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 DC9D319E80F; Tue, 30 Jul 2024 15:53:37 +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=1722354818; cv=none; b=Axp9Gh/HoMAjnitb2HEUwcyt4nRklslPDKEgzElTqOZsRML6yABdgPg4SKob3jI3DGrDNrfwe3C079W2cF1M6K7ecyfmKhEUD0dXIkaFc6ip1iWBz9whdb0/tFYoCZ6di3fmZuGeJ94R1MuAFjbACQjjm1wx02JOjr9Xfgi2vu0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722354818; c=relaxed/simple; bh=MPc3zxRdAjECQoqN/9GHDJVekprxKjjmmtKUp8o+owE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=T0/blBtrR2rnguHuGbaQHWTVeJT3NAV1Fnz3ydv3cWiozZ5QI/MbyKF1qazZ9S3Y6MbgsRAbQzdT05nfCWbmXAnvbBGeV3k++XM5WjNzPR1nfJl1OL83L8F6cUkAnkKk9UKjBQtUlAW6fEQurVw+gxZmdGn06jG+tcEb6D379Uo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gG4hktwz; 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="gG4hktwz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E800C4AF0C; Tue, 30 Jul 2024 15:53:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1722354817; bh=MPc3zxRdAjECQoqN/9GHDJVekprxKjjmmtKUp8o+owE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gG4hktwz0AlZVdvmxc+KsSVjJQvzrpg3jCtijg617midPSf12qayJZZcIDdGbpKuo nM21IXfY2rSBatWTo5NuGJv4FkUeIE58fQ6WQnWhiqgx4j9qGzSGaPg84ZUw+4LSJc ilk6XsaXYzwpi6xI6GI62/WfOjfQESDeIf0PUJjQ= 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)" , Andy Shevchenko , Sasha Levin Subject: [PATCH 6.1 014/440] x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling Date: Tue, 30 Jul 2024 17:44:07 +0200 Message-ID: <20240730151616.318059638@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 724852059e97c48557151b3aa4af424614819752 ] intel_mid_pci_irq_enable() uses pci_read_config_byte() that returns PCIBIOS_* codes. The error handling, however, assumes the codes are normal errnos because it checks for < 0. intel_mid_pci_irq_enable() 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: 5b395e2be6c4 ("x86/platform/intel-mid: Make IRQ allocation a bit more flexible") Signed-off-by: Ilpo Järvinen Signed-off-by: Borislav Petkov (AMD) Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20240527125538.13620-2-ilpo.jarvinen@linux.intel.com Signed-off-by: Sasha Levin --- arch/x86/pci/intel_mid_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c index 8edd622066044..722a33be08a18 100644 --- a/arch/x86/pci/intel_mid_pci.c +++ b/arch/x86/pci/intel_mid_pci.c @@ -233,9 +233,9 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) return 0; ret = pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &gsi); - if (ret < 0) { + if (ret) { dev_warn(&dev->dev, "Failed to read interrupt line: %d\n", ret); - return ret; + return pcibios_err_to_errno(ret); } id = x86_match_cpu(intel_mid_cpu_ids); -- 2.43.0