Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1df94156 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman
Browse files

x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos 



[ Upstream commit 7821fa101eab529521aa4b724bf708149d70820c ]

iosf_mbi_pci_{read,write}_mdr() use pci_{read,write}_config_dword()
that return PCIBIOS_* codes but functions also return -ENODEV which are
not compatible error codes. As neither of the functions are related to
PCI read/write functions, they should return normal errnos.

Convert PCIBIOS_* returns code using pcibios_err_to_errno() into normal
errno before returning it.

Fixes: 46184415 ("arch: x86: New MailBox support driver for Intel SOC's")
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20240527125538.13620-4-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2ffb9d2d

arch/x86/platform/intel/iosf_mbi.c

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int iosf_mbi_pci_read_mdr(u32 mcrx, u32 mcr, u32 *mdr) 


fail_read:

	dev_err(&mbi_pdev->dev, "PCI config access failed with %d\n", result);

	return result;

	return pcibios_err_to_errno(result);

}



static int iosf_mbi_pci_write_mdr(u32 mcrx, u32 mcr, u32 mdr)
@@ -91,7 +91,7 @@ static int iosf_mbi_pci_write_mdr(u32 mcrx, u32 mcr, u32 mdr) 


fail_write:

	dev_err(&mbi_pdev->dev, "PCI config access failed with %d\n", result);

	return result;

	return pcibios_err_to_errno(result);

}



int iosf_mbi_read(u8 port, u8 opcode, u32 offset, u32 *mdr)