linaro-kernel

linaro-kernel@lists.linaro.org

10095 discussions

by Benjamin Gaignard

version 3: - split the original patch in 3 parts, it should be more easy to review like this. - duplicate drm_fb_cma_helper.c and drm_gem_cma_helper.c into nommu version - add a configuration flag for drm_vm.c The purpose of this RFC is to understand what is needed to allow to write drm/kms drivers for devices without MMU. There are some MCU platforms, like stm32f4, which don't have MMU but have hardware display IP where is it possible to implement a drm/kms driver. Obviously that start by removing MMU configuration flag from Kconfig. But while coding the driver for stm32f4 (on discovery board to have enough memory) we have already identify few other pieces of code that need to be change. We have been inspired by what already exist in v4l2 where using mmuless devices is possible. Since we have only use cma helpers we only have partial view of what could be needed for other part of drm/kms framework. Benjamin Gaignard (3): fbmem: add default get_fb_unmapped_area function drm: compile drm_vm.c only when needed drm: allow to use mmuless SoC drivers/gpu/drm/Kconfig | 28 +- drivers/gpu/drm/Makefile | 5 +- drivers/gpu/drm/drm_fb_cma_helper_nommu.c | 648 +++++++++++++++++++++++++++++ drivers/gpu/drm/drm_gem_cma_helper_nommu.c | 574 +++++++++++++++++++++++++ drivers/gpu/drm/drm_legacy.h | 7 + drivers/gpu/drm/nouveau/Kconfig | 1 + drivers/video/fbdev/core/fbmem.c | 15 + include/drm/drm_gem_cma_helper.h | 8 + 8 files changed, 1281 insertions(+), 5 deletions(-) create mode 100644 drivers/gpu/drm/drm_fb_cma_helper_nommu.c create mode 100644 drivers/gpu/drm/drm_gem_cma_helper_nommu.c -- 1.9.1

8 years, 9 months

[RFC v2 1/1] drm: allow to use mmuless SoC

by Benjamin Gaignard

