diff options
16 files changed, 41 insertions, 41 deletions
diff --git a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch index 9722df0c..082194d1 100644 --- a/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch +++ b/patches/collateral-evolutions/drm/07-intel-gtt/drivers_gpu_drm_i915_i915_gem.patch @@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -4184,8 +4184,10 @@ i915_gem_init_hw(struct drm_device *dev) +@@ -4154,8 +4154,10 @@ i915_gem_init_hw(struct drm_device *dev) drm_i915_private_t *dev_priv = dev->dev_private; int ret; @@ -9,5 +9,5 @@ return -EIO; +#endif - if (dev_priv->ellc_size) - I915_WRITE(HSW_IDICR, I915_READ(HSW_IDICR) | IDIHASHMSK(0xf)); + if (IS_HASWELL(dev) && (I915_READ(0x120010) == 1)) + I915_WRITE(0x9008, I915_READ(0x9008) | 0xf0000); diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/atl1c.patch b/patches/collateral-evolutions/network/0001-netdev_ops/atl1c.patch index 5e0fb047..4ac2c5eb 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/atl1c.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/atl1c.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -2470,7 +2470,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2508,7 +2508,7 @@ static int atl1c_init_netdev(struct net_ SET_NETDEV_DEV(netdev, &pdev->dev); pci_set_drvdata(pdev, netdev); diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch b/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch index 58a38ab2..1aca5fe0 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/mwifiex.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c -@@ -749,7 +749,7 @@ static const struct net_device_ops mwifi +@@ -755,7 +755,7 @@ static const struct net_device_ops mwifi void mwifiex_init_priv_params(struct mwifiex_private *priv, struct net_device *dev) { diff --git a/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch index d5a6a128..4664bc12 100644 --- a/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch +++ b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch @@ -144,7 +144,7 @@ rdev->testmode_info->snd_seq, GFP_KERNEL); } -@@ -6945,7 +6945,7 @@ static int nl80211_remain_on_channel(str +@@ -6947,7 +6947,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)) { -@@ -7164,7 +7164,7 @@ static int nl80211_register_mgmt(struct +@@ -7166,7 +7166,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])); } -@@ -7245,7 +7245,7 @@ static int nl80211_tx_mgmt(struct sk_buf +@@ -7247,7 +7247,7 @@ static int nl80211_tx_mgmt(struct sk_buf if (!msg) return -ENOMEM; @@ -171,7 +171,7 @@ NL80211_CMD_FRAME); if (IS_ERR(hdr)) { -@@ -7360,7 +7360,7 @@ static int nl80211_get_power_save(struct +@@ -7362,7 +7362,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; -@@ -7671,7 +7671,7 @@ static int nl80211_get_wowlan(struct sk_ +@@ -7673,7 +7673,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; -@@ -8096,7 +8096,7 @@ static int nl80211_register_unexpected_f +@@ -8098,7 +8098,7 @@ static int nl80211_register_unexpected_f if (wdev->ap_unexpected_nlportid) return -EBUSY; @@ -198,7 +198,7 @@ return 0; } -@@ -8126,7 +8126,7 @@ static int nl80211_probe_client(struct s +@@ -8128,7 +8128,7 @@ static int nl80211_probe_client(struct s if (!msg) return -ENOMEM; @@ -207,7 +207,7 @@ NL80211_CMD_PROBE_CLIENT); if (IS_ERR(hdr)) { -@@ -8170,13 +8170,13 @@ static int nl80211_register_beacons(stru +@@ -8172,13 +8172,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); -@@ -8243,7 +8243,7 @@ static int nl80211_get_protocol_features +@@ -8245,7 +8245,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; -@@ -8318,7 +8318,7 @@ static int nl80211_crit_protocol_start(s +@@ -8320,7 +8320,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; } -@@ -10693,12 +10693,12 @@ static int nl80211_netlink_notify(struct +@@ -10696,12 +10696,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) diff --git a/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch b/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch index 78ebbf8f..e6b963eb 100644 --- a/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch +++ b/patches/collateral-evolutions/network/05-usb/ath9k_htc.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -1376,7 +1376,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1381,7 +1381,9 @@ static struct usb_driver ath9k_hif_usb_d .reset_resume = ath9k_hif_usb_resume, #endif .id_table = ath9k_hif_usb_ids, diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch index 86e99ff4..8468d966 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch +++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c -@@ -788,12 +788,21 @@ void iwl_trans_pcie_free(struct iwl_tran +@@ -793,12 +793,21 @@ void iwl_trans_pcie_free(struct iwl_tran { struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); @@ -22,7 +22,7 @@ iwl_pcie_free_ict(trans); pci_disable_msi(trans_pcie->pci_dev); -@@ -1582,9 +1591,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s +@@ -1587,9 +1596,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s if (iwl_pcie_alloc_ict(trans)) goto out_free_cmd_pool; diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch index fa2385ad..86b356ce 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -2743,6 +2743,9 @@ static const struct pci_error_handlers a +@@ -2781,6 +2781,9 @@ static const struct pci_error_handlers a .resume = atl1c_io_resume, }; @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume); static struct pci_driver atl1c_driver = { -@@ -2752,7 +2755,12 @@ static struct pci_driver atl1c_driver = +@@ -2790,7 +2793,12 @@ static struct pci_driver atl1c_driver = .remove = atl1c_remove, .shutdown = atl1c_shutdown, .err_handler = &atl1c_err_handler, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch index 0d38b884..8d83bbed 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlwifi_pcie_drv.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c -@@ -397,6 +397,9 @@ static int iwl_pci_resume(struct device +@@ -398,6 +398,9 @@ static int iwl_pci_resume(struct device return iwl_trans_resume(iwl_trans); } @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); #define IWL_PM_OPS (&iwl_dev_pm_ops) -@@ -412,7 +415,12 @@ static struct pci_driver iwl_pci_driver +@@ -413,7 +416,12 @@ static struct pci_driver iwl_pci_driver .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = iwl_pci_remove, diff --git a/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_mwifiex_sdio.patch b/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_mwifiex_sdio.patch index 87048897..ab9b14a3 100644 --- a/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_mwifiex_sdio.patch +++ b/patches/collateral-evolutions/network/26-sdio-quirks/drivers_net_wireless_mwifiex_sdio.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c -@@ -75,7 +75,9 @@ mwifiex_sdio_probe(struct sdio_func *fun +@@ -76,7 +76,9 @@ mwifiex_sdio_probe(struct sdio_func *fun card->func = func; diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch index 06c18bc5..8d2d67d3 100644 --- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch +++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c -@@ -140,8 +140,10 @@ mwifiex_sdio_remove(struct sdio_func *fu +@@ -141,8 +141,10 @@ mwifiex_sdio_remove(struct sdio_func *fu wait_for_completion(&adapter->fw_load); if (user_rmmod) { @@ -11,7 +11,7 @@ for (i = 0; i < adapter->priv_num; i++) if ((GET_BSS_ROLE(adapter->priv[i]) == -@@ -158,6 +160,7 @@ mwifiex_sdio_remove(struct sdio_func *fu +@@ -159,6 +161,7 @@ mwifiex_sdio_remove(struct sdio_func *fu kfree(card); } @@ -19,7 +19,7 @@ /* * SDIO suspend. * -@@ -257,6 +260,7 @@ static int mwifiex_sdio_resume(struct de +@@ -258,6 +261,7 @@ static int mwifiex_sdio_resume(struct de return 0; } @@ -27,7 +27,7 @@ /* Device ID for SD8786 */ #define SDIO_DEVICE_ID_MARVELL_8786 (0x9116) -@@ -282,10 +286,12 @@ static const struct sdio_device_id mwifi +@@ -283,10 +287,12 @@ static const struct sdio_device_id mwifi MODULE_DEVICE_TABLE(sdio, mwifiex_ids); @@ -40,7 +40,7 @@ static struct sdio_driver mwifiex_sdio = { .name = "mwifiex_sdio", -@@ -294,7 +300,9 @@ static struct sdio_driver mwifiex_sdio = +@@ -295,7 +301,9 @@ static struct sdio_driver mwifiex_sdio = .remove = mwifiex_sdio_remove, .drv = { .owner = THIS_MODULE, diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch index f6736679..72d672b4 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch @@ -1,14 +1,14 @@ --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -491,6 +491,7 @@ static void atl1c_set_rxbufsize(struct a - roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE; +@@ -496,6 +496,7 @@ static void atl1c_set_rxbufsize(struct a + adapter->rx_frag_size = roundup_pow_of_two(head_size); } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) static netdev_features_t atl1c_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -519,6 +520,7 @@ static int atl1c_set_features(struct net +@@ -524,6 +525,7 @@ static int atl1c_set_features(struct net return 0; } @@ -16,7 +16,7 @@ /** * atl1c_change_mtu - Change the Maximum Transfer Unit -@@ -551,8 +553,19 @@ static int atl1c_change_mtu(struct net_d +@@ -556,8 +558,19 @@ static int atl1c_change_mtu(struct net_d netdev->mtu = new_mtu; adapter->hw.max_frame_size = new_mtu; atl1c_set_rxbufsize(adapter, netdev); @@ -36,7 +36,7 @@ atl1c_up(adapter); clear_bit(__AT_RESETTING, &adapter->flags); } -@@ -2459,8 +2472,10 @@ static const struct net_device_ops atl1c +@@ -2497,8 +2510,10 @@ static const struct net_device_ops atl1c .ndo_set_mac_address = atl1c_set_mac_addr, .ndo_set_rx_mode = atl1c_set_multi, .ndo_change_mtu = atl1c_change_mtu, @@ -47,7 +47,7 @@ .ndo_do_ioctl = atl1c_ioctl, .ndo_tx_timeout = atl1c_tx_timeout, .ndo_get_stats = atl1c_get_stats, -@@ -2478,6 +2493,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2516,6 +2531,7 @@ static int atl1c_init_netdev(struct net_ netdev->watchdog_timeo = AT_TX_WATCHDOG; atl1c_set_ethtool_ops(netdev); @@ -55,7 +55,7 @@ /* TODO: add when ready */ netdev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | -@@ -2486,6 +2502,14 @@ static int atl1c_init_netdev(struct net_ +@@ -2524,6 +2540,14 @@ static int atl1c_init_netdev(struct net_ NETIF_F_TSO6; netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_CTAG_TX; diff --git a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch index 103d8f5a..6494b84c 100644 --- a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch +++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -2622,7 +2622,9 @@ static int atl1c_probe(struct pci_dev *p +@@ -2660,7 +2660,9 @@ static int atl1c_probe(struct pci_dev *p } if (atl1c_read_mac_addr(&adapter->hw)) { /* got a random MAC address, set NET_ADDR_RANDOM to netdev */ diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch index ce5b6d73..6a25832d 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_ath3k.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c -@@ -473,7 +473,9 @@ static struct usb_driver ath3k_driver = +@@ -501,7 +501,9 @@ static struct usb_driver ath3k_driver = .probe = ath3k_probe, .disconnect = ath3k_disconnect, .id_table = ath3k_table, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch index 9a2c9e36..ad7942fb 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_bluetooth_btusb.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -1623,7 +1623,9 @@ static struct usb_driver btusb_driver = +@@ -1627,7 +1627,9 @@ static struct usb_driver btusb_driver = #endif .id_table = btusb_table, .supports_autosuspend = 1, diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch index 5753b5e0..ff160652 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_ath_ath9k_hif_usb.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -1379,7 +1379,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1384,7 +1384,9 @@ static struct usb_driver ath9k_hif_usb_d #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) .soft_unbind = 1, #endif diff --git a/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch index 06c882dc..fb20e842 100644 --- a/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch +++ b/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -7815,7 +7815,7 @@ static int nl80211_parse_wowlan_tcp(stru +@@ -7817,7 +7817,7 @@ static int nl80211_parse_wowlan_tcp(stru port = nla_get_u16(tb[NL80211_WOWLAN_TCP_SRC_PORT]); else port = 0; |