Skip to contentSkip to conversation

backport: pending backlog

PATCH Applied Luis R. Rodriguez 3 participants 20 messages Apr 13, 2013 – Apr 23, 2013 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

cover backport: pending backlog

From: "Luis R. Rodriguez" <[email protected]>

Here's my backlog of patches. With this I would have finally have cought up. After this we would then need the release script and I think we're ready to start making releases. This adds two new subsystems. I've been run time testing the media subsystem drivers for a while now.

As for intel_ips graphics turbo is still disabled with:

ips 0000:00:1f.6: CPU TDP doesn't match expected value (found 25, expected 29) ips 0000:00:1f.6: failed to get i915 symbols, graphics turbo disabled until i915 loads

Luis R. Rodriguez (7):
backports: add support for backport_srctree
compat: add missing header includes for DMA backports
compat: backport IORESOURCE_REG definition gentree.py: add support to explicitly disable a config
backports: add support for voltage / current regulator drivers
backports: add media subsystem drivers
backports: add intel_ips support

 backport/.blacklist.map                            |    1 +
 backport/Kconfig                                   |    5 +
 backport/Makefile.kernel                           |    5 +
 backport/compat/compat-3.6.c                       |    1 +
 backport/defconfigs/media                          |  506 ++++++++++++++++++++
 backport/defconfigs/regulator                      |   63 +++
 backport/include/linux/compat-3.6.h                |    1 +
 backport/include/linux/compat-3.7.h                |    2 +
 copy-list                                          |   57 +++
 dependencies                                       |   73 +++
 gentree.py                                         |    9 +-
 .../collateral-evolutions/media/0001-pr_fmt.patch  |  493 +++++++++++++++++++
 .../media/0002-dma_mmap_coherent-revert.patch      |   58 +++
 .../media/0003-technisat-usb2-led-rename.patch     |   83 ++++
 .../regulator/0001-bt8xx-rename-dst-ops.patch      |   67 +++
 15 files changed, 1422 insertions(+), 2 deletions(-)
 create mode 100644 backport/defconfigs/media
 create mode 100644 backport/defconfigs/regulator
 create mode 100644 patches/collateral-evolutions/media/0001-pr_fmt.patch
 create mode 100644 patches/collateral-evolutions/media/0002-dma_mmap_coherent-revert.patch
 create mode 100644 patches/collateral-evolutions/media/0003-technisat-usb2-led-rename.patch
 create mode 100644 patches/collateral-evolutions/regulator/0001-bt8xx-rename-dst-ops.patch
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/7 backports: add support for backport_srctree

From: "Luis R. Rodriguez" <[email protected]>

The Linux kernel uses srctree to help prefix header files and scripts. When backporting we want to be able to override driver's Makefiles' usage of srctree with our own. Since we can't easily and sanely override the srctree itself without causing a lot of issues just use the python generator to do the change for us on the target Makefiles. This addresses the srctree usage case and where ccflags was used without prefixing any parent directory when used with drivers, the kernel tends to fix that with addtree command.

---
 backport/Makefile.kernel |    2 ++
 gentree.py               |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)
backport/Makefile.kernel +2 -0
index 91e7dd6..59e95ef 100644
@@ -15,6 +15,8 @@ NOSTDINC_FLAGS := \
 	$(BACKPORTS_GIT_TRACKER_DEF) \
 	$(CFLAGS)
 
+export backport_srctree = $(M)
+
 obj-y += compat/
 
 obj-$(CPTCFG_CFG80211) += net/wireless/
gentree.py +3 -1
index 476a3fc..c0838ea 100755
@@ -478,11 +478,13 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
             data = open(os.path.join(root, f), 'r').read()
             for r in regexes:
                 data = r.sub(r'CPTCFG_\1', data)
+            data = re.sub(r'\$\(srctree\)', '$(backport_srctree)', data)
+            data = re.sub(r'-Idrivers', '-I$(backport_srctree)/drivers', data)
             fo = open(os.path.join(root, f), 'w')
             fo.write(data)
             fo.close()
 