Some SoC without MMU have display driver where a drm/kms driver could be implemented. Before doing such kind of thing drm/kms must allow to use mmuless devices. This patch propose to remove MMU configuration flag and add some cma helpers functions to help implementing mmuless display driver version 2: - define get_fb_unmapped_area() in drivers/video/fbdev/core/fbmem.c if HAVE_ARCH_FB_UNMAPPED_AREA is set and get_fb_unmapped_area not already defined in the architecture Signed-off-by: Benjamin Gaignard <benjamin.gaignard(a)linaro.org> --- drivers/gpu/drm/Kconfig | 4 +-- drivers/gpu/drm/drm_fb_cma_helper.c | 4 +++ drivers/gpu/drm/drm_gem_cma_helper.c | 62 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_vm.c | 4 +++ drivers/video/fbdev/core/fbmem.c | 15 +++++++++ include/drm/drm_gem_cma_helper.h | 6 ++++ 6 files changed, 93 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 8d9cf73..36c102b 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -6,7 +6,7 @@ # menuconfig DRM tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" - depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU && HAS_DMA + depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && HAS_DMA select HDMI select FB_CMDLINE select I2C @@ -98,7 +98,7 @@ config DRM_LOAD_EDID_FIRMWARE config DRM_TTM tristate - depends on DRM + depends on DRM && MMU help GPU memory management subsystem for devices with multiple GPU memory types. Will be enabled automatically if a device driver diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c index 81b3558..b1414b6 100644 --- a/drivers/gpu/drm/drm_fb_cma_helper.c +++ b/drivers/gpu/drm/drm_fb_cma_helper.c @@ -343,8 +343,12 @@ int drm_fb_cma_debugfs_show(struct seq_file *m, void *arg) static int drm_fb_cma_mmap(struct fb_info *info, struct vm_area_struct *vma) { +#ifdef CONFIG_MMU return dma_mmap_writecombine(info->device, vma, info->screen_base, info->fix.smem_start, info->fix.smem_len); +#else + return vm_iomap_memory(vma, vma->vm_start, info->fix.smem_len); +#endif } static struct fb_ops drm_fbdev_cma_ops = { diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index 1d6c335..de13535 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c @@ -318,11 +318,16 @@ static int drm_gem_cma_mmap_obj(struct drm_gem_cma_object *cma_obj, vma->vm_flags &= ~VM_PFNMAP; vma->vm_pgoff = 0; +#ifdef CONFIG_MMU ret = dma_mmap_wc(cma_obj->base.dev->dev, vma, cma_obj->vaddr, cma_obj->paddr, vma->vm_end - vma->vm_start); if (ret) drm_gem_vm_close(vma); +#else + ret = vm_iomap_memory(vma, vma->vm_start, + (vma->vm_end - vma->vm_start)); +#endif return ret; } @@ -358,6 +363,63 @@ int drm_gem_cma_mmap(struct file *filp, struct vm_area_struct *vma) } EXPORT_SYMBOL_GPL(drm_gem_cma_mmap); +#ifdef CONFIG_MMU +#define drm_gem_cma_get_unmapped_area NULL +#else +unsigned long drm_gem_cma_get_unmapped_area(struct file *filp, + unsigned long addr, + unsigned long len, + unsigned long pgoff, + unsigned long flags) +{ + struct drm_gem_cma_object *cma_obj; + struct drm_gem_object *obj = NULL; + struct drm_file *priv = filp->private_data; + struct drm_device *dev = priv->minor->dev; + struct drm_vma_offset_node *node; + + if (drm_device_is_unplugged(dev)) + return -ENODEV; + + drm_vma_offset_lock_lookup(dev->vma_offset_manager); + node = drm_vma_offset_exact_lookup_locked(dev->vma_offset_manager, + pgoff, + len >> PAGE_SHIFT); + if (likely(node)) { + obj = container_of(node, struct drm_gem_object, vma_node); + /* + * When the object is being freed, after it hits 0-refcnt it + * proceeds to tear down the object. In the process it will + * attempt to remove the VMA offset and so acquire this + * mgr->vm_lock. Therefore if we find an object with a 0-refcnt + * that matches our range, we know it is in the process of being + * destroyed and will be freed as soon as we release the lock - + * so we have to check for the 0-refcnted object and treat it as + * invalid. + */ + if (!kref_get_unless_zero(&obj->refcount)) + obj = NULL; + } + + drm_vma_offset_unlock_lookup(dev->vma_offset_manager); + + if (!obj) + return -EINVAL; + + if (!drm_vma_node_is_allowed(node, priv)) { + drm_gem_object_unreference_unlocked(obj); + return -EACCES; + } + + cma_obj = to_drm_gem_cma_obj(obj); + + drm_gem_object_unreference_unlocked(obj); + + return cma_obj->vaddr ? (unsigned long)cma_obj->vaddr : -EINVAL; +} +#endif +EXPORT_SYMBOL_GPL(drm_gem_cma_get_unmapped_area); + #ifdef CONFIG_DEBUG_FS /** * drm_gem_cma_describe - describe a CMA GEM object for debugfs diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index caa4e4c..974e02b 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -489,6 +489,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma) #if defined(__i386__) || defined(__x86_64__) pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; #else +#ifdef CONFIG_MMU /* Ye gads this is ugly. With more thought we could move this up higher and use `protection_map' instead. */ @@ -497,6 +498,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma) (pte_wrprotect (__pte(pgprot_val(vma->vm_page_prot))))); #endif +#endif } vma->vm_ops = &drm_vm_dma_ops; @@ -573,6 +575,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) #if defined(__i386__) || defined(__x86_64__) pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; #else +#ifdef CONFIG_MMU /* Ye gads this is ugly. With more thought we could move this up higher and use `protection_map' instead. */ @@ -581,6 +584,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) (pte_wrprotect (__pte(pgprot_val(vma->vm_page_prot))))); #endif +#endif } switch (map->type) { diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 76c1ad9..54488ee 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1492,6 +1492,21 @@ static long fb_compat_ioctl(struct file *file, unsigned int cmd, return 0; } +#if defined(HAVE_ARCH_FB_UNMAPPED_AREA) && !defined(get_fb_unmapped_area) +unsigned long get_fb_unmapped_area(struct file *filp, + unsigned long addr, unsigned long len, + unsigned long pgoff, unsigned long flags) +{ + struct fb_info * const info = filp->private_data; + unsigned long fb_size = PAGE_ALIGN(info->fix.smem_len); + + if (pgoff > fb_size || len > fb_size - pgoff) + return -EINVAL; + + return (unsigned long)info->screen_base + pgoff; +} +#endif + static const struct file_operations fb_fops = { .owner = THIS_MODULE, .read = fb_read, diff --git a/include/drm/drm_gem_cma_helper.h b/include/drm/drm_gem_cma_helper.h index acd6af8..177a20d 100644 --- a/include/drm/drm_gem_cma_helper.h +++ b/include/drm/drm_gem_cma_helper.h @@ -53,6 +53,12 @@ struct drm_gem_cma_object *drm_gem_cma_create(struct drm_device *drm, extern const struct vm_operations_struct drm_gem_cma_vm_ops; +unsigned long drm_gem_cma_get_unmapped_area(struct file *filp, + unsigned long addr, + unsigned long len, + unsigned long pgoff, + unsigned long flags); + #ifdef CONFIG_DEBUG_FS void drm_gem_cma_describe(struct drm_gem_cma_object *obj, struct seq_file *m); #endif -- 1.9.1

