Add driver for Broadcom FacetimeHD camera
cover Add driver for Broadcom FacetimeHD camera
Merge Patrik Jakobsson's out-of-tree driver for the Broadcom FacetimeHD camera on some Apple Macbooks using the Video4Linux 2 framework to add in-tree support and remove the need to install a DKMS package
Jack Flusche (5):
facetimehd: copy code from patjak/facetimehd
facetimehd: add Kconfig and Makefile
facetimehd: fix compile-time issues and formatting
facetimehd: add firmware extraction script from
patjak/facetimehd-firmware
facetimehd: add entry to MAINTAINERS
MAINTAINERS | 7 + drivers/media/pci/Kconfig | 1 + drivers/media/pci/Makefile | 1 + drivers/media/pci/facetimehd/FIRMWARE | 6 + drivers/media/pci/facetimehd/Kconfig | 12 + drivers/media/pci/facetimehd/Makefile | 2 + drivers/media/pci/facetimehd/firmware.sh | 61 + drivers/media/pci/facetimehd/fthd_buffer.c | 126 ++ drivers/media/pci/facetimehd/fthd_buffer.h | 73 + drivers/media/pci/facetimehd/fthd_ddr.c | 670 +++++++++ drivers/media/pci/facetimehd/fthd_ddr.h | 33 + drivers/media/pci/facetimehd/fthd_debugfs.c | 204 +++ drivers/media/pci/facetimehd/fthd_debugfs.h | 16 + drivers/media/pci/facetimehd/fthd_drv.c | 558 +++++++ drivers/media/pci/facetimehd/fthd_drv.h | 124 ++ drivers/media/pci/facetimehd/fthd_hw.c | 710 +++++++++ drivers/media/pci/facetimehd/fthd_hw.h | 128 ++ drivers/media/pci/facetimehd/fthd_isp.c | 1468 +++++++++++++++++++ drivers/media/pci/facetimehd/fthd_isp.h | 770 ++++++++++ drivers/media/pci/facetimehd/fthd_reg.h | 183 +++ drivers/media/pci/facetimehd/fthd_ringbuf.c | 133 ++ drivers/media/pci/facetimehd/fthd_ringbuf.h | 45 + drivers/media/pci/facetimehd/fthd_v4l2.c | 759 ++++++++++ drivers/media/pci/facetimehd/fthd_v4l2.h | 34 + 24 files changed, 6124 insertions(+) create mode 100644 drivers/media/pci/facetimehd/FIRMWARE create mode 100644 drivers/media/pci/facetimehd/Kconfig create mode 100644 drivers/media/pci/facetimehd/Makefile create mode 100755 drivers/media/pci/facetimehd/firmware.sh create mode 100644 drivers/media/pci/facetimehd/fthd_buffer.c create mode 100644 drivers/media/pci/facetimehd/fthd_buffer.h create mode 100644 drivers/media/pci/facetimehd/fthd_ddr.c create mode 100644 drivers/media/pci/facetimehd/fthd_ddr.h create mode 100644 drivers/media/pci/facetimehd/fthd_debugfs.c create mode 100644 drivers/media/pci/facetimehd/fthd_debugfs.h create mode 100644 drivers/media/pci/facetimehd/fthd_drv.c create mode 100644 drivers/media/pci/facetimehd/fthd_drv.h create mode 100644 drivers/media/pci/facetimehd/fthd_hw.c create mode 100644 drivers/media/pci/facetimehd/fthd_hw.h create mode 100644 drivers/media/pci/facetimehd/fthd_isp.c create mode 100644 drivers/media/pci/facetimehd/fthd_isp.h create mode 100644 drivers/media/pci/facetimehd/fthd_reg.h create mode 100644 drivers/media/pci/facetimehd/fthd_ringbuf.c create mode 100644 drivers/media/pci/facetimehd/fthd_ringbuf.h create mode 100644 drivers/media/pci/facetimehd/fthd_v4l2.c create mode 100644 drivers/media/pci/facetimehd/fthd_v4l2.h
Signature · 1 line
2.55.0
PATCH RESEND 2/5 facetimehd: add Kconfig and Makefile
Added build files for the FacetimeHD driver
--- drivers/media/pci/Kconfig | 1 + drivers/media/pci/Makefile | 1 + drivers/media/pci/facetimehd/Kconfig | 12 ++++++++++++ drivers/media/pci/facetimehd/Makefile | 2 ++ 4 files changed, 16 insertions(+) create mode 100644 drivers/media/pci/facetimehd/Kconfig create mode 100644 drivers/media/pci/facetimehd/Makefile
drivers/media/pci/Kconfig +1 -0
@@ -20,6 +20,7 @@ source "drivers/media/pci/tw5864/Kconfig" source "drivers/media/pci/tw68/Kconfig" source "drivers/media/pci/tw686x/Kconfig" source "drivers/media/pci/zoran/Kconfig" +source "drivers/media/pci/facetimehd/Kconfig" endif
drivers/media/pci/Makefile +1 -0
@@ -39,3 +39,4 @@ obj-$(CONFIG_VIDEO_TW5864) += tw5864/ obj-$(CONFIG_VIDEO_TW686X) += tw686x/ obj-$(CONFIG_VIDEO_TW68) += tw68/ obj-$(CONFIG_VIDEO_ZORAN) += zoran/ +obj-$(CONFIG_VIDEO_FACETIMEHD) += facetimehd/
drivers/media/pci/facetimehd/Kconfig new file +12 -0
@@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# "Broadcom Facetime HD camera driver +# +config VIDEO_FACETIMEHD + tristate "Broadcom Facetime HD camera" + select VIDEOBUF2_CORE + select VIDEOBUF2_DMA_SG + select VIDEO_DEV + help + This adds support for the Apple Facetime HD camera using the Broadcom + PCIe controller (14e4:1570) found on Macbooks from around 2013-2017.
drivers/media/pci/facetimehd/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +facetimehd-objs := fthd_ddr.o fthd_hw.o fthd_drv.o fthd_ringbuf.o fthd_isp.o fthd_v4l2.o fthd_buffer.o fthd_debugfs.o +obj-$(CONFIG_VIDEO_FACETIMEHD) += facetimehd.o
Signature · 1 line
2.55.0
PATCH RESEND 1/5 facetimehd: copy code from patjak/facetimehd
In reply to Jack FluscheCopy over code from https//github.com/patjak/facetimehd
--- drivers/media/pci/facetimehd/fthd_buffer.c | 125 ++ drivers/media/pci/facetimehd/fthd_buffer.h | 73 + drivers/media/pci/facetimehd/fthd_ddr.c | 675 +++++++++ drivers/media/pci/facetimehd/fthd_ddr.h | 30 + drivers/media/pci/facetimehd/fthd_debugfs.c | 198 +++ drivers/media/pci/facetimehd/fthd_debugfs.h | 17 + drivers/media/pci/facetimehd/fthd_drv.c | 564 +++++++ drivers/media/pci/facetimehd/fthd_drv.h | 128 ++ drivers/media/pci/facetimehd/fthd_hw.c | 712 +++++++++ drivers/media/pci/facetimehd/fthd_hw.h | 128 ++ drivers/media/pci/facetimehd/fthd_isp.c | 1459 +++++++++++++++++++ drivers/media/pci/facetimehd/fthd_isp.h | 767 ++++++++++ drivers/media/pci/facetimehd/fthd_reg.h | 184 +++ drivers/media/pci/facetimehd/fthd_ringbuf.c | 135 ++ drivers/media/pci/facetimehd/fthd_ringbuf.h | 44 + drivers/media/pci/facetimehd/fthd_v4l2.c | 790 ++++++++++ drivers/media/pci/facetimehd/fthd_v4l2.h | 34 + 17 files changed, 6063 insertions(+) create mode 100644 drivers/media/pci/facetimehd/fthd_buffer.c create mode 100644 drivers/media/pci/facetimehd/fthd_buffer.h create mode 100644 drivers/media/pci/facetimehd/fthd_ddr.c create mode 100644 drivers/media/pci/facetimehd/fthd_ddr.h create mode 100644 drivers/media/pci/facetimehd/fthd_debugfs.c create mode 100644 drivers/media/pci/facetimehd/fthd_debugfs.h create mode 100644 drivers/media/pci/facetimehd/fthd_drv.c create mode 100644 drivers/media/pci/facetimehd/fthd_drv.h create mode 100644 drivers/media/pci/facetimehd/fthd_hw.c create mode 100644 drivers/media/pci/facetimehd/fthd_hw.h create mode 100644 drivers/media/pci/facetimehd/fthd_isp.c create mode 100644 drivers/media/pci/facetimehd/fthd_isp.h create mode 100644 drivers/media/pci/facetimehd/fthd_reg.h create mode 100644 drivers/media/pci/facetimehd/fthd_ringbuf.c create mode 100644 drivers/media/pci/facetimehd/fthd_ringbuf.h create mode 100644 drivers/media/pci/facetimehd/fthd_v4l2.c create mode 100644 drivers/media/pci/facetimehd/fthd_v4l2.h
drivers/media/pci/facetimehd/fthd_buffer.c new file +125 -0
@@ -0,0 +1,125 @@ +/* +* SPDX-License-Identifier: GPL-2.0-only +* +* FacetimeHD camera driver +* +* Copyright (C) 2015 Sven Schnelle <[email protected]> +* +*/ + +#include <linux/delay.h> +#include <linux/dma-mapping.h> +#include <linux/printk.h> +#include "fthd_drv.h" +#include "fthd_isp.h" +#include "fthd_hw.h" +#include "fthd_buffer.h" + +#define GET_IOMMU_PAGES (_x) (((_x) + 4095)/4096) + +struct buf_ctx { +struct fthd_plane plane[4 ]; +struct isp_mem_obj *isphdr; +}; + +static int iommu_allocator_init (struct fthd_private *dev_priv) +{ + dev_priv->iommu =kzalloc (sizeof (struct resource ),GFP_KERNEL ); +if (!dev_priv->iommu) +return -ENOMEM ; + + dev_priv->iommu->start =0 ; + dev_priv->iommu->end =4095 ; +return 0 ; +} + +struct iommu_obj *iommu_allocate_sgtable (struct fthd_private *dev_priv,struct sg_table *sgtable) +{ +struct iommu_obj *obj; +struct resource *root = dev_priv->iommu; +struct scatterlist *sg; +int ret, i, pos; +int total_len =0 , dma_length; +dma_addr_t dma_addr; + +for (i =0 ; i < sgtable->nents; i++) + total_len +=sg_dma_len (sgtable->sgl + i); + +if (!total_len) +return NULL ; + + total_len +=4095 ; + total_len /=4096 ; + + obj =kzalloc (sizeof (struct iommu_obj ),GFP_KERNEL ); +if (!obj) +return NULL ; + + obj->base.name ="S2 IOMMU" ; + ret =allocate_resource (root, &obj->base, total_len, root->start, root->end, +1 ,NULL ,NULL ); +if (ret) { +dev_err (&dev_priv->pdev->dev, +"Failed to allocate resource (size: %d, start: %Ld, end: %Ld)\n" , + total_len, root->start, root->end); +kfree (obj); + obj =NULL ; +return NULL ; + } + + obj->offset = obj->base.start - root->start; + obj->size = total_len; + + pos =0x9000 + obj->offset *4 ; +for (i =0 ; i < sgtable->nents; i++) { + sg = sgtable->sgl + i; +WARN_ON (sg->offset); + dma_addr =sg_dma_address (sg); +WARN_ON (dma_addr &0xfff ); + dma_addr >>=12 ; + +for (dma_length =0 ; dma_length <sg_dma_len (sg); dma_length +=0x1000 ) { +// pr_debug("IOMMU %08x -> %08llx (dma length %d)\n", pos, dma_addr, dma_length); +FTHD_S2_REG_WRITE (dma_addr++, pos); + pos +=4 ; + } + } + +pr_debug ("allocated %d pages @ %p / offset %d\n" , obj->size, obj, obj->offset); +return obj; +} + +void iommu_free (struct fthd_private *dev_priv,struct iommu_obj *obj) +{ +int i; +pr_debug ("freeing %p\n" , obj); + +if (!obj) +return ; + +for (i = obj->offset; i < obj->offset + obj->size; i++) +FTHD_S2_REG_WRITE (0 ,0x9000 + i *4 ); + +release_resource (&obj->base); +kfree (obj); + obj =NULL ; +} + +static void iommu_allocator_destroy (struct fthd_private *dev_priv) +{ +kfree (dev_priv->iommu); +} + +int fthd_buffer_init (struct fthd_private *dev_priv) +{ +int i; +for (i =0 ; i <0x1000 ; i++) +FTHD_S2_REG_WRITE (0 ,0x9000 + i *4 ); + +return iommu_allocator_init (dev_priv); +} + +void fthd_buffer_exit (struct fthd_private *dev_priv) +{ +iommu_allocator_destroy (dev_priv); +}
drivers/media/pci/facetimehd/fthd_buffer.h new file +73 -0
73 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_ddr.c new file +675 -0
675 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_ddr.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* Broadcom PCIe 1570 webcam driver +* +* Copyright (C) 2014 Patrik Jakobsson ([email protected]) +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License version 2 as published by +* the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software Foundation. +* +*/ + +#ifndef _FTHD_DDR_H +#define _FTHD_DDR_H + +#define MEM_VERIFY_BASE 0x0/* 0x1000000 */ +#define MEM_VERIFY_NUM 128 +#define MEM_VERIFY_NUM_FULL (1 * 1024 * 1024) + +int fthd_ddr_calibrate (struct fthd_private *dev_priv); +int fthd_ddr_verify_mem (struct fthd_private *dev_priv,u32 base,int count); + +#endif
drivers/media/pci/facetimehd/fthd_debugfs.c new file +198 -0
198 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_debugfs.h new file +17 -0
@@ -0,0 +1,17 @@ +/* +* SPDX-License-Identifier: GPL-2.0-only +* +* FacetimeHD camera driver +* +* Copyright (C) 2015 Sven Schnelle <[email protected]> +* +*/ + +#ifndef _FTHD_SYSFS_H +#define _FTHD_SYSFS_H + +struct fthd_private ; + +int fthd_debugfs_init (struct fthd_private *priv); +void fthd_debugfs_exit (struct fthd_private *priv); +#endif
drivers/media/pci/facetimehd/fthd_drv.c new file +564 -0
564 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_drv.h new file +128 -0
128 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_hw.c new file +712 -0
712 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_hw.h new file +128 -0
128 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_isp.c new file +1459 -0
350 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_isp.h new file +767 -0
767 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_reg.h new file +184 -0
184 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_ringbuf.c new file +135 -0
135 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_ringbuf.h new file +44 -0
44 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_v4l2.c new file +790 -0
790 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_v4l2.h new file +34 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.55.0
Part of the diff is not shown here. View the raw message.
PATCH RESEND 3/5 facetimehd: fix compile-time issues and formatting
In reply to Jack FluscheFix errors and warnings from clangd and checkpatch.pl to meet kernel code standards in the FacetimeHD driver
--- drivers/media/pci/facetimehd/fthd_buffer.c | 33 ++--- drivers/media/pci/facetimehd/fthd_buffer.h | 14 +- drivers/media/pci/facetimehd/fthd_ddr.c | 29 ++-- drivers/media/pci/facetimehd/fthd_ddr.h | 5 +- drivers/media/pci/facetimehd/fthd_debugfs.c | 14 +- drivers/media/pci/facetimehd/fthd_debugfs.h | 3 +- drivers/media/pci/facetimehd/fthd_drv.c | 40 +++--- drivers/media/pci/facetimehd/fthd_drv.h | 16 +-- drivers/media/pci/facetimehd/fthd_hw.c | 62 +++++---- drivers/media/pci/facetimehd/fthd_hw.h | 4 +- drivers/media/pci/facetimehd/fthd_isp.c | 75 ++++++----- drivers/media/pci/facetimehd/fthd_isp.h | 19 +-- drivers/media/pci/facetimehd/fthd_reg.h | 3 +- drivers/media/pci/facetimehd/fthd_ringbuf.c | 10 +- drivers/media/pci/facetimehd/fthd_ringbuf.h | 11 +- drivers/media/pci/facetimehd/fthd_v4l2.c | 141 ++++++++------------ drivers/media/pci/facetimehd/fthd_v4l2.h | 4 +- 17 files changed, 227 insertions(+), 256 deletions(-)
drivers/media/pci/facetimehd/fthd_buffer.c +17 -16
@@ -1,6 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only /* -* SPDX-License-Identifier: GPL-2.0-only -* * FacetimeHD camera driver * * Copyright (C) 2015 Sven Schnelle <[email protected]>
@@ -24,9 +23,9 @@ struct buf_ctx {static int iommu_allocator_init (struct fthd_private *dev_priv) { - dev_priv->iommu =kzalloc (sizeof (struct resource ),GFP_KERNEL ); + dev_priv->iommu = kzalloc_obj(struct resource, GFP_KERNEL);if (!dev_priv->iommu) -return -ENOMEM ; +return -ENOMEM ; dev_priv->iommu->start =0 ; dev_priv->iommu->end =4095 ;
@@ -41,17 +40,17 @@ struct iommu_obj *iommu_allocate_sgtable(struct fthd_private *dev_priv, struct sint ret, i, pos;int total_len =0 , dma_length;dma_addr_t dma_addr; - -for (i =0 ; i < sgtable->nents; i++) + +for (i =0 ; i < sgtable->nents; i++) total_len +=sg_dma_len (sgtable->sgl + i); - +if (!total_len)return NULL ; total_len +=4095 ; total_len /=4096 ; - - obj =kzalloc (sizeof (struct iommu_obj ),GFP_KERNEL ); + + obj = kzalloc_obj(struct iommu_obj, GFP_KERNEL);if (!obj)return NULL ;
@@ -60,7 +59,7 @@ struct iommu_obj *iommu_allocate_sgtable(struct fthd_private *dev_priv, struct s 1, NULL, NULL);if (ret) {dev_err (&dev_priv->pdev->dev, -"Failed to allocate resource (size: %d, start: %Ld, end: %Ld)\n" , +"Failed to allocate resource (size: %d, start: %lld, end: %lld)\n" , total_len, root->start, root->end);kfree (obj); obj =NULL ;
@@ -71,14 +70,14 @@ struct iommu_obj *iommu_allocate_sgtable(struct fthd_private *dev_priv, struct s obj->size = total_len; pos =0x9000 + obj->offset *4 ; -for (i =0 ; i < sgtable->nents; i++) { +for (i =0 ; i < sgtable->nents; i++) { sg = sgtable->sgl + i;WARN_ON (sg->offset); dma_addr =sg_dma_address (sg);WARN_ON (dma_addr &0xfff ); dma_addr >>=12 ; - -for (dma_length =0 ; dma_length <sg_dma_len (sg); dma_length +=0x1000 ) { + +for (dma_length =0 ; dma_length <sg_dma_len (sg); dma_length +=0x1000 ) {// pr_debug("IOMMU %08x -> %08llx (dma length %d)\n", pos, dma_addr, dma_length); FTHD_S2_REG_WRITE (dma_addr++, pos); pos +=4 ;
@@ -92,12 +91,13 @@ struct iommu_obj *iommu_allocate_sgtable(struct fthd_private *dev_priv, struct svoid iommu_free (struct fthd_private *dev_priv,struct iommu_obj *obj) {int i; +pr_debug ("freeing %p\n" , obj);if (!obj)return ; - -for (i = obj->offset; i < obj->offset + obj->size; i++) + +for (i = obj->offset; i < obj->offset + obj->size; i++)FTHD_S2_REG_WRITE (0 ,0x9000 + i *4 );release_resource (&obj->base);
@@ -113,7 +113,8 @@ static void iommu_allocator_destroy(struct fthd_private *dev_priv)int fthd_buffer_init (struct fthd_private *dev_priv) {int i; -for (i =0 ; i <0x1000 ; i++) + +for (i =0 ; i <0x1000 ; i++)FTHD_S2_REG_WRITE (0 ,0x9000 + i *4 );return iommu_allocator_init (dev_priv);
drivers/media/pci/facetimehd/fthd_buffer.h +7 -7
@@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* -* SPDX-License-Identifier: GPL-2.0-only -* * FacetimeHD camera driver * * Copyright (C) 2015 Sven Schnelle <[email protected]>
@@ -10,7 +9,8 @@#define FTHD_BUFFER_H #include <linux/scatterlist.h> -#include "fthd_buffer.h" + +struct fthd_private ;enum fthd_buffer_state {BUF_FREE ,
@@ -29,14 +29,14 @@ struct dma_descriptor {u32 count;u32 pool;u64 tag; -} __attribute__((packed)); +} __packed;struct dma_descriptor_list {u32 field0; -u32 count; +u32 count;struct dma_descriptor desc[4 ];char unknown[216 ]; -} __attribute__((packed)); +} __packed;struct iommu_obj {struct resource base;
@@ -68,6 +68,6 @@ extern int fthd_buffer_init(struct fthd_private *dev_priv);extern void fthd_buffer_exit (struct fthd_private *dev_priv);extern void fthd_buffer_return_handler (struct fthd_private *dev_priv,u32 offset,int size);extern void fthd_buffer_queued_handler (struct fthd_private *dev_priv,u32 offset); -extern struct iommu_obj *iommu_allocate_sgtable (struct fthd_private *dev_priv,struct sg_table *); +extern struct iommu_obj *iommu_allocate_sgtable (struct fthd_private *dev_priv,struct sg_table *sgtable);extern void iommu_free (struct fthd_private *dev_priv,struct iommu_obj *obj);#endif
drivers/media/pci/facetimehd/fthd_ddr.c +12 -17
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * FacetimeHD camera driver *
@@ -17,13 +18,7 @@* */ -#include <linux/version.h> -#if LINUX_VERSION_CODE >=KERNEL_VERSION (6 ,13 ,0 )#include <linux/prandom.h> -#else -#include <linux/random.h> -#endif -#include "fthd_drv.h" #include "fthd_hw.h" #include "fthd_ddr.h"
@@ -302,12 +297,11 @@ static int fthd_ddr_calibrate_one_re_fifo(struct fthd_private *dev_priv, *rden_byte1 = bl_start[1 ]; } -if (*rden_byte0 >63 ) { +if (*rden_byte0 >63 ) *rden_byte0 =63 ; - } -if (*rden_byte1 >63 ) { + +if (*rden_byte1 >63 ) *rden_byte1 =63 ; - }return 0 ; }
@@ -429,13 +423,14 @@ static int fthd_ddr_calibrate_rd_dqs(struct fthd_private *dev_priv,u32 pass_end[16 ];// u32 var_f0[16]; int fail_sum, i, j, bit;s32 setting; -printk (KERN_CONT "\n" ); + +dev_info (&dev_priv->pdev->dev,"Calibrating RD DQS: " );for (bit =0 ; bit <16 ; bit++) { pass_start[bit] =64 ; pass_end[bit] =64 ; -printk (KERN_CONT "%.2d: " , bit); +pr_cont ("%.2d: " , bit);/* Start looking for start of pass */ for (i =0 ; i <63 ; i++) {
@@ -446,9 +441,9 @@ static int fthd_ddr_calibrate_rd_dqs(struct fthd_private *dev_priv, fail_sum += fails[i + j] & (1 << bit);if (fail_sum) { -printk (KERN_CONT "." ); +pr_cont ("." ); }else { -printk (KERN_CONT "O" ); +pr_cont ("O" ); pass_start[bit] = i;break ;
@@ -461,9 +456,9 @@ static int fthd_ddr_calibrate_rd_dqs(struct fthd_private *dev_priv,if (pass_end[bit] ==64 ) pass_end[bit] = i; -printk (KERN_CONT "." ); +pr_cont ("." ); }else { -printk (KERN_CONT "O" ); +pr_cont ("O" ); } }
@@ -478,7 +473,7 @@ static int fthd_ddr_calibrate_rd_dqs(struct fthd_private *dev_priv, setting =63 ; settings[bit] = setting; -printk (KERN_CONT " : start=%d end=%d len=%d new=%d\n" , pass_start[bit], +pr_cont (" : start=%d end=%d len=%d new=%d\n" , pass_start[bit], pass_end[bit], pass_len[bit], settings[bit]); }
drivers/media/pci/facetimehd/fthd_ddr.h +4 -1
@@ -1,5 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Broadcom PCIe 1570 webcam driver +* FacetimeHD camera driver * * Copyright (C) 2014 Patrik Jakobsson ([email protected]) *
@@ -20,6 +21,8 @@#ifndef _FTHD_DDR_H#define _FTHD_DDR_H +#include "fthd_drv.h" +#define MEM_VERIFY_BASE 0x0/* 0x1000000 */ #define MEM_VERIFY_NUM 128#define MEM_VERIFY_NUM_FULL (1 * 1024 * 1024)
drivers/media/pci/facetimehd/fthd_debugfs.c +10 -4
@@ -1,6 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only /* -* SPDX-License-Identifier: GPL-2.0-only -* * FacetimeHD camera driver * * Copyright (C) 2015 Sven Schnelle <[email protected]>
@@ -93,7 +92,7 @@ static int seq_channel_read(struct seq_file *seq, struct fthd_private *dev_priv,u32 entry;spin_lock_irq (&chan->lock); -for ( i =0 ; i < chan->size; i++) { +for (i =0 ; i < chan->size; i++) {if (chan->ringbuf.idx == i) pos ='*' ;else
@@ -113,6 +112,7 @@ static int seq_channel_terminal_read(struct seq_file *seq, void *data) {struct fthd_private *dev_priv =dev_get_drvdata (seq->private); +return seq_channel_read (seq, dev_priv, dev_priv->channel_terminal); }
@@ -120,6 +120,7 @@ static int seq_channel_sharedmalloc_read(struct seq_file *seq, void *data) {struct fthd_private *dev_priv =dev_get_drvdata (seq->private); +return seq_channel_read (seq, dev_priv, dev_priv->channel_shared_malloc); }
@@ -127,6 +128,7 @@ static int seq_channel_io_read(struct seq_file *seq, void *data) {struct fthd_private *dev_priv =dev_get_drvdata (seq->private); +return seq_channel_read (seq, dev_priv, dev_priv->channel_io); }
@@ -134,6 +136,7 @@ static int seq_channel_io_t2h_read(struct seq_file *seq, void *data) {struct fthd_private *dev_priv =dev_get_drvdata (seq->private); +return seq_channel_read (seq, dev_priv, dev_priv->channel_io_t2h); }
@@ -141,6 +144,7 @@ static int seq_channel_buf_h2t_read(struct seq_file *seq, void *data) {struct fthd_private *dev_priv =dev_get_drvdata (seq->private); +return seq_channel_read (seq, dev_priv, dev_priv->channel_buf_h2t); }
@@ -148,6 +152,7 @@ static int seq_channel_buf_t2h_read(struct seq_file *seq, void *data) {struct fthd_private *dev_priv =dev_get_drvdata (seq->private); +return seq_channel_read (seq, dev_priv, dev_priv->channel_buf_t2h); }
@@ -155,6 +160,7 @@ static int seq_channel_debug_read(struct seq_file *seq, void *data) {struct fthd_private *dev_priv =dev_get_drvdata (seq->private); +return seq_channel_read (seq, dev_priv, dev_priv->channel_debug); }
@@ -187,7 +193,7 @@ int fthd_debugfs_init(struct fthd_private *dev_priv)debugfs_create_devm_seqfile (&dev_priv->pdev->dev,"channel_buf_h2t" , d, seq_channel_buf_h2t_read);debugfs_create_devm_seqfile (&dev_priv->pdev->dev,"channel_buf_t2h" , d, seq_channel_buf_t2h_read);debugfs_create_devm_seqfile (&dev_priv->pdev->dev,"channel_debug" , d, seq_channel_debug_read); -debugfs_create_file ("debug" ,S_IRUSR |S_IWUSR , d, dev_priv, &fops_debug); +debugfs_create_file ("debug" ,0600 , d, dev_priv, &fops_debug); dev_priv->debugfs = top;return 0 ; }
drivers/media/pci/facetimehd/fthd_debugfs.h +1 -2
@@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* -* SPDX-License-Identifier: GPL-2.0-only -* * FacetimeHD camera driver * * Copyright (C) 2015 Sven Schnelle <[email protected]>
drivers/media/pci/facetimehd/fthd_drv.c +17 -23
@@ -1,6 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only /* -* SPDX-License-Identifier: GPL-2.0-only -* * FacetimeHD camera driver * * Copyright (C) 2014 Patrik Jakobsson ([email protected])
@@ -11,10 +10,6 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/pci.h> -#include <linux/version.h> -#if LINUX_VERSION_CODE <KERNEL_VERSION (5 ,4 ,0 ) -#include <linux/pci-aspm.h> -#endif #include <linux/io.h> #include <linux/interrupt.h> #include <linux/workqueue.h>
@@ -97,7 +92,7 @@ static void sharedmalloc_handler(struct fthd_private *dev_priv, request_size =FTHD_S2_MEM_READ (entry +FTHD_RINGBUF_REQUEST_SIZE ); response_size =FTHD_S2_MEM_READ (entry +FTHD_RINGBUF_RESPONSE_SIZE ); - address =FTHD_S2_MEM_READ (entry +FTHD_RINGBUF_ADDRESS_FLAGS ) & ~3 ; + address =FTHD_S2_MEM_READ (entry +FTHD_RINGBUF_ADDRESS_FLAGS ) & ~3 ;if (address) {pr_debug ("Firmware wants to free memory at %08x\n" , address);
@@ -106,7 +101,7 @@ static void sharedmalloc_handler(struct fthd_private *dev_priv, ret =fthd_channel_ringbuf_send (dev_priv, chan,0 ,0 ,0 ,NULL );if (ret) -pr_err ("%s: fthd_channel_ringbuf_send: %d\n" , __FUNCTION__, ret); +pr_err ("%s: fthd_channel_ringbuf_send: %d\n" , __func__, ret); }else {if (!request_size)return ;
@@ -115,12 +110,12 @@ static void sharedmalloc_handler(struct fthd_private *dev_priv,return ;pr_debug ("Firmware allocated %d bytes at %08lx (tag %c%c%c%c)\n" , request_size, obj->offset, - response_size >>24 ,response_size >>16 , + response_size >>24 , response_size >>16 , response_size >>8 , response_size);FTHD_S2_MEMCPY_TOIO (obj->offset, &obj,sizeof (obj)); ret =fthd_channel_ringbuf_send (dev_priv, chan, obj->offset +64 ,0 ,0 ,NULL );if (ret) -pr_err ("%s: fthd_channel_ringbuf_send: %d\n" , __FUNCTION__, ret); +pr_err ("%s: fthd_channel_ringbuf_send: %d\n" , __func__, ret); }
@@ -136,7 +131,7 @@ static void terminal_handler(struct fthd_private *dev_priv, request_size =FTHD_S2_MEM_READ (entry +FTHD_RINGBUF_REQUEST_SIZE ); response_size =FTHD_S2_MEM_READ (entry +FTHD_RINGBUF_RESPONSE_SIZE ); - address =FTHD_S2_MEM_READ (entry +FTHD_RINGBUF_ADDRESS_FLAGS ) & ~3 ; + address =FTHD_S2_MEM_READ (entry +FTHD_RINGBUF_ADDRESS_FLAGS ) & ~3 ;if (!address || !request_size)return ;
@@ -153,6 +148,7 @@ static void buf_t2h_handler(struct fthd_private *dev_priv, {u32 request_size, response_size, address;int ret; + request_size =FTHD_S2_MEM_READ (entry +FTHD_RINGBUF_REQUEST_SIZE ); response_size =FTHD_S2_MEM_READ (entry +FTHD_RINGBUF_RESPONSE_SIZE ); address =FTHD_S2_MEM_READ (entry +FTHD_RINGBUF_ADDRESS_FLAGS );
@@ -165,7 +161,7 @@ static void buf_t2h_handler(struct fthd_private *dev_priv, ret =fthd_channel_ringbuf_send (dev_priv, chan, (response_size &0x10000000 ) ? address :0 ,0 ,0x80000000 ,NULL );if (ret) -pr_err ("%s: fthd_channel_ringbuf_send: %d\n" , __FUNCTION__, ret); +pr_err ("%s: fthd_channel_ringbuf_send: %d\n" , __func__, ret); }
@@ -174,8 +170,9 @@ static void io_t2h_handler(struct fthd_private *dev_priv, u32 entry) {int ret =fthd_channel_ringbuf_send (dev_priv, chan,0 ,0 ,0 ,NULL ); +if (ret) -pr_err ("%s: fthd_channel_ringbuf_send: %d\n" , __FUNCTION__, ret); +pr_err ("%s: fthd_channel_ringbuf_send: %d\n" , __func__, ret); }
@@ -202,7 +199,7 @@ static void fthd_handle_irq(struct fthd_private *dev_priv, struct fw_channel *chreturn ; } -while ((entry =fthd_channel_ringbuf_receive (dev_priv, chan)) != (u32)-1 ) { +while ((entry =fthd_channel_ringbuf_receive (dev_priv, chan)) != (u32)-1 ) {pr_debug ("channel %s: message available, address %08x\n" , chan->name,FTHD_S2_MEM_READ (entry +FTHD_RINGBUF_ADDRESS_FLAGS ));if (chan == dev_priv->channel_shared_malloc) {sharedmalloc_handler (dev_priv, chan, entry);
@@ -210,7 +207,7 @@ static void fthd_handle_irq(struct fthd_private *dev_priv, struct fw_channel *chterminal_handler (dev_priv, chan, entry); ret =fthd_channel_ringbuf_send (dev_priv, chan,0 ,0 ,0 ,NULL );if (ret) -pr_err ("%s: fthd_channel_ringbuf_send: %d\n" , __FUNCTION__, ret); +pr_err ("%s: fthd_channel_ringbuf_send: %d\n" , __func__, ret); }else if (chan == dev_priv->channel_buf_t2h) {buf_t2h_handler (dev_priv, chan, entry); }else if (chan == dev_priv->channel_io_t2h) {
@@ -232,7 +229,7 @@ static void fthd_irq_work(struct work_struct *work)u32 pending;int i =0 ; -while (i++ <500 ) { +while (i++ <500 ) {spin_lock_irq (&dev_priv->io_lock); pending =FTHD_ISP_REG_READ (ISP_IRQ_STATUS );spin_unlock_irq (&dev_priv->io_lock);
@@ -246,7 +243,7 @@ static void fthd_irq_work(struct work_struct *work)spin_unlock_irq (&dev_priv->io_lock);pci_write_config_dword (dev_priv->pdev,0x90 ,0x200 ); -for (i =0 ; i < dev_priv->num_channels; i++) { +for (i =0 ; i < dev_priv->num_channels; i++) { chan = dev_priv->channels[i];
@@ -396,11 +393,7 @@ static int fthd_pci_init(struct fthd_private *dev_priv) goto fail_irq;dev_info (&pdev->dev,"Setting %ubit DMA mask\n" , dev_priv->dma_mask); -#if LINUX_VERSION_CODE <KERNEL_VERSION (5 ,18 ,0 ) -pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (dev_priv->dma_mask)); -#else dma_set_coherent_mask (&pdev->dev,DMA_BIT_MASK (dev_priv->dma_mask)); -#endif pci_set_master (pdev);pci_set_drvdata (pdev, dev_priv);
@@ -441,7 +434,8 @@ static int fthd_firmware_start(struct fthd_private *dev_priv)/* Query the sensor's native resolution now so fthd_v4l2_register() * can advertise it. Non-fatal: if it fails the V4L2 layer falls back -* to a default size. */ +* to a default size. +*/ fthd_isp_cmd_channel_camera_config (dev_priv);return fthd_isp_cmd_set_loadfile (dev_priv);
@@ -457,7 +451,7 @@ static int fthd_pci_probe(struct pci_dev *pdev,dev_info (&pdev->dev,"Found FaceTime HD camera with device id: %x\n" , pdev->device); - dev_priv =kzalloc (sizeof (struct fthd_private ),GFP_KERNEL ); + dev_priv = kzalloc_obj(struct fthd_private, GFP_KERNEL);if (!dev_priv) {dev_err (&pdev->dev,"Failed to allocate memory\n" );return -ENOMEM ;
drivers/media/pci/facetimehd/fthd_drv.h +6 -10
@@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* -* SPDX-License-Identifier: GPL-2.0-only -* * FacetimeHD camera driver * * Copyright (C) 2014 Patrik Jakobsson ([email protected])
@@ -14,7 +13,6 @@#include <linux/spinlock.h> #include <linux/wait.h> #include <linux/mutex.h> -#include <linux/version.h> #include <media/videobuf2-dma-sg.h> #include <media/v4l2-device.h> #include <media/v4l2-ctrls.h>
@@ -30,9 +28,9 @@#define FTHD_BUFFERS 4enum FW_CHAN_TYPE { -FW_CHAN_TYPE_OUT =0 , -FW_CHAN_TYPE_IN =1 , -FW_CHAN_TYPE_UNI_IN =2 , +FW_CHAN_TYPE_OUT =0 , +FW_CHAN_TYPE_IN =1 , +FW_CHAN_TYPE_UNI_IN =2 , };struct fw_channel {
@@ -105,7 +103,8 @@ struct fthd_private {int sensor_id1;/* Native sensor resolution, read from the firmware's per-channel camera * config. MacBookPro sensors report 1280x720; the 12-inch MacBook -* (MacBook8,1, sensor 1675) reports 848x588. 0 until detected. */ +* (MacBook8,1, sensor 1675) reports 848x588. 0 until detected. +*/ unsigned int sensor_width;unsigned int sensor_height;
@@ -114,9 +113,6 @@ struct fthd_private {struct vb2_queue vb2_queue;struct mutex vb2_queue_lock;struct list_head buffer_queue; -#if LINUX_VERSION_CODE <KERNEL_VERSION (4 ,8 ,0 ) -struct vb2_alloc_ctx *alloc_ctx; -#endif struct h2t_buf_ctx h2t_bufs[FTHD_BUFFERS ];struct v4l2_ctrl_handler v4l2_ctrl_handler;
drivers/media/pci/facetimehd/fthd_hw.c +30 -32
153 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_hw.h +2 -2
@@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* -* SPDX-License-Identifier: GPL-2.0-only -* * FacetimeHD camera driver * * Copyright (C) 2014 Patrik Jakobsson ([email protected])
@@ -11,6 +10,7 @@#define _FTHD_HW_H#include <linux/pci.h> +#include "fthd_drv.h" /* Used after most PCI Link IO writes */ static inline void fthd_hw_pci_post (struct fthd_private *dev_priv)
drivers/media/pci/facetimehd/fthd_isp.c +42 -33
233 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_isp.h +11 -8
@@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* -* SPDX-License-Identifier: GPL-2.0-only -* * FacetimeHD camera driver * * Copyright (C) 2014 Patrik Jakobsson ([email protected])
@@ -10,6 +9,10 @@#ifndef _ISP_H#define _ISP_H +#include <linux/types.h> +#include <linux/ioport.h> +#include "fthd_drv.h" +/* ISP memory types */ #define FTHD_MEM_FIRMWARE 1#define FTHD_MEM_HEAP 2
@@ -438,7 +441,7 @@ enum fthd_isp_cmds { };enum isp_debug_cmds { -CISP_CMD_DEBUG_BANNER =0 , +CISP_CMD_DEBUG_BANNER =0 ,CISP_CMD_DEBUG_NOP1 ,CISP_CMD_DEBUG_NOP2 ,CISP_CMD_DEBUG_PS ,
@@ -494,11 +497,11 @@ struct isp_cmd_hdr {u32 unknown0;u16 opcode;u16 status; -} __attribute__((packed)); +} __packed;struct isp_cmd_print_enable {u32 enable; -} __attribute__((packed)); +} __packed;struct isp_cmd_config {u32 field0;
@@ -509,13 +512,13 @@ struct isp_cmd_config {u32 field14;u32 field18;u32 field1c; -} __attribute__((packed)); +} __packed;struct isp_cmd_set_loadfile {u32 unknown;u32 addr;u32 length; -} __attribute__((packed)); +} __packed;struct isp_cmd_channel_info {u32 field_0;
@@ -534,7 +537,7 @@ struct isp_cmd_channel_info {u8 unknown2[40 ];u8 sensor_serial_number[8 ];u8 camera_module_serial_number[18 ]; -} __attribute__((packed)); +} __packed;struct isp_cmd_channel_camera_config {u32 unknown;
drivers/media/pci/facetimehd/fthd_reg.h +1 -2
@@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* -* SPDX-License-Identifier: GPL-2.0-only -* * FacetimeHD camera driver * * Copyright (C) 2014 Patrik Jakobsson ([email protected])
drivers/media/pci/facetimehd/fthd_ringbuf.c +4 -6
@@ -1,6 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only /* -* SPDX-License-Identifier: GPL-2.0-only -* * FacetimeHD camera driver * * Copyright (C) 2015 Sven Schnelle <[email protected]>
@@ -15,7 +14,6 @@#include "fthd_drv.h" #include "fthd_hw.h" #include "fthd_ringbuf.h" -#include "fthd_isp.h" u32 get_entry_addr (struct fthd_private *dev_priv,struct fw_channel *chan,int num)
@@ -29,7 +27,7 @@ void fthd_channel_ringbuf_dump(struct fthd_private *dev_priv, struct fw_channelchar pos;int i; -for ( i =0 ; i < chan->size; i++) { +for (i =0 ; i < chan->size; i++) {if (chan->ringbuf.idx == i) pos ='*' ;else
@@ -55,7 +53,7 @@ void fthd_channel_ringbuf_init(struct fthd_private *dev_priv, struct fw_channel chan->name, chan->offset, chan->size);spin_lock_irq (&chan->lock); -for (i =0 ; i < chan->size; i++) { +for (i =0 ; i < chan->size; i++) { entry =get_entry_addr (dev_priv, chan, i);FTHD_S2_MEM_WRITE (1 , entry +FTHD_RINGBUF_ADDRESS_FLAGS );FTHD_S2_MEM_WRITE (0 , entry +FTHD_RINGBUF_REQUEST_SIZE );
@@ -86,7 +84,7 @@ int fthd_channel_ringbuf_send(struct fthd_private *dev_priv, struct fw_channel *FTHD_S2_MEM_WRITE (request_size, entry +FTHD_RINGBUF_REQUEST_SIZE );FTHD_S2_MEM_WRITE (response_size, entry +FTHD_RINGBUF_RESPONSE_SIZE ); -wmb (); +wmb ();/* Force write to request size and response size buffers */ FTHD_S2_MEM_WRITE (data_offset | (chan->type ==0 ?0 :1 ), entry +FTHD_RINGBUF_ADDRESS_FLAGS );spin_unlock_irq (&chan->lock);
drivers/media/pci/facetimehd/fthd_ringbuf.h +6 -5
@@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* -* SPDX-License-Identifier: GPL-2.0-only -* * FacetimeHD camera driver * * Copyright (C) 2015 Sven Schnelle <[email protected]>
@@ -10,6 +9,8 @@#ifndef _FTHD_RINGBUF_H#define _FTHD_RINGBUF_H +#include <linux/types.h> +#define FTHD_RINGBUF_ENTRY_SIZE 64#define FTHD_RINGBUF_ADDRESS_FLAGS 0
@@ -17,8 +18,8 @@#define FTHD_RINGBUF_RESPONSE_SIZE 8enum ringbuf_type_t { -RINGBUF_TYPE_H2T =0 , -RINGBUF_TYPE_T2H =1 , +RINGBUF_TYPE_H2T =0 , +RINGBUF_TYPE_T2H =1 ,RINGBUF_TYPE_UNIDIRECTIONAL , };
@@ -31,7 +32,7 @@ struct fw_channel;struct fthd_private ;extern void fthd_channel_ringbuf_dump (struct fthd_private *dev_priv,struct fw_channel *chan);extern void fthd_channel_ringbuf_init (struct fthd_private *dev_priv,struct fw_channel *chan); -extern u32 fthd_channel_ringbuf_get_entry (struct fthd_private *,struct fw_channel *); +extern u32 fthd_channel_ringbuf_get_entry (struct fthd_private *dev_priv,struct fw_channel *chan);extern int fthd_channel_ringbuf_send (struct fthd_private *dev_priv,struct fw_channel *chan,u32 data_offset,u32 request_size,u32 response_size,u32 *entry);
drivers/media/pci/facetimehd/fthd_v4l2.c +55 -86
369 lines not on this page · raw message
drivers/media/pci/facetimehd/fthd_v4l2.h +2 -2
@@ -1,6 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* -* SPDX-License-Identifier: GPL-2.0-only -* * FacetimeHD camera driver * * Copyright (C) 2015 Sven Schnelle <[email protected]>
@@ -28,6 +27,7 @@ struct fthd_fmt { };struct fthd_private ; +extern int fthd_v4l2_register (struct fthd_private *dev_priv);extern void fthd_v4l2_unregister (struct fthd_private *dev_priv);
Signature · 1 line
2.55.0
PATCH RESEND 4/5 facetimehd: add firmware extraction script from patjak/facetimehd-firmware
In reply to Jack FluscheCopy script from https://github.com/patjak/facetimehd-firmware to extract proprietary firmware for the FacetimeHD driver from an Apple OSX update file and add a FIRMWARE file to describe usage
--- drivers/media/pci/facetimehd/FIRMWARE | 6 +++ drivers/media/pci/facetimehd/firmware.sh | 61 ++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 drivers/media/pci/facetimehd/FIRMWARE create mode 100755 drivers/media/pci/facetimehd/firmware.sh
drivers/media/pci/facetimehd/FIRMWARE new file +6 -0
@@ -0,0 +1,6 @@ +This driver uses proprietary Apple firmware. To obtain this firmware, use the +included firmware.sh script (copied from patjak/facetimehd-firmware). This +script will download and extract the firmware from a Mac update file found at +https://updates.cdn-apple.com/2019/cert/041-88431-20191011-e7ee7d98-2878-4cd9-bc0a-d98b3a1e24b1/OSXUpd10.11.5.dmg +The script extracts the firmware to /usr/lib/firmware or /lib/firmware, +or to a folder specified using the first argument
drivers/media/pci/facetimehd/firmware.sh new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
2.55.0
PATCH RESEND 5/5 facetimehd: add entry to MAINTAINERS
In reply to Jack FluscheAdd MAINTAINERS entry for the FacetimeHD driver
--- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+)
MAINTAINERS +7 -0
@@ -5396,6 +5396,13 @@ F: drivers/net/phy/bcm*.[ch] F: drivers/net/phy/broadcom.c F: include/linux/brcmphy.h +BROADCOM FACETIMEHD CAMERA DRIVER +M: Patrik Jakobsson <[email protected]> +M: Jack Flusche <[email protected]> +L: [email protected] +S: Maintained +F: drivers/media/pci/facetimehd/ + BROADCOM GENET ETHERNET DRIVER M: Doug Berger <[email protected]> M: Florian Fainelli <[email protected]>
Signature · 1 line
2.55.0
Quoted 4 lines · Jack Flusche
Merge Patrik Jakobsson's out-of-tree driver for the Broadcom FacetimeHD camera on some Apple Macbooks using the Video4Linux 2 framework to add in-tree support and remove the need to install a DKMS package
Hi Jack,
I'm fine with upstreaming this but here are some initial thoughts:
- Should this be in staging instead? I defer that question to the media maintainers.
- There are quite a few PRs pending on github. Perhaps I should merge them first and then we redo the submission with those included?
- Perhaps we should have both the download and extraction scripts included? We've just updated the download script to grab a much newer version which adds support for new devices.
Thanks
Patrik
Quoted 59 lines
Jack Flusche (5):
facetimehd: copy code from patjak/facetimehd
facetimehd: addKconfigandMakefile
facetimehd: fix compile-time issues and formatting
facetimehd: add firmware extraction script from
patjak/facetimehd-firmware
facetimehd: add entry toMAINTAINERSMAINTAINERS | 7 + drivers/media/pci/Kconfig | 1 + drivers/media/pci/Makefile | 1 + drivers/media/pci/facetimehd/FIRMWARE | 6 + drivers/media/pci/facetimehd/Kconfig | 12 + drivers/media/pci/facetimehd/Makefile | 2 + drivers/media/pci/facetimehd/firmware.sh | 61 + drivers/media/pci/facetimehd/fthd_buffer.c | 126 ++ drivers/media/pci/facetimehd/fthd_buffer.h | 73 + drivers/media/pci/facetimehd/fthd_ddr.c | 670 +++++++++ drivers/media/pci/facetimehd/fthd_ddr.h | 33 + drivers/media/pci/facetimehd/fthd_debugfs.c | 204 +++ drivers/media/pci/facetimehd/fthd_debugfs.h | 16 + drivers/media/pci/facetimehd/fthd_drv.c | 558 +++++++ drivers/media/pci/facetimehd/fthd_drv.h | 124 ++ drivers/media/pci/facetimehd/fthd_hw.c | 710 +++++++++ drivers/media/pci/facetimehd/fthd_hw.h | 128 ++ drivers/media/pci/facetimehd/fthd_isp.c | 1468 +++++++++++++++++++ drivers/media/pci/facetimehd/fthd_isp.h | 770 ++++++++++ drivers/media/pci/facetimehd/fthd_reg.h | 183 +++ drivers/media/pci/facetimehd/fthd_ringbuf.c | 133 ++ drivers/media/pci/facetimehd/fthd_ringbuf.h | 45 + drivers/media/pci/facetimehd/fthd_v4l2.c | 759 ++++++++++ drivers/media/pci/facetimehd/fthd_v4l2.h | 34 + 24 files changed, 6124 insertions(+) create mode 100644 drivers/media/pci/facetimehd/FIRMWARE create mode 100644 drivers/media/pci/facetimehd/Kconfig create mode 100644 drivers/media/pci/facetimehd/Makefile create mode 100755 drivers/media/pci/facetimehd/firmware.sh create mode 100644 drivers/media/pci/facetimehd/fthd_buffer.c create mode 100644 drivers/media/pci/facetimehd/fthd_buffer.h create mode 100644 drivers/media/pci/facetimehd/fthd_ddr.c create mode 100644 drivers/media/pci/facetimehd/fthd_ddr.h create mode 100644 drivers/media/pci/facetimehd/fthd_debugfs.c create mode 100644 drivers/media/pci/facetimehd/fthd_debugfs.h create mode 100644 drivers/media/pci/facetimehd/fthd_drv.c create mode 100644 drivers/media/pci/facetimehd/fthd_drv.h create mode 100644 drivers/media/pci/facetimehd/fthd_hw.c create mode 100644 drivers/media/pci/facetimehd/fthd_hw.h create mode 100644 drivers/media/pci/facetimehd/fthd_isp.c create mode 100644 drivers/media/pci/facetimehd/fthd_isp.h create mode 100644 drivers/media/pci/facetimehd/fthd_reg.h create mode 100644 drivers/media/pci/facetimehd/fthd_ringbuf.c create mode 100644 drivers/media/pci/facetimehd/fthd_ringbuf.h create mode 100644 drivers/media/pci/facetimehd/fthd_v4l2.c create mode 100644 drivers/media/pci/facetimehd/fthd_v4l2.h--
2.55.0
Yes, merging the PRs is probably a good idea. On the firmware, I only included the install script since it doesn't require a manual download, but including the extraction script as well isn't be a problem.
Can you message me (or submit a patch set) when the driver is ready for upstreaming?
Thanks,
Jack
Quoted 79 lines · Patrik Jakobsson
Quoted 4 lines · Jack Flusche
Merge Patrik Jakobsson's out-of-tree driver for the Broadcom FacetimeHD camera on some Apple Macbooks using the Video4Linux 2 framework to add in-tree support and remove the need to install a DKMS package
Hi Jack,
I'm fine with upstreaming this but here are some initial thoughts:
- Should this be in staging instead? I defer that question to the media maintainers.
- There are quite a few PRs pending on github. Perhaps I should merge them first and then we redo the submission with those included?
- Perhaps we should have both the download and extraction scripts included? We've just updated the download script to grab a much newer version which adds support for new devices.Thanks
PatrikQuoted 59 lines
Jack Flusche (5):
facetimehd: copy code from patjak/facetimehd
facetimehd: addKconfigandMakefile
facetimehd: fix compile-time issues and formatting
facetimehd: add firmware extraction script from
patjak/facetimehd-firmware
facetimehd: add entry toMAINTAINERSMAINTAINERS | 7 + drivers/media/pci/Kconfig | 1 + drivers/media/pci/Makefile | 1 + drivers/media/pci/facetimehd/FIRMWARE | 6 + drivers/media/pci/facetimehd/Kconfig | 12 + drivers/media/pci/facetimehd/Makefile | 2 + drivers/media/pci/facetimehd/firmware.sh | 61 + drivers/media/pci/facetimehd/fthd_buffer.c | 126 ++ drivers/media/pci/facetimehd/fthd_buffer.h | 73 + drivers/media/pci/facetimehd/fthd_ddr.c | 670 +++++++++ drivers/media/pci/facetimehd/fthd_ddr.h | 33 + drivers/media/pci/facetimehd/fthd_debugfs.c | 204 +++ drivers/media/pci/facetimehd/fthd_debugfs.h | 16 + drivers/media/pci/facetimehd/fthd_drv.c | 558 +++++++ drivers/media/pci/facetimehd/fthd_drv.h | 124 ++ drivers/media/pci/facetimehd/fthd_hw.c | 710 +++++++++ drivers/media/pci/facetimehd/fthd_hw.h | 128 ++ drivers/media/pci/facetimehd/fthd_isp.c | 1468 +++++++++++++++++++ drivers/media/pci/facetimehd/fthd_isp.h | 770 ++++++++++ drivers/media/pci/facetimehd/fthd_reg.h | 183 +++ drivers/media/pci/facetimehd/fthd_ringbuf.c | 133 ++ drivers/media/pci/facetimehd/fthd_ringbuf.h | 45 + drivers/media/pci/facetimehd/fthd_v4l2.c | 759 ++++++++++ drivers/media/pci/facetimehd/fthd_v4l2.h | 34 + 24 files changed, 6124 insertions(+) create mode 100644 drivers/media/pci/facetimehd/FIRMWARE create mode 100644 drivers/media/pci/facetimehd/Kconfig create mode 100644 drivers/media/pci/facetimehd/Makefile create mode 100755 drivers/media/pci/facetimehd/firmware.sh create mode 100644 drivers/media/pci/facetimehd/fthd_buffer.c create mode 100644 drivers/media/pci/facetimehd/fthd_buffer.h create mode 100644 drivers/media/pci/facetimehd/fthd_ddr.c create mode 100644 drivers/media/pci/facetimehd/fthd_ddr.h create mode 100644 drivers/media/pci/facetimehd/fthd_debugfs.c create mode 100644 drivers/media/pci/facetimehd/fthd_debugfs.h create mode 100644 drivers/media/pci/facetimehd/fthd_drv.c create mode 100644 drivers/media/pci/facetimehd/fthd_drv.h create mode 100644 drivers/media/pci/facetimehd/fthd_hw.c create mode 100644 drivers/media/pci/facetimehd/fthd_hw.h create mode 100644 drivers/media/pci/facetimehd/fthd_isp.c create mode 100644 drivers/media/pci/facetimehd/fthd_isp.h create mode 100644 drivers/media/pci/facetimehd/fthd_reg.h create mode 100644 drivers/media/pci/facetimehd/fthd_ringbuf.c create mode 100644 drivers/media/pci/facetimehd/fthd_ringbuf.h create mode 100644 drivers/media/pci/facetimehd/fthd_v4l2.c create mode 100644 drivers/media/pci/facetimehd/fthd_v4l2.h--
2.55.0
Quoted 5 lines · Jack Flusche
Yes, merging the PRs is probably a good idea. On the firmware, I only included the install script since it doesn't require a manual download, but including the extraction script as well isn't be a problem.
On second thought, this needs to be distributed separately. Distros should figure out how to create a package that downloads and install the firmware files on installation. I did this for openSUSE [1].
[1] https://build.opensuse.org/package/show/hardware/facetimehd-firmware
Quoted 2 lines
Can you message me (or submit a patch set) when the driver is ready for upstreaming?
The driver is still quite ugly in many places and not up to kernel standards. I'll resubmit this to staging instead but leave out your modifications. You can then resubmit your fixes on top of that instead. Would that be ok?
-Patrik
Quoted 86 lines
Thanks,
JackQuoted 79 lines · Patrik Jakobsson
Quoted 4 lines · Jack Flusche
Merge Patrik Jakobsson's out-of-tree driver for the Broadcom FacetimeHD camera on some Apple Macbooks using the Video4Linux 2 framework to add in-tree support and remove the need to install a DKMS package
Hi Jack,
I'm fine with upstreaming this but here are some initial thoughts:
- Should this be in staging instead? I defer that question to the media maintainers.
- There are quite a few PRs pending on github. Perhaps I should merge them first and then we redo the submission with those included?
- Perhaps we should have both the download and extraction scripts included? We've just updated the download script to grab a much newer version which adds support for new devices.Thanks
PatrikQuoted 59 lines
Jack Flusche (5):
facetimehd: copy code from patjak/facetimehd
facetimehd: addKconfigandMakefile
facetimehd: fix compile-time issues and formatting
facetimehd: add firmware extraction script from
patjak/facetimehd-firmware
facetimehd: add entry toMAINTAINERSMAINTAINERS | 7 + drivers/media/pci/Kconfig | 1 + drivers/media/pci/Makefile | 1 + drivers/media/pci/facetimehd/FIRMWARE | 6 + drivers/media/pci/facetimehd/Kconfig | 12 + drivers/media/pci/facetimehd/Makefile | 2 + drivers/media/pci/facetimehd/firmware.sh | 61 + drivers/media/pci/facetimehd/fthd_buffer.c | 126 ++ drivers/media/pci/facetimehd/fthd_buffer.h | 73 + drivers/media/pci/facetimehd/fthd_ddr.c | 670 +++++++++ drivers/media/pci/facetimehd/fthd_ddr.h | 33 + drivers/media/pci/facetimehd/fthd_debugfs.c | 204 +++ drivers/media/pci/facetimehd/fthd_debugfs.h | 16 + drivers/media/pci/facetimehd/fthd_drv.c | 558 +++++++ drivers/media/pci/facetimehd/fthd_drv.h | 124 ++ drivers/media/pci/facetimehd/fthd_hw.c | 710 +++++++++ drivers/media/pci/facetimehd/fthd_hw.h | 128 ++ drivers/media/pci/facetimehd/fthd_isp.c | 1468 +++++++++++++++++++ drivers/media/pci/facetimehd/fthd_isp.h | 770 ++++++++++ drivers/media/pci/facetimehd/fthd_reg.h | 183 +++ drivers/media/pci/facetimehd/fthd_ringbuf.c | 133 ++ drivers/media/pci/facetimehd/fthd_ringbuf.h | 45 + drivers/media/pci/facetimehd/fthd_v4l2.c | 759 ++++++++++ drivers/media/pci/facetimehd/fthd_v4l2.h | 34 + 24 files changed, 6124 insertions(+) create mode 100644 drivers/media/pci/facetimehd/FIRMWARE create mode 100644 drivers/media/pci/facetimehd/Kconfig create mode 100644 drivers/media/pci/facetimehd/Makefile create mode 100755 drivers/media/pci/facetimehd/firmware.sh create mode 100644 drivers/media/pci/facetimehd/fthd_buffer.c create mode 100644 drivers/media/pci/facetimehd/fthd_buffer.h create mode 100644 drivers/media/pci/facetimehd/fthd_ddr.c create mode 100644 drivers/media/pci/facetimehd/fthd_ddr.h create mode 100644 drivers/media/pci/facetimehd/fthd_debugfs.c create mode 100644 drivers/media/pci/facetimehd/fthd_debugfs.h create mode 100644 drivers/media/pci/facetimehd/fthd_drv.c create mode 100644 drivers/media/pci/facetimehd/fthd_drv.h create mode 100644 drivers/media/pci/facetimehd/fthd_hw.c create mode 100644 drivers/media/pci/facetimehd/fthd_hw.h create mode 100644 drivers/media/pci/facetimehd/fthd_isp.c create mode 100644 drivers/media/pci/facetimehd/fthd_isp.h create mode 100644 drivers/media/pci/facetimehd/fthd_reg.h create mode 100644 drivers/media/pci/facetimehd/fthd_ringbuf.c create mode 100644 drivers/media/pci/facetimehd/fthd_ringbuf.h create mode 100644 drivers/media/pci/facetimehd/fthd_v4l2.c create mode 100644 drivers/media/pci/facetimehd/fthd_v4l2.h--
2.55.0
That sounds great, thanks.
Quoted 110 lines · Patrik Jakobsson
Quoted 5 lines · Jack Flusche
Yes, merging the PRs is probably a good idea. On the firmware, I only included the install script since it doesn't require a manual download, but including the extraction script as well isn't be a problem.
On second thought, this needs to be distributed separately. Distros should figure out how to create a package that downloads and install the firmware files on installation. I did this for openSUSE [1].
[1] https://build.opensuse.org/package/show/hardware/facetimehd-firmware
Quoted 2 lines
Can you message me (or submit a patch set) when the driver is ready for upstreaming?
The driver is still quite ugly in many places and not up to kernel standards. I'll resubmit this to staging instead but leave out your modifications. You can then resubmit your fixes on top of that instead. Would that be ok?
-Patrik
Quoted 86 lines
Thanks,
JackQuoted 79 lines · Patrik Jakobsson
Quoted 4 lines · Jack Flusche
Merge Patrik Jakobsson's out-of-tree driver for the Broadcom FacetimeHD camera on some Apple Macbooks using the Video4Linux 2 framework to add in-tree support and remove the need to install a DKMS package
Hi Jack,
I'm fine with upstreaming this but here are some initial thoughts:
- Should this be in staging instead? I defer that question to the media maintainers.
- There are quite a few PRs pending on github. Perhaps I should merge them first and then we redo the submission with those included?
- Perhaps we should have both the download and extraction scripts included? We've just updated the download script to grab a much newer version which adds support for new devices.Thanks
PatrikQuoted 59 lines
Jack Flusche (5):
facetimehd: copy code from patjak/facetimehd
facetimehd: addKconfigandMakefile
facetimehd: fix compile-time issues and formatting
facetimehd: add firmware extraction script from
patjak/facetimehd-firmware
facetimehd: add entry toMAINTAINERSMAINTAINERS | 7 + drivers/media/pci/Kconfig | 1 + drivers/media/pci/Makefile | 1 + drivers/media/pci/facetimehd/FIRMWARE | 6 + drivers/media/pci/facetimehd/Kconfig | 12 + drivers/media/pci/facetimehd/Makefile | 2 + drivers/media/pci/facetimehd/firmware.sh | 61 + drivers/media/pci/facetimehd/fthd_buffer.c | 126 ++ drivers/media/pci/facetimehd/fthd_buffer.h | 73 + drivers/media/pci/facetimehd/fthd_ddr.c | 670 +++++++++ drivers/media/pci/facetimehd/fthd_ddr.h | 33 + drivers/media/pci/facetimehd/fthd_debugfs.c | 204 +++ drivers/media/pci/facetimehd/fthd_debugfs.h | 16 + drivers/media/pci/facetimehd/fthd_drv.c | 558 +++++++ drivers/media/pci/facetimehd/fthd_drv.h | 124 ++ drivers/media/pci/facetimehd/fthd_hw.c | 710 +++++++++ drivers/media/pci/facetimehd/fthd_hw.h | 128 ++ drivers/media/pci/facetimehd/fthd_isp.c | 1468 +++++++++++++++++++ drivers/media/pci/facetimehd/fthd_isp.h | 770 ++++++++++ drivers/media/pci/facetimehd/fthd_reg.h | 183 +++ drivers/media/pci/facetimehd/fthd_ringbuf.c | 133 ++ drivers/media/pci/facetimehd/fthd_ringbuf.h | 45 + drivers/media/pci/facetimehd/fthd_v4l2.c | 759 ++++++++++ drivers/media/pci/facetimehd/fthd_v4l2.h | 34 + 24 files changed, 6124 insertions(+) create mode 100644 drivers/media/pci/facetimehd/FIRMWARE create mode 100644 drivers/media/pci/facetimehd/Kconfig create mode 100644 drivers/media/pci/facetimehd/Makefile create mode 100755 drivers/media/pci/facetimehd/firmware.sh create mode 100644 drivers/media/pci/facetimehd/fthd_buffer.c create mode 100644 drivers/media/pci/facetimehd/fthd_buffer.h create mode 100644 drivers/media/pci/facetimehd/fthd_ddr.c create mode 100644 drivers/media/pci/facetimehd/fthd_ddr.h create mode 100644 drivers/media/pci/facetimehd/fthd_debugfs.c create mode 100644 drivers/media/pci/facetimehd/fthd_debugfs.h create mode 100644 drivers/media/pci/facetimehd/fthd_drv.c create mode 100644 drivers/media/pci/facetimehd/fthd_drv.h create mode 100644 drivers/media/pci/facetimehd/fthd_hw.c create mode 100644 drivers/media/pci/facetimehd/fthd_hw.h create mode 100644 drivers/media/pci/facetimehd/fthd_isp.c create mode 100644 drivers/media/pci/facetimehd/fthd_isp.h create mode 100644 drivers/media/pci/facetimehd/fthd_reg.h create mode 100644 drivers/media/pci/facetimehd/fthd_ringbuf.c create mode 100644 drivers/media/pci/facetimehd/fthd_ringbuf.h create mode 100644 drivers/media/pci/facetimehd/fthd_v4l2.c create mode 100644 drivers/media/pci/facetimehd/fthd_v4l2.h--
2.55.0