mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
EFI updates for v5.14
First microbatch of EFI updates - not a lot going on these days. -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEE+9lifEBpyUIVN1cpw08iOZLZjyQFAmCqF/IACgkQw08iOZLZ jyRc1wv/eqzy5gvXUp44sUDIdUbb/D3sx3+RaBeDbC6W7ZXsjGoPUENPCLlxvnJa D95kW1IaOyNXuNAN/lqZG2a3dJR8O/erpscNhKNrtMMPxrkIeeGhLh+ypYewHgj+ iGHqGDIznV+1emyR5V46rIyiGp7cLxA9hLBGYNGNWtReV3rv//LABxTVwCU3X8YO DfqosZ8xb29biW/HMpHo0OlBK+A5FMIevWOb14roEiXzrUVmkcbO+MGXV7KujBxA xE/ReCJwyKy4EUCCDNS0eXY0ffTRkVImOEzBCy+t5XWEtL36/OgVI5FnI3KcxYR3 qgic56H3tJMeB6YboG8CG9J/N/ct+gapxEOhCZwYfe2rtdqzHAudGNlue9Wodz35 37JcVjKMkmc0HGG7sDVKSoU/V0EzbqirdKDFtjsqxL82zvdTELK+zT/DyKJhPSs1 U63uCm39lgE8+4yaP5u2LH3zNArNb3DrVWas+MS2C/KTTuSmDnjTnHHGvyEYnNWZ pJf05pB+ =KsV8 -----END PGP SIGNATURE----- Merge tag 'efi-next-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core Pull EFI updates for v5.14 from Ard Biesheuvel: "First microbatch of EFI updates - not a lot going on these days." Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
commit
267be9dbac
3 changed files with 19 additions and 32 deletions
|
@ -468,7 +468,7 @@ void __init efi_init(void)
|
|||
*/
|
||||
|
||||
if (!efi_runtime_supported())
|
||||
pr_info("No EFI runtime due to 32/64-bit mismatch with kernel\n");
|
||||
pr_err("No EFI runtime due to 32/64-bit mismatch with kernel\n");
|
||||
|
||||
if (!efi_runtime_supported() || efi_runtime_disabled()) {
|
||||
efi_memmap_unmap();
|
||||
|
|
|
@ -157,7 +157,7 @@ static int __init unmarshal_devices(struct properties_header *properties)
|
|||
if (!entry[0].name)
|
||||
goto skip_device;
|
||||
|
||||
ret = device_add_properties(dev, entry); /* makes deep copy */
|
||||
ret = device_create_managed_software_node(dev, entry, NULL);
|
||||
if (ret)
|
||||
dev_err(dev, "error %d assigning properties\n", ret);
|
||||
|
||||
|
|
|
@ -12,52 +12,39 @@
|
|||
#include <linux/efi.h>
|
||||
#include <linux/pci.h>
|
||||
|
||||
struct acpi_hid_uid {
|
||||
struct acpi_device_id hid[2];
|
||||
char uid[11]; /* UINT_MAX + null byte */
|
||||
};
|
||||
|
||||
static int __init match_acpi_dev(struct device *dev, const void *data)
|
||||
{
|
||||
struct acpi_hid_uid hid_uid = *(const struct acpi_hid_uid *)data;
|
||||
struct acpi_device *adev = to_acpi_device(dev);
|
||||
|
||||
if (acpi_match_device_ids(adev, hid_uid.hid))
|
||||
return 0;
|
||||
|
||||
if (adev->pnp.unique_id)
|
||||
return !strcmp(adev->pnp.unique_id, hid_uid.uid);
|
||||
else
|
||||
return !strcmp("0", hid_uid.uid);
|
||||
}
|
||||
|
||||
static long __init parse_acpi_path(const struct efi_dev_path *node,
|
||||
struct device *parent, struct device **child)
|
||||
{
|
||||
struct acpi_hid_uid hid_uid = {};
|
||||
char hid[ACPI_ID_LEN], uid[11]; /* UINT_MAX + null byte */
|
||||
struct acpi_device *adev;
|
||||
struct device *phys_dev;
|
||||
|
||||
if (node->header.length != 12)
|
||||
return -EINVAL;
|
||||
|
||||
sprintf(hid_uid.hid[0].id, "%c%c%c%04X",
|
||||
sprintf(hid, "%c%c%c%04X",
|
||||
'A' + ((node->acpi.hid >> 10) & 0x1f) - 1,
|
||||
'A' + ((node->acpi.hid >> 5) & 0x1f) - 1,
|
||||
'A' + ((node->acpi.hid >> 0) & 0x1f) - 1,
|
||||
node->acpi.hid >> 16);
|
||||
sprintf(hid_uid.uid, "%u", node->acpi.uid);
|
||||
sprintf(uid, "%u", node->acpi.uid);
|
||||
|
||||
*child = bus_find_device(&acpi_bus_type, NULL, &hid_uid,
|
||||
match_acpi_dev);
|
||||
if (!*child)
|
||||
for_each_acpi_dev_match(adev, hid, NULL, -1) {
|
||||
if (adev->pnp.unique_id && !strcmp(adev->pnp.unique_id, uid))
|
||||
break;
|
||||
if (!adev->pnp.unique_id && node->acpi.uid == 0)
|
||||
break;
|
||||
acpi_dev_put(adev);
|
||||
}
|
||||
if (!adev)
|
||||
return -ENODEV;
|
||||
|
||||
phys_dev = acpi_get_first_physical_node(to_acpi_device(*child));
|
||||
phys_dev = acpi_get_first_physical_node(adev);
|
||||
if (phys_dev) {
|
||||
get_device(phys_dev);
|
||||
put_device(*child);
|
||||
*child = phys_dev;
|
||||
}
|
||||
*child = get_device(phys_dev);
|
||||
acpi_dev_put(adev);
|
||||
} else
|
||||
*child = &adev->dev;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue