mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-10-31 08:44:41 +00:00 
			
		
		
		
	 02e2af20f4
			
		
	
	
		02e2af20f4
		
	
	
	
	
		
			
			Here is the big set of char/misc and other small driver subsystem updates for 5.18-rc1. Included in here are merges from driver subsystems which contain: - iio driver updates and new drivers - fsi driver updates - fpga driver updates - habanalabs driver updates and support for new hardware - soundwire driver updates and new drivers - phy driver updates and new drivers - coresight driver updates - icc driver updates Individual changes include: - mei driver updates - interconnect driver updates - new PECI driver subsystem added - vmci driver updates - lots of tiny misc/char driver updates There will be two merge conflicts with your tree, one in MAINTAINERS which is obvious to fix up, and one in drivers/phy/freescale/Kconfig which also should be easy to resolve. All of these have been in linux-next for a while with no reported problems. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCYkG3fQ8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+ykNEgCfaRG8CRxewDXOO4+GSeA3NGK+AIoAnR89donC R4bgCjfg8BWIBcVVXg3/ =WWXC -----END PGP SIGNATURE----- Merge tag 'char-misc-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char/misc and other driver updates from Greg KH: "Here is the big set of char/misc and other small driver subsystem updates for 5.18-rc1. Included in here are merges from driver subsystems which contain: - iio driver updates and new drivers - fsi driver updates - fpga driver updates - habanalabs driver updates and support for new hardware - soundwire driver updates and new drivers - phy driver updates and new drivers - coresight driver updates - icc driver updates Individual changes include: - mei driver updates - interconnect driver updates - new PECI driver subsystem added - vmci driver updates - lots of tiny misc/char driver updates All of these have been in linux-next for a while with no reported problems" * tag 'char-misc-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (556 commits) firmware: google: Properly state IOMEM dependency kgdbts: fix return value of __setup handler firmware: sysfb: fix platform-device leak in error path firmware: stratix10-svc: add missing callback parameter on RSU arm64: dts: qcom: add non-secure domain property to fastrpc nodes misc: fastrpc: Add dma handle implementation misc: fastrpc: Add fdlist implementation misc: fastrpc: Add helper function to get list and page misc: fastrpc: Add support to secure memory map dt-bindings: misc: add fastrpc domain vmid property misc: fastrpc: check before loading process to the DSP misc: fastrpc: add secure domain support dt-bindings: misc: add property to support non-secure DSP misc: fastrpc: Add support to get DSP capabilities misc: fastrpc: add support for FASTRPC_IOCTL_MEM_MAP/UNMAP misc: fastrpc: separate fastrpc device from channel context dt-bindings: nvmem: brcm,nvram: add basic NVMEM cells dt-bindings: nvmem: make "reg" property optional nvmem: brcm_nvram: parse NVRAM content into NVMEM cells nvmem: dt-bindings: Fix the error of dt-bindings check ...
		
			
				
	
	
		
			133 lines
		
	
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			133 lines
		
	
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0-or-later
 | |
| /*
 | |
|  * Generic System Framebuffers
 | |
|  * Copyright (c) 2012-2013 David Herrmann <dh.herrmann@gmail.com>
 | |
|  */
 | |
| 
 | |
| /*
 | |
|  * simple-framebuffer probing
 | |
|  * Try to convert "screen_info" into a "simple-framebuffer" compatible mode.
 | |
|  * If the mode is incompatible, we return "false" and let the caller create
 | |
|  * legacy nodes instead.
 | |
|  */
 | |
| 
 | |
| #include <linux/err.h>
 | |
| #include <linux/init.h>
 | |
| #include <linux/kernel.h>
 | |
| #include <linux/mm.h>
 | |
| #include <linux/platform_data/simplefb.h>
 | |
| #include <linux/platform_device.h>
 | |
| #include <linux/screen_info.h>
 | |
| #include <linux/sysfb.h>
 | |
| 
 | |
| static const char simplefb_resname[] = "BOOTFB";
 | |
| static const struct simplefb_format formats[] = SIMPLEFB_FORMATS;
 | |
| 
 | |
| /* try parsing screen_info into a simple-framebuffer mode struct */
 | |
| __init bool sysfb_parse_mode(const struct screen_info *si,
 | |
| 			     struct simplefb_platform_data *mode)
 | |
