backports: synch up to next-20130627
Subsystems (2)
cover backports: synch up to next-20130627
From: "Luis R. Rodriguez" <[email protected]>
These try to get us caught up to next-20130627. The dmi one is not the best solution but an alternative really should be considered upstream as otherwise we'd end up with shit work arounds all over. Not sure if a reasonable alternative is possible upstream that is easier to backport.
I am testing this with ckmake right now but its late so going to crash and report results in the morning. I think this should do it. If someone can take this further to get closer to the date circa v3.11-rc1 that'd help if not I can try to take care of that tomorrow.
Johannes Berg (1):
backport: backport sprintf-style workqueue naming
Luis R. Rodriguez (8):
backports: fix patches required for next-20130627
backports: refresh patches for next-20130627
backports: simplify swiotlb_nr_tbl() backport
backports: copy the max77693-private.h header file
backports: revert DMI_EXACT_MATCH() for older kernels
backports: add clock enable/disable on soc_camera_power_[on|off]()
backports: enable REGULATOR_MAX77693 on >= 3.6
backports: lib/kconfig.py - fix src line regexp
backport/backport-include/linux/mod_devicetable.h | 4 ++ backport/backport-include/linux/swiotlb.h | 17 +++++ backport/backport-include/linux/workqueue.h | 50 ++++++++++++-- .../backport-include/uapi/linux/v4l2-mediabus.h | 8 ++- backport/compat/compat-3.3.c | 69 ++++++++++++++++++++ backport/compat/compat-3.4.c | 31 +++++++-- copy-list | 2 + dependencies | 1 + lib/kconfig.py | 2 +- patches/collateral-evolutions/drm/03-swiotlb/INFO | 5 -- .../drivers_gpu_drm_nouveau_nouveau_bo.patch | 31 --------- .../drivers_gpu_drm_radeon_radeon_ttm.patch | 47 ------------- .../drivers_gpu_drm_i915_i915_gem.patch | 2 +- .../14-shrinkers-api/drivers_gpu_drm_i915.patch | 12 ++-- .../network/0001-netdev_ops/ipw2200.patch | 4 +- .../network/0005-netlink-portid/nl80211.patch | 60 ++++++++--------- .../0006-disable-dump-adjust-on-old-kernels.patch | 8 +-- .../network/05-usb/ath9k_htc.patch | 2 +- .../include_net_cfg80211.patch | 2 +- .../drivers_net_wireless_iwlwifi_pcie_trans.patch | 2 +- .../drivers_net_wireless_ti_wlcore_main.patch | 6 +- .../drivers_net_wireless_ath_ath9k_pci.patch | 4 +- .../drivers_net_wireless_ti_wlcore_main.patch | 4 +- .../include_net_mac80211.patch | 2 +- ..._wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch | 8 +-- .../30-bridge-port/net_wireless_nl80211.patch | 2 +- .../42-netlink_seq/net_wireless_nl80211.patch | 2 +- .../network/46-use_other_workqueue/INFO | 4 -- .../net_bluetooth_hci_core.patch | 27 -------- .../drivers_net_wireless_mwifiex_init.patch | 2 +- .../drivers_bluetooth_ath3k.patch | 2 +- .../drivers_bluetooth_btusb.patch | 2 +- .../drivers_net_wireless_ath_ath9k_hif_usb.patch | 2 +- .../drivers_net_wireless_rt2x00_rt73usb.patch | 2 +- .../69-wowlan-no-socket/net_wireless_nl80211.patch | 2 +- .../drivers_net_wireless_ti_wlcore_main.patch | 6 +- 36 files changed, 237 insertions(+), 199 deletions(-) create mode 100644 backport/backport-include/linux/swiotlb.h delete mode 100644 patches/collateral-evolutions/drm/03-swiotlb/INFO delete mode 100644 patches/collateral-evolutions/drm/03-swiotlb/drivers_gpu_drm_nouveau_nouveau_bo.patch delete mode 100644 patches/collateral-evolutions/drm/03-swiotlb/drivers_gpu_drm_radeon_radeon_ttm.patch delete mode 100644 patches/collateral-evolutions/network/46-use_other_workqueue/INFO delete mode 100644 patches/collateral-evolutions/network/46-use_other_workqueue/net_bluetooth_hci_core.patch
Signature · 1 line
1.7.10.4
RFC 1/9 backport: backport sprintf-style workqueue naming
From: Johannes Berg <[email protected]>
Since kernel version 3.3, workqueue names could be sprintf'ed instead of just pointing to a name. This wasn't used a lot so never needed to be backported, but now it's used everywhere. Backport this API.
--- backport/backport-include/linux/workqueue.h | 50 ++++++++++++++++--- backport/compat/compat-3.3.c | 69 +++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 7 deletions(-)
backport/backport-include/linux/workqueue.h +43 -7
@@ -14,16 +14,52 @@ bool mod_delayed_work(struct workqueue_struct *wq, struct delayed_work *dwork,#define create_freezable_workqueue create_freezeable_workqueue#endif -#ifndef alloc_ordered_workqueue -#define alloc_ordered_workqueue (name, flags) create_singlethread_workqueue(name) +#if LINUX_VERSION_CODE <=KERNEL_VERSION (2 ,6 ,36 ) +#define WQ_HIGHPRI 0 +#define WQ_MEM_RECLAIM 0#endif -#if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,28 ) -#define alloc_workqueue (name, flags, max_active) __create_workqueue(name, flags, max_active) +#if LINUX_VERSION_CODE <KERNEL_VERSION (3 ,3 ,0 ) +#if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,36 ) +#define WQ_UNBOUND 0#endif - -#ifndef alloc_workqueue -#define alloc_workqueue (name, flags, max_active) __create_workqueue(name, flags, max_active, 0) +#define __WQ_ORDERED 0 +/* +* commit b196be89cdc14a88cc637cdad845a75c5886c82d +* Author: Tejun Heo <[email protected]> +* Date: Tue Jan 10 15:11:35 2012 -0800 +* +* workqueue: make alloc_workqueue() take printf fmt and args for name +*/ +struct workqueue_struct * +backport_alloc_workqueue (const char *fmt,unsigned int flags, +int max_active,struct lock_class_key *key, +const char *lock_name, ...); +#undef alloc_workqueue +#ifdef CONFIG_LOCKDEP +#define alloc_workqueue(fmt, flags, max_active, args...) \ +({ \ + static struct lock_class_key __key; \ + const char *__lock_name; \ + \ + if (__builtin_constant_p(fmt)) \ + __lock_name = (fmt); \ + else \ + __lock_name = #fmt; \ + \ + backport_alloc_workqueue((fmt), (flags), (max_active), \ + &__key, __lock_name, ##args); \ +}) +#else +#define alloc_workqueue(fmt, flags, max_active, args...) \ + backport_alloc_workqueue((fmt), (flags), (max_active), \ + NULL, NULL, ##args) +#endif +#undef alloc_ordered_workqueue +#define alloc_ordered_workqueue(fmt, flags, args...) \ + alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | (flags), 1, ##args) +#define destroy_workqueue backport_destroy_workqueue +void backport_destroy_workqueue (struct workqueue_struct *wq);#endif #if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,36 )
backport/compat/compat-3.3.c +69 -0
78 lines not on this page · raw message
Signature · 1 line
1.7.10.4
RFC 2/9 backports: fix patches required for next-20130627
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
--- .../network/0005-netlink-portid/nl80211.patch | 60 ++++++++++---------- .../network/46-use_other_workqueue/INFO | 4 -- .../net_bluetooth_hci_core.patch | 27 --------- .../drivers_net_wireless_ti_wlcore_main.patch | 6 +- 4 files changed, 33 insertions(+), 64 deletions(-) delete mode 100644 patches/collateral-evolutions/network/46-use_other_workqueue/INFO delete mode 100644 patches/collateral-evolutions/network/46-use_other_workqueue/net_bluetooth_hci_core.patch
patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch +30 -30
@@ -1,24 +1,24 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1564,7 +1564,7 @@ static int nl80211_dump_wiphy(struct sk_ +@@ -1593,7 +1593,7 @@ static int nl80211_dump_wiphy(struct sk_ /* attempt to fit multiple wiphy data chunks into the skb */ do { ret = nl80211_send_wiphy(dev, skb, - NETLINK_CB(cb->skb).portid, + NETLINK_CB_PORTID(cb->skb), cb->nlh->nlmsg_seq, - NLM_F_MULTI, - split, &cb->args[1], -@@ -1613,7 +1613,7 @@ static int nl80211_get_wiphy(struct sk_b + NLM_F_MULTI, state); + if (ret < 0) { +@@ -1646,7 +1646,7 @@ static int nl80211_get_wiphy(struct sk_b if (!msg) return -ENOMEM; - if (nl80211_send_wiphy(dev, msg, info->snd_portid, info->snd_seq, 0, + if (nl80211_send_wiphy(dev, msg, genl_info_snd_portid(info), info->snd_seq, 0, - false, NULL, NULL, NULL) < 0) { + &state) < 0) { nlmsg_free(msg); return -ENOBUFS; -@@ -2183,7 +2183,7 @@ static int nl80211_dump_interface(struct +@@ -2221,7 +2221,7 @@ static int nl80211_dump_interface(struct if_idx++; continue; }
@@ -27,7 +27,7 @@ cb->nlh->nlmsg_seq, NLM_F_MULTI, rdev, wdev) < 0) { goto out; -@@ -2212,7 +2212,7 @@ static int nl80211_get_interface(struct +@@ -2250,7 +2250,7 @@ static int nl80211_get_interface(struct if (!msg) return -ENOMEM;
@@ -36,7 +36,7 @@ dev, wdev) < 0) { nlmsg_free(msg); return -ENOBUFS; -@@ -2445,7 +2445,7 @@ static int nl80211_new_interface(struct +@@ -2483,7 +2483,7 @@ static int nl80211_new_interface(struct break; }
@@ -45,7 +45,7 @@ rdev, wdev) < 0) { nlmsg_free(msg); return -ENOBUFS; -@@ -2580,7 +2580,7 @@ static int nl80211_get_key(struct sk_buf +@@ -2618,7 +2618,7 @@ static int nl80211_get_key(struct sk_buf if (!msg) return -ENOMEM;
@@ -54,7 +54,7 @@ NL80211_CMD_NEW_KEY); if (IS_ERR(hdr)) return PTR_ERR(hdr); -@@ -3552,7 +3552,7 @@ static int nl80211_dump_station(struct s +@@ -3587,7 +3587,7 @@ static int nl80211_dump_station(struct s goto out_err; if (nl80211_send_station(skb,
@@ -63,7 +63,7 @@ cb->nlh->nlmsg_seq, NLM_F_MULTI, dev, wdev->netdev, mac_addr, &sinfo) < 0) -@@ -3598,7 +3598,7 @@ static int nl80211_get_station(struct sk +@@ -3633,7 +3633,7 @@ static int nl80211_get_station(struct sk if (!msg) return -ENOMEM;
@@ -72,7 +72,7 @@ rdev, dev, mac_addr, &sinfo) < 0) { nlmsg_free(msg); return -ENOBUFS; -@@ -4206,7 +4206,7 @@ static int nl80211_dump_mpath(struct sk_ +@@ -4241,7 +4241,7 @@ static int nl80211_dump_mpath(struct sk_ if (err) goto out_err;
@@ -81,7 +81,7 @@ cb->nlh->nlmsg_seq, NLM_F_MULTI, wdev->netdev, dst, next_hop, &pinfo) < 0) -@@ -4255,7 +4255,7 @@ static int nl80211_get_mpath(struct sk_b +@@ -4290,7 +4290,7 @@ static int nl80211_get_mpath(struct sk_b if (!msg) return -ENOMEM;
@@ -90,7 +90,7 @@ dev, dst, next_hop, &pinfo) < 0) { nlmsg_free(msg); return -ENOBUFS; -@@ -4519,7 +4519,7 @@ static int nl80211_get_mesh_config(struc +@@ -4554,7 +4554,7 @@ static int nl80211_get_mesh_config(struc msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); if (!msg) return -ENOMEM;
@@ -99,7 +99,7 @@ NL80211_CMD_GET_MESH_CONFIG); if (!hdr) goto out; -@@ -4878,7 +4878,7 @@ static int nl80211_get_reg(struct sk_buf +@@ -4913,7 +4913,7 @@ static int nl80211_get_reg(struct sk_buf if (!msg) return -ENOBUFS;
@@ -108,7 +108,7 @@ NL80211_CMD_GET_REG); if (!hdr) goto put_failure; -@@ -5557,7 +5557,7 @@ static int nl80211_send_bss(struct sk_bu +@@ -5592,7 +5592,7 @@ static int nl80211_send_bss(struct sk_bu ASSERT_WDEV_LOCK(wdev);
@@ -117,7 +117,7 @@ NL80211_CMD_NEW_SCAN_RESULTS); if (!hdr) return -1; -@@ -5793,7 +5793,7 @@ static int nl80211_dump_survey(struct sk +@@ -5828,7 +5828,7 @@ static int nl80211_dump_survey(struct sk } if (nl80211_send_survey(skb,
@@ -126,7 +126,7 @@ cb->nlh->nlmsg_seq, NLM_F_MULTI, wdev->netdev, &survey) < 0) goto out; -@@ -6460,7 +6460,7 @@ static int nl80211_testmode_dump(struct +@@ -6500,7 +6500,7 @@ static int nl80211_testmode_dump(struct } while (1) {
@@ -135,7 +135,7 @@ cb->nlh->nlmsg_seq, NLM_F_MULTI, NL80211_CMD_TESTMODE); struct nlattr *tmdata; -@@ -6539,7 +6539,7 @@ struct sk_buff *cfg80211_testmode_alloc_ +@@ -6579,7 +6579,7 @@ struct sk_buff *cfg80211_testmode_alloc_ return NULL; return __cfg80211_testmode_alloc_skb(rdev, approxlen,
@@ -144,7 +144,7 @@ rdev->testmode_info->snd_seq, GFP_KERNEL); } -@@ -6905,7 +6905,7 @@ static int nl80211_remain_on_channel(str +@@ -6945,7 +6945,7 @@ static int nl80211_remain_on_channel(str if (!msg) return -ENOMEM;
@@ -153,7 +153,7 @@ NL80211_CMD_REMAIN_ON_CHANNEL); if (IS_ERR(hdr)) { -@@ -7124,7 +7124,7 @@ static int nl80211_register_mgmt(struct +@@ -7164,7 +7164,7 @@ static int nl80211_register_mgmt(struct if (!rdev->ops->mgmt_tx) return -EOPNOTSUPP;
@@ -162,7 +162,7 @@ nla_data(info->attrs[NL80211_ATTR_FRAME_MATCH]), nla_len(info->attrs[NL80211_ATTR_FRAME_MATCH])); } -@@ -7205,7 +7205,7 @@ static int nl80211_tx_mgmt(struct sk_buf +@@ -7245,7 +7245,7 @@ static int nl80211_tx_mgmt(struct sk_buf if (!msg) return -ENOMEM;
@@ -171,7 +171,7 @@ NL80211_CMD_FRAME); if (IS_ERR(hdr)) { -@@ -7320,7 +7320,7 @@ static int nl80211_get_power_save(struct +@@ -7360,7 +7360,7 @@ static int nl80211_get_power_save(struct if (!msg) return -ENOMEM;
@@ -180,7 +180,7 @@ NL80211_CMD_GET_POWER_SAVE); if (!hdr) { err = -ENOBUFS; -@@ -7631,7 +7631,7 @@ static int nl80211_get_wowlan(struct sk_ +@@ -7671,7 +7671,7 @@ static int nl80211_get_wowlan(struct sk_ if (!msg) return -ENOMEM;
@@ -189,7 +189,7 @@ NL80211_CMD_GET_WOWLAN); if (!hdr) goto nla_put_failure; -@@ -8056,7 +8056,7 @@ static int nl80211_register_unexpected_f +@@ -8096,7 +8096,7 @@ static int nl80211_register_unexpected_f if (wdev->ap_unexpected_nlportid) return -EBUSY;
@@ -198,7 +198,7 @@ return 0; } -@@ -8086,7 +8086,7 @@ static int nl80211_probe_client(struct s +@@ -8126,7 +8126,7 @@ static int nl80211_probe_client(struct s if (!msg) return -ENOMEM;
@@ -207,7 +207,7 @@ NL80211_CMD_PROBE_CLIENT); if (IS_ERR(hdr)) { -@@ -8130,13 +8130,13 @@ static int nl80211_register_beacons(stru +@@ -8170,13 +8170,13 @@ static int nl80211_register_beacons(stru /* First, check if already registered. */ spin_lock_bh(&rdev->beacon_registrations_lock); list_for_each_entry(reg, &rdev->beacon_registrations, list) {
@@ -223,7 +223,7 @@ list_add(&nreg->list, &rdev->beacon_registrations); spin_unlock_bh(&rdev->beacon_registrations_lock); -@@ -8203,7 +8203,7 @@ static int nl80211_get_protocol_features +@@ -8243,7 +8243,7 @@ static int nl80211_get_protocol_features if (!msg) return -ENOMEM;
@@ -232,7 +232,7 @@ NL80211_CMD_GET_PROTOCOL_FEATURES); if (!hdr) goto nla_put_failure; -@@ -8278,7 +8278,7 @@ static int nl80211_crit_protocol_start(s +@@ -8318,7 +8318,7 @@ static int nl80211_crit_protocol_start(s ret = rdev_crit_proto_start(rdev, wdev, proto, duration); if (!ret)
@@ -241,7 +241,7 @@ return ret; } -@@ -10652,12 +10652,12 @@ static int nl80211_netlink_notify(struct +@@ -10693,12 +10693,12 @@ static int nl80211_netlink_notify(struct list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) { list_for_each_entry_rcu(wdev, &rdev->wdev_list, list)
patches/collateral-evolutions/network/46-use_other_workqueue/INFO deleted +0 -4
@@ -1,4 +0,0 @@ -Old kernel versions do not support WQ_HIGHPRI and WQ_MEM_RECLAIM so we -should use create_singlethread_workqueue() which was used at this -position before. -
patches/collateral-evolutions/network/46-use_other_workqueue/net_bluetooth_hci_core.patch deleted +0 -27
@@ -1,27 +0,0 @@ ---- a/net/bluetooth/hci_core.c -+++ b/net/bluetooth/hci_core.c -@@ -2161,16 +2161,24 @@ int hci_register_dev(struct hci_dev *hde - list_add(&hdev->list, &hci_dev_list); - write_unlock(&hci_dev_list_lock); - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) - hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND | - WQ_MEM_RECLAIM, 1); -+#else -+ hdev->workqueue = create_singlethread_workqueue(hdev->name); -+#endif - if (!hdev->workqueue) { - error = -ENOMEM; - goto err; - } - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) - hdev->req_workqueue = alloc_workqueue(hdev->name, - WQ_HIGHPRI | WQ_UNBOUND | - WQ_MEM_RECLAIM, 1); -+#else -+ hdev->req_workqueue = create_singlethread_workqueue(hdev->name); -+#endif - if (!hdev->req_workqueue) { - destroy_workqueue(hdev->workqueue); - error = -ENOMEM;
patches/collateral-evolutions/network/71-bin_attribute-api-change/drivers_net_wireless_ti_wlcore_main.patch +3 -3
@@ -1,6 +1,6 @@ ---- a/drivers/net/wireless/ti/wlcore/main.c -+++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -5518,7 +5518,11 @@ static ssize_t wl1271_sysfs_show_hw_pg_v +--- a/drivers/net/wireless/ti/wlcore/sysfs.c ++++ b/drivers/net/wireless/ti/wlcore/sysfs.c +@@ -106,7 +106,11 @@ static ssize_t wl1271_sysfs_show_hw_pg_v static DEVICE_ATTR(hw_pg_ver, S_IRUGO, wl1271_sysfs_show_hw_pg_ver, NULL);
Signature · 1 line
1.7.10.4
RFC 3/9 backports: refresh patches for next-20130627
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
--- .../drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch | 2 +- .../drm/14-shrinkers-api/drivers_gpu_drm_i915.patch | 12 ++++++------ .../network/0001-netdev_ops/ipw2200.patch | 4 ++-- .../network/0006-disable-dump-adjust-on-old-kernels.patch | 8 ++++---- .../collateral-evolutions/network/05-usb/ath9k_htc.patch | 2 +- .../09-cfg80211-wext-padding/include_net_cfg80211.patch | 2 +- .../drivers_net_wireless_iwlwifi_pcie_trans.patch | 2 +- .../drivers_net_wireless_ti_wlcore_main.patch | 6 +++--- .../11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch | 4 ++-- .../drivers_net_wireless_ti_wlcore_main.patch | 4 ++-- .../25-multicast-list_head/include_net_mac80211.patch | 2 +- ...vers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch | 8 ++++---- .../network/30-bridge-port/net_wireless_nl80211.patch | 2 +- .../network/42-netlink_seq/net_wireless_nl80211.patch | 2 +- .../drivers_net_wireless_mwifiex_init.patch | 2 +- .../62-usb_driver_lpm/drivers_bluetooth_ath3k.patch | 2 +- .../62-usb_driver_lpm/drivers_bluetooth_btusb.patch | 2 +- .../drivers_net_wireless_ath_ath9k_hif_usb.patch | 2 +- .../drivers_net_wireless_rt2x00_rt73usb.patch | 2 +- .../network/69-wowlan-no-socket/net_wireless_nl80211.patch | 2 +- 20 files changed, 36 insertions(+), 36 deletions(-)
patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4185,9 +4185,14 @@ i915_gem_init_hw(struct drm_device *dev) +@@ -4178,9 +4178,14 @@ i915_gem_init_hw(struct drm_device *dev) drm_i915_private_t *dev_priv = dev->dev_private; int ret;
patches/collateral-evolutions/drm/14-shrinkers-api/drivers_gpu_drm_i915.patch +6 -6
@@ -42,7 +42,7 @@ static long i915_gem_purge(struct drm_i915_private *dev_priv, long target); static long i915_gem_shrink_all(struct drm_i915_private *dev_priv); static void i915_gem_object_truncate(struct drm_i915_gem_object *obj); -@@ -4397,8 +4402,12 @@ i915_gem_load(struct drm_device *dev) +@@ -4390,8 +4395,12 @@ i915_gem_load(struct drm_device *dev) dev_priv->mm.interruptible = true;
@@ -55,7 +55,7 @@ dev_priv->mm.inactive_shrinker.seeks = DEFAULT_SEEKS; register_shrinker(&dev_priv->mm.inactive_shrinker); } -@@ -4621,8 +4630,14 @@ static bool mutex_is_locked_by(struct mu +@@ -4614,8 +4623,14 @@ static bool mutex_is_locked_by(struct mu #endif }
@@ -70,7 +70,7 @@ { struct drm_i915_private *dev_priv = container_of(shrinker, -@@ -4631,7 +4646,12 @@ i915_gem_inactive_count(struct shrinker +@@ -4624,7 +4639,12 @@ i915_gem_inactive_count(struct shrinker struct drm_device *dev = dev_priv->dev; struct drm_i915_gem_object *obj; bool unlock = true;
@@ -83,7 +83,7 @@ if (!mutex_trylock(&dev->struct_mutex)) { if (!mutex_is_locked_by(&dev->struct_mutex, current)) -@@ -4643,6 +4663,17 @@ i915_gem_inactive_count(struct shrinker +@@ -4636,6 +4656,17 @@ i915_gem_inactive_count(struct shrinker unlock = false; }
@@ -101,7 +101,7 @@ count = 0; list_for_each_entry(obj, &dev_priv->mm.unbound_list, global_list) if (obj->pages_pin_count == 0) -@@ -4656,6 +4687,7 @@ i915_gem_inactive_count(struct shrinker +@@ -4649,6 +4680,7 @@ i915_gem_inactive_count(struct shrinker return count; }
@@ -109,7 +109,7 @@ static unsigned long i915_gem_inactive_scan(struct shrinker *shrinker, struct shrink_control *sc) { -@@ -4689,3 +4721,4 @@ i915_gem_inactive_scan(struct shrinker * +@@ -4682,3 +4714,4 @@ i915_gem_inactive_scan(struct shrinker * mutex_unlock(&dev->struct_mutex); return freed; }
patches/collateral-evolutions/network/0001-netdev_ops/ipw2200.patch +2 -2
@@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c -@@ -11680,7 +11680,7 @@ static int ipw_prom_alloc(struct ipw_pri +@@ -11681,7 +11681,7 @@ static int ipw_prom_alloc(struct ipw_pri memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN); priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -9,7 +9,7 @@ priv->prom_priv->ieee->iw_mode = IW_MODE_MONITOR; SET_NETDEV_DEV(priv->prom_net_dev, &priv->pci_dev->dev); -@@ -11818,7 +11818,7 @@ static int ipw_pci_probe(struct pci_dev +@@ -11819,7 +11819,7 @@ static int ipw_pci_probe(struct pci_dev priv->ieee->perfect_rssi = -20; priv->ieee->worst_rssi = -85;
patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch +4 -4
@@ -28,15 +28,15 @@ Date: Fri Mar 1 14:03:49 2013 +0100 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1571,6 +1571,7 @@ static int nl80211_dump_wiphy(struct sk_ - &cb->args[2], - &cb->args[3]); +@@ -1597,6 +1597,7 @@ static int nl80211_dump_wiphy(struct sk_ + cb->nlh->nlmsg_seq, + NLM_F_MULTI, state); if (ret < 0) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) /* * If sending the wiphy data didn't fit (ENOBUFS * or EMSGSIZE returned), this SKB is still -@@ -1591,6 +1592,7 @@ static int nl80211_dump_wiphy(struct sk_ +@@ -1617,6 +1618,7 @@ static int nl80211_dump_wiphy(struct sk_ rtnl_unlock(); return 1; }
patches/collateral-evolutions/network/05-usb/ath9k_htc.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -1370,7 +1370,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1376,7 +1376,9 @@ static struct usb_driver ath9k_hif_usb_d .reset_resume = ath9k_hif_usb_resume, #endif .id_table = ath9k_hif_usb_ids,
patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.patch +1 -1
@@ -1,6 +1,6 @@ --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -2615,6 +2615,9 @@ struct wiphy_wowlan_support { +@@ -2645,6 +2645,9 @@ struct wiphy_wowlan_support { struct wiphy { /* assign these fields before you register the wiphy */
patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch +1 -1
@@ -22,7 +22,7 @@ iwl_pcie_free_ict(trans); pci_disable_msi(trans_pcie->pci_dev); -@@ -1581,9 +1590,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s +@@ -1582,9 +1591,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s if (iwl_pcie_alloc_ict(trans)) goto out_free_cmd_pool;
patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch +3 -3
@@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -6063,13 +6063,24 @@ static void wlcore_nvs_cb(const struct f +@@ -5931,13 +5931,24 @@ static void wlcore_nvs_cb(const struct f wl->platform_quirks = pdata->platform_quirks; wl->if_ops = pdev_data->if_ops;
@@ -25,7 +25,7 @@ if (ret < 0) { wl1271_error("request_irq() failed: %d", ret); goto out_free_nvs; -@@ -6138,7 +6149,11 @@ out_unreg: +@@ -5983,7 +5994,11 @@ out_unreg: wl1271_unregister_hw(wl); out_irq:
@@ -37,7 +37,7 @@ out_free_nvs: kfree(wl->nvs); -@@ -6184,7 +6199,12 @@ int wlcore_remove(struct platform_device +@@ -6029,7 +6044,12 @@ int wlcore_remove(struct platform_device disable_irq_wake(wl->irq); } wl1271_unregister_hw(wl);
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_ath_ath9k_pci.patch +2 -2
@@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c -@@ -339,6 +339,9 @@ static int ath_pci_resume(struct device +@@ -411,6 +411,9 @@ static int ath_pci_resume(struct device return 0; }
@@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(ath9k_pm_ops, ath_pci_suspend, ath_pci_resume); #define ATH9K_PM_OPS (&ath9k_pm_ops) -@@ -357,7 +360,12 @@ static struct pci_driver ath_pci_driver +@@ -429,7 +432,12 @@ static struct pci_driver ath_pci_driver .id_table = ath_pci_id_table, .probe = ath_pci_probe, .remove = ath_pci_remove,
patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_ti_wlcore_main.patch +2 -2
@@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -2952,11 +2952,20 @@ struct wl1271_filter_params { +@@ -2939,11 +2939,20 @@ struct wl1271_filter_params { u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; };
@@ -21,7 +21,7 @@ fp = kzalloc(sizeof(*fp), GFP_ATOMIC); if (!fp) { -@@ -2965,16 +2974,40 @@ static u64 wl1271_op_prepare_multicast(s +@@ -2952,16 +2961,40 @@ static u64 wl1271_op_prepare_multicast(s } /* update multicast filtering parameters */
patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch +1 -1
@@ -1,6 +1,6 @@ --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2660,14 +2660,24 @@ struct ieee80211_ops { +@@ -2662,14 +2662,24 @@ struct ieee80211_ops { void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); u64 (*prepare_multicast)(struct ieee80211_hw *hw,
patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch +4 -4
@@ -1,6 +1,6 @@ --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c -@@ -70,7 +70,7 @@ static bool +@@ -70,7 +70,7 @@ bool brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev) { bool is_err = false;
@@ -10,7 +10,7 @@ #endif return is_err; @@ -79,7 +79,7 @@ brcmf_pm_resume_error(struct brcmf_sdio_ - static void + void brcmf_pm_resume_wait(struct brcmf_sdio_dev *sdiodev, wait_queue_head_t *wq) { -#ifdef CONFIG_PM_SLEEP
@@ -18,7 +18,7 @@ int retry = 0; while (atomic_read(&sdiodev->suspend) && retry++ != 30) wait_event_timeout(*wq, false, HZ/100); -@@ -516,7 +516,7 @@ static void brcmf_ops_sdio_remove(struct +@@ -406,7 +406,7 @@ static void brcmf_ops_sdio_remove(struct brcmf_dbg(SDIO, "Exit\n"); }
@@ -27,7 +27,7 @@ static int brcmf_sdio_suspend(struct device *dev) { mmc_pm_flag_t sdio_flags; -@@ -566,7 +566,7 @@ static struct sdio_driver brcmf_sdmmc_dr +@@ -456,7 +456,7 @@ static struct sdio_driver brcmf_sdmmc_dr .remove = brcmf_ops_sdio_remove, .name = BRCMFMAC_SDIO_PDATA_NAME, .id_table = brcmf_sdmmc_ids,
patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch +1 -1
@@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -2258,7 +2258,7 @@ static int nl80211_valid_4addr(struct cf +@@ -2296,7 +2296,7 @@ static int nl80211_valid_4addr(struct cf enum nl80211_iftype iftype) { if (!use_4addr) {
patches/collateral-evolutions/network/42-netlink_seq/net_wireless_nl80211.patch +1 -1
@@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -5668,7 +5668,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -5703,7 +5703,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev);
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 -@@ -285,8 +285,10 @@ void mwifiex_set_trans_start(struct net_ +@@ -288,8 +288,10 @@ void mwifiex_set_trans_start(struct net_ { int i;
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c -@@ -473,7 +473,9 @@ static struct usb_driver ath3k_driver = +@@ -475,7 +475,9 @@ static struct usb_driver ath3k_driver = .probe = ath3k_probe, .disconnect = ath3k_disconnect, .id_table = ath3k_table,
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 -@@ -1623,7 +1623,9 @@ static struct usb_driver btusb_driver = +@@ -1624,7 +1624,9 @@ static struct usb_driver btusb_driver = #endif .id_table = btusb_table, .supports_autosuspend = 1,
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -1373,7 +1373,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1379,7 +1379,9 @@ static struct usb_driver ath9k_hif_usb_d #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) .soft_unbind = 1, #endif
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt73usb.patch +1 -1
@@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c -@@ -2547,7 +2547,9 @@ static struct usb_driver rt73usb_driver +@@ -2548,7 +2548,9 @@ static struct usb_driver rt73usb_driver .suspend = rt2x00usb_suspend, .resume = rt2x00usb_resume, .reset_resume = rt2x00usb_resume,
patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch +1 -1
@@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -7775,7 +7775,7 @@ static int nl80211_parse_wowlan_tcp(stru +@@ -7815,7 +7815,7 @@ static int nl80211_parse_wowlan_tcp(stru port = nla_get_u16(tb[NL80211_WOWLAN_TCP_SRC_PORT]); else port = 0;
Signature · 1 line
1.7.10.4
RFC 4/9 backports: simplify swiotlb_nr_tbl() backport
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
swiotlb_nr_tbl() was available since 3.2 but was exported since 3.3. Since it uses an internal global state variable, it is impossible to backport it to. Instead of reverting the changes added just let this return 0 as the code will not do anything. This simplifies the backport.
--- backport/backport-include/linux/swiotlb.h | 17 +++++++ patches/collateral-evolutions/drm/03-swiotlb/INFO | 5 --- .../drivers_gpu_drm_nouveau_nouveau_bo.patch | 31 ------------- .../drivers_gpu_drm_radeon_radeon_ttm.patch | 47 -------------------- 4 files changed, 17 insertions(+), 83 deletions(-) create mode 100644 backport/backport-include/linux/swiotlb.h delete mode 100644 patches/collateral-evolutions/drm/03-swiotlb/INFO delete mode 100644 patches/collateral-evolutions/drm/03-swiotlb/drivers_gpu_drm_nouveau_nouveau_bo.patch delete mode 100644 patches/collateral-evolutions/drm/03-swiotlb/drivers_gpu_drm_radeon_radeon_ttm.patch
backport/backport-include/linux/swiotlb.h new file +17 -0
@@ -0,0 +1,17 @@ +#ifndef __BACKPORT_LINUX_SWIOTLB_H +#define __BACKPORT_LINUX_SWIOTLB_H + +#include <linux/version.h> + +#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,28 )) +#include_next <linux/swiotlb.h> +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)) */ + +#if (LINUX_VERSION_CODE <KERNEL_VERSION (3 ,3 ,0 )) +static inline unsigned long swiotlb_nr_tbl (void ) +{ +return 0 ; +} +#endif + +#endif /* __BACKPORT_LINUX_SWIOTLB_H */
patches/collateral-evolutions/drm/03-swiotlb/INFO deleted +0 -5
@@ -1,5 +0,0 @@ - -swiotlb_nr_tbl() was available since 3.2 but was exported since 3.3. -Since it uses an internal global state variable, it is impossible -to backport it to compat.git. So revert the changes. -
patches/collateral-evolutions/drm/03-swiotlb/drivers_gpu_drm_nouveau_nouveau_bo.patch deleted +0 -31
@@ -1,31 +0,0 @@ ---- a/drivers/gpu/drm/nouveau/nouveau_bo.c -+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c -@@ -1374,11 +1374,13 @@ nouveau_ttm_tt_populate(struct ttm_tt *t - } - #endif - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) - #ifdef CONFIG_SWIOTLB - if (swiotlb_nr_tbl()) { - return ttm_dma_populate((void *)ttm, dev->dev); - } - #endif -+#endif - - r = ttm_pool_populate(ttm); - if (r) { -@@ -1424,12 +1426,14 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt - } - #endif - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)) - #ifdef CONFIG_SWIOTLB - if (swiotlb_nr_tbl()) { - ttm_dma_unpopulate((void *)ttm, dev->dev); - return; - } - #endif -+#endif - - for (i = 0; i < ttm->num_pages; i++) { - if (ttm_dma->dma_address[i]) {
patches/collateral-evolutions/drm/03-swiotlb/drivers_gpu_drm_radeon_radeon_ttm.patch deleted +0 -47
47 lines not on this page · raw message
Signature · 1 line
1.7.10.4
RFC 5/9 backports: copy the max77693-private.h header file
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
--- copy-list | 1 + 1 file changed, 1 insertion(+)
copy-list +1 -0
@@ -139,6 +139,7 @@ include/linux/regulator/max8649.h include/linux/regulator/max8660.h include/linux/regulator/max8952.h include/linux/regulator/max8973-regulator.h +include/linux/mfd/max77693-private.h include/linux/regulator/of_regulator.h include/linux/regulator/tps51632-regulator.h include/linux/regulator/tps62360.h
Signature · 1 line
1.7.10.4
RFC 6/9 backports: revert DMI_EXACT_MATCH() for older kernels
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
struct dmi_strmatch was modified on v3.11 with a exact_match member. The DMI_EXACT_MATCH() macro was added as a mod version of DMI_MATCH() to account for dmi strings that look closely like each other. An example is D510MO Vs D510MOV.
Since exact_match is is not available on older kernels we can't use it and must revert to the old DMI_MATCH(). Addressing the desired behaviour will require a separate change to deal with addressing the difference in the behaviour.
I welcome alternative ideas.
mcgrof@frijol ~/linux-stable (git::master)$ git describe --contains 5017b285 v3.11-rc1~99^2~254
commit 5017b2851373ee15c7035151853bb1448800cae2
Author: Jani Nikula <[email protected]> Date: Wed Jul 3 15:05:02 2013 -0700
dmi: add support for exact DMI matches in addition to substring matching
dmi_match() considers a substring match to be a successful match. This is not always sufficient to distinguish between DMI data for different systems. Add support for exact string matching using strcmp() in addition to the substring matching using strstr().
The specific use case in the i915 driver is to allow us to use an exact match for D510MO, without also incorrectly matching D510MOV:
{
.ident = "Intel D510MO",
.matches = {
DMI_MATCH(DMI_BOARD_VENDOR, "Intel"), DMI_EXACT_MATCH(DMI_BOARD_NAME, "D510MO"),
},
}
--- backport/backport-include/linux/mod_devicetable.h | 4 ++++ 1 file changed, 4 insertions(+)
backport/backport-include/linux/mod_devicetable.h +4 -0
@@ -2,6 +2,10 @@#define __BACKPORT_MOD_DEVICETABLE_H#include_next <linux/mod_devicetable.h> +#if LINUX_VERSION_CODE <KERNEL_VERSION (3 ,11 ,0 ) +#define DMI_EXACT_MATCH (a, b) { a, b } +#endif +#ifndef HID_BUS_ANY #define HID_BUS_ANY 0xffff#endif
Signature · 1 line
1.7.10.4
Re: [RFC 6/9] backports: revert DMI_EXACT_MATCH() for older kernels
Quoted 8 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
struct
dmi_strmatchwas modified on v3.11 with aexact_matchmember. TheDMI_EXACT_MATCH()macro was added as a mod version ofDMI_MATCH()to account for dmi strings that look closely like each other. An example is D510MO Vs D510MOV.
Quoted 5 lines
Since
exact_matchis is not available on older kernels we can't use it and must revert to the oldDMI_MATCH(). Addressing the desired behaviour will require a separate change to deal with addressing the difference in the behaviour.
If you choose not to backport DMI_EXACT_MATCH, then don't backport the two fixes that depend upon it.
Is there a blocker for not backporting the DMI_EXACT_MATCH feature? -Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [RFC 6/9] backports: revert DMI_EXACT_MATCH() for older kernels
Quoted 9 lines · Chris Wilson
Quoted 8 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
struct
dmi_strmatchwas modified on v3.11 with aexact_matchmember. TheDMI_EXACT_MATCH()macro was added as a mod version ofDMI_MATCH()to account for dmi strings that look closely like each other. An example is D510MO Vs D510MOV.
Quoted 8 lines
Quoted 5 lines
Since
exact_matchis is not available on older kernels we can't use it and must revert to the oldDMI_MATCH(). Addressing the desired behaviour will require a separate change to deal with addressing the difference in the behaviour.If you choose not to backport
DMI_EXACT_MATCH, then don't backport the two fixes that depend upon it.
Which ones? These two?
dcf6d294830d46b0e6901477fb4bf455281d90c8 - drm/i915: quirk away phantom LVDS on Intel's D525MW mainboard e5614f0c2d0f4d7f0b8ef745d34593baf2c5dbf8 - drm/i915: quirk away phantom LVDS on Intel's D510MO mainboard
Just #ifdef over these for older kernels ifndef DMI_EXACT_MATCH ?
Quoted 1 line
Is there a blocker for not backporting the
DMI_EXACT_MATCHfeature?
I'm so glad you asked. DMI_EXACT_MATCH uses struct dmi_strmatch's new member exact_match:
@@ -456,7 +456,8 @@ enum dmi_field {
};
struct dmi_strmatch {
- unsigned char slot;
+ unsigned char slot:7;
+ unsigned char exact_match:1;
char substr[79];};
Prior to 5017b285 we only had slot so to use DMI_EXACT_MATCH with its intent we'd have to do something like slot |= 1 if its called. This however assumes though that older code has the sanity check as changed in 5017b285 on drivers/firmware/dmi_scan.c. dmi_scan.o gets linked with CONFIG_DMI. At least for x86 that gets objects sprinkled on arch/x86/, but more importantly CONFIG_DMI is bool. I've argued how I envision us being able to backport core components before (see 0935deab for the hint) but as it is right now we can't. We only backport things we can throw in as modular.
Please let me know if you see any other way.
Luis
Re: [RFC 6/9] backports: revert DMI_EXACT_MATCH() for older kernels
Quoted 19 lines · Luis R. Rodriguez
Quoted 9 lines · Chris Wilson
Quoted 8 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
struct
dmi_strmatchwas modified on v3.11 with aexact_matchmember. TheDMI_EXACT_MATCH()macro was added as a mod version ofDMI_MATCH()to account for dmi strings that look closely like each other. An example is D510MO Vs D510MOV.Quoted 8 lines
Quoted 5 lines
Since
exact_matchis is not available on older kernels we can't use it and must revert to the oldDMI_MATCH(). Addressing the desired behaviour will require a separate change to deal with addressing the difference in the behaviour.If you choose not to backport
DMI_EXACT_MATCH, then don't backport the two fixes that depend upon it.
Quoted 6 lines
Which ones? These two?
dcf6d294830d46b0e6901477fb4bf455281d90c8- drm/i915: quirk away phantom LVDS on Intel's D525MW mainboarde5614f0c2d0f4d7f0b8ef745d34593baf2c5dbf8- drm/i915: quirk away phantom LVDS on Intel's D510MO mainboard
Yes.
Quoted 27 lines
Just #ifdef over these for older kernels ifndef
DMI_EXACT_MATCH?Quoted 1 line
Is there a blocker for not backporting the
DMI_EXACT_MATCHfeature?I'm so glad you asked.
DMI_EXACT_MATCHuses struct dmi_strmatch's new memberexact_match:(quoted diff) +2
-1@@ -456,7 +456,8 @@ enum dmi_field { }; struct dmi_strmatch { - unsigned char slot; + unsigned char slot:7; + unsigned char exact_match:1; char substr[79]; };Prior to
5017b285we only had slot so to useDMI_EXACT_MATCHwith its intent we'd have to do something like slot |= 1 if its called. This however assumes though that older code has the sanity check as changed in5017b285ondrivers/firmware/dmi_scan.c. dmi_scan.o gets linked withCONFIG_DMI. At least for x86 that gets objects sprinkled onarch/x86/, but more importantlyCONFIG_DMIis bool. I've argued how I envision us being able to backport core components before (see0935deabfor the hint) but as it is right now we can't. We only backport things we can throw in as modular.
Quoted 1 line
Please let me know if you see any other way.
An alternative ugly hack would be to encode some metadata into the search string. I am a bit wary of simply converting the DMI_EXACT_MATCH back into DMI_MATCH because that introduces a regression into working machines if we blithely backport fixes like the two above. I'd rather have the compile failure.
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Re: [RFC 6/9] backports: revert DMI_EXACT_MATCH() for older kernels
Quoted 9 lines · Chris Wilson
Quoted 6 lines · Luis R. Rodriguez
Which ones? These two?
dcf6d294830d46b0e6901477fb4bf455281d90c8- drm/i915: quirk away phantom LVDS on Intel's D525MW mainboarde5614f0c2d0f4d7f0b8ef745d34593baf2c5dbf8- drm/i915: quirk away phantom LVDS on Intel's D510MO mainboardYes.
OK, will do.
Quoted 7 lines
Quoted 1 line
Please let me know if you see any other way.
An alternative ugly hack would be to encode some metadata into the search string. I am a bit wary of simply converting the
DMI_EXACT_MATCHback intoDMI_MATCHbecause that introduces a regression into working machines if we blithely backport fixes like the two above. I'd rather have the compile failure.
How about then just backporting like this then:
#define DMI_EXACT_MATCH(a, b) DMI_MATCH(DMI_PRODUCT_NAME, "BACKPORT_IGNORE")
It'd mean no #ifdef'ing code and at the same time making the run time of the code of the mentioned patches skip.
Thoughts?
Luis
Re: [RFC 6/9] backports: revert DMI_EXACT_MATCH() for older kernels
Quoted 21 lines · Luis R. Rodriguez
Quoted 9 lines · Chris Wilson
Quoted 6 lines · Luis R. Rodriguez
Which ones? These two?
dcf6d294830d46b0e6901477fb4bf455281d90c8- drm/i915: quirk away phantom LVDS on Intel's D525MW mainboarde5614f0c2d0f4d7f0b8ef745d34593baf2c5dbf8- drm/i915: quirk away phantom LVDS on Intel's D510MO mainboardYes.
OK, will do.
Quoted 7 lines
Quoted 1 line
Please let me know if you see any other way.
An alternative ugly hack would be to encode some metadata into the search string. I am a bit wary of simply converting the
DMI_EXACT_MATCHback intoDMI_MATCHbecause that introduces a regression into working machines if we blithely backport fixes like the two above. I'd rather have the compile failure.
Quoted 6 lines
How about then just backporting like this then:
#define
DMI_EXACT_MATCH(a, b)DMI_MATCH(DMI_PRODUCT_NAME, "BACKPORT_IGNORE")It'd mean no #ifdef'ing code and at the same time making the run time of the code of the mentioned patches skip.
Yeah, I think as a solution for the backport tree that's a neat hack and would allow us to reuse the latest upstream drm/i915 code unchanged, without the risk of breaking some machines. Of course we'll miss a few quirk entries but the lack of such shouldn't ever cause regressions.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
RFC 7/9 backports: add clock enable/disable on soc_camera_power_[on|off]()
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
v4l2-core now supports enabling and disabling its own clock on turning the camera on / off. We backport v4l2-core fully so just backport the soc calls appropriately to let SOC cameras to turn the clock on / off when the v4l2-core clock ops are implemented on a device driver.
--- .../backport-include/uapi/linux/v4l2-mediabus.h | 8 +++-- backport/compat/compat-3.4.c | 31 ++++++++++++++++---- 2 files changed, 31 insertions(+), 8 deletions(-)
backport/backport-include/uapi/linux/v4l2-mediabus.h +6 -2
@@ -20,15 +20,19 @@#if (LINUX_VERSION_CODE <KERNEL_VERSION (3 ,4 ,0 ))#if defined(CPTCFG_VIDEO_DEV_MODULE ) +#include <media/v4l2-clk.h> +struct soc_camera_subdev_desc ;#define soc_camera_power_on LINUX_BACKPORT(soc_camera_power_on)int soc_camera_power_on (struct device *dev, -struct soc_camera_subdev_desc *ssdd); +struct soc_camera_subdev_desc *ssdd, +struct v4l2_clk *clk);#define soc_camera_power_off LINUX_BACKPORT(soc_camera_power_off)int soc_camera_power_off (struct device *dev, -struct soc_camera_subdev_desc *ssdd); +struct soc_camera_subdev_desc *ssdd, +struct v4l2_clk *clk);#endif /* defined(CPTCFG_VIDEO_DEV_MODULE) */ #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) */
backport/compat/compat-3.4.c +25 -6
@@ -38,14 +38,21 @@ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) #if defined(CPTCFG_VIDEO_V4L2_MODULE) +#include <media/v4l2-clk.h> int soc_camera_power_on(struct device *dev, - struct soc_camera_subdev_desc *ssdd) + struct soc_camera_subdev_desc *ssdd, + struct v4l2_clk *clk) { - int ret = regulator_bulk_enable(ssdd->num_regulators, + int ret = clk ? v4l2_clk_enable(clk) : 0; + if (ret < 0) { + dev_err(dev, "Cannot enable clock: %d\n", ret); + return ret; + } + ret = regulator_bulk_enable(ssdd->num_regulators, ssdd->regulators); if (ret < 0) { dev_err(dev, "Cannot enable regulators\n"); - return ret; + goto eregenable; } if (ssdd->power) {
@@ -53,17 +60,26 @@ int soc_camera_power_on(struct device *dev,if (ret <0 ) {dev_err (dev,"Platform failed to power-on the camera.\n" ); -regulator_bulk_disable (ssdd->num_regulators, - ssdd->regulators); + goto epwron; } } +return 0 ; + +epwron: +regulator_bulk_disable (ssdd->num_regulators, + ssdd->regulators); +eregenable: +if (clk) +v4l2_clk_disable (clk); +return ret; }EXPORT_SYMBOL_GPL (soc_camera_power_on);int soc_camera_power_off (struct device *dev, -struct soc_camera_subdev_desc *ssdd) +struct soc_camera_subdev_desc *ssdd, +struct v4l2_clk *clk) {int ret =0 ;int err;
@@ -84,6 +100,9 @@ int soc_camera_power_off(struct device *dev, ret = ret ? : err; } +if (clk) +v4l2_clk_disable (clk); +return ret; }EXPORT_SYMBOL_GPL (soc_camera_power_off);
Signature · 1 line
1.7.10.4
RFC 8/9 backports: enable REGULATOR_MAX77693 on >= 3.6
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
There is a symbol missing otherwise that is currently only provided by the core, ie, non modular.
--- copy-list | 1 + dependencies | 1 + 2 files changed, 2 insertions(+)
copy-list +1 -0
@@ -139,6 +139,7 @@ include/linux/regulator/max8649.h include/linux/regulator/max8660.h include/linux/regulator/max8952.h include/linux/regulator/max8973-regulator.h +include/linux/mfd/max77693.h include/linux/mfd/max77693-private.h include/linux/regulator/of_regulator.h include/linux/regulator/tps51632-regulator.h
dependencies +1 -0
@@ -64,6 +64,7 @@ REGULATOR 3.4 # requires some work REGULATOR_ARIZONA DISABLE REGULATOR_MAX8973 DISABLE +REGULATOR_MAX77693 3.6 REGULATOR_MAX77686 DISABLE REGULATOR_MAX8997 DISABLE REGULATOR_RC5T583 DISABLE
Signature · 1 line
1.7.10.4
RFC 9/9 backports: lib/kconfig.py - fix src line regexp
In reply to Luis R. RodriguezFrom: "Luis R. Rodriguez" <[email protected]>
The source line can be prefixed by spaces and tabs. Without this a slew of kconfig options were not being parsed for dependency checking and at compile time they'd obviously fail.
--- lib/kconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/kconfig.py +1 -1
@@ -4,7 +4,7 @@ import os, re -src_line = re.compile(r'^source\s+"?(?P<src>[^\s"]*)"?\s*$') +src_line = re.compile(r'^[\s]*source\s+"?(?P<src>[^\s"]*)"?\s*$') tri_line = re.compile(r'^(?P<spc>\s+)tristate') bool_line = re.compile(r'^(?P<spc>\s+)bool') cfg_line = re.compile(r'^(config|menuconfig)\s+(?P<sym>[^\s]*)')
Signature · 1 line
1.7.10.4
Quoted 9 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
These try to get us caught up to next-20130627. The dmi one is not the best solution but an alternative really should be considered upstream as otherwise we'd end up with shit work arounds all over. Not sure if a reasonable alternative is possible upstream that is easier to backport.
Quoted 5 lines
I am testing this with ckmake right now but its late so going to crash and report results in the morning. I think this should do it. If someone can take this further to get closer to the date circa v3.11-rc1 that'd help if not I can try to take care of that tomorrow.
I'll address the feedback and then move on with life.
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.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ]
real 34m5.379s user 921m5.112s sys 128m8.156s
Luis
Quoted 47 lines · Luis R. Rodriguez
Quoted 9 lines · Luis R. Rodriguez
From: "Luis R. Rodriguez" <[email protected]>
These try to get us caught up to next-20130627. The dmi one is not the best solution but an alternative really should be considered upstream as otherwise we'd end up with shit work arounds all over. Not sure if a reasonable alternative is possible upstream that is easier to backport.
Quoted 5 lines
I am testing this with ckmake right now but its late so going to crash and report results in the morning. I think this should do it. If someone can take this further to get closer to the date circa v3.11-rc1 that'd help if not I can try to take care of that tomorrow.
I'll address the feedback and then move on with life.
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.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ]
Quoted 3 lines
real 34m5.379s user 921m5.112s sys 128m8.156s
Based on feedback I'm going to push this through but annotate some possible changes we may need for the DMI stuff. We can do that later though.
Luis