-    git_debug_snapshot(args, "rename config symbol usage")
+    git_debug_snapshot(args, "rename config symbol / srctree usage")
 
     # disable unbuildable Kconfig symbols and stuff Makefiles that doesn't exist
     maketree = make.MakeTree(os.path.join(args.outdir, 'Makefile.kernel'))
Signature · 1 line
1.7.10.4
#2 lore raw

Re: [PATCH 1/7] backports: add support for backport_srctree

Quoted 11 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

The Linux kernel uses srctree to help prefix header files and scripts. When backporting we want to be able to override driver's Makefiles' usage of srctree with our own. Since we can't easily and sanely override the srctree itself without causing a lot of issues just use the python generator to do the change for us on the target Makefiles. This addresses the srctree usage case and where ccflags was used without prefixing any parent directory when used with drivers, the kernel tends to fix that with addtree command.

Applied. I also removed the now unnecessary patches that change -Idrivers/...

johannes

#3 lore raw

PATCH 2/7 compat: add missing header includes for DMA backports

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

---
 backport/compat/compat-3.6.c        |    1 +
 backport/include/linux/compat-3.6.h |    1 +
 2 files changed, 2 insertions(+)
backport/compat/compat-3.6.c +1 -0
index 5355cd2..1e4480b 100644
@@ -16,6 +16,7 @@
 #include <linux/i2c.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+#include <linux/dma-attrs.h>
 /*
  * Create scatter-list for the already allocated DMA buffer.
  */
backport/include/linux/compat-3.6.h +1 -0
index ccc43a2..f2c1a90 100644
@@ -9,6 +9,7 @@
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
 #include <linux/i2c.h>
+#include <linux/dma-attrs.h>
 /* Unlocked flavor */
 #define __i2c_transfer LINUX_BACKPORT(__i2c_transfer)
 extern int __i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
Signature · 1 line
1.7.10.4
#4 lore raw

Re: [PATCH 2/7] compat: add missing header includes for DMA backports

APplied

#5 lore raw

PATCH 3/7 compat: backport IORESOURCE_REG definition

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This was added to help regmap drivers avoid having to use some non memory mapped equivalent, IORESOURCE_IO, to help avoid confusion. This is simply carried over.

mcgrof@frijol ~/linux-stable (git::master)$ git describe --contains 72dcb119 v3.7-rc1~112^2~84

commit 72dcb1197228b50bfb709ba97c2d53013c605868

Author: Mark Brown <[email protected]>
Date:   Tue Aug 7 19:42:45 2012 +0100

resources: Add register address resource type

Currently a bunch of I2C/SPI MFD drivers are using IORESOURCE_IO for register address ranges. Since this causes some confusion due to the primary use of this resource type for PCI/ISA I/O ports create a new resource type IORESOURCE_REG.

Unfortunately the current resource types are specified as bitmasks and there are no free bitmasks even though they really shouldn't be used as such so we define the new type as IORESOURCE_IO | IORESOURCE_MEM. Benjamin Herrenschmidt and Russell King have both verified that none of the users in this series will have a problem with this, and no new code should be affected.

This patch was written by Russell King but he found himself unable to take the patch further.

---
 backport/include/linux/compat-3.7.h |    2 ++
 1 file changed, 2 insertions(+)
backport/include/linux/compat-3.7.h +2 -0
index 96662e3..c7a4ebc 100644
@@ -17,6 +17,8 @@
 
 #define VM_DONTDUMP    VM_NODUMP
 
+#define IORESOURCE_REG	0x00000300	/* Register offsets */
+
 #ifdef CONFIG_USER_NS
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38))
Signature · 1 line
1.7.10.4
#6 lore raw

Re: [PATCH 3/7] compat: backport IORESOURCE_REG definition

Quoted 5 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This was added to help regmap drivers avoid having to use some non memory mapped equivalent, IORESOURCE_IO, to help avoid confusion. This is simply carried over.

Applied.

johannes

#7 lore raw

PATCH 4/7 gentree.py: add support to explicitly disable a config

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

At times we may want to disable a config option completely. Add support for this. All you have to is list the config on the depdependencies file with DISABLE instead of a kernel version.

---
 gentree.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
gentree.py +4 -1
index c0838ea..6dccaa9 100755
@@ -502,7 +502,10 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
     for sym in tuple(deplist.keys()):
         new = []
         for dep in deplist[sym]:
-            new.append('!BACKPORT_KERNEL_%s' % dep.replace('.', '_'))
+            if (dep == "DISABLE"):
+		    new.append('BACKPORT_KERNEL_%s' % dep.replace('.', '_'))
+            else:
+                    new.append('!BACKPORT_KERNEL_%s' % dep.replace('.', '_'))
         deplist[sym] = new
     configtree.add_dependencies(deplist)
     git_debug_snapshot(args, "add kernel version dependencies")
Signature · 1 line
1.7.10.4
#8 lore raw

Re: [PATCH 4/7] gentree.py: add support to explicitly disable a config

Quoted 6 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

At times we may want to disable a config option completely. Add support for this. All you have to is list the config on the depdependencies file with DISABLE instead of a kernel version.

Applied, but

Quoted 1 line

+ if (dep == "DISABLE"):

I removed those parentheses

gentree.py def process(kerneldir, outdir, copy_list_file, git_revision=None, · line 506

Quoted 1 line
gentree.py +1 -0
+		    new.append('BACKPORT_KERNEL_%s' % dep.replace('.', '_'))

and made this just "BACKPORT_DISABLED_KCONFIG_OPTION" instead of using "dep"

johannes

#9 lore raw

PATCH 5/7 backports: add support for voltage / current regulator drivers

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This backports the latest regulator drivers for kernels >= 3.4. We enable the regulator only on kernels >= 3.4 given that it relies on the new probe deferral mechanism which would otherwise mean having to support drivers that do not probe correctly. Note that 3.2 had a base regulator implementation but that was just stubs.

I did look into a way to upgrade the core kernel regulator but given that it relies on late_initcall() and core_initcall() we can't update this part of the kernel. I even looked at using ksplice for this but it seems ksplice can't be used to update init sections on the vmlinux ELF. I also haven't much updates to these routines since 3.4 except for 86f5fcfc.

1   2.6.24              [  OK  ]
2   2.6.25              [  OK  ]
3   2.6.26              [  OK  ]
4   2.6.27              [  OK  ]
5   2.6.28              [  OK  ]
6   2.6.29              [  OK  ]
7   2.6.30              [  OK  ]
8   2.6.31              [  OK  ]
9   2.6.32              [  OK  ]
10  2.6.33              [  OK  ]
11  2.6.34              [  OK  ]
12  2.6.35              [  OK  ]
13  2.6.36              [  OK  ]
14  2.6.37              [  OK  ]
15  2.6.38              [  OK  ]
16  2.6.39              [  OK  ]
17  3.0.65              [  OK  ]
18  3.1.10              [  OK  ]
19  3.2.38              [  OK  ]
20  3.3.8               [  OK  ]
21  3.4.32              [  OK  ]
22  3.5.7               [  OK  ]
23  3.6.11              [  OK  ]
24  3.7.9               [  OK  ]
25  3.8.0               [  OK  ]
26  3.9-rc1             [  OK  ]
real    39m35.615s
user    1068m47.428s
sys     155m55.657s
---
 backport/Kconfig                                   |    2 +
 backport/Makefile.kernel                           |    1 +
 backport/defconfigs/regulator                      |   63 ++++++++++++++++++
 copy-list                                          |   33 ++++++++++
 dependencies                                       |   27 ++++++++
 .../regulator/0001-bt8xx-rename-dst-ops.patch      |   67 ++++++++++++++++++++
 6 files changed, 193 insertions(+)
 create mode 100644 backport/defconfigs/regulator
 create mode 100644 patches/collateral-evolutions/regulator/0001-bt8xx-rename-dst-ops.patch
backport/Kconfig +2 -0
index 6ab0991..6088bfe 100644
@@ -38,3 +38,5 @@ source drivers/bcma/Kconfig
 source drivers/gpu/drm/Kconfig
 
 source net/nfc/Kconfig
+
+source drivers/regulator/Kconfig
backport/Makefile.kernel +1 -0
index 59e95ef..2741cc9 100644
@@ -31,3 +31,4 @@ obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
 obj-$(CPTCFG_DRM) += drivers/gpu/drm/
 obj-$(CPTCFG_NFC) += net/nfc/
 obj-$(CPTCFG_NFC) += drivers/nfc/
+obj-$(CPTCFG_REGULATOR) += drivers/regulator/
backport/defconfigs/regulator new file +63 -0

63 lines not on this page · raw message

copy-list +33 -0
index e8b1241..9771c43 100644
@@ -135,3 +135,36 @@ drivers/nfc/
 drivers/nfc/microread/
 drivers/nfc/pn544/
 include/linux/platform_data/pn544.h
+
+# Regulator
+# we don't include the whole directory as we need
+# rely on your core regulator implementation given that
+# it relies on late_initcall() and core_initcall() and
+# these can't be backported, as such we need to rely
+# on your base kernel regulator implementatin and can
+# only extend it with further exports. Your core
+# regulator routines are defined via the header file
+# include/linux/regulator/consumer.h and dummy.h
+include/linux/regulator/ab8500.h
+include/linux/regulator/db8500-prcmu.h
+include/linux/regulator/driver.h
+include/linux/regulator/fan53555.h
+include/linux/regulator/fixed.h
+include/linux/regulator/gpio-regulator.h
+include/linux/regulator/lp3971.h
+include/linux/regulator/lp3972.h
+include/linux/regulator/lp872x.h
+include/linux/regulator/machine.h
+include/linux/regulator/max1586.h
+include/linux/regulator/max8649.h
+include/linux/regulator/max8660.h
+include/linux/regulator/max8952.h
+include/linux/regulator/max8973-regulator.h
+include/linux/regulator/of_regulator.h
+include/linux/regulator/tps51632-regulator.h
+include/linux/regulator/tps62360.h
+include/linux/regulator/tps6507x.h
+include/linux/regulator/userspace-consumer.h
+include/linux/platform_data/lp8755.h
+
+drivers/regulator/
dependencies +27 -0
index 44e23da..0ab99d4 100644
@@ -46,6 +46,28 @@ HDMI 3.2
 DRM 3.2
 DRM_TTM 3.2
 
+# Regulator
+# Because of -EPROBE_DEFER see commit d1c3414c and note that
+# we can't backport the core regulator as its part of the core
+# vmlinux.
+REGULATOR 3.4
+# requires some work
+REGULATOR_ARIZONA DISABLE
+REGULATOR_MAX8973 DISABLE
+REGULATOR_MAX77686 DISABLE
+REGULATOR_MAX8997 DISABLE
+REGULATOR_RC5T583 DISABLE
+REGULATOR_TPS62360 DISABLE
+REGULATOR_TPS65910 DISABLE
+REGULATOR_TPS65090 DISABLE
+REGULATOR_TPS65217 DISABLE
+REGULATOR_TPS6586X DISABLE
+REGULATOR_WM831X DISABLE
+REGULATOR_WM8350 DISABLE
+REGULATOR_PALMAS DISABLE
+REGULATOR_DA9055 DISABLE
+REGULATOR_S5M8767 DISABLE
+
 # This requires proc_create(), and that doesn't exist before 2.6.24
 LIBIPW_DEBUG 2.6.25
 
@@ -71,6 +93,11 @@ BCMA_DRIVER_GPIO 3.0
 # (rfkill-regulator.h) that we don't backport
 # right now, so make it depend on 3.0
 RFKILL_REGULATOR 3.0
+# drivers/regulator/ab3100.c and drivers/mfd/ab3100-core.c
+# both depend on include/linux/mfd/ab3100.h and we should
+# only backport REGULATOR_AB3100 if the mfd driver is
+# backported as well.
+REGULATOR_AB3100 3.9
 
 # This is a fun one ... the implementation of this
 # uses subdir-ccflags-$(CONFIG_BRCMDBG) which was
patches/collateral-evolutions/regulator/0001-bt8xx-rename-dst-ops.patch new file +67 -0

67 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#10 lore raw

Re: [PATCH 5/7] backports: add support for voltage / current regulator drivers

Quoted 8 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This backports the latest regulator drivers for kernels >= 3.4. We enable the regulator only on kernels >= 3.4 given that it relies on the new probe deferral mechanism which would otherwise mean having to support drivers that do not probe correctly. Note that 3.2 had a base regulator implementation but that was just stubs.

Applied.

johannes

#11 lore raw

Re: [PATCH 5/7] backports: add support for voltage / current regulator drivers

Quoted 10 lines · Johannes Berg
Quoted 6 lines · Luis R. Rodriguez

This backports the latest regulator drivers for kernels >= 3.4. We enable the regulator only on kernels >= 3.4 given that it relies on the new probe deferral mechanism which would otherwise mean having to support drivers that do not probe correctly. Note that 3.2 had a base regulator implementation but that was just stubs.

Applied.

Please let's at least discuss the issues here, I'm not sure what this is supposed to do but the analysis of the subsystem didn't seem complete.

#12 lore raw

Re: [PATCH 5/7] backports: add support for voltage / current regulator drivers

Quoted 10 lines · Mark Brown
Quoted 8 lines · Johannes Berg
Quoted 6 lines · Luis R. Rodriguez

This backports the latest regulator drivers for kernels >= 3.4. We enable the regulator only on kernels >= 3.4 given that it relies on the new probe deferral mechanism which would otherwise mean having to support drivers that do not probe correctly. Note that 3.2 had a base regulator implementation but that was just stubs.

Quoted 4 lines
Quoted 1 line

Applied.

Please let's at least discuss the issues here, I'm not sure what this is supposed to do but the analysis of the subsystem didn't seem complete.

I wouldn't worry about it too much. For some reason (media drivers related?) Luis decided that it was worth including this in the backports project (see http://backports.wiki.kernel.org) and I am currently maintaining the git tree for that, at least while I was doing some refactoring.

I do notice that it doesn't quite work, there are a lot of unresolved symbols :)

If you think you'd be impacted by this because users demand support from you for the backport or whatever I can revert this (or probably just remove it from the copy list for now.) I don't really have an opinion on it, I'm doing this because I'm interested in one specific wireless driver.

johannes

#13 lore raw

Re: [PATCH 5/7] backports: add support for voltage / current regulator drivers

Quoted 11 lines · Johannes Berg
Quoted 2 lines · Mark Brown

Please let's at least discuss the issues here, I'm not sure what this is supposed to do but the analysis of the subsystem didn't seem complete.

I wouldn't worry about it too much. For some reason (media drivers related?) Luis decided that it was worth including this in the backports project (see http://backports.wiki.kernel.org) and I am currently maintaining the git tree for that, at least while I was doing some refactoring.

Quoted 8 lines

I do notice that it doesn't quite work, there are a lot of unresolved symbols :)

If you think you'd be impacted by this because users demand support from you for the backport or whatever I can revert this (or probably just remove it from the copy list for now.) I don't really have an opinion on it, I'm doing this because I'm interested in one specific wireless driver.

Well, I'd much rather have a sane backport if we're going to have one - whatever problem is being solved here it seems likely that someone else will have the same need and if there's a general kernel project for this (which preusmably has some overlap with LTSI?) it seems bad to have one that people have to be warned away from using.

Given how big the misunderstandings in the cover letter for Luis' patch were I'd be really concerned about seeing this going into anything officialish without some discussion about what's going on.

#14 lore raw

Re: [PATCH 5/7] backports: add support for voltage / current regulator drivers

Quoted 21 lines · Mark Brown
Quoted 11 lines · Johannes Berg
Quoted 2 lines · Mark Brown

Please let's at least discuss the issues here, I'm not sure what this is supposed to do but the analysis of the subsystem didn't seem complete.

I wouldn't worry about it too much. For some reason (media drivers related?) Luis decided that it was worth including this in the backports project (see http://backports.wiki.kernel.org) and I am currently maintaining the git tree for that, at least while I was doing some refactoring.

Quoted 8 lines

I do notice that it doesn't quite work, there are a lot of unresolved symbols :)

If you think you'd be impacted by this because users demand support from you for the backport or whatever I can revert this (or probably just remove it from the copy list for now.) I don't really have an opinion on it, I'm doing this because I'm interested in one specific wireless driver.

Quoted 5 lines

Well, I'd much rather have a sane backport if we're going to have one - whatever problem is being solved here it seems likely that someone else will have the same need and if there's a general kernel project for this (which preusmably has some overlap with LTSI?) it seems bad to have one that people have to be warned away from using.

LTSI is for folks who stick to a kernel revision. backports project is for folks who do not have control over what kernel they are on -- yet or as a model. backports provides support for backporting new kernel drivers down to any range of kernels. We strive for 802.11 down to 2.6.24, for BT 2.6.27, DRM to 3.2, regulator 3.2, Media 3.2. There are both daily snapshots based on linux-next, and stable release snapshots based on linux-stable. This enables Linux distributions, either rolling or non-rolling, to embraces released bast on latest and greatest drivers or based on stable releases.

The target here was not to make an assessment over quality of work on the subsystem but instead more on the backportability nature of it. In this case the regulator ends up using some data structures defined upon late_initcall() and core_initcall() which implicates what you can backport unless you can genuinely provide gaurantee a proper backport of regulator as a module and forcing drivers to use a separate namespace or somehow modifying the kernel's init calls with things like ksplice. Neither of these two are possible today and as such what is backported for regulator is things that do not depend on these calls having fired off as is today. 3.2 as a target seemed reasonable given that DRM was backported down to 3.2 and so was media.

Quoted 3 lines

Given how big the misunderstandings in the cover letter for Luis' patch were I'd be really concerned about seeing this going into anything officialish without some discussion about what's going on.

Official? Huh?

Luis

#15 lore raw

Re: [PATCH 5/7] backports: add support for voltage / current regulator drivers

In reply to Luis R. Rodriguez
Quoted 4 lines · Luis R. Rodriguez

This backports the latest regulator drivers for kernels >= 3.4. We enable the regulator only on kernels >= 3.4 given that it relies on the new probe deferral mechanism which would otherwise mean having to support drivers that do not probe

There's no great reliance on deferred probes here...

Quoted 2 lines

correctly. Note that 3.2 had a base regulator implementation but that was just stubs.

I'm sorry, what on earth makes you say that? The regulator API has been usefully functional since it was merged.

Quoted 6 lines

I did look into a way to upgrade the core kernel regulator but given that it relies on late_initcall() and core_initcall() we can't update this part of the kernel. I even looked at using ksplice for this but it seems ksplice can't be used to update init sections on the vmlinux ELF. I also haven't much updates to these routines since 3.4 except for 86f5fcfc.

Again I'm not sure what you're talking about here?

#16 lore raw

PATCH 6/7 backports: add media subsystem drivers

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This adds backport support for all media subsystem drivers. This is enabled only for >= 3.2. Some media drivers rely on the new probe deferrral mechanism (-EPROBE_DEFER see commit d1c3414c), those are only enabled for kernels >= 3.4. Some media drivers only depend on the regulatory but since we only support backporting the regulatory on kernels >= 3.4 we only enable those media drivers for >= 3.4.

This backports 433 media drivers.

1   2.6.24              [  OK  ]
2   2.6.25              [  OK  ]
3   2.6.26              [  OK  ]
4   2.6.27              [  OK  ]
5   2.6.28              [  OK  ]
6   2.6.29              [  OK  ]
7   2.6.30              [  OK  ]
8   2.6.31              [  OK  ]
9   2.6.32              [  OK  ]
10  2.6.33              [  OK  ]
11  2.6.34              [  OK  ]
12  2.6.35              [  OK  ]
13  2.6.36              [  OK  ]
14  2.6.37              [  OK  ]
15  2.6.38              [  OK  ]
16  2.6.39              [  OK  ]
17  3.0.65              [  OK  ]
18  3.1.10              [  OK  ]
19  3.2.38              [  OK  ]
20  3.3.8               [  OK  ]
21  3.4.32              [  OK  ]
22  3.5.7               [  OK  ]
23  3.6.11              [  OK  ]
24  3.7.9               [  OK  ]
25  3.8.0               [  OK  ]
26  3.9-rc1             [  OK  ]
real    39m35.615s
user    1068m47.428s
sys     155m55.657s
---
 backport/.blacklist.map                            |    1 +
 backport/Kconfig                                   |    1 +
 backport/Makefile.kernel                           |    1 +
 backport/defconfigs/media                          |  506 ++++++++++++++++++++
 copy-list                                          |   17 +
 dependencies                                       |   44 ++
 .../collateral-evolutions/media/0001-pr_fmt.patch  |  493 +++++++++++++++++++
 .../media/0002-dma_mmap_coherent-revert.patch      |   58 +++
 .../media/0003-technisat-usb2-led-rename.patch     |   83 ++++
 9 files changed, 1204 insertions(+)
 create mode 100644 backport/defconfigs/media
 create mode 100644 patches/collateral-evolutions/media/0001-pr_fmt.patch
 create mode 100644 patches/collateral-evolutions/media/0002-dma_mmap_coherent-revert.patch
 create mode 100644 patches/collateral-evolutions/media/0003-technisat-usb2-led-rename.patch
backport/.blacklist.map +1 -0
index dd58203..c1bdcfc 100644
@@ -8,3 +8,4 @@
 # new-driver	old-driver
 iwlwifi		iwlagn
 iwl4965		iwlagn
+videodev	v4l2-compat-ioctl32
backport/Kconfig +1 -0
index 6088bfe..2c75cd8 100644
@@ -40,3 +40,4 @@ source drivers/gpu/drm/Kconfig
 source net/nfc/Kconfig
 
 source drivers/regulator/Kconfig
+source drivers/media/Kconfig
backport/Makefile.kernel +1 -0
index 2741cc9..27b44da 100644
@@ -32,3 +32,4 @@ obj-$(CPTCFG_DRM) += drivers/gpu/drm/
 obj-$(CPTCFG_NFC) += net/nfc/
 obj-$(CPTCFG_NFC) += drivers/nfc/
 obj-$(CPTCFG_REGULATOR) += drivers/regulator/
+obj-$(CPTCFG_MEDIA_SUPPORT) += drivers/media/
backport/defconfigs/media new file +506 -0

506 lines not on this page · raw message

copy-list +17 -0
index 9771c43..0c25be5 100644
@@ -168,3 +168,20 @@ include/linux/regulator/userspace-consumer.h
 include/linux/platform_data/lp8755.h
 
 drivers/regulator/
+
+# Media
+include/media/
+
+include/linux/videodev2.h
+include/linux/video_output.h
+
+include/uapi/linux/media.h
+include/uapi/linux/dvb/
+include/uapi/linux/v4l2-common.h
+include/uapi/linux/v4l2-controls.h
+include/uapi/linux/v4l2-dv-timings.h
+include/uapi/linux/v4l2-mediabus.h
+include/uapi/linux/v4l2-subdev.h
+include/uapi/linux/videodev2.h
+
+drivers/media/
dependencies +44 -0

50 lines not on this page · raw message

patches/collateral-evolutions/media/0001-pr_fmt.patch new file +493 -0

493 lines not on this page · raw message

patches/collateral-evolutions/media/0002-dma_mmap_coherent-revert.patch new file +58 -0

58 lines not on this page · raw message

patches/collateral-evolutions/media/0003-technisat-usb2-led-rename.patch new file +83 -0

83 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#17 lore raw

Re: [PATCH 6/7] backports: add media subsystem drivers

Quoted 11 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This adds backport support for all media subsystem drivers. This is enabled only for >= 3.2. Some media drivers rely on the new probe deferrral mechanism (-EPROBE_DEFER see commit d1c3414c), those are only enabled for kernels >= 3.4. Some media drivers only depend on the regulatory but since we only support backporting the regulatory on kernels >= 3.4 we only enable those media drivers for >= 3.4.

Quoted 1 line

This backports 433 media drivers.

Heh. Applied. Good thing I can kill the pr_fmt patches again soon.

johannes

#18 lore raw

PATCH 7/7 backports: add intel_ips support

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

1   2.6.24              [  OK  ]
2   2.6.25              [  OK  ]
3   2.6.26              [  OK  ]
4   2.6.27              [  OK  ]
5   2.6.28              [  OK  ]
6   2.6.29              [  OK  ]
7   2.6.30              [  OK  ]
8   2.6.31              [  OK  ]
9   2.6.32              [  OK  ]
10  2.6.33              [  OK  ]
11  2.6.34              [  OK  ]
12  2.6.35              [  OK  ]
13  2.6.36              [  OK  ]
14  2.6.37              [  OK  ]
15  2.6.38              [  OK  ]
16  2.6.39              [  OK  ]
17  3.0.65              [  OK  ]
18  3.1.10              [  OK  ]
19  3.2.38              [  OK  ]
20  3.3.8               [  OK  ]
21  3.4.32              [  OK  ]
22  3.5.7               [  OK  ]
23  3.6.11              [  OK  ]
24  3.7.9               [  OK  ]
25  3.8.0               [  OK  ]
26  3.9-rc1             [  OK  ]
real    39m35.615s
user    1068m47.428s
sys     155m55.657s
---
 backport/Kconfig         |    2 ++
 backport/Makefile.kernel |    1 +
 copy-list                |    7 +++++++
 dependencies             |    2 ++
 4 files changed, 12 insertions(+)
backport/Kconfig +2 -0
index 2c75cd8..3103f10 100644
@@ -41,3 +41,5 @@ source net/nfc/Kconfig
 
 source drivers/regulator/Kconfig
 source drivers/media/Kconfig
+
+source drivers/platform/x86/Kconfig
backport/Makefile.kernel +1 -0
index 27b44da..096e80c 100644
@@ -33,3 +33,4 @@ obj-$(CPTCFG_NFC) += net/nfc/
 obj-$(CPTCFG_NFC) += drivers/nfc/
 obj-$(CPTCFG_REGULATOR) += drivers/regulator/
 obj-$(CPTCFG_MEDIA_SUPPORT) += drivers/media/
+obj-$(CPTCFG_INTEL_IPS) += drivers/platform/x86/
copy-list +7 -0
index 0c25be5..b49901d 100644
@@ -185,3 +185,10 @@ include/uapi/linux/v4l2-subdev.h
 include/uapi/linux/videodev2.h
 
 drivers/media/
+
+# Platform
+drivers/platform/x86/Kconfig
+drivers/platform/x86/Makefile
+drivers/platform/x86/intel_ips.c
+drivers/platform/x86/intel_ips.h
+include/asm-generic/io-64-nonatomic-lo-hi.h
dependencies +2 -0
index 0658289..f939b90 100644
@@ -157,3 +157,5 @@ BT_HIDP 2.6.33
 # NFC core needs PF_NFC defined in socket.h which was
 # only introduced in kernel 3.1
 NFC 3.1
+
+INTEL_IPS 3.2
Signature · 1 line
1.7.10.4
#19 lore raw

Re: [PATCH 7/7] backports: add intel_ips support

APplied.