8 years, 9 months

master build: 0 failures 0 warnings (v4.9-rc7-39-g43c4f67)

by Build bot for Mark Brown

Tree/Branch: master Git describe: v4.9-rc7-39-g43c4f67 Commit: 43c4f67c96 Merge branch 'akpm' (patches from Andrew) Build Time: 86 min 31 sec Passed: 10 / 10 (100.00 %) Failed: 0 / 10 ( 0.00 %) Errors: 0 Warnings: 0 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): ------------------------------------------------------------------------------- =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm64-allmodconfig arm-multi_v5_defconfig arm-multi_v7_defconfig x86_64-defconfig arm-allmodconfig arm-allnoconfig x86_64-allnoconfig arm-multi_v4t_defconfig arm64-defconfig close failed in file object destructor: sys.excepthook is missing lost sys.stderr

8 years, 9 months

master build: 0 failures 0 warnings (v4.9-rc7-31-gf513581)

by Build bot for Mark Brown

Tree/Branch: master Git describe: v4.9-rc7-31-gf513581 Commit: f513581c35 Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux Build Time: 85 min 54 sec Passed: 10 / 10 (100.00 %) Failed: 0 / 10 ( 0.00 %) Errors: 0 Warnings: 0 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): ------------------------------------------------------------------------------- =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm64-allmodconfig arm-multi_v5_defconfig arm-multi_v7_defconfig x86_64-defconfig arm-allmodconfig arm-allnoconfig x86_64-allnoconfig arm-multi_v4t_defconfig arm64-defconfig close failed in file object destructor: sys.excepthook is missing lost sys.stderr

8 years, 9 months

master build: 0 failures 0 warnings (v4.9-rc7-27-ge2b588a)

by Build bot for Mark Brown

Tree/Branch: master Git describe: v4.9-rc7-27-ge2b588a Commit: e2b588ab60 Merge tag 'pwm/for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm Build Time: 83 min 39 sec Passed: 10 / 10 (100.00 %) Failed: 0 / 10 ( 0.00 %) Errors: 0 Warnings: 0 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): ------------------------------------------------------------------------------- =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm64-allmodconfig arm-multi_v5_defconfig arm-multi_v7_defconfig x86_64-defconfig arm-allmodconfig arm-allnoconfig x86_64-allnoconfig arm-multi_v4t_defconfig arm64-defconfig close failed in file object destructor: sys.excepthook is missing lost sys.stderr

8 years, 9 months

[RFC 0/1] DRM: allow to use mmuless devices

by Benjamin Gaignard

Hello, The purpose of this RFC is to understand what is needed to allow to write drm/kms drivers for devices without MMU. There are some MCU platforms, like stm32f4, which don't have MMU but have hardware display IP where is it possible to implement a drm/kms driver. Obviously that start by removing MMU configuration flag from Kconfig. But while coding the driver for stm32f4 (on discovery board to have enough memory) we have already identify few other pieces of code that need to be change. We have been inspired by what already exist in v4l2 where using mmuless devices is possible. Since we have only use cma helpers we only have partial view of what could be needed for other part of drm/kms framework. Benjamin Gaignard (1): drm: allow to use mmuless SoC drivers/gpu/drm/Kconfig | 4 +-- drivers/gpu/drm/drm_fb_cma_helper.c | 20 ++++++++++++ drivers/gpu/drm/drm_gem_cma_helper.c | 62 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/drm_vm.c | 4 +++ drivers/video/fbdev/core/fbmem.c | 8 +++++ include/drm/drm_gem_cma_helper.h | 6 ++++ 6 files changed, 102 insertions(+), 2 deletions(-) -- 1.9.1

8 years, 9 months

master build: 0 failures 0 warnings (v4.9-rc7-23-gded6e84)

by Build bot for Mark Brown

