backports: take up up to next-20130426
Subsystems (3)
cover backports: take up up to next-20130426
From: "Luis R. Rodriguez" <[email protected]>
This series takes us up to next-20130426. The next tag is next-20130429 and it seems that Linus took accepted code reflected there so for instance we'll need to complete the backport of these next:
* remove_proc_subtree()
* proc_set_size()
* ttm_bo_reference()
* ttm_bo_unref()
* ttm_kmap_obj_virtual()
Luis R. Rodriguez (3):
backports: add support for regulator_map_voltage_ascend()
backports: refresh patches for next-20130424
backports: refresh patches for next-20130426
backport/backport-include/linux/regulator/driver.h | 26 ++++++++ backport/compat/Makefile | 1 + backport/compat/backport-3.10.c | 62 ++++++++++++++++++++ .../drivers_gpu_drm_i915_intel_opregion.patch | 2 +- .../drivers_bluetooth_btmrvl_sdio.patch | 6 +- .../net_bluetooth_hci_core.patch | 2 +- .../drivers_net_wireless_mwifiex_init.patch | 2 +- .../drivers_bluetooth_btusb.patch | 2 +- 8 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 backport/backport-include/linux/regulator/driver.h create mode 100644 backport/compat/backport-3.10.c
Signature · 1 line
1.7.10.4
PATCH 1/3 backports: add support for regulator_map_voltage_ascend()
From: "Luis R. Rodriguez" <[email protected]>
This is required by some drivers as of next-20130424.
commit fcf371ee5624cc87abac205cd0dad2432d7f0346
Author: Axel Lin <[email protected]> Date: Thu Apr 18 10:34:49 2013 +0800
regulator: core: Add regulator_map_voltage_ascend() API
A lot of regulator hardware has ascendant voltage list. This patch adds regulator_map_voltage_ascend() and export it.
Drivers that have ascendant voltage list can use this as their map_voltage() operation, this is more efficient than default regulator_map_voltage_iterate() function.
--- backport/backport-include/linux/regulator/driver.h | 26 ++++++++ backport/compat/Makefile | 1 + backport/compat/backport-3.10.c | 62 ++++++++++++++++++++ 3 files changed, 89 insertions(+) create mode 100644 backport/backport-include/linux/regulator/driver.h create mode 100644 backport/compat/backport-3.10.c
backport/backport-include/linux/regulator/driver.h new file +26 -0
@@ -0,0 +1,26 @@ +/* +* driver.h -- SoC Regulator driver support. +* +* Copyright (C) 2007, 2008 Wolfson Microelectronics PLC. +* +* Author: Liam Girdwood <[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. +* +* Regulator Driver Interface. +*/ + +#ifndef __BACKPORT_LINUX_REGULATOR_DRIVER_H_ +#define __BACKPORT_LINUX_REGULATOR_DRIVER_H_ + +#include <linux/version.h> +#include_next <linux/regulator/driver.h> + +#if (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,6 ,0 )) +int regulator_map_voltage_ascend (struct regulator_dev *rdev, +int min_uV,int max_uV); +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) */ + +#endif /* __BACKPORT_LINUX_REGULATOR_DRIVER_H_ */
backport/compat/Makefile +1 -0
@@ -34,6 +34,7 @@ compat-$(CPTCFG_BACKPORT_KERNEL_3_6) += compat-3.6.o compat-$(CPTCFG_BACKPORT_KERNEL_3_7) += compat-3.7.o compat-$(CPTCFG_BACKPORT_KERNEL_3_8) += compat-3.8.o compat-$(CPTCFG_BACKPORT_KERNEL_3_9) += compat-3.9.o +compat-$(CPTCFG_BACKPORT_KERNEL_3_10) += backport-3.10.o compat-$(CPTCFG_BACKPORT_BUILD_KFIFO) += kfifo.o compat-$(CPTCFG_BACKPORT_BUILD_GENERIC_ATOMIC64) += compat_atomic.o
backport/compat/backport-3.10.c new file +62 -0
62 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 2/3 backports: refresh patches for next-20130424
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
== ckmake-report.log ==
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.76 [ OK ] 18 3.1.10 [ OK ] 19 3.2.44 [ OK ] 20 3.3.8 [ OK ] 21 3.4.43 [ OK ] 22 3.5.7 [ OK ] 23 3.6.11 [ OK ] 24 3.7.10 [ OK ] 25 3.8.11 [ OK ] 26 3.9.0 [ OK ]
real 30m48.012s user 814m18.301s sys 127m38.575s
--- .../29-sdio_no_suspend/drivers_bluetooth_btmrvl_sdio.patch | 6 +++--- .../network/46-use_other_workqueue/net_bluetooth_hci_core.patch | 2 +- .../drivers_net_wireless_mwifiex_init.patch | 2 +- .../network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_bluetooth_btmrvl_sdio.patch +3 -3
@@ -1,6 +1,6 @@ --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c -@@ -1050,6 +1050,7 @@ static void btmrvl_sdio_remove(struct sd +@@ -1055,6 +1055,7 @@ static void btmrvl_sdio_remove(struct sd } }
@@ -8,7 +8,7 @@ static int btmrvl_sdio_suspend(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); -@@ -1145,6 +1146,7 @@ static const struct dev_pm_ops btmrvl_sd +@@ -1150,6 +1151,7 @@ static const struct dev_pm_ops btmrvl_sd .suspend = btmrvl_sdio_suspend, .resume = btmrvl_sdio_resume, };
@@ -16,7 +16,7 @@ static struct sdio_driver bt_mrvl_sdio = { .name = "btmrvl_sdio", -@@ -1153,7 +1155,9 @@ static struct sdio_driver bt_mrvl_sdio = +@@ -1158,7 +1160,9 @@ static struct sdio_driver bt_mrvl_sdio = .remove = btmrvl_sdio_remove, .drv = { .owner = THIS_MODULE,
patches/collateral-evolutions/network/46-use_other_workqueue/net_bluetooth_hci_core.patch +1 -1
@@ -1,6 +1,6 @@ --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c -@@ -2191,16 +2191,24 @@ int hci_register_dev(struct hci_dev *hde +@@ -2202,16 +2202,24 @@ int hci_register_dev(struct hci_dev *hde list_add(&hdev->list, &hci_dev_list); write_unlock(&hci_dev_list_lock);
patches/collateral-evolutions/network/47-no_trans_start_on_netdev_queue/drivers_net_wireless_mwifiex_init.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/init.c +++ b/drivers/net/wireless/mwifiex/init.c -@@ -371,8 +371,10 @@ void mwifiex_set_trans_start(struct net_ +@@ -369,8 +369,10 @@ void mwifiex_set_trans_start(struct net_ { int i;
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -1242,7 +1242,9 @@ static struct usb_driver btusb_driver = +@@ -1619,7 +1619,9 @@ static struct usb_driver btusb_driver = #endif .id_table = btusb_table, .supports_autosuspend = 1,
Signature · 1 line
1.7.10.4
PATCH 3/3 backports: refresh patches for next-20130426
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
== ckmake-report.log ==
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.76 [ OK ] 18 3.1.10 [ OK ] 19 3.2.44 [ OK ] 20 3.3.8 [ OK ] 21 3.4.43 [ OK ] 22 3.5.7 [ OK ] 23 3.6.11 [ OK ] 24 3.7.10 [ OK ] 25 3.8.11 [ OK ] 26 3.9.0 [ OK ]
real 30m52.106s user 816m17.749s sys 127m27.702s
--- .../drivers_gpu_drm_i915_intel_opregion.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
patches/collateral-evolutions/drm/05-i915-define-acpi-video-class/drivers_gpu_drm_i915_intel_opregion.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c -@@ -307,6 +307,9 @@ static int intel_opregion_video_event(st +@@ -259,6 +259,9 @@ static int intel_opregion_video_event(st struct acpi_bus_event *event = data; int ret = NOTIFY_OK;
Signature · 1 line
1.7.10.4
Quoted 3 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
This series takes us up to next-20130426.
Also applied these.
Quoted 10 lines
The next tag
is next-20130429 and it seems that Linus took accepted code reflected there so for instance we'll need to complete the backport of these next:*
remove_proc_subtree()
*proc_set_size()
*ttm_bo_reference()
*ttm_bo_unref()
*ttm_kmap_obj_virtual()
I take it these are more problematic?
johannes
Quoted 1 line · Johannes Berg
Quoted 1 line
*
remove_proc_subtree()
This can't be backported modularly so I'm going to revert the patches that add this and encourage debugfs to be used in the future.
Quoted 1 line
Quoted 1 line
*
proc_set_size()
I just backported this.
Quoted 3 lines
Quoted 3 lines
*
ttm_bo_reference()
*ttm_bo_unref()
*ttm_kmap_obj_virtual()
These seem to be issues with header include order for ttm_bo_driver.h and I cannot figure out why or how, for the failing case I suspect the kernel's header file is being used instead of our copy. DRM drivers use two include forms for including ttm_bo_driver.h:
#include <ttm/ttm_bo_driver.h>
#include <drm/ttm/ttm_bo_driver.h>
drivers/gpu/drm/ttm/ttm_bo_vm.c compiled fine which used the first form while nouveau fails and uses the later.
Luis
Quoted 1 line · Luis R. Rodriguez
while nouveau fails and uses the later.
Actually I see now drivers that use either work so this seems to be nouveau specific.
Luis
Quoted 6 lines · Luis R. Rodriguez
Quoted 1 line · Luis R. Rodriguez
while nouveau fails and uses the later.
Actually I see now drivers that use either work so this seems to be nouveau specific.
This seems to be because of the new changes that stuffed nouveau files into separate directories:
drivers/gpu/drm/nouveau/core/drivers/gpu/drm/nouveau/dispnv04/
I've tried this but no luck.
drivers/gpu/drm/nouveau/Makefile +3 -3
@@ -3,9 +3,9 @@ # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. ccflags-y := -Iinclude/drm -ccflags-y += -I$(src)/core/include -ccflags-y += -I$(src)/core -ccflags-y += -I$(src) +ccflags-y += -I$(backport_srctree)/drivers/gpu/drm/nouveau/core/include/ +ccflags-y += -I$(backport_srctree)/drivers/gpu/drm/nouveau/core/ +ccflags-y += -I$(backport_srctree)/drivers/gpu/drm/nouveau/ nouveau-y := core/core/client.o nouveau-y += core/core/engctx.o
Luis
Quoted 16 lines · Luis R. Rodriguez
Quoted 4 lines
Quoted 1 line
while nouveau fails and uses the later.
Actually I see now drivers that use either work so this seems to be nouveau specific.
This seems to be because of the new changes that stuffed nouveau files into separate directories:
drivers/gpu/drm/nouveau/core/drivers/gpu/drm/nouveau/dispnv04/I've tried this but no luck.
drivers/gpu/drm/nouveau/Makefile line 5
Quoted 3 lines
drivers/gpu/drm/nouveau/Makefile +0
-0@@ -3,9 +3,9 @@ # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. ccflags-y := -Iinclude/drm
Isn't this part actually the issue?
Are you adding an override ttm_bo_driver.h file? Maybe include_next doesn't work right with this -Iinclude/drm?
johannes
Quoted 15 lines · Johannes Berg
Quoted 13 lines · Luis R. Rodriguez
Quoted 4 lines
Quoted 1 line
while nouveau fails and uses the later.
Actually I see now drivers that use either work so this seems to be nouveau specific.
This seems to be because of the new changes that stuffed nouveau files into separate directories:
drivers/gpu/drm/nouveau/core/drivers/gpu/drm/nouveau/dispnv04/I've tried this but no luck.
Quoted 8 lines
drivers/gpu/drm/nouveau/Makefile line 5
Quoted 6 lines
drivers/gpu/drm/nouveau/Makefile +0
-0@@ -3,9 +3,9 @@ # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. ccflags-y := -Iinclude/drmIsn't this part actually the issue?
Yes... thanks. Odd, I thought I tested against that. I'll send patches.
Quoted 2 lines
Are you adding an override
ttm_bo_driver.hfile? Maybeinclude_nextdoesn't work right with this -Iinclude/drm?
Nope.
Luis