| {
 | |
| 	const struct simplefb_format *f;
 | |
| 	__u8 type;
 | |
| 	unsigned int i;
 | |
| 
 | |
| 	type = si->orig_video_isVGA;
 | |
| 	if (type != VIDEO_TYPE_VLFB && type != VIDEO_TYPE_EFI)
 | |
| 		return false;
 | |
| 
 | |
| 	for (i = 0; i < ARRAY_SIZE(formats); ++i) {
 | |
| 		f = &formats[i];
 | |
| 		if (si->lfb_depth == f->bits_per_pixel &&
 | |
| 		    si->red_size == f->red.length &&
 | |
| 		    si->red_pos == f->red.offset &&
 | |
| 		    si->green_size == f->green.length &&
 | |
| 		    si->green_pos == f->green.offset &&
 | |
| 		    si->blue_size == f->blue.length &&
 | |
| 		    si->blue_pos == f->blue.offset &&
 | |
| 		    si->rsvd_size == f->transp.length &&
 | |
| 		    si->rsvd_pos == f->transp.offset) {
 | |
| 			mode->format = f->name;
 | |
| 			mode->width = si->lfb_width;
 | |
| 			mode->height = si->lfb_height;
 | |
| 			mode->stride = si->lfb_linelength;
 | |
| 			return true;
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	return false;
 | |
| }
 | |
| 
 | |
| __init int sysfb_create_simplefb(const struct screen_info *si,
 | |
| 				 const struct simplefb_platform_data *mode)
 | |
| {
 | |
| 	struct platform_device *pd;
 | |
| 	struct resource res;
 | |
| 	u64 base, size;
 | |
| 	u32 length;
 | |
| 	int ret;
 | |
| 
 | |
| 	/*
 | |
| 	 * If the 64BIT_BASE capability is set, ext_lfb_base will contain the
 | |
| 	 * upper half of the base address. Assemble the address, then make sure
 | |
| 	 * it is valid and we can actually access it.
 | |
| 	 */
 | |
| 	base = si->lfb_base;
 | |
| 	if (si->capabilities & VIDEO_CAPABILITY_64BIT_BASE)
 | |
| 		base |= (u64)si->ext_lfb_base << 32;
 | |
| 	if (!base || (u64)(resource_size_t)base != base) {
 | |
| 		printk(KERN_DEBUG "sysfb: inaccessible VRAM base\n");
 | |
| 		return -EINVAL;
 | |
| 	}
 | |
| 
 | |
| 	/*
 | |
| 	 * Don't use lfb_size as IORESOURCE size, since it may contain the
 | |
| 	 * entire VMEM, and thus require huge mappings. Use just the part we
 | |
| 	 * need, that is, the part where the framebuffer is located. But verify
 | |
| 	 * that it does not exceed the advertised VMEM.
 | |
| 	 * Note that in case of VBE, the lfb_size is shifted by 16 bits for
 | |
| 	 * historical reasons.
 | |
| 	 */
 | |
| 	size = si->lfb_size;
 | |
| 	if (si->orig_video_isVGA == VIDEO_TYPE_VLFB)
 | |
| 		size <<= 16;
 | |
| 	length = mode->height * mode->stride;
 | |
| 	if (length > size) {
 | |
| 		printk(KERN_WARNING "sysfb: VRAM smaller than advertised\n");
 | |
| 		return -EINVAL;
 | |
| 	}
 | |
| 	length = PAGE_ALIGN(length);
 | |
| 
 | |
| 	/* setup IORESOURCE_MEM as framebuffer memory */
 | |
| 	memset(&res, 0, sizeof(res));
 | |
| 	res.flags = IORESOURCE_MEM;
 | |
| 	res.name = simplefb_resname;
 | |
| 	res.start = base;
 | |
| 	res.end = res.start + length - 1;
 | |
| 	if (res.end <= res.start)
 | |
| 		return -EINVAL;
 | |
| 
 | |
| 	pd = platform_device_alloc("simple-framebuffer", 0);
 | |
| 	if (!pd)
 | |
| 		return -ENOMEM;
 | |
| 
 | |
| 	sysfb_apply_efi_quirks(pd);
 | |
| 
 | |
| 	ret = platform_device_add_resources(pd, &res, 1);
 | |
| 	if (ret)
 | |
| 		goto err_put_device;
 | |
| 
 | |
| 	ret = platform_device_add_data(pd, mode, sizeof(*mode));
 | |
| 	if (ret)
 | |
| 		goto err_put_device;
 | |
| 
 | |
| 	ret = platform_device_add(pd);
 | |
| 	if (ret)
 | |
| 		goto err_put_device;
 | |
| 
 | |
| 	return 0;
 | |
| 
 | |
| err_put_device:
 | |
| 	platform_device_put(pd);
 | |
| 
 | |
| 	return ret;
 | |
| }
 |