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 10FDB19DFA6; Thu, 15 Aug 2024 13:27:54 +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=1723728474; cv=none; b=CX0+nNAITDZxH5Z+Af3bdapgktJQ3WeR4xgfEi1SPHJhd3TF1Emnmu7HaEf3XHWZb34aiudgXNsRvwz+z3Y1ojVi+G5IE1/VICbu6dVQolaXViEF7W8qFAwr9C5m0Sm7LTkCLgzbHYKzebIuoH075Bl94MQ0Og61NtKBI816v+I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723728474; c=relaxed/simple; bh=ca5Zje9p91I87zlmRAf4WhxJOEXKG9mIeGvb9UVSOSY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JPjoHHZml+DXyCKyuLKUt9QEZcm3j0Gl5JH3TRq+bT1xYyKY4DIz8QBdeg4scfHhQE3ftHwj3An9tt6tlg3IMsKrs4ygrog5h8j0gaZx3mFnBulvDWh1Vo0JP1ZcecfJxc+wwQ42tv+3ZGN3eFuJNd8oZ8cKOnj9gps6ORI67XA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Pw/ViGr5; 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="Pw/ViGr5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E39CC32786; Thu, 15 Aug 2024 13:27:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723728473; bh=ca5Zje9p91I87zlmRAf4WhxJOEXKG9mIeGvb9UVSOSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pw/ViGr59Vi7WOOF4DHr+XnUDlQPjIy79u/UCGtqiaRw0xZQjBcfH/+WtVArdGf/g AQkweFFmAO7GMe32UZ4LHWAuLXR6kxBaFkbrRoWfDKT0fZR4B2Zg2X4sF/HT6fIlo5 Acow8AXcEezHfSpyFCvyZ+r42wE8keJzzsfaDfzU= 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 4.19 004/196] x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling Date: Thu, 15 Aug 2024 15:22:01 +0200 Message-ID: <20240815131852.239645589@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131852.063866671@linuxfoundation.org> References: <20240815131852.063866671@linuxfoundation.org> User-Agent: quilt/0.67 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 4.19-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 eea5a0f3b959b..63513968f5617 100644 --- a/arch/x86/pci/intel_mid_pci.c +++ b/arch/x86/pci/intel_mid_pci.c @@ -223,9 +223,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); } switch (intel_mid_identify_cpu()) { -- 2.43.0