Tree/Branch: master Git describe: v4.9-rc7-23-gded6e84 Commit: ded6e842cf Merge tag 'arc-4.9-final' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc Build Time: 86 min 56 sec Passed: 10 / 10 (100.00 %) Failed: 0 / 10 ( 0.00 %) Errors: 0 Warnings: 0 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): ------------------------------------------------------------------------------- =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm64-allmodconfig arm-multi_v5_defconfig arm-multi_v7_defconfig x86_64-defconfig arm-allmodconfig arm-allnoconfig x86_64-allnoconfig arm-multi_v4t_defconfig arm64-defconfig close failed in file object destructor: sys.excepthook is missing lost sys.stderr

8 years, 9 months

next-20161130 build: 2 failures 20 warnings (next-20161130)

by Build bot for Mark Brown

Tree/Branch: next-20161130 Git describe: next-20161130 Commit: 59ab008349 Add linux-next specific files for 20161130 Build Time: 151 min 57 sec Passed: 8 / 10 ( 80.00 %) Failed: 2 / 10 ( 20.00 %) Errors: 16 Warnings: 20 Section Mismatches: 0 Failed defconfigs: arm64-allmodconfig arm-allmodconfig Errors: arm64-allmodconfig ERROR: "cnstr_shdsc_ablkcipher_givencap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_ablkcipher_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_ablkcipher_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_xts_ablkcipher_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_xts_ablkcipher_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4106_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4106_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4543_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4543_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_gcm_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_gcm_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_givencap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_null_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_null_encap" [drivers/crypto/caam/caamalg.ko] undefined! arm-allmodconfig ERROR: "cnstr_shdsc_ablkcipher_givencap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_ablkcipher_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_ablkcipher_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_xts_ablkcipher_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_xts_ablkcipher_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4106_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4106_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4543_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4543_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_gcm_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_gcm_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_givencap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_null_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_null_encap" [drivers/crypto/caam/caamalg.ko] undefined! ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): 1 warnings 0 mismatches : arm64-allmodconfig 18 warnings 0 mismatches : arm-allmodconfig 1 warnings 0 mismatches : arm64-defconfig ------------------------------------------------------------------------------- Errors summary: 16 2 ERROR: "cnstr_shdsc_xts_ablkcipher_encap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_xts_ablkcipher_decap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_rfc4543_encap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_rfc4543_decap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_rfc4106_encap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_rfc4106_decap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_gcm_encap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_gcm_decap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_aead_null_encap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_aead_null_decap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_aead_givencap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_aead_encap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_aead_decap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_ablkcipher_givencap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_ablkcipher_encap" [drivers/crypto/caam/caamalg.ko] undefined! 2 ERROR: "cnstr_shdsc_ablkcipher_decap" [drivers/crypto/caam/caamalg.ko] undefined! Warnings Summary: 20 1 ../include/linux/kern_levels.h:4:18: warning: format '%d' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=] 1 ../fs/btrfs/inode.c:1198:31: warning: 'cur_end' may be used uninitialized in this function [-Wmaybe-uninitialized] 1 ../drivers/crypto/caam/caamalg_desc.c:918:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:848:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:776:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:705:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:67:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:629:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:539:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:236:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:228:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:143:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:1271:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:1219:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:1148:15: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:1143:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:1079:15: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:1074:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:1014:15: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] 1 ../drivers/crypto/caam/caamalg_desc.c:1009:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- arm64-allmodconfig : FAIL, 16 errors, 1 warnings, 0 section mismatches Errors: ERROR: "cnstr_shdsc_ablkcipher_givencap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_ablkcipher_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_ablkcipher_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_xts_ablkcipher_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_xts_ablkcipher_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4106_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4106_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4543_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4543_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_gcm_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_gcm_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_givencap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_null_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_null_encap" [drivers/crypto/caam/caamalg.ko] undefined! Warnings: ../include/linux/kern_levels.h:4:18: warning: format '%d' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Wformat=] ------------------------------------------------------------------------------- arm-allmodconfig : FAIL, 16 errors, 18 warnings, 0 section mismatches Errors: ERROR: "cnstr_shdsc_ablkcipher_givencap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_ablkcipher_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_ablkcipher_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_xts_ablkcipher_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_xts_ablkcipher_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4106_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4106_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4543_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_rfc4543_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_gcm_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_gcm_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_givencap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_encap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_null_decap" [drivers/crypto/caam/caamalg.ko] undefined! ERROR: "cnstr_shdsc_aead_null_encap" [drivers/crypto/caam/caamalg.ko] undefined! Warnings: ../drivers/crypto/caam/caamalg_desc.c:67:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:143:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:228:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:236:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:539:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:629:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:705:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:776:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:848:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:918:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:1009:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:1014:15: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:1074:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:1079:15: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:1143:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:1148:15: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:1219:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../drivers/crypto/caam/caamalg_desc.c:1271:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ------------------------------------------------------------------------------- arm64-defconfig : PASS, 0 errors, 1 warnings, 0 section mismatches Warnings: ../fs/btrfs/inode.c:1198:31: warning: 'cur_end' may be used uninitialized in this function [-Wmaybe-uninitialized] ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm-multi_v5_defconfig arm-multi_v7_defconfig x86_64-defconfig arm-allnoconfig x86_64-allnoconfig arm-multi_v4t_defconfig close failed in file object destructor: sys.excepthook is missing lost sys.stderr

8 years, 9 months

master build: 0 failures 0 warnings (v4.9-rc7-19-gfaaae2a)

by Build bot for Mark Brown

Tree/Branch: master Git describe: v4.9-rc7-19-gfaaae2a Commit: faaae2a581 Re-enable CONFIG_MODVERSIONS in a slightly weaker form Build Time: 137 min 47 sec Passed: 10 / 10 (100.00 %) Failed: 0 / 10 ( 0.00 %) Errors: 0 Warnings: 0 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): ------------------------------------------------------------------------------- =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm64-allmodconfig arm-multi_v5_defconfig arm-multi_v7_defconfig x86_64-defconfig arm-allmodconfig arm-allnoconfig x86_64-allnoconfig arm-multi_v4t_defconfig arm64-defconfig close failed in file object destructor: sys.excepthook is missing lost sys.stderr

8 years, 9 months

[PATCH] PM / OPP: Allow inactive opp_device to be present in dev list

by Viresh Kumar

Joonyoung Shim reported an interesting problem on his ARM octa-core Odoroid-XU3 platform. During system suspend, dev_pm_opp_put_regulator() was failing for a struct device for which dev_pm_opp_set_regulator() is called earlier. This happened because an earlier call to dev_pm_opp_of_cpumask_remove_table() function (from cpufreq-dt.c file) removed all the entries from opp_table->dev_list apart from the last CPU device in the cpumask of CPUs sharing the OPP. But both dev_pm_opp_set_regulator() and dev_pm_opp_put_regulator() routines get CPU device for the first CPU in the cpumask. And so the OPP core failed to find the OPP table for the struct device. This patch attempts to fix this problem by adding another field in the struct opp_device: inactive. Instead of removing the entries from the list during dev_pm_opp_of_cpumask_remove_table() function call, we mark them as inactive. Such inactive devices will not be used by the core in most of the cases, like before, but will be used only at special places which need to take inactive devices into account. All the devices are removed from the list together now and that happens only when the opp_table gets destroyed. This patch is tested on Dual A15, Exynos5250 platform by compiling the cpufreq-dt driver as a module. The module is inserted/removed multiple times with combinations of CPU offline/online steps. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- drivers/base/power/opp/core.c | 156 ++++++++++++++++++++++++++------------- drivers/base/power/opp/cpu.c | 4 +- drivers/base/power/opp/debugfs.c | 4 +- drivers/base/power/opp/of.c | 2 +- drivers/base/power/opp/opp.h | 6 +- 5 files changed, 116 insertions(+), 56 deletions(-) diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c index 4c7c6da7a989..df3c8b3a62ea 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -40,14 +40,30 @@ do { \ "opp_table_lock protection"); \ } while (0) +/** + * _find_opp_dev - Returns existing opp_dev for opp table + * + * @dev: Device for which opp_dev needs to be found + * @opp_table: OPP table. + * @active_only: If true: find only for active entries. If false, find for both + * active and inactive entries. + */ static struct opp_device *_find_opp_dev(const struct device *dev, - struct opp_table *opp_table) + struct opp_table *opp_table, + bool active_only) { struct opp_device *opp_dev; - list_for_each_entry(opp_dev, &opp_table->dev_list, node) - if (opp_dev->dev == dev) - return opp_dev; + list_for_each_entry(opp_dev, &opp_table->dev_list, node) { + if (opp_dev->dev != dev) + continue; + + /* Only return active entries ? */ + if (active_only && opp_dev->inactive) + return NULL; + + return opp_dev; + } return NULL; } @@ -55,6 +71,8 @@ static struct opp_device *_find_opp_dev(const struct device *dev, /** * _find_opp_table() - find opp_table struct using device pointer * @dev: device pointer used to lookup OPP table + * @active_only: If true: find only for active entries. If false, find for both + * active and inactive entries. * * Search OPP table for one containing matching device. Does a RCU reader * operation to grab the pointer needed. @@ -68,7 +86,7 @@ static struct opp_device *_find_opp_dev(const struct device *dev, * * For Writers, this function must be called with opp_table_lock held. */ -struct opp_table *_find_opp_table(struct device *dev) +struct opp_table *_find_opp_table(struct device *dev, bool active_only) { struct opp_table *opp_table; @@ -80,7 +98,7 @@ struct opp_table *_find_opp_table(struct device *dev) } list_for_each_entry_rcu(opp_table, &opp_tables, node) - if (_find_opp_dev(dev, opp_table)) + if (_find_opp_dev(dev, opp_table, active_only)) return opp_table; return ERR_PTR(-ENODEV); @@ -199,7 +217,7 @@ unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev) rcu_read_lock(); - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table)) clock_latency_ns = 0; else @@ -229,7 +247,7 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev) rcu_read_lock(); - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table)) { rcu_read_unlock(); return 0; @@ -302,7 +320,7 @@ struct dev_pm_opp *dev_pm_opp_get_suspend_opp(struct device *dev) opp_rcu_lockdep_assert(); - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table) || !opp_table->suspend_opp || !opp_table->suspend_opp->available) return NULL; @@ -328,7 +346,7 @@ int dev_pm_opp_get_opp_count(struct device *dev) rcu_read_lock(); - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table)) { count = PTR_ERR(opp_table); dev_err(dev, "%s: OPP table not found (%d)\n", @@ -382,7 +400,7 @@ struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev, opp_rcu_lockdep_assert(); - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table)) { int r = PTR_ERR(opp_table); @@ -451,7 +469,7 @@ struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev, return ERR_PTR(-EINVAL); } - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table)) return ERR_CAST(opp_table); @@ -493,7 +511,7 @@ struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev, return ERR_PTR(-EINVAL); } - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table)) return ERR_CAST(opp_table); @@ -524,7 +542,7 @@ static struct clk *_get_opp_clk(struct device *dev) rcu_read_lock(); - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table)) { dev_err(dev, "%s: device opp doesn't exist\n", __func__); clk = ERR_CAST(opp_table); @@ -611,7 +629,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) rcu_read_lock(); - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table)) { dev_err(dev, "%s: device opp doesn't exist\n", __func__); rcu_read_unlock(); @@ -694,21 +712,57 @@ static void _kfree_opp_dev_rcu(struct rcu_head *head) kfree_rcu(opp_dev, rcu_head); } -static void _remove_opp_dev(struct opp_device *opp_dev, - struct opp_table *opp_table) +static void _remove_opp_devices(struct opp_table *opp_table) +{ + struct opp_device *opp_dev, *tmp; + + list_for_each_entry_safe(opp_dev, tmp, &opp_table->dev_list, node) { + list_del(&opp_dev->node); + call_srcu(&opp_table->srcu_head.srcu, &opp_dev->rcu_head, + _kfree_opp_dev_rcu); + } +} + +static void _deactivate_opp_dev(struct opp_device *opp_dev, + struct opp_table *opp_table) { + opp_table->active_dev_count--; + opp_dev->inactive = true; opp_debug_unregister(opp_dev, opp_table); - list_del(&opp_dev->node); - call_srcu(&opp_table->srcu_head.srcu, &opp_dev->rcu_head, - _kfree_opp_dev_rcu); +} + +static void _activate_opp_dev(struct opp_device *opp_dev, + struct opp_table *opp_table) +{ + int ret; + + /* Create debugfs entries for the opp_table */ + ret = opp_debug_register(opp_dev, opp_table); + if (ret) + dev_err(opp_dev->dev, "%s: Failed to register opp debugfs (%d)\n", + __func__, ret); + + opp_dev->inactive = false; + opp_table->active_dev_count++; } struct opp_device *_add_opp_dev(const struct device *dev, struct opp_table *opp_table) { struct opp_device *opp_dev; - int ret; + /* Try to find an inactive entry first */ + opp_dev = _find_opp_dev(dev, opp_table, false); + if (opp_dev) { + if (opp_dev->inactive) + goto activate; + + /* Already active */ + dev_err(opp_dev->dev, "%s: Entry already active\n", __func__); + return NULL; + } + + /* Allocate new opp-dev */ opp_dev = kzalloc(sizeof(*opp_dev), GFP_KERNEL); if (!opp_dev) return NULL; @@ -717,12 +771,8 @@ struct opp_device *_add_opp_dev(const struct device *dev, opp_dev->dev = dev; list_add_rcu(&opp_dev->node, &opp_table->dev_list); - /* Create debugfs entries for the opp_table */ - ret = opp_debug_register(opp_dev, opp_table); - if (ret) - dev_err(dev, "%s: Failed to register opp debugfs (%d)\n", - __func__, ret); - +activate: + _activate_opp_dev(opp_dev, opp_table); return opp_dev; } @@ -742,7 +792,7 @@ static struct opp_table *_add_opp_table(struct device *dev) int ret; /* Check for existing table for 'dev' first */ - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, false); if (!IS_ERR(opp_table)) return opp_table; @@ -804,8 +854,6 @@ static void _kfree_device_rcu(struct rcu_head *head) */ static void _remove_opp_table(struct opp_table *opp_table) { - struct opp_device *opp_dev; - if (!list_empty(&opp_table->opp_list)) return; @@ -822,10 +870,7 @@ static void _remove_opp_table(struct opp_table *opp_table) if (!IS_ERR(opp_table->clk)) clk_put(opp_table->clk); - opp_dev = list_first_entry(&opp_table->dev_list, struct opp_device, - node); - - _remove_opp_dev(opp_dev, opp_table); + _remove_opp_devices(opp_table); /* dev_list must be empty now */ WARN_ON(!list_empty(&opp_table->dev_list)); @@ -897,7 +942,7 @@ void dev_pm_opp_remove(struct device *dev, unsigned long freq) /* Hold our table modification lock here */ mutex_lock(&opp_table_lock); - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table)) goto unlock; @@ -1165,7 +1210,7 @@ void dev_pm_opp_put_supported_hw(struct device *dev) mutex_lock(&opp_table_lock); /* Check for existing table for 'dev' first */ - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, false); if (IS_ERR(opp_table)) { dev_err(dev, "Failed to find opp_table: %ld\n", PTR_ERR(opp_table)); @@ -1274,7 +1319,7 @@ void dev_pm_opp_put_prop_name(struct device *dev) mutex_lock(&opp_table_lock); /* Check for existing table for 'dev' first */ - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, false); if (IS_ERR(opp_table)) { dev_err(dev, "Failed to find opp_table: %ld\n", PTR_ERR(opp_table)); @@ -1382,7 +1427,7 @@ void dev_pm_opp_put_regulator(struct device *dev) mutex_lock(&opp_table_lock); /* Check for existing table for 'dev' first */ - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, false); if (IS_ERR(opp_table)) { dev_err(dev, "Failed to find opp_table: %ld\n", PTR_ERR(opp_table)); @@ -1471,7 +1516,7 @@ static int _opp_set_availability(struct device *dev, unsigned long freq, mutex_lock(&opp_table_lock); /* Find the opp_table */ - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table)) { r = PTR_ERR(opp_table); dev_warn(dev, "%s: Device OPP not found (%d)\n", __func__, r); @@ -1586,7 +1631,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_disable); */ struct srcu_notifier_head *dev_pm_opp_get_notifier(struct device *dev) { - struct opp_table *opp_table = _find_opp_table(dev); + struct opp_table *opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table)) return ERR_CAST(opp_table); /* matching type */ @@ -1603,12 +1648,13 @@ void _dev_pm_opp_remove_table(struct device *dev, bool remove_all) { struct opp_table *opp_table; struct dev_pm_opp *opp, *tmp; + struct opp_device *opp_dev; /* Hold our table modification lock here */ mutex_lock(&opp_table_lock); /* Check for existing table for 'dev' */ - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (IS_ERR(opp_table)) { int error = PTR_ERR(opp_table); @@ -1620,17 +1666,27 @@ void _dev_pm_opp_remove_table(struct device *dev, bool remove_all) goto unlock; } - /* Find if opp_table manages a single device */ - if (list_is_singular(&opp_table->dev_list)) { - /* Free static OPPs */ - list_for_each_entry_safe(opp, tmp, &opp_table->opp_list, node) { - if (remove_all || !opp->dynamic) - _opp_remove(opp_table, opp, true); - } - } else { - _remove_opp_dev(_find_opp_dev(dev, opp_table), opp_table); + opp_dev = _find_opp_dev(dev, opp_table, true); + + /* Already inactive */ + if (opp_dev->inactive) { + dev_err(opp_dev->dev, "%s: entry already inactive\n", __func__); + goto unlock; } + /* Remove the OPPs only if the table has no active devices */ + if (opp_table->active_dev_count > 1) + goto deactivate; + + /* Free static OPPs */ + list_for_each_entry_safe(opp, tmp, &opp_table->opp_list, node) { + if (remove_all || !opp->dynamic) + _opp_remove(opp_table, opp, true); + } + +deactivate: + _deactivate_opp_dev(opp_dev, opp_table); + unlock: mutex_unlock(&opp_table_lock); } diff --git a/drivers/base/power/opp/cpu.c b/drivers/base/power/opp/cpu.c index 8c3434bdb26d..203b5b79740a 100644 --- a/drivers/base/power/opp/cpu.c +++ b/drivers/base/power/opp/cpu.c @@ -186,7 +186,7 @@ int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, mutex_lock(&opp_table_lock); - opp_table = _find_opp_table(cpu_dev); + opp_table = _find_opp_table(cpu_dev, true); if (IS_ERR(opp_table)) { ret = PTR_ERR(opp_table); goto unlock; @@ -244,7 +244,7 @@ int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask) mutex_lock(&opp_table_lock); - opp_table = _find_opp_table(cpu_dev); + opp_table = _find_opp_table(cpu_dev, true); if (IS_ERR(opp_table)) { ret = PTR_ERR(opp_table); goto unlock; diff --git a/drivers/base/power/opp/debugfs.c b/drivers/base/power/opp/debugfs.c index ef1ae6b52042..44ec0209947f 100644 --- a/drivers/base/power/opp/debugfs.c +++ b/drivers/base/power/opp/debugfs.c @@ -158,7 +158,7 @@ static void opp_migrate_dentry(struct opp_device *opp_dev, /* Look for next opp-dev */ list_for_each_entry(new_dev, &opp_table->dev_list, node) - if (new_dev != opp_dev) + if (new_dev != opp_dev && !new_dev->inactive) break; /* new_dev is guaranteed to be valid here */ @@ -191,7 +191,7 @@ void opp_debug_unregister(struct opp_device *opp_dev, { if (opp_dev->dentry == opp_table->dentry) { /* Move the real dentry object under another device */ - if (!list_is_singular(&opp_table->dev_list)) { + if (opp_table->active_dev_count) { opp_migrate_dentry(opp_dev, opp_table); goto out; } diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c index 5b3755e49731..75b10159576e 100644 --- a/drivers/base/power/opp/of.c +++ b/drivers/base/power/opp/of.c @@ -358,7 +358,7 @@ static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np) mutex_lock(&opp_table_lock); - opp_table = _find_opp_table(dev); + opp_table = _find_opp_table(dev, true); if (WARN_ON(IS_ERR(opp_table))) { ret = PTR_ERR(opp_table); mutex_unlock(&opp_table_lock); diff --git a/drivers/base/power/opp/opp.h b/drivers/base/power/opp/opp.h index 96cd30ac6c1d..6eb5aed7777b 100644 --- a/drivers/base/power/opp/opp.h +++ b/drivers/base/power/opp/opp.h @@ -104,6 +104,7 @@ struct dev_pm_opp { * @node: list node * @dev: device to which the struct object belongs * @rcu_head: RCU callback head used for deferred freeing + * @inactive: 'fase' if the device is still using the opp table, else 'true'. * @dentry: debugfs dentry pointer (per device) * * This is an internal data structure maintaining the devices that are managed @@ -113,6 +114,7 @@ struct opp_device { struct list_head node; const struct device *dev; struct rcu_head rcu_head; + bool inactive; #ifdef CONFIG_DEBUG_FS struct dentry *dentry; @@ -136,6 +138,7 @@ enum opp_table_access { * @rcu_head: RCU callback head used for deferred freeing * @dev_list: list of devices that share these OPPs * @opp_list: table of opps + * @active_dev_count: Count of active devices using this table. * @np: struct device_node pointer for opp's DT node. * @clock_latency_ns_max: Max clock latency in nanoseconds. * @shared_opp: OPP is shared between multiple devices. @@ -165,6 +168,7 @@ struct opp_table { struct rcu_head rcu_head; struct list_head dev_list; struct list_head opp_list; + unsigned int active_dev_count; struct device_node *np; unsigned long clock_latency_ns_max; @@ -188,7 +192,7 @@ struct opp_table { }; /* Routines internal to opp core */ -struct opp_table *_find_opp_table(struct device *dev); +struct opp_table *_find_opp_table(struct device *dev, bool active_only); struct opp_device *_add_opp_dev(const struct device *dev, struct opp_table *opp_table); void _dev_pm_opp_remove_table(struct device *dev, bool remove_all); struct dev_pm_opp *_allocate_opp(struct device *dev, struct opp_table **opp_table); -- 2.7.1.410.g6faf27b

8 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel