mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-18 22:54:00 +00:00
Add core/linux-raspberrypi-latest (3.9.1) to the repo
This commit is contained in:
moonman
parent
c6e9c12366
commit
56f0596a27
13 changed files with 10499 additions and 0 deletions
|
|
@ -0,0 +1,62 @@
|
||||||
|
From 599be431332e31a25ebe203155fa18d34781c3d3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Arianna Avanzini <avanzini.arianna@gmail.com>
|
||||||
|
Date: Tue, 5 Mar 2013 10:41:49 +0100
|
||||||
|
Subject: [PATCH] block, bfq: attempt to fix use-after-free which affects SLUB
|
||||||
|
behavior (3.3.0 to 3.8.0)
|
||||||
|
|
||||||
|
It may happen that a call to bfq_del_bfqq_busy() puts the last
|
||||||
|
reference taken on a queue and frees it. Subsequent accesses to that
|
||||||
|
same queue would result in a use-after-free. Make sure that a queue
|
||||||
|
that has just been deleted from busy is no more touched.
|
||||||
|
---
|
||||||
|
block/bfq-iosched.c | 20 ++++++++++----------
|
||||||
|
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
|
||||||
|
index 9378b7d..e9a6514 100644
|
||||||
|
--- a/block/bfq-iosched.c
|
||||||
|
+++ b/block/bfq-iosched.c
|
||||||
|
@@ -1244,14 +1244,23 @@ static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)
|
||||||
|
|
||||||
|
__bfq_bfqd_reset_active(bfqd);
|
||||||
|
|
||||||
|
+ /*
|
||||||
|
+ * If this bfqq is shared between multiple processes, check
|
||||||
|
+ * to make sure that those processes are still issuing I/Os
|
||||||
|
+ * within the mean seek distance. If not, it may be time to
|
||||||
|
+ * break the queues apart again.
|
||||||
|
+ */
|
||||||
|
+ if (bfq_bfqq_coop(bfqq) && BFQQ_SEEKY(bfqq))
|
||||||
|
+ bfq_mark_bfqq_split_coop(bfqq);
|
||||||
|
+
|
||||||
|
if (RB_EMPTY_ROOT(&bfqq->sort_list)) {
|
||||||
|
- bfq_del_bfqq_busy(bfqd, bfqq, 1);
|
||||||
|
/*
|
||||||
|
* overloading budget_timeout field to store when
|
||||||
|
* the queue remains with no backlog, used by
|
||||||
|
* the weight-raising mechanism
|
||||||
|
*/
|
||||||
|
bfqq->budget_timeout = jiffies ;
|
||||||
|
+ bfq_del_bfqq_busy(bfqd, bfqq, 1);
|
||||||
|
} else {
|
||||||
|
bfq_activate_bfqq(bfqd, bfqq);
|
||||||
|
/*
|
||||||
|
@@ -1259,15 +1268,6 @@ static void __bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq)
|
||||||
|
*/
|
||||||
|
bfq_rq_pos_tree_add(bfqd, bfqq);
|
||||||
|
}
|
||||||
|
-
|
||||||
|
- /*
|
||||||
|
- * If this bfqq is shared between multiple processes, check
|
||||||
|
- * to make sure that those processes are still issuing I/Os
|
||||||
|
- * within the mean seek distance. If not, it may be time to
|
||||||
|
- * break the queues apart again.
|
||||||
|
- */
|
||||||
|
- if (bfq_bfqq_coop(bfqq) && BFQQ_SEEKY(bfqq))
|
||||||
|
- bfq_mark_bfqq_split_coop(bfqq);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
||||||
|
|
@ -0,0 +1,55 @@
|
||||||
|
From cb439ee574d4496ca0d14566e7c4bbf4fe20cbf4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Arianna Avanzini <avanzini.arianna@gmail.com>
|
||||||
|
Date: Fri, 3 May 2013 20:45:49 +0200
|
||||||
|
Subject: [PATCH] block, bfq: use the uninitialized_var() macro when needed
|
||||||
|
|
||||||
|
It may happen that a variable is initialized in a function that is
|
||||||
|
called by the function that defined it. Use the uninitialized_var()
|
||||||
|
macro in these cases.
|
||||||
|
---
|
||||||
|
block/bfq-iosched.c | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
|
||||||
|
index c9d57b0..b94aa24 100644
|
||||||
|
--- a/block/bfq-iosched.c
|
||||||
|
+++ b/block/bfq-iosched.c
|
||||||
|
@@ -3023,7 +3023,7 @@ static ssize_t \
|
||||||
|
__FUNC(struct elevator_queue *e, const char *page, size_t count) \
|
||||||
|
{ \
|
||||||
|
struct bfq_data *bfqd = e->elevator_data; \
|
||||||
|
- unsigned long __data; \
|
||||||
|
+ unsigned long uninitialized_var(__data); \
|
||||||
|
int ret = bfq_var_store(&__data, (page), count); \
|
||||||
|
if (__data < (MIN)) \
|
||||||
|
__data = (MIN); \
|
||||||
|
@@ -3083,7 +3083,7 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e,
|
||||||
|
const char *page, size_t count)
|
||||||
|
{
|
||||||
|
struct bfq_data *bfqd = e->elevator_data;
|
||||||
|
- unsigned long __data;
|
||||||
|
+ unsigned long uninitialized_var(__data);
|
||||||
|
int ret = bfq_var_store(&__data, (page), count);
|
||||||
|
|
||||||
|
if (__data == 0)
|
||||||
|
@@ -3103,7 +3103,7 @@ static ssize_t bfq_timeout_sync_store(struct elevator_queue *e,
|
||||||
|
const char *page, size_t count)
|
||||||
|
{
|
||||||
|
struct bfq_data *bfqd = e->elevator_data;
|
||||||
|
- unsigned long __data;
|
||||||
|
+ unsigned long uninitialized_var(__data);
|
||||||
|
int ret = bfq_var_store(&__data, (page), count);
|
||||||
|
|
||||||
|
if (__data < 1)
|
||||||
|
@@ -3122,7 +3122,7 @@ static ssize_t bfq_low_latency_store(struct elevator_queue *e,
|
||||||
|
const char *page, size_t count)
|
||||||
|
{
|
||||||
|
struct bfq_data *bfqd = e->elevator_data;
|
||||||
|
- unsigned long __data;
|
||||||
|
+ unsigned long uninitialized_var(__data);
|
||||||
|
int ret = bfq_var_store(&__data, (page), count);
|
||||||
|
|
||||||
|
if (__data > 1)
|
||||||
|
--
|
||||||
|
1.8.1.4
|
||||||
|
|
||||||
|
|
@ -0,0 +1,93 @@
|
||||||
|
From bfbdf60074337d435f84bb3947c7ed4738405945 Mon Sep 17 00:00:00 2001
|
||||||
|
From: ponce <matteo.bernardini@gmail.com>
|
||||||
|
Date: Sat, 4 May 2013 08:44:53 +0200
|
||||||
|
Subject: [PATCH 1/2] block: cgroups, kconfig, build bits for BFQ-v6-3.9
|
||||||
|
|
||||||
|
Update Kconfig.iosched and do the related Makefile changes to include
|
||||||
|
kernel configuration options for BFQ. Also add the bfqio controller
|
||||||
|
to the cgroups subsystem.
|
||||||
|
---
|
||||||
|
block/Kconfig.iosched | 25 +++++++++++++++++++++++++
|
||||||
|
block/Makefile | 1 +
|
||||||
|
include/linux/cgroup_subsys.h | 6 ++++++
|
||||||
|
3 files changed, 32 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
|
||||||
|
index 421bef9..695e064 100644
|
||||||
|
--- a/block/Kconfig.iosched
|
||||||
|
+++ b/block/Kconfig.iosched
|
||||||
|
@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED
|
||||||
|
---help---
|
||||||
|
Enable group IO scheduling in CFQ.
|
||||||
|
|
||||||
|
+config IOSCHED_BFQ
|
||||||
|
+ tristate "BFQ I/O scheduler"
|
||||||
|
+ default n
|
||||||
|
+ ---help---
|
||||||
|
+ The BFQ I/O scheduler tries to distribute bandwidth among
|
||||||
|
+ all processes according to their weights.
|
||||||
|
+ It aims at distributing the bandwidth as desired, independently of
|
||||||
|
+ the disk parameters and with any workload. It also tries to
|
||||||
|
+ guarantee low latency to interactive and soft real-time
|
||||||
|
+ applications. If compiled built-in (saying Y here), BFQ can
|
||||||
|
+ be configured to support hierarchical scheduling.
|
||||||
|
+
|
||||||
|
+config CGROUP_BFQIO
|
||||||
|
+ bool "BFQ hierarchical scheduling support"
|
||||||
|
+ depends on CGROUPS && IOSCHED_BFQ=y
|
||||||
|
+ default n
|
||||||
|
+ ---help---
|
||||||
|
+ Enable hierarchical scheduling in BFQ, using the cgroups
|
||||||
|
+ filesystem interface. The name of the subsystem will be
|
||||||
|
+ bfqio.
|
||||||
|
+
|
||||||
|
choice
|
||||||
|
prompt "Default I/O scheduler"
|
||||||
|
default DEFAULT_CFQ
|
||||||
|
@@ -52,6 +73,9 @@ choice
|
||||||
|
config DEFAULT_CFQ
|
||||||
|
bool "CFQ" if IOSCHED_CFQ=y
|
||||||
|
|
||||||
|
+ config DEFAULT_BFQ
|
||||||
|
+ bool "BFQ" if IOSCHED_BFQ=y
|
||||||
|
+
|
||||||
|
config DEFAULT_NOOP
|
||||||
|
bool "No-op"
|
||||||
|
|
||||||
|
@@ -61,6 +85,7 @@ config DEFAULT_IOSCHED
|
||||||
|
string
|
||||||
|
default "deadline" if DEFAULT_DEADLINE
|
||||||
|
default "cfq" if DEFAULT_CFQ
|
||||||
|
+ default "bfq" if DEFAULT_BFQ
|
||||||
|
default "noop" if DEFAULT_NOOP
|
||||||
|
|
||||||
|
endmenu
|
||||||
|
diff --git a/block/Makefile b/block/Makefile
|
||||||
|
index 39b76ba..c0d20fa 100644
|
||||||
|
--- a/block/Makefile
|
||||||
|
+++ b/block/Makefile
|
||||||
|
@@ -15,6 +15,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o
|
||||||
|
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
|
||||||
|
obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
|
||||||
|
obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
|
||||||
|
+obj-$(CONFIG_IOSCHED_BFQ) += bfq-iosched.o
|
||||||
|
|
||||||
|
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
|
||||||
|
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
|
||||||
|
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
|
||||||
|
index f204a7a..b999bfa 100644
|
||||||
|
--- a/include/linux/cgroup_subsys.h
|
||||||
|
+++ b/include/linux/cgroup_subsys.h
|
||||||
|
@@ -78,3 +78,9 @@ SUBSYS(hugetlb)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* */
|
||||||
|
+
|
||||||
|
+#ifdef CONFIG_CGROUP_BFQIO
|
||||||
|
+SUBSYS(bfqio)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* */
|
||||||
|
--
|
||||||
|
1.8.2
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load diff
296
core/linux-raspberrypi-latest/PKGBUILD
Normal file
296
core/linux-raspberrypi-latest/PKGBUILD
Normal file
|
|
@ -0,0 +1,296 @@
|
||||||
|
# Maintainer: Dave Higham <pepedog@archlinuxarm.org>
|
||||||
|
# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||||
|
|
||||||
|
buildarch=18
|
||||||
|
|
||||||
|
pkgbase=linux-raspberrypi
|
||||||
|
pkgname=('linux-raspberrypi-latest' 'linux-headers-raspberrypi-latest')
|
||||||
|
# pkgname=linux-custom # Build kernel with a different name
|
||||||
|
_kernelname=${pkgname#linux}
|
||||||
|
_basekernel=3.9
|
||||||
|
pkgver=${_basekernel}.1
|
||||||
|
pkgrel=1
|
||||||
|
bfqver=v6
|
||||||
|
arch=('arm armv6h')
|
||||||
|
url="http://www.kernel.org/"
|
||||||
|
license=('GPL2')
|
||||||
|
makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'git' 'python2' 'bc')
|
||||||
|
options=('!strip')
|
||||||
|
source=('config'
|
||||||
|
'change-default-console-loglevel.patch'
|
||||||
|
'usb-add-reset-resume-quirk-for-several-webcams.patch'
|
||||||
|
'args-uncompressed.txt'
|
||||||
|
'boot-uncompressed.txt'
|
||||||
|
'imagetool-uncompressed.py'
|
||||||
|
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch"
|
||||||
|
"http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-3).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch"
|
||||||
|
"http://dl.dropbox.com/u/15043728/ArchLinuxArm/kernels/0001-block-bfq-attempt-to-fix-use-after-free-which-3.3.0-to-3.8.0.patch"
|
||||||
|
'0001-block-bfq-use-the-uninitialized_var-macro-when-neede.patch')
|
||||||
|
|
||||||
|
md5sums=('ab8ba3443399f12cb76bac844f87af9b'
|
||||||
|
'9d3c56a4b999c8bfbd4018089a62f662'
|
||||||
|
'd00814b57448895e65fbbc800e8a58ba'
|
||||||
|
'9335d1263fd426215db69841a380ea26'
|
||||||
|
'a00e424e2fbb8c5a5f77ba2c4871bed4'
|
||||||
|
'2f82dbe5752af65ff409d737caf11954'
|
||||||
|
'eca0d65e1fa790c334ad93f40adf545e'
|
||||||
|
'ba6027b85b363ddb5a736e6d63503657'
|
||||||
|
'5c76a198d2242acd66fc4a0a3f955461'
|
||||||
|
'984207865dd160368d16f30004522468')
|
||||||
|
|
||||||
|
build() {
|
||||||
|
git clone --branch=rpi-3.9.y --depth=1 https://github.com/raspberrypi/linux.git
|
||||||
|
|
||||||
|
cd "${srcdir}/linux"
|
||||||
|
|
||||||
|
msg "Patches:"
|
||||||
|
#msg2 "Add upstream patch"
|
||||||
|
#patch -p1 -i "${srcdir}/patch-${pkgver}"
|
||||||
|
|
||||||
|
msg2 "Add the USB_QUIRK_RESET_RESUME for several webcams"
|
||||||
|
# FS#26528
|
||||||
|
patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
|
||||||
|
|
||||||
|
msg2 "Add BFQ patches"
|
||||||
|
patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-$(echo $_basekernel | cut -c 1-3).patch"
|
||||||
|
patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-3).patch"
|
||||||
|
patch -Np1 -i "${srcdir}/0001-block-bfq-attempt-to-fix-use-after-free-which-3.3.0-to-3.8.0.patch"
|
||||||
|
patch -Np1 -i "${srcdir}/0001-block-bfq-use-the-uninitialized_var-macro-when-neede.patch"
|
||||||
|
|
||||||
|
# add latest fixes from stable queue, if needed
|
||||||
|
# http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
|
||||||
|
|
||||||
|
msg2 "Set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)"
|
||||||
|
# remove this when a Kconfig knob is made available by upstream
|
||||||
|
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
|
||||||
|
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
|
||||||
|
cp ${srcdir}/args-uncompressed.txt arch/arm/boot/
|
||||||
|
cp ${srcdir}/boot-uncompressed.txt arch/arm/boot/
|
||||||
|
cp ${srcdir}/imagetool-uncompressed.py arch/arm/boot/
|
||||||
|
|
||||||
|
#make bcmrpi_defconfig
|
||||||
|
#sed -ri "s|^(CONFIG_LOCALVERSION=\").*|\1\-ARCH\"|" .config
|
||||||
|
cat "${srcdir}/config" > ./.config
|
||||||
|
|
||||||
|
msg "Prepare to build"
|
||||||
|
# set extraversion to pkgrel
|
||||||
|
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
|
||||||
|
|
||||||
|
# don't run depmod on 'make install'. We'll do this ourselves in packaging
|
||||||
|
sed -i '2iexit 0' scripts/depmod.sh
|
||||||
|
|
||||||
|
# get kernel version
|
||||||
|
make prepare
|
||||||
|
|
||||||
|
# load configuration
|
||||||
|
# Configure the kernel. Replace the line below with one of your choice.
|
||||||
|
#make menuconfig # CLI menu for configuration
|
||||||
|
#make nconfig # new CLI menu for configuration
|
||||||
|
#make xconfig # X-based configuration
|
||||||
|
#make oldconfig # using old config from previous kernel version
|
||||||
|
# ... or manually edit .config
|
||||||
|
|
||||||
|
# Copy back our configuration (use with new kernel version)
|
||||||
|
#cp ./.config ../${pkgver}.config
|
||||||
|
|
||||||
|
####################
|
||||||
|
# stop here
|
||||||
|
# this is useful to configure the kernel
|
||||||
|
#msg "Stopping build"
|
||||||
|
#return 1
|
||||||
|
####################
|
||||||
|
|
||||||
|
#yes "" | make config
|
||||||
|
|
||||||
|
msg "Building!"
|
||||||
|
make ${MAKEFLAGS} modules uImage
|
||||||
|
}
|
||||||
|
|
||||||
|
package_linux-raspberrypi-latest() {
|
||||||
|
pkgdesc="The Linux Kernel and modules for Raspberry Pi"
|
||||||
|
depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16')
|
||||||
|
optdepends=('crda: to set the correct wireless channels of your country')
|
||||||
|
provides=('kernel26' "linux=${pkgver}")
|
||||||
|
conflicts=('kernel26' 'linux')
|
||||||
|
install=${pkgname}.install
|
||||||
|
|
||||||
|
cd "${srcdir}/linux"
|
||||||
|
|
||||||
|
KARCH=arm
|
||||||
|
|
||||||
|
# get kernel version
|
||||||
|
_kernver="$(make kernelrelease)"
|
||||||
|
|
||||||
|
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
|
||||||
|
make INSTALL_MOD_PATH="${pkgdir}" modules_install
|
||||||
|
cd arch/$KARCH/boot/
|
||||||
|
/usr/bin/python2 imagetool-uncompressed.py
|
||||||
|
cd "${srcdir}/linux"
|
||||||
|
cp arch/$KARCH/boot/kernel.img ${pkgdir}/boot/kernel.img
|
||||||
|
#cp arch/$KARCH/boot/uImage "${pkgdir}/boot/uImage"
|
||||||
|
|
||||||
|
# set correct depmod command for install
|
||||||
|
sed \
|
||||||
|
-e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
|
||||||
|
-e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
|
||||||
|
-i "${startdir}/${pkgname}.install"
|
||||||
|
|
||||||
|
# remove build and source links
|
||||||
|
rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
|
||||||
|
# remove the firmware
|
||||||
|
rm -rf "${pkgdir}/lib/firmware"
|
||||||
|
# gzip -9 all modules to save 100MB of space
|
||||||
|
find "${pkgdir}" -name '*.ko' |xargs -P 2 -n 1 gzip -9
|
||||||
|
# make room for external modules
|
||||||
|
ln -s "../extramodules-${pkgver}-${_kernelname:-ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
|
||||||
|
# add real version for building modules and running depmod from post_install/upgrade
|
||||||
|
mkdir -p "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}"
|
||||||
|
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}/version"
|
||||||
|
|
||||||
|
# Now we call depmod...
|
||||||
|
depmod -b "$pkgdir" -F System.map "$_kernver"
|
||||||
|
|
||||||
|
# move module tree /lib -> /usr/lib
|
||||||
|
mkdir -p "${pkgdir}/usr"
|
||||||
|
mv "$pkgdir/lib" "$pkgdir/usr"
|
||||||
|
}
|
||||||
|
|
||||||
|
package_linux-headers-raspberrypi-latest() {
|
||||||
|
pkgdesc="Header files and scripts for building modules for linux kernel for Raspberry Pi"
|
||||||
|
provides=('kernel26-headers' "linux-headers=${pkgver}")
|
||||||
|
conflicts=('kernel26-headers')
|
||||||
|
|
||||||
|
install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
|
||||||
|
|
||||||
|
cd "${pkgdir}/usr/lib/modules/${_kernver}"
|
||||||
|
ln -sf ../../../src/linux-${_kernver} build
|
||||||
|
|
||||||
|
cd "${srcdir}/linux"
|
||||||
|
install -D -m644 Makefile \
|
||||||
|
"${pkgdir}/usr/src/linux-${_kernver}/Makefile"
|
||||||
|
install -D -m644 kernel/Makefile \
|
||||||
|
"${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
|
||||||
|
install -D -m644 .config \
|
||||||
|
"${pkgdir}/usr/src/linux-${_kernver}/.config"
|
||||||
|
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
|
||||||
|
|
||||||
|
for i in acpi asm-generic config crypto drm generated linux math-emu \
|
||||||
|
media net pcmcia scsi sound trace video xen; do
|
||||||
|
cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
|
||||||
|
done
|
||||||
|
|
||||||
|
# copy arch includes for external modules
|
||||||
|
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH
|
||||||
|
cp -a arch/$KARCH/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
|
||||||
|
mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-bcm2708
|
||||||
|
cp -a arch/$KARCH/mach-bcm2708/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-bcm2708/
|
||||||
|
|
||||||
|
# copy files necessary for later builds, like nvidia and vmware
|
||||||
|
cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
|
||||||
|
cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
|
||||||
|
|
||||||
|
# fix permissions on scripts dir
|
||||||
|
chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
|
||||||
|
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
|
||||||
|
|
||||||
|
cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
|
||||||
|
|
||||||
|
if [ "${CARCH}" = "i686" ]; then
|
||||||
|
cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
|
||||||
|
|
||||||
|
# add headers for lirc package
|
||||||
|
# mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/v4l2-core"
|
||||||
|
|
||||||
|
# cp drivers/media/v4l2-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/v4l2-core/"
|
||||||
|
|
||||||
|
# pci
|
||||||
|
for i in bt8xx cx88 saa7134; do
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
|
||||||
|
cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}"
|
||||||
|
done
|
||||||
|
# usb
|
||||||
|
for i in cpia2 em28xx pwc sn9c102; do
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
|
||||||
|
cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}"
|
||||||
|
done
|
||||||
|
# i2c
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c"
|
||||||
|
cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
|
||||||
|
for i in cx25840; do
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
|
||||||
|
cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}"
|
||||||
|
done
|
||||||
|
|
||||||
|
# add docbook makefile
|
||||||
|
install -D -m644 Documentation/DocBook/Makefile \
|
||||||
|
"${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
|
||||||
|
|
||||||
|
# add dm headers
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
|
||||||
|
cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
|
||||||
|
|
||||||
|
# add inotify.h
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
|
||||||
|
cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
|
||||||
|
|
||||||
|
# add wireless headers
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
|
||||||
|
cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
|
||||||
|
|
||||||
|
# add dvb headers for external modules
|
||||||
|
# in reference to:
|
||||||
|
# http://bugs.archlinux.org/task/9912
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core"
|
||||||
|
cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-core/"
|
||||||
|
# and...
|
||||||
|
# http://bugs.archlinux.org/task/11194
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
|
||||||
|
cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
|
||||||
|
|
||||||
|
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
|
||||||
|
# in reference to:
|
||||||
|
# http://bugs.archlinux.org/task/13146
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
|
||||||
|
cp drivers/media/dvb-frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
|
||||||
|
#cp drivers/media/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/"
|
||||||
|
|
||||||
|
# add dvb headers
|
||||||
|
# in reference to:
|
||||||
|
# http://bugs.archlinux.org/task/20402
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb"
|
||||||
|
cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb/"
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends"
|
||||||
|
cp drivers/media/dvb-frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb-frontends/"
|
||||||
|
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners"
|
||||||
|
cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/tuners/"
|
||||||
|
|
||||||
|
# copy in Kconfig files
|
||||||
|
for i in `find . -name "Kconfig*"`; do
|
||||||
|
mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
|
||||||
|
cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
|
||||||
|
done
|
||||||
|
|
||||||
|
chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
|
||||||
|
find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
|
||||||
|
|
||||||
|
# strip scripts directory
|
||||||
|
find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
|
||||||
|
case "$(file -bi "${binary}")" in
|
||||||
|
*application/x-sharedlib*) # Libraries (.so)
|
||||||
|
/usr/bin/strip ${STRIP_SHARED} "${binary}";;
|
||||||
|
*application/x-archive*) # Libraries (.a)
|
||||||
|
/usr/bin/strip ${STRIP_STATIC} "${binary}";;
|
||||||
|
*application/x-executable*) # Binaries
|
||||||
|
/usr/bin/strip ${STRIP_BINARIES} "${binary}";;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
# remove unneeded architectures
|
||||||
|
rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,x86,xtensa}
|
||||||
|
}
|
||||||
12
core/linux-raspberrypi-latest/args-uncompressed.txt
Normal file
12
core/linux-raspberrypi-latest/args-uncompressed.txt
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
; kernel args (place at 0x00000100)
|
||||||
|
0x00000005
|
||||||
|
0x54410001
|
||||||
|
0x00000001
|
||||||
|
0x00001000
|
||||||
|
0x00000000
|
||||||
|
0x00000004
|
||||||
|
0x54410002
|
||||||
|
0x08000000
|
||||||
|
0x00000000
|
||||||
|
0x00000000
|
||||||
|
0x00000000
|
||||||
122
core/linux-raspberrypi-latest/armdma.patch
Normal file
122
core/linux-raspberrypi-latest/armdma.patch
Normal file
|
|
@ -0,0 +1,122 @@
|
||||||
|
diff -urN linux-3.1-rc4-a/arch/arm/include/asm/dma-mapping.h linux-3.1-rc4-b/arch/arm/include/asm/dma-mapping.h
|
||||||
|
--- linux-3.1-rc4-a/arch/arm/include/asm/dma-mapping.h 2011-08-29 05:16:01.000000000 +0100
|
||||||
|
+++ linux-3.1-rc4-b/arch/arm/include/asm/dma-mapping.h 2011-09-02 12:09:00.000000000 +0100
|
||||||
|
@@ -205,6 +205,15 @@
|
||||||
|
int dma_mmap_writecombine(struct device *, struct vm_area_struct *,
|
||||||
|
void *, dma_addr_t, size_t);
|
||||||
|
|
||||||
|
+#ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE
|
||||||
|
+#define ARCH_HAS_DMA_COHERENT_WRITE_SYNC
|
||||||
|
+
|
||||||
|
+static inline void dma_coherent_write_sync(void)
|
||||||
|
+{
|
||||||
|
+ dsb();
|
||||||
|
+ outer_sync();
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_DMABOUNCE
|
||||||
|
/*
|
||||||
|
diff -urN linux-3.1-rc4-a/Documentation/DMA-API-HOWTO.txt linux-3.1-rc4-b/Documentation/DMA-API-HOWTO.txt
|
||||||
|
--- linux-3.1-rc4-a/Documentation/DMA-API-HOWTO.txt 2011-08-29 05:16:01.000000000 +0100
|
||||||
|
+++ linux-3.1-rc4-b/Documentation/DMA-API-HOWTO.txt 2011-09-02 12:01:09.000000000 +0100
|
||||||
|
@@ -400,6 +400,22 @@
|
||||||
|
from a pool before you destroy the pool. This function may not
|
||||||
|
be called in interrupt context.
|
||||||
|
|
||||||
|
+Some architectures which supporting DMA coherent memory may still have write
|
||||||
|
+buffering between the CPU and DMA memory. This buffering may delay CPU writes
|
||||||
|
+from reaching coherent memory in a timely manner. These delays in turn can
|
||||||
|
+lead lead to dramatic performance issues in certain cases. An architecture
|
||||||
|
+may mitigate this problem to a large degree by having a write buffer flush
|
||||||
|
+implicit in the MMIO functions used to write to device registers. This works
|
||||||
|
+for the most common cases where a driver needs to write to a register to tell
|
||||||
|
+a device that something was written to the shared coherent memory. There are
|
||||||
|
+other cases where the device polls the dma-coherent memory for data written
|
||||||
|
+by the driver. In such cases, the driver needs to explicity force write buffer
|
||||||
|
+data to memory by calling:
|
||||||
|
+
|
||||||
|
+ dma_coherent_write_sync();
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+
|
||||||
|
DMA Direction
|
||||||
|
|
||||||
|
The interfaces described in subsequent portions of this document
|
||||||
|
diff -urN linux-3.1-rc4-a/Documentation/DMA-API.txt linux-3.1-rc4-b/Documentation/DMA-API.txt
|
||||||
|
--- linux-3.1-rc4-a/Documentation/DMA-API.txt 2011-08-29 05:16:01.000000000 +0100
|
||||||
|
+++ linux-3.1-rc4-b/Documentation/DMA-API.txt 2011-09-02 12:03:06.000000000 +0100
|
||||||
|
@@ -418,6 +418,18 @@
|
||||||
|
....
|
||||||
|
|
||||||
|
|
||||||
|
+Part Ie - Write buffering to dma-coherent memory
|
||||||
|
+------------------------------------------------
|
||||||
|
+
|
||||||
|
+Some architectures supporting DMA coherent memory may have write
|
||||||
|
+buffering between the CPU and DMA memory. This buffering may delay
|
||||||
|
+CPU writes from reaching coherent memory in a timely manner.
|
||||||
|
+
|
||||||
|
+ void
|
||||||
|
+ dma_coherent_write_sync()
|
||||||
|
+
|
||||||
|
+Force any outstanding coherent writes to memory.
|
||||||
|
+
|
||||||
|
Part II - Advanced dma_ usage
|
||||||
|
-----------------------------
|
||||||
|
|
||||||
|
diff -urN linux-3.1-rc4-a/drivers/usb/host/ehci-q.c linux-3.1-rc4-b/drivers/usb/host/ehci-q.c
|
||||||
|
--- linux-3.1-rc4-a/drivers/usb/host/ehci-q.c 2011-08-29 05:16:01.000000000 +0100
|
||||||
|
+++ linux-3.1-rc4-b/drivers/usb/host/ehci-q.c 2011-09-02 12:17:20.000000000 +0100
|
||||||
|
@@ -114,6 +114,7 @@
|
||||||
|
/* HC must see latest qtd and qh data before we clear ACTIVE+HALT */
|
||||||
|
wmb ();
|
||||||
|
hw->hw_token &= cpu_to_hc32(ehci, QTD_TOGGLE | QTD_STS_PING);
|
||||||
|
+ dma_coherent_write_sync();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* if it weren't for a common silicon quirk (writing the dummy into the qh
|
||||||
|
@@ -404,6 +405,7 @@
|
||||||
|
wmb();
|
||||||
|
hw->hw_token = cpu_to_hc32(ehci,
|
||||||
|
token);
|
||||||
|
+ dma_coherent_write_sync();
|
||||||
|
goto retry_xacterr;
|
||||||
|
}
|
||||||
|
stopped = 1;
|
||||||
|
@@ -753,8 +755,10 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
/* by default, enable interrupt on urb completion */
|
||||||
|
- if (likely (!(urb->transfer_flags & URB_NO_INTERRUPT)))
|
||||||
|
+ if (likely(!(urb->transfer_flags & URB_NO_INTERRUPT))) {
|
||||||
|
qtd->hw_token |= cpu_to_hc32(ehci, QTD_IOC);
|
||||||
|
+ dma_coherent_write_sync();
|
||||||
|
+ }
|
||||||
|
return head;
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
@@ -1081,6 +1085,7 @@
|
||||||
|
/* let the hc process these next qtds */
|
||||||
|
wmb ();
|
||||||
|
dummy->hw_token = token;
|
||||||
|
+ dma_coherent_write_sync();
|
||||||
|
|
||||||
|
urb->hcpriv = qh_get (qh);
|
||||||
|
}
|
||||||
|
diff -urN linux-3.1-rc4-a/include/linux/dma-mapping.h linux-3.1-rc4-b/include/linux/dma-mapping.h
|
||||||
|
--- linux-3.1-rc4-a/include/linux/dma-mapping.h 2011-08-29 05:16:01.000000000 +0100
|
||||||
|
+++ linux-3.1-rc4-b/include/linux/dma-mapping.h 2011-09-02 12:06:06.000000000 +0100
|
||||||
|
@@ -154,6 +154,12 @@
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifndef ARCH_HAS_DMA_COHERENT_WRITE_SYNC
|
||||||
|
+static inline void dma_coherent_write_sync(void)
|
||||||
|
+{
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Managed DMA API
|
||||||
|
*/
|
||||||
17
core/linux-raspberrypi-latest/boot-uncompressed.txt
Normal file
17
core/linux-raspberrypi-latest/boot-uncompressed.txt
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
; bootloader (place at 0x00000000)
|
||||||
|
0xea000006
|
||||||
|
0xe1a00000
|
||||||
|
0xe1a00000
|
||||||
|
0xe1a00000
|
||||||
|
0xe1a00000
|
||||||
|
0xe1a00000
|
||||||
|
0xe1a00000
|
||||||
|
0xe1a00000
|
||||||
|
|
||||||
|
0xe3a00000
|
||||||
|
0xe3a01042
|
||||||
|
0xe3811c0c
|
||||||
|
0xe59f2000
|
||||||
|
0xe59ff000
|
||||||
|
0x00000100
|
||||||
|
0x00008000
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c
|
||||||
|
--- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300
|
||||||
|
+++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300
|
||||||
|
@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea
|
||||||
|
|
||||||
|
/* We show everything that is MORE important than this.. */
|
||||||
|
#define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
|
||||||
|
-#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
|
||||||
|
+#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */
|
||||||
|
|
||||||
|
DECLARE_WAIT_QUEUE_HEAD(log_wait);
|
||||||
|
|
||||||
3814
core/linux-raspberrypi-latest/config
Normal file
3814
core/linux-raspberrypi-latest/config
Normal file
File diff suppressed because it is too large
Load diff
41
core/linux-raspberrypi-latest/imagetool-uncompressed.py
Normal file
41
core/linux-raspberrypi-latest/imagetool-uncompressed.py
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
#!/usr/bin/python2
|
||||||
|
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import sys
|
||||||
|
|
||||||
|
try:
|
||||||
|
linuxdir = sys.argv[1]
|
||||||
|
except:
|
||||||
|
linuxdir = "linux"
|
||||||
|
|
||||||
|
re_line = re.compile(r"0x(?P<value>[0-9a-f]{8})")
|
||||||
|
|
||||||
|
mem = [0 for i in range(32768)]
|
||||||
|
|
||||||
|
def load_to_mem(name, addr):
|
||||||
|
f = open(name)
|
||||||
|
|
||||||
|
for l in f.readlines():
|
||||||
|
m = re_line.match(l)
|
||||||
|
|
||||||
|
if m:
|
||||||
|
value = int(m.group("value"), 16)
|
||||||
|
|
||||||
|
for i in range(4):
|
||||||
|
mem[addr] = int(value >> i * 8 & 0xff)
|
||||||
|
addr += 1
|
||||||
|
|
||||||
|
f.close()
|
||||||
|
|
||||||
|
load_to_mem("boot-uncompressed.txt", 0x00000000)
|
||||||
|
load_to_mem("args-uncompressed.txt", 0x00000100)
|
||||||
|
|
||||||
|
f = open("first32k.bin", "wb")
|
||||||
|
|
||||||
|
for m in mem:
|
||||||
|
f.write(chr(m))
|
||||||
|
|
||||||
|
f.close()
|
||||||
|
|
||||||
|
os.system("cat first32k.bin Image > kernel.img")
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
# arg 1: the new package version
|
||||||
|
# arg 2: the old package version
|
||||||
|
|
||||||
|
KERNEL_NAME=-raspberrypi
|
||||||
|
KERNEL_VERSION=3.9.0-1-ARCH+
|
||||||
|
|
||||||
|
post_install () {
|
||||||
|
# updating module dependencies
|
||||||
|
echo ">>> Updating module dependencies. Please wait ..."
|
||||||
|
depmod ${KERNEL_VERSION}
|
||||||
|
}
|
||||||
|
|
||||||
|
post_upgrade() {
|
||||||
|
if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
|
||||||
|
if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
|
||||||
|
echo "WARNING: /boot appears to be a seperate partition but is not mounted."
|
||||||
|
echo " You probably just broke your system. Congratulations."
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# updating module dependencies
|
||||||
|
echo ">>> Updating module dependencies. Please wait ..."
|
||||||
|
depmod ${KERNEL_VERSION}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,98 @@
|
||||||
|
commit 2394d67e446bf616a0885167d5f0d397bdacfdfc
|
||||||
|
Author: Oliver Neukum <oneukum@suse.de>
|
||||||
|
Date: Tue Sep 13 08:42:21 2011 +0200
|
||||||
|
|
||||||
|
USB: add RESET_RESUME for webcams shown to be quirky
|
||||||
|
|
||||||
|
The new runtime PM code has shown that many webcams suffer
|
||||||
|
from a race condition that may crash them upon resume.
|
||||||
|
Runtime PM is especially prone to show the problem because
|
||||||
|
it retains power to the cameras at all times. However
|
||||||
|
system suspension may also crash the devices and retain
|
||||||
|
power to the devices.
|
||||||
|
The only way to solve this problem without races is in
|
||||||
|
usbcore with the RESET_RESUME quirk.
|
||||||
|
|
||||||
|
Signed-off-by: Oliver Neukum <oneukum@suse.de>
|
||||||
|
Signed-off-by: stable <stable@kernel.org>
|
||||||
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
||||||
|
|
||||||
|
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
|
||||||
|
index 81ce6a8..38f0510 100644
|
||||||
|
--- a/drivers/usb/core/quirks.c
|
||||||
|
+++ b/drivers/usb/core/quirks.c
|
||||||
|
@@ -38,6 +38,24 @@ static const struct usb_device_id usb_quirk_list[] = {
|
||||||
|
/* Creative SB Audigy 2 NX */
|
||||||
|
{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
|
||||||
|
+ /* Logitech Webcam C200 */
|
||||||
|
+ { USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
+
|
||||||
|
+ /* Logitech Webcam C250 */
|
||||||
|
+ { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
+
|
||||||
|
+ /* Logitech Webcam B/C500 */
|
||||||
|
+ { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
+
|
||||||
|
+ /* Logitech Webcam Pro 9000 */
|
||||||
|
+ { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
+
|
||||||
|
+ /* Logitech Webcam C310 */
|
||||||
|
+ { USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
+
|
||||||
|
+ /* Logitech Webcam C270 */
|
||||||
|
+ { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
+
|
||||||
|
/* Logitech Harmony 700-series */
|
||||||
|
{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
|
||||||
|
|
||||||
|
@@ -69,6 +87,9 @@ static const struct usb_device_id usb_quirk_list[] = {
|
||||||
|
{ USB_DEVICE(0x06a3, 0x0006), .driver_info =
|
||||||
|
USB_QUIRK_CONFIG_INTF_STRINGS },
|
||||||
|
|
||||||
|
+ /* Guillemot Webcam Hercules Dualpix Exchange*/
|
||||||
|
+ { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
+
|
||||||
|
/* M-Systems Flash Disk Pioneers */
|
||||||
|
{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
|
||||||
|
commit 5b253d88cc6c65a23cefc457a5a4ef139913c5fc
|
||||||
|
Author: Jon Levell <linuxusb@coralbark.net>
|
||||||
|
Date: Thu Sep 29 20:42:52 2011 +0100
|
||||||
|
|
||||||
|
USB: add quirk for Logitech C300 web cam
|
||||||
|
|
||||||
|
My webcam is a Logitech C300 and I get "chipmunk"ed squeaky sound.
|
||||||
|
The following trivial patch fixes it.
|
||||||
|
|
||||||
|
Signed-off-by: Jon Levell <linuxusb@coralbark.net>
|
||||||
|
Cc: stable <stable@kernel.org>
|
||||||
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
||||||
|
|
||||||
|
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
|
||||||
|
index 38f0510..d6a8d82 100644
|
||||||
|
--- a/drivers/usb/core/quirks.c
|
||||||
|
+++ b/drivers/usb/core/quirks.c
|
||||||
|
@@ -44,6 +44,9 @@ static const struct usb_device_id usb_quirk_list[] = {
|
||||||
|
/* Logitech Webcam C250 */
|
||||||
|
{ USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
|
||||||
|
+ /* Logitech Webcam C300 */
|
||||||
|
+ { USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
+
|
||||||
|
/* Logitech Webcam B/C500 */
|
||||||
|
{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
|
||||||
|
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
|
||||||
|
index d6a8d82..caa1991 100644
|
||||||
|
--- a/drivers/usb/core/quirks.c
|
||||||
|
+++ b/drivers/usb/core/quirks.c
|
||||||
|
@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = {
|
||||||
|
/* Logitech Webcam B/C500 */
|
||||||
|
{ USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
|
||||||
|
+ /* Logitech Webcam C600 */
|
||||||
|
+ { USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
|
+
|
||||||
|
/* Logitech Webcam Pro 9000 */
|
||||||
|
{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
|
||||||
Loading…
Reference in a new issue