Updated patches for linux-lts-utopic
This commit is contained in:
Ruben Rodriguez
parent
e70f0ce053
commit
0c6b5eb93c
5 changed files with 8415 additions and 2 deletions
|
|
@ -0,0 +1,104 @@
|
|||
From c21ab7dfe08353f54716a1361b541aade42c1dca Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Valente <paolo.valente@unimore.it>
|
||||
Date: Thu, 22 May 2014 11:59:35 +0200
|
||||
Subject: [PATCH 1/3] block: cgroups, kconfig, build bits for BFQ-v7r7-3.16
|
||||
|
||||
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.
|
||||
|
||||
Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
|
||||
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
|
||||
---
|
||||
block/Kconfig.iosched | 32 ++++++++++++++++++++++++++++++++
|
||||
block/Makefile | 1 +
|
||||
include/linux/cgroup_subsys.h | 4 ++++
|
||||
3 files changed, 37 insertions(+)
|
||||
|
||||
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
|
||||
index 421bef9..0ee5f0f 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,16 @@ choice
|
||||
config DEFAULT_CFQ
|
||||
bool "CFQ" if IOSCHED_CFQ=y
|
||||
|
||||
+ config DEFAULT_BFQ
|
||||
+ bool "BFQ" if IOSCHED_BFQ=y
|
||||
+ help
|
||||
+ Selects BFQ as the default I/O scheduler which will be
|
||||
+ used by default for all block devices.
|
||||
+ The BFQ I/O scheduler 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.
|
||||
+
|
||||
config DEFAULT_NOOP
|
||||
bool "No-op"
|
||||
|
||||
@@ -61,6 +92,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 a2ce6ac..a0fc06a 100644
|
||||
--- a/block/Makefile
|
||||
+++ b/block/Makefile
|
||||
@@ -18,6 +18,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 98c4f9b..13b010d 100644
|
||||
--- a/include/linux/cgroup_subsys.h
|
||||
+++ b/include/linux/cgroup_subsys.h
|
||||
@@ -35,6 +35,10 @@ SUBSYS(net_cls)
|
||||
SUBSYS(blkio)
|
||||
#endif
|
||||
|
||||
+#if IS_ENABLED(CONFIG_CGROUP_BFQIO)
|
||||
+SUBSYS(bfqio)
|
||||
+#endif
|
||||
+
|
||||
#if IS_ENABLED(CONFIG_CGROUP_PERF)
|
||||
SUBSYS(perf_event)
|
||||
#endif
|
||||
--
|
||||
2.1.3
|
||||
|
||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
101
helpers/DATA/linux-lts-utopic/c720-touchpad.patch
Normal file
101
helpers/DATA/linux-lts-utopic/c720-touchpad.patch
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
|
||||
index 7f1a2e2..a241e5f 100644
|
||||
--- a/drivers/platform/chrome/chromeos_laptop.c
|
||||
+++ b/drivers/platform/chrome/chromeos_laptop.c
|
||||
@@ -45,6 +45,8 @@ static const char *i2c_adapter_names[] = {
|
||||
"SMBus I801 adapter",
|
||||
"i915 gmbus vga",
|
||||
"i915 gmbus panel",
|
||||
+ "i2c-designware-pci",
|
||||
+ "i2c-designware-pci",
|
||||
};
|
||||
|
||||
/* Keep this enum consistent with i2c_adapter_names */
|
||||
@@ -52,6 +54,8 @@ enum i2c_adapter_type {
|
||||
I2C_ADAPTER_SMBUS = 0,
|
||||
I2C_ADAPTER_VGADDC,
|
||||
I2C_ADAPTER_PANEL,
|
||||
+ I2C_ADAPTER_DESIGNWARE_0,
|
||||
+ I2C_ADAPTER_DESIGNWARE_1,
|
||||
};
|
||||
|
||||
struct i2c_peripheral {
|
||||
@@ -172,29 +176,42 @@ static struct i2c_client *__add_probed_i2c_device(
|
||||
return client;
|
||||
}
|
||||
|
||||
+struct i2c_lookup {
|
||||
+ const char *name;
|
||||
+ int instance;
|
||||
+ int n;
|
||||
+};
|
||||
+
|
||||
static int __find_i2c_adap(struct device *dev, void *data)
|
||||
{
|
||||
- const char *name = data;
|
||||
+ struct i2c_lookup *lookup = data;
|
||||
static const char *prefix = "i2c-";
|
||||
struct i2c_adapter *adapter;
|
||||
if (strncmp(dev_name(dev), prefix, strlen(prefix)) != 0)
|
||||
return 0;
|
||||
adapter = to_i2c_adapter(dev);
|
||||
- return (strncmp(adapter->name, name, strlen(name)) == 0);
|
||||
+ if (strncmp(adapter->name, lookup->name, strlen(lookup->name)) == 0 &&
|
||||
+ lookup->n++ == lookup->instance)
|
||||
+ return 1;
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
static int find_i2c_adapter_num(enum i2c_adapter_type type)
|
||||
{
|
||||
struct device *dev = NULL;
|
||||
struct i2c_adapter *adapter;
|
||||
- const char *name = i2c_adapter_names[type];
|
||||
+ struct i2c_lookup lookup;
|
||||
+
|
||||
+ memset(&lookup, 0, sizeof(lookup));
|
||||
+ lookup.name = i2c_adapter_names[type];
|
||||
+ lookup.instance = (type == I2C_ADAPTER_DESIGNWARE_1) ? 1 : 0;
|
||||
+
|
||||
/* find the adapter by name */
|
||||
- dev = bus_find_device(&i2c_bus_type, NULL, (void *)name,
|
||||
- __find_i2c_adap);
|
||||
+ dev = bus_find_device(&i2c_bus_type, NULL, &lookup, __find_i2c_adap);
|
||||
if (!dev) {
|
||||
/* Adapters may appear later. Deferred probing will retry */
|
||||
pr_notice("%s: i2c adapter %s not found on system.\n", __func__,
|
||||
- name);
|
||||
+ lookup.name);
|
||||
return -ENODEV;
|
||||
}
|
||||
adapter = to_i2c_adapter(dev);
|
||||
@@ -377,6 +394,15 @@ static struct chromeos_laptop acer_ac700 = {
|
||||
},
|
||||
};
|
||||
|
||||
+static struct chromeos_laptop acer_c720 = {
|
||||
+ .i2c_peripherals = {
|
||||
+ /* Touchpad. */
|
||||
+ { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 },
|
||||
+ /* Light Sensor. */
|
||||
+ { .add = setup_isl29018_als, I2C_ADAPTER_DESIGNWARE_1 },
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
static struct chromeos_laptop hp_pavilion_14_chromebook = {
|
||||
.i2c_peripherals = {
|
||||
/* Touchpad. */
|
||||
@@ -434,6 +460,13 @@ static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
|
||||
_CBDD(acer_ac700),
|
||||
},
|
||||
{
|
||||
+ .ident = "Acer C720",
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "Peppy"),
|
||||
+ },
|
||||
+ _CBDD(acer_c720),
|
||||
+ },
|
||||
+ {
|
||||
.ident = "HP Pavilion 14 Chromebook",
|
||||
.matches = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "Butterfly"),
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2008-2014 Rubén Rodríguez <ruben@trisquel.info>
|
||||
# Copyright (C) 2008-2015 Ruben Rodriguez <ruben@trisquel.info>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -23,6 +23,7 @@ VERSION=1
|
|||
. ./config
|
||||
|
||||
for PATCH in $DATA/*.patch ; do
|
||||
echo $PATCH
|
||||
patch -p1 < $PATCH
|
||||
done
|
||||
|
||||
|
|
@ -43,12 +44,31 @@ sed s/family=ubuntu/family=trisquel/ -i debian/rules.d/0-common-vars.mk
|
|||
|
||||
rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu
|
||||
|
||||
sed 's/Linux/Linux-libre/g' debian/control debian/control.stub -i
|
||||
find debian* -type f -name *control* -exec sed 's/ with Ubuntu patches//; s/Linux/Linux-libre/g' -i {} \;
|
||||
|
||||
# Descriptions should not change based on the build arch
|
||||
sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-control.stub -i
|
||||
|
||||
sed '/^firmware/d' ./debian*/abi/*/fwinfo -i
|
||||
echo > ./debian.master/d-i/firmware/nic-modules
|
||||
echo > ./debian.master/d-i/firmware/scsi-modules
|
||||
|
||||
# Use BFQ scheduler in lowlatency kernels
|
||||
cat << EOF >> debian.master/config/config.common.trisquel
|
||||
CONFIG_IOSCHED_BFQ=y
|
||||
CONFIG_CGROUP_BFQIO=y
|
||||
# CONFIG_DEFAULT_BFQ is not set
|
||||
EOF
|
||||
cp debian.master/config/config.common.trisquel debian.utopic/config/config.common.trisquel
|
||||
|
||||
cat << EOF >> debian.master/config/i386/config.flavour.lowlatency
|
||||
CONFIG_DEFAULT_BFQ=y
|
||||
CONFIG_DEFAULT_IOSCHED="BFQ"
|
||||
EOF
|
||||
cp debian.master/config/i386/config.flavour.lowlatency debian.master/config/amd64/config.flavour.lowlatency
|
||||
cp debian.master/config/i386/config.flavour.lowlatency debian.utopic/config/amd64/config.flavour.lowlatency
|
||||
cp debian.master/config/amd64/config.flavour.lowlatency debian.utopic/config/amd64/config.flavour.lowlatency
|
||||
|
||||
changelog "Removed non-free bits"
|
||||
|
||||
cp debian/changelog debian.master/changelog
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue