github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

chrome-platform-firmware: Fixes for v7.4-rc2

Browse Source 
- Don't skip CBMEM entries outside of known memory resources.
 - Fix a Coccinelle warning for error-pointer handling in coreboot-cfr.
 -----BEGIN PGP SIGNATURE-----
 
 iIkEABYKADEWIQS0yQeDP3cjLyifNRUrxTEGBto89AUCaurtEhMcdHp1bmdiaUBr
 ZXJuZWwub3JnAAoJECvFMQYG2jz0H+gBAIevUDxLdZBx6xJv2F7JhZalkE+epvPr
 wRg7CVhO0FTCAP9B+pV+ZVvck1D36fiwchpYMGxw8qYxOPXB1gBZz1GKCg==
 =g5i+
 -----END PGP SIGNATURE-----

Merge tag 'chrome-platform-firmware-fixes-v7.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux

Pull chrome platform firmware fixes from Tzung-Bi Shih:

 - Don't skip CBMEM entries outside of known memory resources

 - Fix a Coccinelle warning for error-pointer handling in coreboot-cfr

* tag 'chrome-platform-firmware-fixes-v7.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  firmware: coreboot: Fix CFR error-pointer handling warning
  firmware: coreboot: Don't skip CBMEM entries outside of known memory
This commit is contained in:
Linus Torvalds 2026-11-05 16:51:29 -08:00
commit eedaa7d61f
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/firmware/coreboot/coreboot-cfr.c
View File

@ -341,7 +341,7 @@ static int coreboot_cfr_read_value(const struct coreboot_cfr_setting *setting,
int ret;
if (IS_ERR(efi_name))
return PTR_ERR(no_free_ptr(efi_name));
return PTR_ERR(efi_name);
ret = efivar_lock();
if (ret)

42
drivers/firmware/coreboot/coreboot_table.c
View File

@ -114,6 +114,30 @@ void coreboot_driver_unregister(struct coreboot_driver *driver)
}
EXPORT_SYMBOL(coreboot_driver_unregister);
/*
* Whether the memory of a CBMEM entry may be mapped: it must be exclusively
* System RAM, or exclusively Reserved memory, as CBMEM often is on x86, or
* memory that the kernel doesn't know about at all. coreboot leaves CBMEM out
* of the /memory node of the device tree that it passes to FIT payloads, e.g.
* on arm64, and only lists it in the memory reservation block.
*
* Anything else, such as no-map regions on arm64, which are IORESOURCE_MEM
* (see request_standard_resources() in arch/arm64/kernel/setup.c), must not
* be mapped.
*/
static bool cbmem_entry_is_mappable(const struct lb_cbmem_entry *entry)
{
resource_size_t start = entry->address;
size_t size = entry->entry_size;
return region_intersects(start, size, IORESOURCE_SYSTEM_RAM,
IORES_DESC_NONE) == REGION_INTERSECTS ||
region_intersects(start, size, IORESOURCE_MEM,
IORES_DESC_RESERVED) == REGION_INTERSECTS ||
region_intersects(start, size, IORESOURCE_MEM,
IORES_DESC_NONE) == REGION_DISJOINT;
}
static int coreboot_table_populate(struct device *dev, void *ptr, resource_size_t len)
{
int i, ret;
@ -149,23 +173,7 @@ static int coreboot_table_populate(struct device *dev, void *ptr, resource_size_
switch (device->entry.tag) {
case LB_TAG_CBMEM_ENTRY:
/*
* Skip entries that are not exclusively System RAM or
* Reserved memory.
* On ARM64, no-map regions are filtered out as they are
* IORESOURCE_MEM (see request_standard_resources() in
* arch/arm64/kernel/setup.c).
* On x86, CBMEM often resides in standard reserved regions
* (IORES_DESC_RESERVED).
*/
if (region_intersects(device->cbmem_entry.address,
device->cbmem_entry.entry_size,
IORESOURCE_SYSTEM_RAM,
IORES_DESC_NONE) != REGION_INTERSECTS &&
region_intersects(device->cbmem_entry.address,
device->cbmem_entry.entry_size,
IORESOURCE_MEM,
IORES_DESC_RESERVED) != REGION_INTERSECTS) {
if (!cbmem_entry_is_mappable(&device->cbmem_entry)) {
kfree(device);
continue;
}