mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-16 07:51:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/sysfb: Fix efidrm error handling and memory type mismatch

Browse Source 
Fix incorrect error checking and memory type confusion in
efidrm_device_create(). devm_memremap() returns error pointers, not
NULL, and returns system memory while devm_ioremap() returns I/O memory.
The code incorrectly passes system memory to iosys_map_set_vaddr_iomem().

Restructure to handle each memory type separately. Use devm_ioremap*()
with ERR_PTR(-ENXIO) for WC/UC, and devm_memremap() with ERR_CAST() for
WT/WB.

Fixes: 32ae90c66f ("drm/sysfb: Add efidrm for EFI displays")
Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patch.msgid.link/20260311064652.2903449-1-nichen@iscas.ac.cn
This commit is contained in:
Chen Ni
2026-03-11 14:46:52 +08:00
committed by Thomas Zimmermann
parent 2f42c1a616
commit 5e77923a3e
1 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/gpu/drm/sysfb/efidrm.c
View File

@@ -151,7 +151,6 @@ static struct efidrm_device *efidrm_device_create(struct drm_driver *drv,
struct drm_sysfb_device *sysfb;
struct drm_device *dev;
struct resource *mem = NULL;
void __iomem *screen_base = NULL;
struct drm_plane *primary_plane;
struct drm_crtc *crtc;
struct drm_encoder *encoder;
@@ -238,21 +237,38 @@ static struct efidrm_device *efidrm_device_create(struct drm_driver *drv,
mem_flags = efidrm_get_mem_flags(dev, res->start, vsize);
if (mem_flags & EFI_MEMORY_WC)
screen_base = devm_ioremap_wc(&pdev->dev, mem->start, resource_size(mem));
else if (mem_flags & EFI_MEMORY_UC)
screen_base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
else if (mem_flags & EFI_MEMORY_WT)
screen_base = devm_memremap(&pdev->dev, mem->start, resource_size(mem),
MEMREMAP_WT);
else if (mem_flags & EFI_MEMORY_WB)
screen_base = devm_memremap(&pdev->dev, mem->start, resource_size(mem),
MEMREMAP_WB);
else
if (mem_flags & EFI_MEMORY_WC) {
void __iomem *screen_base = devm_ioremap_wc(&pdev->dev, mem->start,
resource_size(mem));
if (!screen_base)
return ERR_PTR(-ENXIO);
iosys_map_set_vaddr_iomem(&sysfb->fb_addr, screen_base);
} else if (mem_flags & EFI_MEMORY_UC) {
void __iomem *screen_base = devm_ioremap(&pdev->dev, mem->start,
resource_size(mem));
if (!screen_base)
return ERR_PTR(-ENXIO);
iosys_map_set_vaddr_iomem(&sysfb->fb_addr, screen_base);
} else if (mem_flags & EFI_MEMORY_WT) {
void *screen_base = devm_memremap(&pdev->dev, mem->start,
resource_size(mem), MEMREMAP_WT);
if (IS_ERR(screen_base))
return ERR_CAST(screen_base);
iosys_map_set_vaddr(&sysfb->fb_addr, screen_base);
} else if (mem_flags & EFI_MEMORY_WB) {
void *screen_base = devm_memremap(&pdev->dev, mem->start,
resource_size(mem), MEMREMAP_WB);
if (IS_ERR(screen_base))
return ERR_CAST(screen_base);
iosys_map_set_vaddr(&sysfb->fb_addr, screen_base);
} else {
drm_err(dev, "invalid mem_flags: 0x%llx\n", mem_flags);
if (!screen_base)
return ERR_PTR(-ENOMEM);
iosys_map_set_vaddr_iomem(&sysfb->fb_addr, screen_base);
return ERR_PTR(-EINVAL);
}
/*
* Modesetting