2.6.35.10 longterm review
Subsystems (93)
PATCH 1/223 block: Ensure physical block size is unsigned int
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Martin K. Petersen <[email protected]>
commit 892b6f90db81cccb723d5d92f4fddc2d68b206e1 upstream.
Physical block size was declared unsigned int to accomodate the maximum size reported by READ CAPACITY(16). Make sure we use the right type in the related functions.
--- block/blk-settings.c | 2 +- include/linux/blkdev.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
block/blk-settings.c +1 -1
@@ -326,7 +326,7 @@ EXPORT_SYMBOL(blk_queue_logical_block_si* hardware can operate on without reverting to read-modify-write * operations. */ -void blk_queue_physical_block_size (struct request_queue *q,unsigned short size) +void blk_queue_physical_block_size (struct request_queue *q,unsigned int size) { q->limits.physical_block_size = size;
include/linux/blkdev.h +2 -2
@@ -936,7 +936,7 @@ extern void blk_queue_max_segment_size(sextern void blk_queue_max_discard_sectors (struct request_queue *q,unsigned int max_discard_sectors);extern void blk_queue_logical_block_size (struct request_queue *,unsigned short ); -extern void blk_queue_physical_block_size (struct request_queue *,unsigned short ); +extern void blk_queue_physical_block_size (struct request_queue *,unsigned int );extern void blk_queue_alignment_offset (struct request_queue *q,unsigned int alignment);extern void blk_limits_io_min (struct queue_limits *limits,unsigned int min);
@@ -1086,7 +1086,7 @@ static inline unsigned int queue_physicareturn q->limits.physical_block_size; } -static inline int bdev_physical_block_size (struct block_device *bdev) +static inline unsigned int bdev_physical_block_size (struct block_device *bdev) {return queue_physical_block_size (bdev_get_queue (bdev)); }
PATCH 3/223 block: limit vec count in bio_kmalloc() and bio_alloc_map_data()
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit f3f63c1c28bc861a931fac283b5bc3585efb8967 upstream.
--- fs/bio.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/bio.c +8 -1
@@ -370,6 +370,9 @@ struct bio *bio_kmalloc(gfp_t gfp_mask, {struct bio *bio; +if (nr_iovecs >UIO_MAXIOV ) +return NULL ; + bio =kmalloc (sizeof (struct bio ) + nr_iovecs *sizeof (struct bio_vec ), gfp_mask);if (unlikely (!bio))
@@ -697,8 +700,12 @@ static void bio_free_map_data(struct biostatic struct bio_map_data *bio_alloc_map_data (int nr_segs,int iov_count,gfp_t gfp_mask) { -struct bio_map_data *bmd =kmalloc (sizeof (*bmd), gfp_mask); +struct bio_map_data *bmd; + +if (iov_count >UIO_MAXIOV ) +return NULL ; + bmd =kmalloc (sizeof (*bmd), gfp_mask);if (!bmd)return NULL ;
PATCH 5/223 block: check for proper length of iov entries in blk_rq_map_user_iov()
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit 9284bcf4e335e5f18a8bc7b26461c33ab60d0689 upstream.
Ensure that we pass down properly validated iov segments before calling into the mapping or copy functions.
--- block/blk-map.c | 2 ++ 1 file changed, 2 insertions(+)
block/blk-map.c +2 -0
@@ -205,6 +205,8 @@ int blk_rq_map_user_iov(struct request_q unaligned =1 ;break ; } +if (!iov[i].iov_len) +return -EINVAL ; }if (unaligned || (q->dma_pad_mask & len) || map_data)
PATCH 4/223 block: take care not to overflow when calculating total iov length
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit 9f864c80913467312c7b8690e41fb5ebd1b50e92 upstream.
--- block/scsi_ioctl.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-)
block/scsi_ioctl.c +24 -10
@@ -321,33 +321,47 @@ static int sg_io(struct request_queue *qif (hdr->iovec_count) {const int size =sizeof (struct sg_iovec ) * hdr->iovec_count;size_t iov_data_len; -struct sg_iovec *iov; +struct sg_iovec *sg_iov; +struct iovec *iov; +int i; - iov =kmalloc (size,GFP_KERNEL ); -if (!iov) { + sg_iov =kmalloc (size,GFP_KERNEL ); +if (!sg_iov) { ret = -ENOMEM ; goto out; } -if (copy_from_user (iov, hdr->dxferp, size)) { -kfree (iov); +if (copy_from_user (sg_iov, hdr->dxferp, size)) { +kfree (sg_iov); ret = -EFAULT ; goto out; } +/* +* Sum up the vecs, making sure they don't overflow +*/ + iov = (struct iovec *) sg_iov; + iov_data_len =0 ; +for (i =0 ; i < hdr->iovec_count; i++) { +if (iov_data_len + iov[i].iov_len < iov_data_len) { +kfree (sg_iov); + ret = -EINVAL ; + goto out; + } + iov_data_len += iov[i].iov_len; + } +/* SG_IO howto says that the shorter of the two wins */ - iov_data_len =iov_length ((struct iovec *)iov, - hdr->iovec_count);if (hdr->dxfer_len < iov_data_len) { - hdr->iovec_count =iov_shorten ((struct iovec *)iov, + hdr->iovec_count =iov_shorten (iov, hdr->iovec_count, hdr->dxfer_len); iov_data_len = hdr->dxfer_len; } - ret =blk_rq_map_user_iov (q, rq,NULL , iov, hdr->iovec_count, + ret =blk_rq_map_user_iov (q, rq,NULL , sg_iov, hdr->iovec_count, iov_data_len,GFP_KERNEL ); -kfree (iov); +kfree (sg_iov); }else if (hdr->dxfer_len) ret =blk_rq_map_user (q, rq,NULL , hdr->dxferp, hdr->dxfer_len,GFP_KERNEL );
PATCH 6/223 drm/radeon/kms: don't disable shared encoders on pre-DCE3 display blocks
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit a0ae5864d42b41c411368bd689462bf063c029c8 upstream.
The A/B links aren't independantly useable on these blocks so when we disable the encoders, make sure to only disable the encoder when there is no connector using it.
Should fix:
https://bugs.freedesktop.org/show_bug.cgi?id=18564
--- drivers/gpu/drm/radeon/radeon_encoders.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/gpu/drm/radeon/radeon_encoders.c +18 -0
@@ -1545,6 +1545,23 @@ static void radeon_atom_encoder_disable(struct radeon_device *rdev = dev->dev_private;struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder);struct radeon_encoder_atom_dig *dig; + +/* check for pre-DCE3 cards with shared encoders; +* can't really use the links individually, so don't disable +* the encoder if it's in use by another connector +*/ +if (!ASIC_IS_DCE3 (rdev)) { +struct drm_encoder *other_encoder; +struct radeon_encoder *other_radeon_encoder; + +list_for_each_entry (other_encoder, &dev->mode_config.encoder_list, head) { + other_radeon_encoder =to_radeon_encoder (other_encoder); +if ((radeon_encoder->encoder_id == other_radeon_encoder->encoder_id) && +drm_helper_encoder_in_use (other_encoder)) + goto disable_done; + } + } +radeon_atom_encoder_dpms (encoder,DRM_MODE_DPMS_OFF );switch (radeon_encoder->encoder_id) {
@@ -1584,6 +1601,7 @@ static void radeon_atom_encoder_disable(break ; } +disable_done:if (radeon_encoder_is_digital (encoder)) {if (atombios_get_encoder_mode (encoder) ==ATOM_ENCODER_MODE_HDMI )r600_hdmi_disable (encoder);
PATCH 7/223 jme: Fix PHY power-off error
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Guo-Fu Tseng <[email protected]>
commit c8a8684d5cfb0f110a962c93586630c0bf91ebc1 upstream.
Adding phy_on in opposition to phy_off.
--- drivers/net/jme.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/net/jme.c +18 -4
@@ -1575,6 +1575,16 @@ jme_free_irq(struct jme_adapter *jme) } } +static inline void +jme_phy_on (struct jme_adapter *jme) +{ +u32 bmcr; + + bmcr =jme_mdio_read (jme->dev, jme->mii_if.phy_id,MII_BMCR ); + bmcr &= ~BMCR_PDOWN ; +jme_mdio_write (jme->dev, jme->mii_if.phy_id,MII_BMCR , bmcr); +} +static int jme_open (struct net_device *netdev) {
@@ -1595,10 +1605,12 @@ jme_open(struct net_device *netdev)jme_start_irq (jme); -if (test_bit (JME_FLAG_SSET , &jme->flags)) +if (test_bit (JME_FLAG_SSET , &jme->flags)) { +jme_phy_on (jme);jme_set_settings (netdev, &jme->old_ecmd); -else + }else {jme_reset_phy_processor (jme); + }jme_reset_link (jme);
@@ -3006,10 +3018,12 @@ jme_resume(struct pci_dev *pdev)jme_clear_pm (jme);pci_restore_state (pdev); -if (test_bit (JME_FLAG_SSET , &jme->flags)) +if (test_bit (JME_FLAG_SSET , &jme->flags)) { +jme_phy_on (jme);jme_set_settings (netdev, &jme->old_ecmd); -else + }else {jme_reset_phy_processor (jme); + }jme_start_irq (jme);netif_device_attach (netdev);
PATCH 8/223 irda: Fix parameter extraction stack overflow
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Ortiz <[email protected]>
commit efc463eb508798da4243625b08c7396462cabf9f upstream.
--- net/irda/parameters.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/irda/parameters.c +3 -1
@@ -298,6 +298,8 @@ static int irda_extract_string(void *sel p.pi = pi;/* In case handler needs to know */ p.pl = buf[1 ];/* Extract length of value */ +if (p.pl >32 ) + p.pl =32 ;IRDA_DEBUG (2 ,"%s(), pi=%#x, pl=%d\n" , __func__, p.pi, p.pl);
@@ -318,7 +320,7 @@ static int irda_extract_string(void *sel (__u8) str[0], (__u8) str[1]);/* Null terminate string */ - str[p.pl+1 ] ='\0' ; + str[p.pl] ='\0' ; p.pv.c = str;/* Handler will need to take a copy */
PATCH 9/223 irda: Fix heap memory corruption in iriap.c
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Samuel Ortiz <[email protected]>
commit 37f9fc452d138dfc4da2ee1ce5ae85094efc3606 upstream.
While parsing the GetValuebyClass command frame, we could potentially write passed the skb->data pointer.
--- net/irda/iriap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/irda/iriap.c +2 -1
@@ -502,7 +502,8 @@ static void iriap_getvaluebyclass_confirIRDA_DEBUG (4 ,"%s(), strlen=%d\n" , __func__, value_len);/* Make sure the string is null-terminated */ - fp[n+value_len] =0x00 ; +if (n + value_len < skb->len) + fp[n + value_len] =0x00 ;IRDA_DEBUG (4 ,"Got string %s\n" , fp+n);/* Will truncate to IAS_MAX_STRING bytes */
PATCH 10/223 cfg80211: fix BSS double-unlinking
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit 3207390a8b58bfc1335750f91cf6783c48ca19ca upstream.
When multiple interfaces are actively trying to associate with the same BSS, they may both find that the BSS isn't there and then try to unlink it. This can cause errors since the unlinking code can't currently deal with items that have already been unlinked.
Normally this doesn't happen as most people don't try to use multiple station interfaces that associate at the same time too.
Fix this by using the list entry as a flag to see if the item is still on a list.
--- net/wireless/scan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/wireless/scan.c +6 -6
@@ -650,14 +650,14 @@ void cfg80211_unlink_bss(struct wiphy *w bss = container_of(pub, struct cfg80211_internal_bss, pub);spin_lock_bh (&dev->bss_lock); +if (!list_empty (&bss->list)) { +list_del_init (&bss->list); + dev->bss_generation++; +rb_erase (&bss->rbn, &dev->bss_tree); -list_del (&bss->list); - dev->bss_generation++; -rb_erase (&bss->rbn, &dev->bss_tree); - +kref_put (&bss->ref, bss_release); + }spin_unlock_bh (&dev->bss_lock); - -kref_put (&bss->ref, bss_release); }EXPORT_SYMBOL (cfg80211_unlink_bss);
PATCH 11/223 cfg80211: fix locking
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Berg <[email protected]>
commit 2234362c427e2ef667595b9b81c0125003ac5607 upstream.
Add missing unlocking of the wiphy in set_channel, and don't try to unlock a non-existing wiphy in set_cqm.
--- net/wireless/nl80211.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
net/wireless/nl80211.c +7 -4
@@ -758,11 +758,13 @@ static int nl80211_set_channel(struct sk result =get_rdev_dev_by_info_ifindex (info, &rdev, &netdev);if (result) - goto unlock; + goto unlock_rtnl; result =__nl80211_set_channel (rdev, netdev->ieee80211_ptr, info); - unlock: +dev_put (netdev); +cfg80211_unlock_rdev (rdev); + unlock_rtnl:rtnl_unlock ();return result;
@@ -4909,7 +4911,7 @@ static int nl80211_set_cqm_rssi(struct g err =get_rdev_dev_by_info_ifindex (info, &rdev, &dev);if (err) - goto unlock_rdev; + goto unlock_rtnl; wdev = dev->ieee80211_ptr;
@@ -4926,9 +4928,10 @@ static int nl80211_set_cqm_rssi(struct g err = rdev->ops->set_cqm_rssi_config (wdev->wiphy, dev, threshold, hysteresis); -unlock_rdev: + unlock_rdev:cfg80211_unlock_rdev (rdev);dev_put (dev); + unlock_rtnl:rtnl_unlock ();return err;
PATCH 13/223 mac80211: fix channel assumption for association done work
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Luis R. Rodriguez <[email protected]>
commit e7480bbb926c5816e4fbfca70748096bbe0e4978 upstream.
Be consistent and use the wk->chan instead of the local->hw.conf.channel for the association done work. This prevents any possible races against channel changes while we run this work.
In the case that the race did happen we would be initializing the bit rates for the new AP under the assumption of a wrong channel and in the worst case, wrong band. This could lead to trying to assuming we could use CCK frames on 5 GHz, for example.
This patch has a fix for kernels >= v2.6.34
--- net/mac80211/mlme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/mac80211/mlme.c +3 -3
@@ -1210,7 +1210,7 @@ static bool ieee80211_assoc_success(stru rates =0 ; basic_rates =0 ; - sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; + sband = local->hw.wiphy->bands[wk->chan->band];for (i =0 ; i < elems.supp_rates_len; i++) {int rate = (elems.supp_rates[i] &0x7f ) *5 ;
@@ -1246,11 +1246,11 @@ static bool ieee80211_assoc_success(stru } } - sta->sta.supp_rates[local->hw.conf.channel->band] = rates; + sta->sta.supp_rates[wk->chan->band] = rates; sdata->vif.bss_conf.basic_rates = basic_rates;/* cf. IEEE 802.11 9.2.12 */ -if (local->hw.conf.channel->band ==IEEE80211_BAND_2GHZ && +if (wk->chan->band ==IEEE80211_BAND_2GHZ && have_higher_than_11mbit) sdata->flags |=IEEE80211_SDATA_OPERATING_GMODE ;else
PATCH 12/223 cfg80211: fix regression on processing country IEs
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Luis R. Rodriguez <[email protected]>
commit a171fba491f54216e356efa46096171a7ed01d10 upstream.
The patch 4f366c5:
wireless: only use alpha2 regulatory information from country IE
removed some complex intersection we were always doing between the AP's country IE info and what we got from CRDA. When CRDA sent us back a regulatory domain we would do some sanity checks on that regulatory domain response we just got. Part of these sanity checks included checking that we already had performed an intersection for the request of NL80211_REGDOM_SET_BY_COUNTRY_IE type.
This mean that cfg80211 was only processing country IEs for cases where we already had an intersection, but since we removed enforcing this this is no longer required, we should just apply the country IE country hint with the data received from CRDA.
This patch has fixes intended for kernels >= 2.6.36. [AK: it seems to be needed for .35 too?? Kept for now]
--- net/wireless/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/wireless/reg.c +1 -1
@@ -1695,7 +1695,7 @@ static int ignore_request(struct wiphy *return 0 ;return -EALREADY ; } -return REG_INTERSECT ; +return 0 ;case NL80211_REGDOM_SET_BY_DRIVER :if (last_request->initiator ==NL80211_REGDOM_SET_BY_CORE ) {if (regdom_changes (pending_request->alpha2))
PATCH 14/223 mac80211: fix offchannel assumption upon association
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Luis R. Rodriguez <[email protected]>
commit 8d4780eb1ece4e8109b4f6b2e5e61f7fc593c3f4 upstream.
Association is dealt with as an atomic offchannel operation, we do this because we don't know we are associated until we get the associatin response from the AP. When we do get the associatin response though we were never clearing the offchannel state. This has a few implications, we told drivers we were still offchannel, and the first configured TX power for the channel does not take into account any power constraints.
For ath9k this meant ANI calibration would not start upon association, and we'd have to wait until the first bgscan to be triggered. There may be other issues this resolves but I'm too lazy to comb the code to check.
--- net/mac80211/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/mac80211/main.c +2 -1
@@ -106,7 +106,8 @@ int ieee80211_hw_config(struct ieee80211if (scan_chan) { chan = scan_chan; channel_type =NL80211_CHAN_NO_HT ; - }else if (local->tmp_channel) { + }else if (local->tmp_channel && + local->oper_channel != local->tmp_channel) { chan = scan_chan = local->tmp_channel; channel_type = local->tmp_channel_type; }else {
PATCH 15/223 mac80211: Fix signal strength average initialization for CQM events
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Jouni Malinen <[email protected]>
commit 3ba06c6fbd651ed3377e584026d1c112b492cc8b upstream.
The ave_beacon_signal value uses 1/16 dB unit and as such, must be initialized with the signal level of the first Beacon frame multiplied by 16. This fixes an issue where the initial CQM events are reported incorrectly with a burst of events while the running average approaches the correct value after the incorrect initialization. This could cause user space -based roaming decision process to get quite confused at the moment when we would like to go through authentication and DHCP.
--- net/mac80211/mlme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/mlme.c +1 -1
@@ -1488,7 +1488,7 @@ static void ieee80211_rx_mgmt_beacon(str ifmgd->last_beacon_signal = rx_status->signal;if (ifmgd->flags &IEEE80211_STA_RESET_SIGNAL_AVE ) { ifmgd->flags &= ~IEEE80211_STA_RESET_SIGNAL_AVE ; - ifmgd->ave_beacon_signal = rx_status->signal; + ifmgd->ave_beacon_signal = rx_status->signal *16 ; ifmgd->last_cqm_event_signal =0 ; }else { ifmgd->ave_beacon_signal =
PATCH 17/223 mac80211: reset connection idle when going offchannel
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Luis R. Rodriguez <[email protected]>
commit 4730d5977f3e12b828d354f7752cffd94bdf39e5 upstream.
When we go offchannel mac80211 currently leaves alive the connection idle monitor. This should be instead postponed until we come back to our home channel, otherwise by the time we get back to the home channel we could be triggering unecesary probe requests. For APs that do not respond to unicast probe requests (Nexus One is a simple example) this means we essentially get disconnected after the probes fails.
This patch has stable fixes for kernels [2.6.35+]
--- net/mac80211/offchannel.c | 5 +++++ 1 file changed, 5 insertions(+)
net/mac80211/offchannel.c +5 -0
@@ -22,12 +22,15 @@static void ieee80211_offchannel_ps_enable (struct ieee80211_sub_if_data *sdata) {struct ieee80211_local *local = sdata->local; +struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; local->offchannel_ps_enabled = false;/* FIXME: what to do when local->pspolling is true? */ del_timer_sync (&local->dynamic_ps_timer); +del_timer_sync (&ifmgd->conn_mon_timer); +cancel_work_sync (&local->dynamic_ps_enable_work);if (local->hw.conf.flags &IEEE80211_CONF_PS ) {
@@ -85,6 +88,8 @@ static void ieee80211_offchannel_ps_disamod_timer (&local->dynamic_ps_timer, jiffies +msecs_to_jiffies (local->hw.conf.dynamic_ps_timeout)); } + +ieee80211_sta_reset_conn_monitor (sdata); }void ieee80211_offchannel_stop_beaconing (struct ieee80211_local *local)
PATCH 16/223 mac80211: add helper for reseting the connection monitor
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Luis R. Rodriguez <[email protected]>
commit be099e82e9cf6d5d65d044e9ef6fc8bee3c7a113 upstream.
This will be used in another place later. The connection monitor was added as of 2.6.35 so these fixes will be applicable to >= 2.6.35.
--- net/mac80211/ieee80211_i.h | 1 + net/mac80211/mlme.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-)
net/mac80211/ieee80211_i.h +1 -0
@@ -1002,6 +1002,7 @@ void ieee80211_sta_process_chanswitch(st u64 timestamp);void ieee80211_sta_quiesce (struct ieee80211_sub_if_data *sdata);void ieee80211_sta_restart (struct ieee80211_sub_if_data *sdata); +void ieee80211_sta_reset_conn_monitor (struct ieee80211_sub_if_data *sdata);/* IBSS code */ void ieee80211_ibss_notify_scan_completed (struct ieee80211_local *local);
net/mac80211/mlme.c +10 -5
@@ -118,6 +118,15 @@ static void mod_beacon_timer(struct ieee round_jiffies_up(jiffies + IEEE80211_BEACON_LOSS_TIME)); } +void ieee80211_sta_reset_conn_monitor (struct ieee80211_sub_if_data *sdata) +{ +if (sdata->local->hw.flags &IEEE80211_HW_CONNECTION_MONITOR ) +return ; + +mod_timer (&sdata->u.mgd.conn_mon_timer, +round_jiffies_up (jiffies +IEEE80211_CONNECTION_IDLE_TIME )); +} +static int ecw2cw (int ecw) {return (1 << ecw) -1 ;
@@ -954,11 +963,7 @@ void ieee80211_sta_rx_notify(struct ieeeif (is_multicast_ether_addr (hdr->addr1))return ; -if (sdata->local->hw.flags &IEEE80211_HW_CONNECTION_MONITOR ) -return ; - -mod_timer (&sdata->u.mgd.conn_mon_timer, -round_jiffies_up (jiffies +IEEE80211_CONNECTION_IDLE_TIME )); +ieee80211_sta_reset_conn_monitor (sdata); }static void ieee80211_mgd_probe_ap_send (struct ieee80211_sub_if_data *sdata)
cover 2.6.35.10 longterm review
This is the start of the longterm review cycle for the 2.6.35.10 release. There are a large number of patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let us know. If anyone is a maintainer of the proper subsystem, and wants to add a Signed-off-by: line to the patch, please respond with it.
Reponses should be made within 48 hours.
Makefile | 2 +- arch/arm/include/asm/assembler.h | 2 +- arch/arm/lib/findbit.S | 6 +- arch/arm/mm/fault-armv.c | 28 +++- arch/arm/plat-omap/dma.c | 50 ++++- arch/arm/plat-omap/include/plat/dma.h | 4 + arch/microblaze/Makefile | 8 +- arch/powerpc/mm/hash_utils_64.c | 2 +- arch/s390/kernel/nmi.c | 10 +- arch/s390/kernel/vtime.c | 19 ++ arch/s390/lib/delay.c | 14 +- arch/sh/include/asm/syscalls_32.h | 4 +- arch/um/drivers/line.c | 5 +- arch/um/kernel/uml.lds.S | 2 +- arch/um/os-Linux/time.c | 2 +- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 1 + arch/x86/kernel/hw_breakpoint.c | 4 + arch/x86/kvm/svm.c | 2 +- arch/x86/kvm/vmx.c | 4 +- arch/x86/kvm/x86.c | 16 +- arch/x86/xen/enlighten.c | 4 - block/blk-map.c | 2 + block/blk-settings.c | 2 +- block/genhd.c | 6 +- block/scsi_ioctl.c | 34 ++- drivers/acpi/battery.c | 38 +++- drivers/acpi/debug.c | 2 +- drivers/ata/libata-scsi.c | 5 +- drivers/ata/sata_via.c | 9 +- drivers/block/pktcdvd.c | 2 +- drivers/char/agp/intel-agp.c | 1 + drivers/char/agp/intel-gtt.c | 63 +++--- drivers/char/hpet.c | 17 ++ drivers/char/ipmi/ipmi_si_intf.c | 30 ++- drivers/char/tty_buffer.c | 14 +- drivers/char/tty_io.c | 13 +- drivers/char/tty_ldisc.c | 51 ++++- drivers/char/vt_ioctl.c | 11 +- drivers/crypto/padlock-aes.c | 2 +- drivers/firewire/ohci.c | 64 ++++-- drivers/gpio/cs5535-gpio.c | 16 ++- drivers/gpu/drm/i915/i915_dma.c | 3 + drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_display.c | 7 + drivers/gpu/drm/i915/intel_overlay.c | 8 + drivers/gpu/drm/i915/intel_sdvo.c | 8 +- drivers/gpu/drm/radeon/r100.c | 6 + drivers/gpu/drm/radeon/r100_track.h | 1 + drivers/gpu/drm/radeon/r200.c | 2 + drivers/gpu/drm/radeon/r600.c | 7 +- drivers/gpu/drm/radeon/r600_blit_kms.c | 8 +- drivers/gpu/drm/radeon/r600_reg.h | 1 + drivers/gpu/drm/radeon/radeon_atombios.c | 8 + drivers/gpu/drm/radeon/radeon_bios.c | 13 +- drivers/gpu/drm/radeon/radeon_connectors.c | 34 +++ drivers/gpu/drm/radeon/radeon_encoders.c | 36 +++- drivers/gpu/drm/radeon/radeon_i2c.c | 1 + drivers/gpu/drm/radeon/radeon_object.c | 4 +- drivers/gpu/drm/radeon/radeon_reg.h | 1 + drivers/gpu/drm/radeon/rv770.c | 9 +- drivers/hid/hid-egalax.c | 16 +- drivers/hid/usbhid/hid-quirks.c | 1 - drivers/hwmon/lm85.c | 1 + drivers/i2c/busses/i2c-pca-platform.c | 2 +- drivers/input/serio/i8042-x86ia64io.h | 7 + drivers/isdn/gigaset/bas-gigaset.c | 89 +++----- drivers/isdn/gigaset/isocdata.c | 8 +- drivers/leds/leds-ss4200.c | 1 + drivers/md/md.c | 4 +- drivers/md/raid1.c | 1 + drivers/media/video/cx23885/cx23885-core.c | 1 + drivers/media/video/gspca/sonixj.c | 3 +- drivers/media/video/hdpvr/hdpvr-video.c | 1 + drivers/media/video/saa7134/saa7134-cards.c | 24 +- drivers/misc/ad525x_dpot-spi.c | 4 +- drivers/misc/sgi-xp/xpc_partition.c | 25 ++- drivers/mmc/core/core.c | 2 +- drivers/net/e1000/e1000_main.c | 12 +- drivers/net/jme.c | 22 ++- drivers/net/pcmcia/pcnet_cs.c | 1 + drivers/net/r8169.c | 14 +- drivers/net/usb/usbnet.c | 11 + drivers/net/wireless/b43/sdio.c | 3 + drivers/oprofile/timer_int.c | 13 + drivers/pci/pci-sysfs.c | 22 ++- drivers/pci/pci.h | 7 +- drivers/pci/proc.c | 2 +- drivers/pcmcia/soc_common.c | 1 + drivers/platform/x86/wmi.c | 2 +- drivers/pnp/pnpacpi/core.c | 29 ++- drivers/power/olpc_battery.c | 8 +- drivers/ssb/b43_pci_bridge.c | 1 + drivers/staging/asus_oled/asus_oled.c | 8 +- drivers/staging/batman-adv/soft-interface.c | 4 + drivers/staging/frontier/tranzport.c | 2 +- drivers/staging/iio/accel/adis16220_core.c | 2 +- drivers/staging/line6/control.c | 204 +++++++++--------- drivers/staging/line6/midi.c | 4 +- drivers/staging/line6/pod.c | 32 ++-- drivers/staging/line6/toneport.c | 4 +- drivers/staging/line6/variax.c | 12 +- drivers/staging/rt2860/usb_main_dev.c | 2 + drivers/staging/rtl8187se/r8185b_init.c | 30 ++- drivers/staging/samsung-laptop/samsung-laptop.c | 2 +- drivers/staging/udlfb/udlfb.c | 2 +- drivers/usb/atm/ueagle-atm.c | 7 +- drivers/usb/core/devio.c | 7 +- drivers/usb/gadget/atmel_usba_udc.c | 2 +- drivers/usb/host/ehci-hcd.c | 10 +- drivers/usb/host/xhci-hub.c | 7 + drivers/usb/host/xhci-mem.c | 168 ++++++++++++++- drivers/usb/host/xhci.c | 18 ++ drivers/usb/host/xhci.h | 32 +++ drivers/usb/misc/cypress_cy7c63.c | 6 +- drivers/usb/misc/iowarrior.c | 1 + drivers/usb/misc/sisusbvga/sisusb.c | 1 + drivers/usb/misc/trancevibrator.c | 2 +- drivers/usb/misc/usbled.c | 2 +- drivers/usb/misc/usbsevseg.c | 10 +- drivers/usb/musb/musb_core.c | 1 - drivers/usb/serial/ftdi_sio.c | 4 + drivers/usb/serial/ftdi_sio_ids.h | 11 + drivers/usb/serial/option.c | 2 +- drivers/usb/serial/usb-serial.c | 3 + drivers/usb/storage/sierra_ms.c | 2 +- drivers/video/backlight/backlight.c | 12 +- drivers/video/via/accel.c | 7 +- drivers/video/via/via_i2c.c | 27 ++- drivers/xen/events.c | 2 +- fs/bio.c | 23 ++- fs/cifs/inode.c | 12 +- fs/compat.c | 28 ++- fs/ecryptfs/inode.c | 11 +- fs/exec.c | 36 +++- fs/fuse/file.c | 10 + fs/hostfs/hostfs.h | 3 +- fs/hostfs/hostfs_kern.c | 2 +- fs/hostfs/hostfs_user.c | 9 +- fs/nfs/file.c | 17 +- fs/nfs/nfs4proc.c | 9 +- fs/nfs/nfs4state.c | 17 +- fs/pipe.c | 14 +- fs/reiserfs/ioctl.c | 7 +- fs/reiserfs/xattr_acl.c | 6 +- fs/splice.c | 24 +-- include/linux/binfmts.h | 5 + include/linux/blkdev.h | 4 +- include/linux/filter.h | 48 ++++ include/linux/gfp.h | 4 +- include/linux/netfilter.h | 2 +- include/linux/pci_ids.h | 1 + include/linux/perf_event.h | 1 + include/linux/pipe_fs_i.h | 1 + include/linux/radix-tree.h | 36 ++-- include/linux/tty.h | 1 + include/net/mac80211.h | 16 ++ ipc/compat.c | 6 + ipc/compat_mq.c | 5 + ipc/shm.c | 1 + kernel/exit.c | 9 + kernel/irq/proc.c | 2 +- kernel/latencytop.c | 17 +- kernel/perf_event.c | 22 ++- kernel/power/hibernate.c | 22 +- kernel/power/suspend.c | 5 +- kernel/power/user.c | 2 + kernel/sched.c | 12 + lib/percpu_counter.c | 1 + lib/radix-tree.c | 78 +++++-- mm/filemap.c | 29 +-- mm/internal.h | 2 +- mm/memory_hotplug.c | 2 +- mm/mempolicy.c | 2 +- mm/mprotect.c | 2 +- mm/nommu.c | 1 + mm/page_alloc.c | 21 +- net/can/bcm.c | 2 +- net/compat.c | 10 +- net/core/dev.c | 6 +- net/core/filter.c | 276 ++++++++++++++++------- net/core/iovec.c | 15 +- net/decnet/af_decnet.c | 2 + net/econet/af_econet.c | 91 ++++---- net/irda/iriap.c | 3 +- net/irda/parameters.c | 4 +- net/mac80211/agg-tx.c | 3 + net/mac80211/cfg.c | 5 +- net/mac80211/ibss.c | 1 + net/mac80211/ieee80211_i.h | 2 + net/mac80211/main.c | 3 +- net/mac80211/mlme.c | 48 +++-- net/mac80211/offchannel.c | 7 + net/mac80211/rate.c | 3 + net/mac80211/status.c | 1 + net/netfilter/nf_conntrack_core.c | 3 +- net/rds/rdma.c | 2 +- net/socket.c | 4 + net/sunrpc/clnt.c | 2 +- net/wireless/chan.c | 51 +++++ net/wireless/nl80211.c | 11 +- net/wireless/reg.c | 2 +- net/wireless/scan.c | 12 +- net/x25/x25_facilities.c | 20 +- net/x25/x25_in.c | 2 + sound/core/oss/mixer_oss.c | 12 +- sound/core/oss/pcm_oss.c | 19 +- sound/pci/hda/hda_intel.c | 16 +- sound/pci/hda/patch_ca0110.c | 2 +- sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 51 ++++- sound/pci/hda/patch_sigmatel.c | 16 ++ sound/pci/intel8x0.c | 6 + sound/soc/codecs/wm8900.c | 6 - sound/soc/codecs/wm8961.c | 4 +- 214 files changed, 2152 insertions(+), 881 deletions(-)
PATCH 2/223 block: Fix race during disk initialization
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Jan Kara <[email protected]>
commit 01ea50638bc04ca5259f5711fcdedefcdde1cf43 upstream.
When a new disk is being discovered, add_disk() first ties the bdev to gendisk (via register_disk()->blkdev_get()) and only after that calls bdi_register_bdev(). Because register_disk() also creates disk's kobject, it can happen that userspace manages to open and modify the device's data (or inode) before its BDI is properly initialized leading to a warning in __mark_inode_dirty().
Fix the problem by registering BDI early enough.
This patch addresses https://bugzilla.kernel.org/show_bug.cgi?id=16312
--- block/genhd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
block/genhd.c +4 -2
@@ -541,13 +541,15 @@ void add_disk(struct gendisk *disk) disk->major =MAJOR (devt); disk->first_minor =MINOR (devt); +/* Register BDI before referencing it from bdev */ + bdi = &disk->queue->backing_dev_info; +bdi_register_dev (bdi,disk_devt (disk)); +blk_register_region (disk_devt (disk), disk->minors,NULL , exact_match, exact_lock, disk);register_disk (disk);blk_register_queue (disk); - bdi = &disk->queue->backing_dev_info; -bdi_register_dev (bdi,disk_devt (disk)); retval =sysfs_create_link (&disk_to_dev (disk)->kobj, &bdi->dev->kobj,"bdi" );WARN_ON (retval);
PATCH 18/223 mac80211: make the beacon monitor available externally
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Luis R. Rodriguez <[email protected]>
commit d3a910a8e4e846b9a767d35483f4dc7c6de7af82 upstream.
This will be used by other components next. The beacon monitor was added as of 2.6.34 so these fixes are applicable only to kernels >= 2.6.34.
--- net/mac80211/ieee80211_i.h | 1 + net/mac80211/mlme.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-)
net/mac80211/ieee80211_i.h +1 -0
@@ -1003,6 +1003,7 @@ void ieee80211_sta_process_chanswitch(stvoid ieee80211_sta_quiesce (struct ieee80211_sub_if_data *sdata);void ieee80211_sta_restart (struct ieee80211_sub_if_data *sdata);void ieee80211_sta_reset_conn_monitor (struct ieee80211_sub_if_data *sdata); +void ieee80211_sta_reset_beacon_monitor (struct ieee80211_sub_if_data *sdata);/* IBSS code */ void ieee80211_ibss_notify_scan_completed (struct ieee80211_local *local);
net/mac80211/mlme.c +4 -4
@@ -109,7 +109,7 @@ static void run_again(struct ieee80211_imod_timer (&ifmgd->timer, timeout); } -static void mod_beacon_timer (struct ieee80211_sub_if_data *sdata) +void ieee80211_sta_reset_beacon_monitor (struct ieee80211_sub_if_data *sdata) {if (sdata->local->hw.flags &IEEE80211_HW_BEACON_FILTER )return ;
@@ -1315,7 +1315,7 @@ static bool ieee80211_assoc_success(stru* Also start the timer that will detect beacon loss. */ ieee80211_sta_rx_notify (sdata, (struct ieee80211_hdr *)mgmt); -mod_beacon_timer (sdata); +ieee80211_sta_reset_beacon_monitor (sdata);return true; }
@@ -1418,7 +1418,7 @@ static void ieee80211_rx_mgmt_probe_resp* we have or will be receiving any beacons or data, so let's * schedule the timers again, just in case. */ -mod_beacon_timer (sdata); +ieee80211_sta_reset_beacon_monitor (sdata); mod_timer(&ifmgd->conn_mon_timer, round_jiffies_up(jiffies +
@@ -1541,7 +1541,7 @@ static void ieee80211_rx_mgmt_beacon(str* Push the beacon loss detection into the future since * we are processing a beacon from the AP just now. */ -mod_beacon_timer (sdata); +ieee80211_sta_reset_beacon_monitor (sdata); ncrc =crc32_be (0 , (void *)&mgmt->u.beacon.beacon_int,4 ); ncrc = ieee802_11_parse_elems_crc(mgmt->u.beacon.variable,
PATCH 19/223 mac80211: send last 3/5 probe requests as unicast
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Luis R. Rodriguez <[email protected]>
commit f01a067d9e4598c71e3c9ee3a84859d2e8af4f8e upstream.
Some buggy APs do not respond to unicast probe requests or send unicast probe requests very delayed so in the worst case we should try to send broadcast probe requests, otherwise we can get disconnected from these APs.
Even if drivers do not have filters to disregard probe responses from foreign APs mac80211 will only process probe responses from our associated AP for re-arming connection monitoring.
We need to do this since the beacon monitor does not push back the connection monitor by design so even if we are getting beacons from these type of APs our connection monitor currently relies heavily on the way the probe requests are received on the AP. An example of an AP affected by this is the Nexus One, but this has also been observed with random APs.
We can probably optimize this later by using null funcs instead of probe requests.
For more details refer to:
http://code.google.com/p/chromium-os/issues/detail?id=5715
This patch has fixes for stable kernels [2.6.35+].
--- net/mac80211/mlme.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
net/mac80211/mlme.c +11 -2
@@ -970,10 +970,19 @@ static void ieee80211_mgd_probe_ap_send( {struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;const u8 *ssid; +u8 *dst = ifmgd->associated->bssid; +u8 unicast_limit =max (1 ,IEEE80211_MAX_PROBE_TRIES -3 ); + +/* +* Try sending broadcast probe requests for the last three +* probe requests after the first ones failed since some +* buggy APs only support broadcast probe requests. +*/ +if (ifmgd->probe_send_count >= unicast_limit) + dst =NULL ; ssid =ieee80211_bss_get_ie (ifmgd->associated,WLAN_EID_SSID ); -ieee80211_send_probe_req (sdata, ifmgd->associated->bssid, - ssid +2 , ssid[1 ],NULL ,0 ); +ieee80211_send_probe_req (sdata, dst, ssid +2 , ssid[1 ],NULL ,0 ); ifmgd->probe_send_count++; ifmgd->probe_timeout = jiffies +IEEE80211_PROBE_WAIT ;
PATCH 20/223 mac80211: disable beacon monitor while going offchannel
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Luis R. Rodriguez <[email protected]>
commit 3bc3c0d748402e8c1f31b8569f5924d25d7b8e30 upstream.
The beacon monitor should be disabled when going off channel to prevent spurious warnings and triggering connection deterioration work such as sending probe requests. Re-enable the beacon monitor once we come back to the home channel.
This patch has fixes for stable kernels [2.6.34+].
--- net/mac80211/offchannel.c | 2 ++ 1 file changed, 2 insertions(+)
net/mac80211/offchannel.c +2 -0
@@ -29,6 +29,7 @@ static void ieee80211_offchannel_ps_enab/* FIXME: what to do when local->pspolling is true? */ del_timer_sync (&local->dynamic_ps_timer); +del_timer_sync (&ifmgd->bcn_mon_timer);del_timer_sync (&ifmgd->conn_mon_timer);cancel_work_sync (&local->dynamic_ps_enable_work);
@@ -89,6 +90,7 @@ static void ieee80211_offchannel_ps_disa msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout)); } +ieee80211_sta_reset_beacon_monitor (sdata);ieee80211_sta_reset_conn_monitor (sdata); }
PATCH 24/223 mac80211: Fix ibss station got expired immediately
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Rajkumar Manoharan <[email protected]>
commit c8716d9dc13c7f6ee92f2bfc6cc3b723b417bff8 upstream.
Station addition in ieee80211_ibss_rx_queued_mgmt is not updating sta->last_rx which is causing station expiry in ieee80211_ibss_work path. So sta addition and deletion happens repeatedly.
--- net/mac80211/ibss.c | 1 + 1 file changed, 1 insertion(+)
net/mac80211/ibss.c +1 -0
@@ -427,6 +427,7 @@ struct sta_info *ieee80211_ibss_add_sta(if (!sta)return NULL ; + sta->last_rx = jiffies;set_sta_flags (sta,WLAN_STA_AUTHORIZED );/* make sure mandatory rates are always added */
PATCH 44/223 drm/radeon/kms: MC vram map needs to be >= pci aperture size
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit b7d8cce5b558e0c0aa6898c9865356481598b46d upstream.
The vram map in the radeon memory controller needs to be
Quoted 1 line
= the pci aperture size. Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=28402
The problematic cards in the above bug have 64 MB of vram, but the pci aperture is 128 MB and the MC vram map was only 64 MB. This can lead to hangs.
--- drivers/gpu/drm/radeon/r100.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/radeon/r100.c +3 -0
@@ -2321,6 +2321,9 @@ void r100_vram_init_sizes(struct radeon_/* Fix for RN50, M6, M7 with 8/16/32(??) MBs of VRAM - * Novell bug 204882 + along with lots of ubuntu ones */ +if (rdev->mc.aper_size > config_aper_size) + config_aper_size = rdev->mc.aper_size; +if (config_aper_size > rdev->mc.real_vram_size) rdev->mc.mc_vram_size = config_aper_size;else
PATCH 45/223 drm/radeon/kms: properly compute group_size on 6xx/7xx
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 881fe6c1d06bf49f4ab7aef212cdaf66bd059614 upstream.
Needed for tiled surfaces.
--- drivers/gpu/drm/radeon/r600.c | 7 +++++-- drivers/gpu/drm/radeon/rv770.c | 9 +++++---- 2 files changed, 10 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/r600.c +5 -2
@@ -1592,8 +1592,11 @@ void r600_gpu_init(struct radeon_device rdev->config.r600.tiling_npipes = rdev->config.r600.max_tile_pipes; rdev->config.r600.tiling_nbanks =4 << ((ramcfg &NOOFBANK_MASK ) >>NOOFBANK_SHIFT ); tiling_config |=BANK_TILING ((ramcfg &NOOFBANK_MASK ) >>NOOFBANK_SHIFT ); - tiling_config |=GROUP_SIZE (0 ); - rdev->config.r600.tiling_group_size =256 ; + tiling_config |=GROUP_SIZE ((ramcfg &BURSTLENGTH_MASK ) >>BURSTLENGTH_SHIFT ); +if ((ramcfg &BURSTLENGTH_MASK ) >>BURSTLENGTH_SHIFT ) + rdev->config.r600.tiling_group_size =512 ; +else + rdev->config.r600.tiling_group_size =256 ; tmp = (ramcfg &NOOFROWS_MASK ) >>NOOFROWS_SHIFT ;if (tmp >3 ) { tiling_config |=ROW_TILING (3 );
drivers/gpu/drm/radeon/rv770.c +5 -4
@@ -627,10 +627,11 @@ static void rv770_gpu_init(struct radeonelse gb_tiling_config |=BANK_TILING ((mc_arb_ramcfg &NOOFBANK_MASK ) >>NOOFBANK_SHIFT ); rdev->config.rv770.tiling_nbanks =4 << ((gb_tiling_config >>4 ) &0x3 ); - - gb_tiling_config |=GROUP_SIZE (0 ); - rdev->config.rv770.tiling_group_size =256 ; - + gb_tiling_config |=GROUP_SIZE ((mc_arb_ramcfg &BURSTLENGTH_MASK ) >>BURSTLENGTH_SHIFT ); +if ((mc_arb_ramcfg &BURSTLENGTH_MASK ) >>BURSTLENGTH_SHIFT ) + rdev->config.rv770.tiling_group_size =512 ; +else + rdev->config.rv770.tiling_group_size =256 ;if (((mc_arb_ramcfg &NOOFROWS_MASK ) >>NOOFROWS_SHIFT ) >3 ) { gb_tiling_config |=ROW_TILING (3 ); gb_tiling_config |=SAMPLE_SPLIT (3 );
PATCH 49/223 drm/i915: diasable clock gating for the panel power sequencer
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Jesse Barnes <[email protected]>
commit 382b09362711d7d03272230a33767015a277926e upstream.
Needed on Ibex Peak and Cougar Point or the panel won't always come on.
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_display.c | 7 +++++++ 2 files changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -2709,6 +2709,9 @@#define FDI_RXB_CHICKEN 0xc2010#define FDI_RX_PHASE_SYNC_POINTER_ENABLE (1) +#define SOUTH_DSPCLK_GATE_D 0xc2020 +#define PCH_DPLSUNIT_CLOCK_GATE_DISABLE (1<<29) +/* CPU: FDI_TX */ #define FDI_TXA_CTL 0x60100#define FDI_TXB_CTL 0x61100
drivers/gpu/drm/i915/intel_display.c +7 -0
@@ -5416,6 +5416,13 @@ void intel_init_clock_gating(struct drm_I915_WRITE (PCH_DSPCLK_GATE_D , dspclk_gate);/* +* On Ibex Peak and Cougar Point, we need to disable clock +* gating for the panel power sequencer or it will fail to +* start up when no ports are active. +*/ +I915_WRITE (SOUTH_DSPCLK_GATE_D ,PCH_DPLSUNIT_CLOCK_GATE_DISABLE ); + +/* * According to the spec the following bits should be set in * order to enable memory self-refresh * The bit 22/21 of 0x42004
PATCH 50/223 drm/i915/overlay: Ensure that the reg_bo is in the GTT prior to writing.
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Chris Wilson <[email protected]>
commit 0ddc1289f3ffd779779ddd3922f26ae7d0a21604 upstream.
Just makes sure that writes are not being aliased by the CPU cache and do make it out to main memory.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=24977
--- drivers/gpu/drm/i915/intel_overlay.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_overlay.c +8 -0
@@ -1364,6 +1364,12 @@ void intel_setup_overlay(struct drm_devi goto out_free_bo; } overlay->flip_addr = overlay->reg_bo->gtt_offset; + + ret =i915_gem_object_set_to_gtt_domain (reg_bo, true); +if (ret) { +DRM_ERROR ("failed to move overlay register bo into the GTT\n" ); + goto out_unpin_bo; + } }else { ret =i915_gem_attach_phys_object (dev, reg_bo,I915_GEM_PHYS_OVERLAY_REGS );
@@ -1395,6 +1401,8 @@ void intel_setup_overlay(struct drm_deviDRM_INFO ("initialized overlay support\n" );return ; +out_unpin_bo: +i915_gem_object_unpin (reg_bo); out_free_bo:drm_gem_object_unreference (reg_bo); out_free:
PATCH 60/223 hpet: fix unwanted interrupt due to stale irq status bit
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Clemens Ladisch <[email protected]>
commit 96e9694df446d1154ec2f4fdba8908588b9cba38 upstream.
Quoted 5 lines · Jaswinder Singh Rajput
By executing
Documentation/timers/hpet_example.cfor polling, I requested for 3 iterations but it seems iteration work for only 2 as first expired time is always very small.
Quoted 12 lines
# ./hpet_example poll /dev/hpet 10 3 -hpet: executing poll hpet_poll: info.hi_flags 0x0 hpet_poll: expired time = 0x13 hpet_poll: revents = 0x1 hpet_poll: data 0x1 hpet_poll: expired time = 0x1868c hpet_poll: revents = 0x1 hpet_poll: data 0x1 hpet_poll: expired time = 0x18645 hpet_poll: revents = 0x1 hpet_poll: data 0x1
Clearing the HPET interrupt enable bit disables interrupt generation but does not disable the timer, so the interrupt status bit will still be set when the timer elapses. If another interrupt arrives before the timer has been correctly programmed (due to some other device on the same interrupt line, or CONFIG_DEBUG_SHIRQ), this results in an extra unwanted interrupt event because the status bit is likely to be set from comparator matches that happened before the device was opened.
Therefore, we have to ensure that the interrupt status bit is and stays cleared until we actually program the timer.
--- drivers/char/hpet.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
drivers/char/hpet.c +15 -0
@@ -479,6 +479,21 @@ static int hpet_ioctl_ieon(struct hpet_dif (irq) {unsigned long irq_flags; +if (devp->hd_flags &HPET_SHARED_IRQ ) { +/* +* To prevent the interrupt handler from seeing an +* unwanted interrupt status bit, program the timer +* so that it will not fire in the near future ... +*/ +writel (readl (&timer->hpet_config) & ~Tn_TYPE_CNF_MASK, + &timer->hpet_config); +write_counter (read_counter (&hpet->hpet_mc), + &timer->hpet_compare); +/* ... and clear any left-over status. */ + isr =1 << (devp - devp->hd_hpets->hp_dev); +writel (isr, &hpet->hpet_isr); + } +sprintf (devp->hd_name,"hpet%d" , (int )(devp - hpetp->hp_dev)); irq_flags = devp->hd_flags &HPET_SHARED_IRQ ?IRQF_SHARED :IRQF_DISABLED ;
PATCH 59/223 Staging: line6: fix up some sysfs attribute permissions
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 2018845b6a169f75341f8e68ad1089cb6697cf24 and 2018845b6a169f75341f8e68ad1089cb6697cf24 upstream merged together as it had to be backported by hand.
They should not be writable by any user
--- drivers/staging/line6/control.c | 204 +++++++++++++++++++-------------------- drivers/staging/line6/midi.c | 4 drivers/staging/line6/pod.c | 32 +++--- drivers/staging/line6/toneport.c | 4 drivers/staging/line6/variax.c | 12 +- 5 files changed, 128 insertions(+), 128 deletions(-)
drivers/staging/line6/control.c +102 -102
@@ -268,210 +268,210 @@ VARIAX_PARAM_R(float, mix2);VARIAX_PARAM_R (float, mix1);VARIAX_PARAM_R (int, pickup_wiring); -static DEVICE_ATTR(tweak, S_IWUGO | S_IRUGO, pod_get_tweak, pod_set_tweak); -static DEVICE_ATTR(wah_position, S_IWUGO | S_IRUGO, pod_get_wah_position, +static DEVICE_ATTR(tweak, S_IWUSR | S_IRUGO, pod_get_tweak, pod_set_tweak); +static DEVICE_ATTR(wah_position, S_IWUSR | S_IRUGO, pod_get_wah_position, pod_set_wah_position); -static DEVICE_ATTR(compression_gain, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(compression_gain, S_IWUSR | S_IRUGO, pod_get_compression_gain, pod_set_compression_gain); -static DEVICE_ATTR(vol_pedal_position, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(vol_pedal_position, S_IWUSR | S_IRUGO, pod_get_vol_pedal_position, pod_set_vol_pedal_position); -static DEVICE_ATTR(compression_threshold, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(compression_threshold, S_IWUSR | S_IRUGO, pod_get_compression_threshold, pod_set_compression_threshold); -static DEVICE_ATTR(pan, S_IWUGO | S_IRUGO, pod_get_pan, pod_set_pan); -static DEVICE_ATTR(amp_model_setup, S_IWUGO | S_IRUGO, pod_get_amp_model_setup, +static DEVICE_ATTR(pan, S_IWUSR | S_IRUGO, pod_get_pan, pod_set_pan); +static DEVICE_ATTR(amp_model_setup, S_IWUSR | S_IRUGO, pod_get_amp_model_setup, pod_set_amp_model_setup); -static DEVICE_ATTR(amp_model, S_IWUGO | S_IRUGO, pod_get_amp_model, +static DEVICE_ATTR(amp_model, S_IWUSR | S_IRUGO, pod_get_amp_model, pod_set_amp_model); -static DEVICE_ATTR(drive, S_IWUGO | S_IRUGO, pod_get_drive, pod_set_drive); -static DEVICE_ATTR(bass, S_IWUGO | S_IRUGO, pod_get_bass, pod_set_bass); -static DEVICE_ATTR(mid, S_IWUGO | S_IRUGO, pod_get_mid, pod_set_mid); -static DEVICE_ATTR(lowmid, S_IWUGO | S_IRUGO, pod_get_lowmid, pod_set_lowmid); -static DEVICE_ATTR(treble, S_IWUGO | S_IRUGO, pod_get_treble, pod_set_treble); -static DEVICE_ATTR(highmid, S_IWUGO | S_IRUGO, pod_get_highmid, +static DEVICE_ATTR(drive, S_IWUSR | S_IRUGO, pod_get_drive, pod_set_drive); +static DEVICE_ATTR(bass, S_IWUSR | S_IRUGO, pod_get_bass, pod_set_bass); +static DEVICE_ATTR(mid, S_IWUSR | S_IRUGO, pod_get_mid, pod_set_mid); +static DEVICE_ATTR(lowmid, S_IWUSR | S_IRUGO, pod_get_lowmid, pod_set_lowmid); +static DEVICE_ATTR(treble, S_IWUSR | S_IRUGO, pod_get_treble, pod_set_treble); +static DEVICE_ATTR(highmid, S_IWUSR | S_IRUGO, pod_get_highmid, pod_set_highmid); -static DEVICE_ATTR(chan_vol, S_IWUGO | S_IRUGO, pod_get_chan_vol, +static DEVICE_ATTR(chan_vol, S_IWUSR | S_IRUGO, pod_get_chan_vol, pod_set_chan_vol); -static DEVICE_ATTR(reverb_mix, S_IWUGO | S_IRUGO, pod_get_reverb_mix, +static DEVICE_ATTR(reverb_mix, S_IWUSR | S_IRUGO, pod_get_reverb_mix, pod_set_reverb_mix); -static DEVICE_ATTR(effect_setup, S_IWUGO | S_IRUGO, pod_get_effect_setup, +static DEVICE_ATTR(effect_setup, S_IWUSR | S_IRUGO, pod_get_effect_setup, pod_set_effect_setup); -static DEVICE_ATTR(band_1_frequency, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(band_1_frequency, S_IWUSR | S_IRUGO, pod_get_band_1_frequency, pod_set_band_1_frequency); -static DEVICE_ATTR(presence, S_IWUGO | S_IRUGO, pod_get_presence, +static DEVICE_ATTR(presence, S_IWUSR | S_IRUGO, pod_get_presence, pod_set_presence); -static DEVICE_ATTR2(treble__bass, treble, S_IWUGO | S_IRUGO, +static DEVICE_ATTR2(treble__bass, treble, S_IWUSR | S_IRUGO, pod_get_treble__bass, pod_set_treble__bass); -static DEVICE_ATTR(noise_gate_enable, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(noise_gate_enable, S_IWUSR | S_IRUGO, pod_get_noise_gate_enable, pod_set_noise_gate_enable); -static DEVICE_ATTR(gate_threshold, S_IWUGO | S_IRUGO, pod_get_gate_threshold, +static DEVICE_ATTR(gate_threshold, S_IWUSR | S_IRUGO, pod_get_gate_threshold, pod_set_gate_threshold); -static DEVICE_ATTR(gate_decay_time, S_IWUGO | S_IRUGO, pod_get_gate_decay_time, +static DEVICE_ATTR(gate_decay_time, S_IWUSR | S_IRUGO, pod_get_gate_decay_time, pod_set_gate_decay_time); -static DEVICE_ATTR(stomp_enable, S_IWUGO | S_IRUGO, pod_get_stomp_enable, +static DEVICE_ATTR(stomp_enable, S_IWUSR | S_IRUGO, pod_get_stomp_enable, pod_set_stomp_enable); -static DEVICE_ATTR(comp_enable, S_IWUGO | S_IRUGO, pod_get_comp_enable, +static DEVICE_ATTR(comp_enable, S_IWUSR | S_IRUGO, pod_get_comp_enable, pod_set_comp_enable); -static DEVICE_ATTR(stomp_time, S_IWUGO | S_IRUGO, pod_get_stomp_time, +static DEVICE_ATTR(stomp_time, S_IWUSR | S_IRUGO, pod_get_stomp_time, pod_set_stomp_time); -static DEVICE_ATTR(delay_enable, S_IWUGO | S_IRUGO, pod_get_delay_enable, +static DEVICE_ATTR(delay_enable, S_IWUSR | S_IRUGO, pod_get_delay_enable, pod_set_delay_enable); -static DEVICE_ATTR(mod_param_1, S_IWUGO | S_IRUGO, pod_get_mod_param_1, +static DEVICE_ATTR(mod_param_1, S_IWUSR | S_IRUGO, pod_get_mod_param_1, pod_set_mod_param_1); -static DEVICE_ATTR(delay_param_1, S_IWUGO | S_IRUGO, pod_get_delay_param_1, +static DEVICE_ATTR(delay_param_1, S_IWUSR | S_IRUGO, pod_get_delay_param_1, pod_set_delay_param_1); -static DEVICE_ATTR(delay_param_1_note_value, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(delay_param_1_note_value, S_IWUSR | S_IRUGO, pod_get_delay_param_1_note_value, pod_set_delay_param_1_note_value); -static DEVICE_ATTR2(band_2_frequency__bass, band_2_frequency, S_IWUGO | S_IRUGO, +static DEVICE_ATTR2(band_2_frequency__bass, band_2_frequency, S_IWUSR | S_IRUGO, pod_get_band_2_frequency__bass, pod_set_band_2_frequency__bass); -static DEVICE_ATTR(delay_param_2, S_IWUGO | S_IRUGO, pod_get_delay_param_2, +static DEVICE_ATTR(delay_param_2, S_IWUSR | S_IRUGO, pod_get_delay_param_2, pod_set_delay_param_2); -static DEVICE_ATTR(delay_volume_mix, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(delay_volume_mix, S_IWUSR | S_IRUGO, pod_get_delay_volume_mix, pod_set_delay_volume_mix); -static DEVICE_ATTR(delay_param_3, S_IWUGO | S_IRUGO, pod_get_delay_param_3, +static DEVICE_ATTR(delay_param_3, S_IWUSR | S_IRUGO, pod_get_delay_param_3, pod_set_delay_param_3); -static DEVICE_ATTR(reverb_enable, S_IWUGO | S_IRUGO, pod_get_reverb_enable, +static DEVICE_ATTR(reverb_enable, S_IWUSR | S_IRUGO, pod_get_reverb_enable, pod_set_reverb_enable); -static DEVICE_ATTR(reverb_type, S_IWUGO | S_IRUGO, pod_get_reverb_type, +static DEVICE_ATTR(reverb_type, S_IWUSR | S_IRUGO, pod_get_reverb_type, pod_set_reverb_type); -static DEVICE_ATTR(reverb_decay, S_IWUGO | S_IRUGO, pod_get_reverb_decay, +static DEVICE_ATTR(reverb_decay, S_IWUSR | S_IRUGO, pod_get_reverb_decay, pod_set_reverb_decay); -static DEVICE_ATTR(reverb_tone, S_IWUGO | S_IRUGO, pod_get_reverb_tone, +static DEVICE_ATTR(reverb_tone, S_IWUSR | S_IRUGO, pod_get_reverb_tone, pod_set_reverb_tone); -static DEVICE_ATTR(reverb_pre_delay, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(reverb_pre_delay, S_IWUSR | S_IRUGO, pod_get_reverb_pre_delay, pod_set_reverb_pre_delay); -static DEVICE_ATTR(reverb_pre_post, S_IWUGO | S_IRUGO, pod_get_reverb_pre_post, +static DEVICE_ATTR(reverb_pre_post, S_IWUSR | S_IRUGO, pod_get_reverb_pre_post, pod_set_reverb_pre_post); -static DEVICE_ATTR(band_2_frequency, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(band_2_frequency, S_IWUSR | S_IRUGO, pod_get_band_2_frequency, pod_set_band_2_frequency); -static DEVICE_ATTR2(band_3_frequency__bass, band_3_frequency, S_IWUGO | S_IRUGO, +static DEVICE_ATTR2(band_3_frequency__bass, band_3_frequency, S_IWUSR | S_IRUGO, pod_get_band_3_frequency__bass, pod_set_band_3_frequency__bass); -static DEVICE_ATTR(wah_enable, S_IWUGO | S_IRUGO, pod_get_wah_enable, +static DEVICE_ATTR(wah_enable, S_IWUSR | S_IRUGO, pod_get_wah_enable, pod_set_wah_enable); -static DEVICE_ATTR(modulation_lo_cut, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(modulation_lo_cut, S_IWUSR | S_IRUGO, pod_get_modulation_lo_cut, pod_set_modulation_lo_cut); -static DEVICE_ATTR(delay_reverb_lo_cut, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(delay_reverb_lo_cut, S_IWUSR | S_IRUGO, pod_get_delay_reverb_lo_cut, pod_set_delay_reverb_lo_cut); -static DEVICE_ATTR(volume_pedal_minimum, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(volume_pedal_minimum, S_IWUSR | S_IRUGO, pod_get_volume_pedal_minimum, pod_set_volume_pedal_minimum); -static DEVICE_ATTR(eq_pre_post, S_IWUGO | S_IRUGO, pod_get_eq_pre_post, +static DEVICE_ATTR(eq_pre_post, S_IWUSR | S_IRUGO, pod_get_eq_pre_post, pod_set_eq_pre_post); -static DEVICE_ATTR(volume_pre_post, S_IWUGO | S_IRUGO, pod_get_volume_pre_post, +static DEVICE_ATTR(volume_pre_post, S_IWUSR | S_IRUGO, pod_get_volume_pre_post, pod_set_volume_pre_post); -static DEVICE_ATTR(di_model, S_IWUGO | S_IRUGO, pod_get_di_model, +static DEVICE_ATTR(di_model, S_IWUSR | S_IRUGO, pod_get_di_model, pod_set_di_model); -static DEVICE_ATTR(di_delay, S_IWUGO | S_IRUGO, pod_get_di_delay, +static DEVICE_ATTR(di_delay, S_IWUSR | S_IRUGO, pod_get_di_delay, pod_set_di_delay); -static DEVICE_ATTR(mod_enable, S_IWUGO | S_IRUGO, pod_get_mod_enable, +static DEVICE_ATTR(mod_enable, S_IWUSR | S_IRUGO, pod_get_mod_enable, pod_set_mod_enable); -static DEVICE_ATTR(mod_param_1_note_value, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(mod_param_1_note_value, S_IWUSR | S_IRUGO, pod_get_mod_param_1_note_value, pod_set_mod_param_1_note_value); -static DEVICE_ATTR(mod_param_2, S_IWUGO | S_IRUGO, pod_get_mod_param_2, +static DEVICE_ATTR(mod_param_2, S_IWUSR | S_IRUGO, pod_get_mod_param_2, pod_set_mod_param_2); -static DEVICE_ATTR(mod_param_3, S_IWUGO | S_IRUGO, pod_get_mod_param_3, +static DEVICE_ATTR(mod_param_3, S_IWUSR | S_IRUGO, pod_get_mod_param_3, pod_set_mod_param_3); -static DEVICE_ATTR(mod_param_4, S_IWUGO | S_IRUGO, pod_get_mod_param_4, +static DEVICE_ATTR(mod_param_4, S_IWUSR | S_IRUGO, pod_get_mod_param_4, pod_set_mod_param_4); -static DEVICE_ATTR(mod_param_5, S_IWUGO | S_IRUGO, pod_get_mod_param_5, +static DEVICE_ATTR(mod_param_5, S_IWUSR | S_IRUGO, pod_get_mod_param_5, pod_set_mod_param_5); -static DEVICE_ATTR(mod_volume_mix, S_IWUGO | S_IRUGO, pod_get_mod_volume_mix, +static DEVICE_ATTR(mod_volume_mix, S_IWUSR | S_IRUGO, pod_get_mod_volume_mix, pod_set_mod_volume_mix); -static DEVICE_ATTR(mod_pre_post, S_IWUGO | S_IRUGO, pod_get_mod_pre_post, +static DEVICE_ATTR(mod_pre_post, S_IWUSR | S_IRUGO, pod_get_mod_pre_post, pod_set_mod_pre_post); -static DEVICE_ATTR(modulation_model, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(modulation_model, S_IWUSR | S_IRUGO, pod_get_modulation_model, pod_set_modulation_model); -static DEVICE_ATTR(band_3_frequency, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(band_3_frequency, S_IWUSR | S_IRUGO, pod_get_band_3_frequency, pod_set_band_3_frequency); -static DEVICE_ATTR2(band_4_frequency__bass, band_4_frequency, S_IWUGO | S_IRUGO, +static DEVICE_ATTR2(band_4_frequency__bass, band_4_frequency, S_IWUSR | S_IRUGO, pod_get_band_4_frequency__bass, pod_set_band_4_frequency__bass); -static DEVICE_ATTR(mod_param_1_double_precision, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(mod_param_1_double_precision, S_IWUSR | S_IRUGO, pod_get_mod_param_1_double_precision, pod_set_mod_param_1_double_precision); -static DEVICE_ATTR(delay_param_1_double_precision, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(delay_param_1_double_precision, S_IWUSR | S_IRUGO, pod_get_delay_param_1_double_precision, pod_set_delay_param_1_double_precision); -static DEVICE_ATTR(eq_enable, S_IWUGO | S_IRUGO, pod_get_eq_enable, +static DEVICE_ATTR(eq_enable, S_IWUSR | S_IRUGO, pod_get_eq_enable, pod_set_eq_enable); -static DEVICE_ATTR(tap, S_IWUGO | S_IRUGO, pod_get_tap, pod_set_tap); -static DEVICE_ATTR(volume_tweak_pedal_assign, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(tap, S_IWUSR | S_IRUGO, pod_get_tap, pod_set_tap); +static DEVICE_ATTR(volume_tweak_pedal_assign, S_IWUSR | S_IRUGO, pod_get_volume_tweak_pedal_assign, pod_set_volume_tweak_pedal_assign); -static DEVICE_ATTR(band_5_frequency, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(band_5_frequency, S_IWUSR | S_IRUGO, pod_get_band_5_frequency, pod_set_band_5_frequency); -static DEVICE_ATTR(tuner, S_IWUGO | S_IRUGO, pod_get_tuner, pod_set_tuner); -static DEVICE_ATTR(mic_selection, S_IWUGO | S_IRUGO, pod_get_mic_selection, +static DEVICE_ATTR(tuner, S_IWUSR | S_IRUGO, pod_get_tuner, pod_set_tuner); +static DEVICE_ATTR(mic_selection, S_IWUSR | S_IRUGO, pod_get_mic_selection, pod_set_mic_selection); -static DEVICE_ATTR(cabinet_model, S_IWUGO | S_IRUGO, pod_get_cabinet_model, +static DEVICE_ATTR(cabinet_model, S_IWUSR | S_IRUGO, pod_get_cabinet_model, pod_set_cabinet_model); -static DEVICE_ATTR(stomp_model, S_IWUGO | S_IRUGO, pod_get_stomp_model, +static DEVICE_ATTR(stomp_model, S_IWUSR | S_IRUGO, pod_get_stomp_model, pod_set_stomp_model); -static DEVICE_ATTR(roomlevel, S_IWUGO | S_IRUGO, pod_get_roomlevel, +static DEVICE_ATTR(roomlevel, S_IWUSR | S_IRUGO, pod_get_roomlevel, pod_set_roomlevel); -static DEVICE_ATTR(band_4_frequency, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(band_4_frequency, S_IWUSR | S_IRUGO, pod_get_band_4_frequency, pod_set_band_4_frequency); -static DEVICE_ATTR(band_6_frequency, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(band_6_frequency, S_IWUSR | S_IRUGO, pod_get_band_6_frequency, pod_set_band_6_frequency); -static DEVICE_ATTR(stomp_param_1_note_value, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(stomp_param_1_note_value, S_IWUSR | S_IRUGO, pod_get_stomp_param_1_note_value, pod_set_stomp_param_1_note_value); -static DEVICE_ATTR(stomp_param_2, S_IWUGO | S_IRUGO, pod_get_stomp_param_2, +static DEVICE_ATTR(stomp_param_2, S_IWUSR | S_IRUGO, pod_get_stomp_param_2, pod_set_stomp_param_2); -static DEVICE_ATTR(stomp_param_3, S_IWUGO | S_IRUGO, pod_get_stomp_param_3, +static DEVICE_ATTR(stomp_param_3, S_IWUSR | S_IRUGO, pod_get_stomp_param_3, pod_set_stomp_param_3); -static DEVICE_ATTR(stomp_param_4, S_IWUGO | S_IRUGO, pod_get_stomp_param_4, +static DEVICE_ATTR(stomp_param_4, S_IWUSR | S_IRUGO, pod_get_stomp_param_4, pod_set_stomp_param_4); -static DEVICE_ATTR(stomp_param_5, S_IWUGO | S_IRUGO, pod_get_stomp_param_5, +static DEVICE_ATTR(stomp_param_5, S_IWUSR | S_IRUGO, pod_get_stomp_param_5, pod_set_stomp_param_5); -static DEVICE_ATTR(stomp_param_6, S_IWUGO | S_IRUGO, pod_get_stomp_param_6, +static DEVICE_ATTR(stomp_param_6, S_IWUSR | S_IRUGO, pod_get_stomp_param_6, pod_set_stomp_param_6); -static DEVICE_ATTR(amp_switch_select, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(amp_switch_select, S_IWUSR | S_IRUGO, pod_get_amp_switch_select, pod_set_amp_switch_select); -static DEVICE_ATTR(delay_param_4, S_IWUGO | S_IRUGO, pod_get_delay_param_4, +static DEVICE_ATTR(delay_param_4, S_IWUSR | S_IRUGO, pod_get_delay_param_4, pod_set_delay_param_4); -static DEVICE_ATTR(delay_param_5, S_IWUGO | S_IRUGO, pod_get_delay_param_5, +static DEVICE_ATTR(delay_param_5, S_IWUSR | S_IRUGO, pod_get_delay_param_5, pod_set_delay_param_5); -static DEVICE_ATTR(delay_pre_post, S_IWUGO | S_IRUGO, pod_get_delay_pre_post, +static DEVICE_ATTR(delay_pre_post, S_IWUSR | S_IRUGO, pod_get_delay_pre_post, pod_set_delay_pre_post); -static DEVICE_ATTR(delay_model, S_IWUGO | S_IRUGO, pod_get_delay_model, +static DEVICE_ATTR(delay_model, S_IWUSR | S_IRUGO, pod_get_delay_model, pod_set_delay_model); -static DEVICE_ATTR(delay_verb_model, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(delay_verb_model, S_IWUSR | S_IRUGO, pod_get_delay_verb_model, pod_set_delay_verb_model); -static DEVICE_ATTR(tempo_msb, S_IWUGO | S_IRUGO, pod_get_tempo_msb, +static DEVICE_ATTR(tempo_msb, S_IWUSR | S_IRUGO, pod_get_tempo_msb, pod_set_tempo_msb); -static DEVICE_ATTR(tempo_lsb, S_IWUGO | S_IRUGO, pod_get_tempo_lsb, +static DEVICE_ATTR(tempo_lsb, S_IWUSR | S_IRUGO, pod_get_tempo_lsb, pod_set_tempo_lsb); -static DEVICE_ATTR(wah_model, S_IWUGO | S_IRUGO, pod_get_wah_model, +static DEVICE_ATTR(wah_model, S_IWUSR | S_IRUGO, pod_get_wah_model, pod_set_wah_model); -static DEVICE_ATTR(bypass_volume, S_IWUGO | S_IRUGO, pod_get_bypass_volume, +static DEVICE_ATTR(bypass_volume, S_IWUSR | S_IRUGO, pod_get_bypass_volume, pod_set_bypass_volume); -static DEVICE_ATTR(fx_loop_on_off, S_IWUGO | S_IRUGO, pod_get_fx_loop_on_off, +static DEVICE_ATTR(fx_loop_on_off, S_IWUSR | S_IRUGO, pod_get_fx_loop_on_off, pod_set_fx_loop_on_off); -static DEVICE_ATTR(tweak_param_select, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(tweak_param_select, S_IWUSR | S_IRUGO, pod_get_tweak_param_select, pod_set_tweak_param_select); -static DEVICE_ATTR(amp1_engage, S_IWUGO | S_IRUGO, pod_get_amp1_engage, +static DEVICE_ATTR(amp1_engage, S_IWUSR | S_IRUGO, pod_get_amp1_engage, pod_set_amp1_engage); -static DEVICE_ATTR(band_1_gain, S_IWUGO | S_IRUGO, pod_get_band_1_gain, +static DEVICE_ATTR(band_1_gain, S_IWUSR | S_IRUGO, pod_get_band_1_gain, pod_set_band_1_gain); -static DEVICE_ATTR2(band_2_gain__bass, band_2_gain, S_IWUGO | S_IRUGO, +static DEVICE_ATTR2(band_2_gain__bass, band_2_gain, S_IWUSR | S_IRUGO, pod_get_band_2_gain__bass, pod_set_band_2_gain__bass); -static DEVICE_ATTR(band_2_gain, S_IWUGO | S_IRUGO, pod_get_band_2_gain, +static DEVICE_ATTR(band_2_gain, S_IWUSR | S_IRUGO, pod_get_band_2_gain, pod_set_band_2_gain); -static DEVICE_ATTR2(band_3_gain__bass, band_3_gain, S_IWUGO | S_IRUGO, +static DEVICE_ATTR2(band_3_gain__bass, band_3_gain, S_IWUSR | S_IRUGO, pod_get_band_3_gain__bass, pod_set_band_3_gain__bass); -static DEVICE_ATTR(band_3_gain, S_IWUGO | S_IRUGO, pod_get_band_3_gain, +static DEVICE_ATTR(band_3_gain, S_IWUSR | S_IRUGO, pod_get_band_3_gain, pod_set_band_3_gain); -static DEVICE_ATTR2(band_4_gain__bass, band_4_gain, S_IWUGO | S_IRUGO, +static DEVICE_ATTR2(band_4_gain__bass, band_4_gain, S_IWUSR | S_IRUGO, pod_get_band_4_gain__bass, pod_set_band_4_gain__bass); -static DEVICE_ATTR2(band_5_gain__bass, band_5_gain, S_IWUGO | S_IRUGO, +static DEVICE_ATTR2(band_5_gain__bass, band_5_gain, S_IWUSR | S_IRUGO, pod_get_band_5_gain__bass, pod_set_band_5_gain__bass); -static DEVICE_ATTR(band_4_gain, S_IWUGO | S_IRUGO, pod_get_band_4_gain, +static DEVICE_ATTR(band_4_gain, S_IWUSR | S_IRUGO, pod_get_band_4_gain, pod_set_band_4_gain); -static DEVICE_ATTR2(band_6_gain__bass, band_6_gain, S_IWUGO | S_IRUGO, +static DEVICE_ATTR2(band_6_gain__bass, band_6_gain, S_IWUSR | S_IRUGO, pod_get_band_6_gain__bass, pod_set_band_6_gain__bass); static DEVICE_ATTR(body, S_IRUGO, variax_get_body, line6_nop_write); static DEVICE_ATTR(pickup1_enable, S_IRUGO, variax_get_pickup1_enable,
drivers/staging/line6/midi.c +2 -2
@@ -362,8 +362,8 @@ static ssize_t midi_set_midi_mask_receivreturn count; } -static DEVICE_ATTR(midi_mask_transmit, S_IWUGO | S_IRUGO, midi_get_midi_mask_transmit, midi_set_midi_mask_transmit); -static DEVICE_ATTR(midi_mask_receive, S_IWUGO | S_IRUGO, midi_get_midi_mask_receive, midi_set_midi_mask_receive); +static DEVICE_ATTR(midi_mask_transmit, S_IWUSR | S_IRUGO, midi_get_midi_mask_transmit, midi_set_midi_mask_transmit); +static DEVICE_ATTR(midi_mask_receive, S_IWUSR | S_IRUGO, midi_get_midi_mask_receive, midi_set_midi_mask_receive);/* MIDI device destructor */ static int snd_line6_midi_free (struct snd_device *device)
drivers/staging/line6/pod.c +16 -16
@@ -952,33 +952,33 @@ POD_GET_SYSTEM_PARAM(tuner_pitch, 1, 1);#undef GET_SYSTEM_PARAM/* POD special files: */ -static DEVICE_ATTR(channel, S_IWUGO | S_IRUGO, pod_get_channel, pod_set_channel); +static DEVICE_ATTR(channel, S_IWUSR | S_IRUGO, pod_get_channel, pod_set_channel); static DEVICE_ATTR(clip, S_IRUGO, pod_wait_for_clip, line6_nop_write); static DEVICE_ATTR(device_id, S_IRUGO, pod_get_device_id, line6_nop_write); static DEVICE_ATTR(dirty, S_IRUGO, pod_get_dirty, line6_nop_write); -static DEVICE_ATTR(dump, S_IWUGO | S_IRUGO, pod_get_dump, pod_set_dump); -static DEVICE_ATTR(dump_buf, S_IWUGO | S_IRUGO, pod_get_dump_buf, pod_set_dump_buf); -static DEVICE_ATTR(finish, S_IWUGO, line6_nop_read, pod_set_finish); +static DEVICE_ATTR(dump, S_IWUSR | S_IRUGO, pod_get_dump, pod_set_dump); +static DEVICE_ATTR(dump_buf, S_IWUSR | S_IRUGO, pod_get_dump_buf, pod_set_dump_buf); +static DEVICE_ATTR(finish, S_IWUSR, line6_nop_read, pod_set_finish); static DEVICE_ATTR(firmware_version, S_IRUGO, pod_get_firmware_version, line6_nop_write); -static DEVICE_ATTR(midi_postprocess, S_IWUGO | S_IRUGO, pod_get_midi_postprocess, pod_set_midi_postprocess); -static DEVICE_ATTR(monitor_level, S_IWUGO | S_IRUGO, pod_get_monitor_level, pod_set_monitor_level); +static DEVICE_ATTR(midi_postprocess, S_IWUSR | S_IRUGO, pod_get_midi_postprocess, pod_set_midi_postprocess); +static DEVICE_ATTR(monitor_level, S_IWUSR | S_IRUGO, pod_get_monitor_level, pod_set_monitor_level); static DEVICE_ATTR(name, S_IRUGO, pod_get_name, line6_nop_write); static DEVICE_ATTR(name_buf, S_IRUGO, pod_get_name_buf, line6_nop_write); -static DEVICE_ATTR(retrieve_amp_setup, S_IWUGO, line6_nop_read, pod_set_retrieve_amp_setup); -static DEVICE_ATTR(retrieve_channel, S_IWUGO, line6_nop_read, pod_set_retrieve_channel); -static DEVICE_ATTR(retrieve_effects_setup, S_IWUGO, line6_nop_read, pod_set_retrieve_effects_setup); -static DEVICE_ATTR(routing, S_IWUGO | S_IRUGO, pod_get_routing, pod_set_routing); +static DEVICE_ATTR(retrieve_amp_setup, S_IWUSR, line6_nop_read, pod_set_retrieve_amp_setup); +static DEVICE_ATTR(retrieve_channel, S_IWUSR, line6_nop_read, pod_set_retrieve_channel); +static DEVICE_ATTR(retrieve_effects_setup, S_IWUSR, line6_nop_read, pod_set_retrieve_effects_setup); +static DEVICE_ATTR(routing, S_IWUSR | S_IRUGO, pod_get_routing, pod_set_routing); static DEVICE_ATTR(serial_number, S_IRUGO, pod_get_serial_number, line6_nop_write); -static DEVICE_ATTR(store_amp_setup, S_IWUGO, line6_nop_read, pod_set_store_amp_setup); -static DEVICE_ATTR(store_channel, S_IWUGO, line6_nop_read, pod_set_store_channel); -static DEVICE_ATTR(store_effects_setup, S_IWUGO, line6_nop_read, pod_set_store_effects_setup); -static DEVICE_ATTR(tuner_freq, S_IWUGO | S_IRUGO, pod_get_tuner_freq, pod_set_tuner_freq); -static DEVICE_ATTR(tuner_mute, S_IWUGO | S_IRUGO, pod_get_tuner_mute, pod_set_tuner_mute); +static DEVICE_ATTR(store_amp_setup, S_IWUSR, line6_nop_read, pod_set_store_amp_setup); +static DEVICE_ATTR(store_channel, S_IWUSR, line6_nop_read, pod_set_store_channel); +static DEVICE_ATTR(store_effects_setup, S_IWUSR, line6_nop_read, pod_set_store_effects_setup); +static DEVICE_ATTR(tuner_freq, S_IWUSR | S_IRUGO, pod_get_tuner_freq, pod_set_tuner_freq); +static DEVICE_ATTR(tuner_mute, S_IWUSR | S_IRUGO, pod_get_tuner_mute, pod_set_tuner_mute); static DEVICE_ATTR(tuner_note, S_IRUGO, pod_get_tuner_note, line6_nop_write); static DEVICE_ATTR(tuner_pitch, S_IRUGO, pod_get_tuner_pitch, line6_nop_write);#if CREATE_RAW_FILE -static DEVICE_ATTR(raw, S_IWUGO, line6_nop_read, line6_set_raw); +static DEVICE_ATTR(raw, S_IWUSR, line6_nop_read, line6_set_raw);#endif /*
drivers/staging/line6/toneport.c +2 -2
@@ -124,9 +124,9 @@ static ssize_t toneport_set_led_green(streturn count; } -static DEVICE_ATTR(led_red, S_IWUGO | S_IRUGO, line6_nop_read, +static DEVICE_ATTR(led_red, S_IWUSR | S_IRUGO, line6_nop_read, toneport_set_led_red); -static DEVICE_ATTR(led_green, S_IWUGO | S_IRUGO, line6_nop_read, +static DEVICE_ATTR(led_green, S_IWUSR | S_IRUGO, line6_nop_read, toneport_set_led_green);static int toneport_send_cmd (struct usb_device *usbdev,int cmd1,int cmd2)
drivers/staging/line6/variax.c +6 -6
@@ -389,17 +389,17 @@ static ssize_t variax_set_raw2(struct de#endif /* Variax workbench special files: */ -static DEVICE_ATTR(model, S_IWUGO | S_IRUGO, variax_get_model, variax_set_model); -static DEVICE_ATTR(volume, S_IWUGO | S_IRUGO, variax_get_volume, variax_set_volume); -static DEVICE_ATTR(tone, S_IWUGO | S_IRUGO, variax_get_tone, variax_set_tone); +static DEVICE_ATTR(model, S_IWUSR | S_IRUGO, variax_get_model, variax_set_model); +static DEVICE_ATTR(volume, S_IWUSR | S_IRUGO, variax_get_volume, variax_set_volume); +static DEVICE_ATTR(tone, S_IWUSR | S_IRUGO, variax_get_tone, variax_set_tone); static DEVICE_ATTR(name, S_IRUGO, variax_get_name, line6_nop_write); static DEVICE_ATTR(bank, S_IRUGO, variax_get_bank, line6_nop_write); static DEVICE_ATTR(dump, S_IRUGO, variax_get_dump, line6_nop_write); -static DEVICE_ATTR(active, S_IWUGO | S_IRUGO, variax_get_active, variax_set_active); +static DEVICE_ATTR(active, S_IWUSR | S_IRUGO, variax_get_active, variax_set_active);#if CREATE_RAW_FILE -static DEVICE_ATTR(raw, S_IWUGO, line6_nop_read, line6_set_raw); -static DEVICE_ATTR(raw2, S_IWUGO, line6_nop_read, variax_set_raw2); +static DEVICE_ATTR(raw, S_IWUSR, line6_nop_read, line6_set_raw); +static DEVICE_ATTR(raw2, S_IWUSR, line6_nop_read, variax_set_raw2);#endif
PATCH 66/223 um: remove PAGE_SIZE alignment in linker script causing kernel segfault.
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Richard Weinberger <[email protected]>
commit 6915e04f8847bea16d0890f559694ad8eedd026c upstream.
The linker script cleanup that I did in commit 5d150a97f93 ("um: Clean up linker script using standard macros.") (2.6.32) accidentally introduced an ALIGN(PAGE_SIZE) when converting to use INIT_TEXT_SECTION; Richard Weinberger reported that this causes the kernel to segfault with CONFIG_STATIC_LINK=y.
I'm not certain why this extra alignment is a problem, but it seems likely it is because previously
__init_begin = _stext = _text = _sinittext
and with the extra ALIGN(PAGE_SIZE), _sinittext becomes different from the rest. So there is likely a bug here where something is assuming that _sinittext is the same as one of those other symbols. But reverting the accidental change fixes the regression, so it seems worth committing that now.
Tested by: Antoine Martin <[email protected]>
--- arch/um/kernel/uml.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/um/kernel/uml.lds.S +1 -1
@@ -22,7 +22,7 @@ SECTIONS _text = .; _stext = .; __init_begin = .; - INIT_TEXT_SECTION(PAGE_SIZE) + INIT_TEXT_SECTION(0) . = ALIGN(PAGE_SIZE); .text :
PATCH 69/223 hwmon: (lm85) Fix ADT7468 frequency table
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Jean Delvare <[email protected]>
commit fa7a5797e57d2ed71f9a6fb44f0ae42c2d7b74b7 upstream.
The ADT7468 uses the same frequency table as the ADT7463.
--- drivers/hwmon/lm85.c | 1 + 1 file changed, 1 insertion(+)
drivers/hwmon/lm85.c +1 -0
@@ -1259,6 +1259,7 @@ static int lm85_probe(struct i2c_clientswitch (data->type) {case adm1027:case adt7463: +case adt7468:case emc6d100:case emc6d102: data->freq_map = adm1027_freq_map;
PATCH 70/223 oprofile: Fix the hang while taking the cpu offline
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Santosh Shilimkar <[email protected]>
commit 4ac3dbec800d93485a5c84e37af676278eea657c upstream.
The kernel build with CONFIG_OPROFILE and CPU_HOTPLUG enabled. The oprofile is initialised using system timer in absence of hardware counters supports. Oprofile isn't started from userland.
In this setup while doing a CPU offline the kernel hangs in infinite for loop inside lock_hrtimer_base() function
This happens because as part of oprofile_cpu_notify(, it tries to stop an hrtimer which was never started. These per-cpu hrtimers are started when the oprfile is started.
echo 1 > /dev/oprofile/enable
This problem also existwhen the cpu is booted with maxcpus parameter set. When bringing the remaining cpus online the timers are started even if oprofile is not yet enabled.
This patch fix this issue by adding a state variable so that these hrtimer start/stop is only attempted when oprofile is started
For stable kernels v2.6.35.y and v2.6.36.y.
--- drivers/oprofile/timer_int.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/oprofile/timer_int.c +13 -0
@@ -21,6 +21,7 @@#include "oprof.h" static DEFINE_PER_CPU(struct hrtimer, oprofile_hrtimer); +static int ctr_running;static enum hrtimer_restart oprofile_hrtimer_notify (struct hrtimer *hrtimer) {
@@ -33,6 +34,9 @@ static void __oprofile_hrtimer_start(voi {struct hrtimer *hrtimer = &__get_cpu_var (oprofile_hrtimer); +if (!ctr_running) +return ; +hrtimer_init (hrtimer,CLOCK_MONOTONIC ,HRTIMER_MODE_REL ); hrtimer->function = oprofile_hrtimer_notify;
@@ -42,7 +46,10 @@ static void __oprofile_hrtimer_start(voistatic int oprofile_hrtimer_start (void ) { +get_online_cpus (); + ctr_running =1 ;on_each_cpu (__oprofile_hrtimer_start,NULL ,1 ); +put_online_cpus ();return 0 ; }
@@ -50,6 +57,9 @@ static void __oprofile_hrtimer_stop(int {struct hrtimer *hrtimer = &per_cpu (oprofile_hrtimer, cpu); +if (!ctr_running) +return ; +hrtimer_cancel (hrtimer); }
@@ -57,8 +67,11 @@ static void oprofile_hrtimer_stop(void) {int cpu; +get_online_cpus ();for_each_online_cpu (cpu)__oprofile_hrtimer_stop (cpu); + ctr_running =0 ; +put_online_cpus (); } static int __cpuinit oprofile_cpu_notify(struct notifier_block *self,
PATCH 68/223 numa: fix slab_node(MPOL_BIND)
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit 800416f799e0723635ac2d720ad4449917a1481c upstream.
When a node contains only HighMem memory, slab_node(MPOL_BIND) dereferences a NULL pointer.
[ This code seems to go back all the way to commit 19770b32609b: "mm:
filter based on a nodemask as well as a gfp_mask". Which was back in April 2008, and it got merged into 2.6.26. - Linus ]
--- mm/mempolicy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/mempolicy.c +1 -1
@@ -1576,7 +1576,7 @@ unsigned slab_node(struct mempolicy *pol (void )first_zones_zonelist (zonelist, highest_zoneidx, &policy->v.nodes, &zone); -return zone->node; +return zone ? zone->node :numa_node_id (); }default :
PATCH 77/223 ssb: b43-pci-bridge: Add new vendor for BCM4318
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Klaffenbach <[email protected]>
commit 1d8638d4038eb8709edc80e37a0bbb77253d86e9 upstream.
Add new vendor for Broadcom 4318.
--- drivers/ssb/b43_pci_bridge.c | 1 + include/linux/pci_ids.h | 1 + 2 files changed, 2 insertions(+)
drivers/ssb/b43_pci_bridge.c +1 -0
@@ -24,6 +24,7 @@ static const struct pci_device_id b43_pc { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4312) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4315) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4318) }, + { PCI_DEVICE(PCI_VENDOR_ID_BCM_GVC, 0x4318) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4319) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4320) }, { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
include/linux/pci_ids.h +1 -0
@@ -2038,6 +2038,7 @@#define PCI_DEVICE_ID_AFAVLAB_P030 0x2182#define PCI_SUBDEVICE_ID_AFAVLAB_P061 0x2150 +#define PCI_VENDOR_ID_BCM_GVC 0x14a4#define PCI_VENDOR_ID_BROADCOM 0x14e4#define PCI_DEVICE_ID_TIGON3_5752 0x1600#define PCI_DEVICE_ID_TIGON3_5752M 0x1601
PATCH 76/223 wireless: b43: fix error path in SDIO
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Guennadi Liakhovetski <[email protected]>
commit e476a5a41ad67d0e2b4a652820c49a3923eb936b upstream.
Fix unbalanced call to sdio_release_host() on the error path.
--- drivers/net/wireless/b43/sdio.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/b43/sdio.c +1 -0
@@ -163,6 +163,7 @@ static int b43_sdio_probe(struct sdio_fu err_free_ssb:kfree (sdio); err_disable_func: +sdio_claim_host (func);sdio_disable_func (func); err_release_host:sdio_release_host (func);
PATCH 79/223 sgi-xpc: XPC fails to discover partitions with all nasids above 128
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: [email protected] <[email protected]>
commit c22c7aeff69796f46ae0fcec141538e28f50b24e upstream.
UV hardware defines 256 memory protection regions versus the baseline 64 with increasing size for the SN2 ia64. This was overlooked when XPC was modified to accomodate both UV and SN2.
Without this patch, a user could reconfigure their existing system and suddenly disable cross-partition communications with no indication of what has gone wrong. It also prevents larger configurations from using cross-partition communication.
--- drivers/misc/sgi-xp/xpc_partition.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
drivers/misc/sgi-xp/xpc_partition.c +15 -10
@@ -439,18 +439,23 @@ xpc_discovery(void)* nodes that can comprise an access protection grouping. The access * protection is in regards to memory, IOI and IPI. */ - max_regions =64 ; region_size = xp_region_size; -switch (region_size) { -case 128 : - max_regions *=2 ; -case 64 : - max_regions *=2 ; -case 32 : - max_regions *=2 ; - region_size =16 ; -DBUG_ON (!is_shub2 ()); +if (is_uv ()) + max_regions =256 ; +else { + max_regions =64 ; + +switch (region_size) { +case 128 : + max_regions *=2 ; +case 64 : + max_regions *=2 ; +case 32 : + max_regions *=2 ; + region_size =16 ; +DBUG_ON (!is_shub2 ()); + } }for (region =0 ; region < max_regions; region++) {
PATCH 84/223 net: NETIF_F_HW_CSUM does not imply FCoE CRC offload
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Ben Hutchings <[email protected]>
commit 66c68bcc489fadd4f5e8839e966e3a366e50d1d5 upstream.
NETIF_F_HW_CSUM indicates the ability to update an TCP/IP-style 16-bit checksum with the checksum of an arbitrary part of the packet data, whereas the FCoE CRC is something entirely different.
--- net/core/dev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/core/dev.c +3 -3
@@ -1653,10 +1653,10 @@ EXPORT_SYMBOL(netif_device_attach);static bool can_checksum_protocol (unsigned long features,__be16 protocol) { -return ((features &NETIF_F_GEN_CSUM ) || - ((features &NETIF_F_IP_CSUM ) && +return ((features &NETIF_F_NO_CSUM ) || + ((features &NETIF_F_V4_CSUM ) && protocol ==htons (ETH_P_IP )) || - ((features &NETIF_F_IPV6_CSUM ) && + ((features &NETIF_F_V6_CSUM ) && protocol ==htons (ETH_P_IPV6 )) || ((features &NETIF_F_FCOE_CRC ) && protocol ==htons (ETH_P_FCOE )));
PATCH 87/223 sata_via: apply magic FIFO fix to vt6420 too
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit b1353e4f40f6179ab26a3bb1b2e1fe29ffe534f5 upstream.
vt6420 has the same FIFO overflow problem as vt6421 when combined with certain devices. This patch applies the magic fix to vt6420 too.
--- drivers/ata/sata_via.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/ata/sata_via.c +5 -4
@@ -538,7 +538,7 @@ static int vt8251_prepare_host(struct pcreturn 0 ; } -static void svia_configure (struct pci_dev *pdev) +static void svia_configure (struct pci_dev *pdev,int board_id) {u8 tmp8;
@@ -577,7 +577,7 @@ static void svia_configure(struct pci_de }/* -* vt6421 has problems talking to some drives. The following +* vt6420/1 has problems talking to some drives. The following * is the fix from Joseph Chan <[email protected]>. * * When host issues HOLD, device may send up to 20DW of data
@@ -596,8 +596,9 @@ static void svia_configure(struct pci_de* * https://bugzilla.kernel.org/show_bug.cgi?id=15173 * http://article.gmane.org/gmane.linux.ide/46352 +* http://thread.gmane.org/gmane.linux.kernel/1062139 */ -if (pdev->device ==0x3249 ) { +if (board_id == vt6420 || board_id == vt6421) {pci_read_config_byte (pdev,0x52 , &tmp8); tmp8 |=1 <<2 ;pci_write_config_byte (pdev,0x52 , tmp8);
@@ -652,7 +653,7 @@ static int svia_init_one(struct pci_devif (rc)return rc; -svia_configure (pdev); +svia_configure (pdev, board_id);pci_set_master (pdev); return ata_host_activate(host, pdev->irq, ata_bmdma_interrupt,
PATCH 86/223 viafb: use proper register for colour when doing fill ops
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Florian Tobias Schandinat <[email protected]>
commit efd4f6398dc92b5bf392670df862f42a19f34cf2 upstream.
The colour was written to a wrong register for fillrect operations. This sometimes caused empty console space (for example after 'clear') to have a different colour than desired. Fix this by writing to the correct register.
Many thanks to Daniel Drake and Jon Nettleton for pointing out this issue and pointing me in the right direction for the fix.
Fixes http://dev.laptop.org/ticket/9323
--- drivers/video/via/accel.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/video/via/accel.c +4 -3
@@ -283,11 +283,12 @@ static int hw_bitblt_2(void __iomem *engwritel (tmp, engine +0x1C ); } -if (op !=VIA_BITBLT_COLOR ) +if (op ==VIA_BITBLT_FILL ) { +writel (fg_color, engine +0x58 ); + }else if (op ==VIA_BITBLT_MONO ) {writel (fg_color, engine +0x4C ); - -if (op ==VIA_BITBLT_MONO )writel (bg_color, engine +0x50 ); + }if (op ==VIA_BITBLT_FILL ) ge_cmd |= fill_rop <<24 |0x00002000 |0x00000001 ;
PATCH 92/223 ALSA: hda: Use BIOS auto-parsing instead of existing model quirk for MEDION MD2
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Daniel T Chen <[email protected]>
commit ac70eb1305d5a81efd1e32327d7e79be15a63a5a upstream.
A 2.6.35 (Ubuntu Maverick) user, burningphantom1, reported a regression in audio: playback was inaudible through both speakers and headphones. In commit 272a527c04 of sound-2.6.git, a new model was added with this machine's PCI SSID. Fortunately, it is now sufficient to use the auto model for BIOS auto-parsing instead of the existing quirk.
Playback, capture, and jack sense were verified working for both 2.6.35 and the alsa-driver snapshot from 2010-11-27 when model=auto is used.
--- sound/pci/hda/patch_realtek.c | 1 - 1 file changed, 1 deletion(-)
sound/pci/hda/patch_realtek.c +0 -1
@@ -9472,7 +9472,6 @@ static struct snd_pci_quirk alc882_cfg_tSND_PCI_QUIRK (0x17aa ,0x3bfc ,"Lenovo NB0763" ,ALC883_LENOVO_NB0763 ),SND_PCI_QUIRK (0x17aa ,0x3bfd ,"Lenovo NB0763" ,ALC883_LENOVO_NB0763 ),SND_PCI_QUIRK (0x17aa ,0x101d ,"Lenovo Sky" ,ALC888_LENOVO_SKY ), -SND_PCI_QUIRK (0x17c0 ,0x4071 ,"MEDION MD2" ,ALC883_MEDION_MD2 ),SND_PCI_QUIRK (0x17c0 ,0x4085 ,"MEDION MD96630" ,ALC888_LENOVO_MS7195_DIG ),SND_PCI_QUIRK (0x17f2 ,0x5000 ,"Albatron KI690-AM2" ,ALC883_6ST_DIG ), SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),
PATCH 91/223 md: fix return value of rdev_size_change()
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Justin Maggard <[email protected]>
commit c26a44ed1e552aaa1d4ceb71842002d235fe98d7 upstream.
When trying to grow an array by enlarging component devices, rdev_size_store() expects the return value of rdev_size_change() to be in sectors, but the actual value is returned in KBs.
This functionality was broken by commit
dd8ac336c13fd8afdb082ebacb1cddd5cf727889
so this patch is suitable for any kernel since 2.6.30.
--- drivers/md/md.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/md.c +2 -2
@@ -1278,7 +1278,7 @@ super_90_rdev_size_change(mdk_rdev_t *rdmd_super_write (rdev->mddev, rdev, rdev->sb_start, rdev->sb_size, rdev->sb_page);md_super_wait (rdev->mddev); -return num_sectors /2 ;/* kB for sysfs */ +return num_sectors; }
@@ -1644,7 +1644,7 @@ super_1_rdev_size_change(mdk_rdev_t *rdemd_super_write (rdev->mddev, rdev, rdev->sb_start, rdev->sb_size, rdev->sb_page);md_super_wait (rdev->mddev); -return num_sectors /2 ;/* kB for sysfs */ +return num_sectors; }static struct super_type super_types[] = {
PATCH 95/223 tty_ldisc: Fix BUG() on hangup
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Philippe=20R=C3=A9tornaz?= <[email protected]>
commit 1c95ba1e1de7edffc0c4e275e147f1a9eb1f81ae upstream.
A kernel BUG when bluetooth rfcomm connection drop while the associated serial port is open is sometime triggered.
It seems that the line discipline can disappear between the tty_ldisc_put and tty_ldisc_get. This patch fall back to the N_TTY line discipline if the previous discipline is not available anymore.
--- drivers/char/tty_ldisc.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/char/tty_ldisc.c +13 -7
@@ -741,9 +741,12 @@ static void tty_reset_termios(struct tty* state closed */ -static void tty_ldisc_reinit (struct tty_struct *tty,int ldisc) +static int tty_ldisc_reinit (struct tty_struct *tty,int ldisc) { -struct tty_ldisc *ld; +struct tty_ldisc *ld =tty_ldisc_get (ldisc); + +if (IS_ERR (ld)) +return -1 ;tty_ldisc_close (tty, tty->ldisc);tty_ldisc_put (tty->ldisc);
@@ -751,10 +754,10 @@ static void tty_ldisc_reinit(struct tty_/* * Switch the line discipline back */ - ld =tty_ldisc_get (ldisc); -BUG_ON (IS_ERR (ld));tty_ldisc_assign (tty, ld);tty_set_termios_ldisc (tty, ldisc); + +return 0 ; }/**
@@ -816,13 +819,16 @@ void tty_ldisc_hangup(struct tty_structa FIXME */ if (tty->ldisc) {/* Not yet closed */ if (reset ==0 ) { -tty_ldisc_reinit (tty, tty->termios->c_line); - err =tty_ldisc_open (tty, tty->ldisc); + +if (!tty_ldisc_reinit (tty, tty->termios->c_line)) + err =tty_ldisc_open (tty, tty->ldisc); +else + err =1 ; }/* If the re-open fails or we reset then go to N_TTY. The N_TTY open cannot fail */ if (reset || err) { -tty_ldisc_reinit (tty,N_TTY ); +BUG_ON (tty_ldisc_reinit (tty,N_TTY ));WARN_ON (tty_ldisc_open (tty, tty->ldisc)); }tty_ldisc_enable (tty);
PATCH 99/223 usbnet: fix usb_autopm_get_interface failure(v1)
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
commit b0786b430c982dffbb44d8030e6b6088671ce745 upstream.
Since usbnet already took usb runtime pm, we have to enable runtime pm for usb interface of usbnet, otherwise usb_autopm_get_interface may return failure and cause 'ifconfig usb0 up' failed if USB_SUSPEND(RUNTIME_PM) is enabled.
--- drivers/net/usb/usbnet.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/usb/usbnet.c +11 -0
@@ -44,6 +44,7 @@#include <linux/usb.h> #include <linux/usb/usbnet.h> #include <linux/slab.h> +#include <linux/pm_runtime.h> #define DRIVER_VERSION "22-Aug-2005"
@@ -1272,6 +1273,16 @@ usbnet_probe (struct usb_interface *udevstruct usb_device *xdev;int status;const char *name; +struct usb_driver *driver =to_usb_driver (udev->dev.driver); + +/* usbnet already took usb runtime pm, so have to enable the feature +* for usb interface, otherwise usb_autopm_get_interface may return +* failure if USB_SUSPEND(RUNTIME_PM) is enabled. +*/ +if (!driver->supports_autosuspend) { + driver->supports_autosuspend =1 ; +pm_runtime_enable (&udev->dev); + } name = udev->dev.driver->name; info = (struct driver_info *) prod->driver_info;
PATCH 100/223 HID: Fix for problems with eGalax/DWAV multi-touch-screen
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Merkel <[email protected]>
commit f51661105c3c8a0afcd69f995a4f4a10e53da153 upstream.
This patch fixes three problems with the eGalax/DWAV multi-touch screen found in the Eee PC T101MT:
1) While there is a dedicated multitouch driver for the screen (hid-egalax.c), the MULTI_INPUT quirk is also applied, preventing the hid-egalax driver from working. This patch removes the quirk so the hid-egalax driver can handle the device correctly.
2) The x and y coordinates sent by the screen in multi-touch mode are shifted by three bits from the events sent in single-touch mode, thus the coordinates are out of range, leading to the pointer being stuck in the bottom-right corner if no additional calibration is applied (e.g. in the X evdev driver). This patch shifts the coordinates back. This does not decrease accuracy as the last three bits of the "wrong" coordinates are always 0.
3) Only multi-touch pressure events are sent, single touch emulation is missing pressure information. This patch adds single-touch ABS_PRESSURE events.
--- drivers/hid/hid-egalax.c | 16 +++++++++++----- drivers/hid/usbhid/hid-quirks.c | 1 - 2 files changed, 11 insertions(+), 6 deletions(-)
drivers/hid/hid-egalax.c +11 -5
@@ -31,7 +31,7 @@ struct egalax_data {bool first;/* is this the first finger in the frame? */ bool valid;/* valid finger data, or just placeholder? */ bool activity;/* at least one active finger previously? */ -__u16 lastx, lasty;/* latest valid (x, y) in the frame */ +__u16 lastx, lasty, lastz;/* latest valid (x, y, z) in the frame */ }; static int egalax_input_mapping(struct hid_device *hdev, struct hid_input *hi,
@@ -79,6 +79,10 @@ static int egalax_input_mapping(struct hcase HID_DG_TIPPRESSURE :hid_map_usage (hi, usage, bit, max,EV_ABS ,ABS_MT_PRESSURE ); +/* touchscreen emulation */ +input_set_abs_params (hi->input,ABS_PRESSURE , + field->logical_minimum, + field->logical_maximum,0 ,0 );return 1 ; }return 0 ;
@@ -109,8 +113,8 @@ static void egalax_filter_event(struct eif (td->valid) {/* emit multitouch events */ input_event (input,EV_ABS ,ABS_MT_TRACKING_ID , td->id); -input_event (input,EV_ABS ,ABS_MT_POSITION_X , td->x); -input_event (input,EV_ABS ,ABS_MT_POSITION_Y , td->y); +input_event (input,EV_ABS ,ABS_MT_POSITION_X , td->x >>3 ); +input_event (input,EV_ABS ,ABS_MT_POSITION_Y , td->y >>3 );input_event (input,EV_ABS ,ABS_MT_PRESSURE , td->z);input_mt_sync (input);
@@ -121,6 +125,7 @@ static void egalax_filter_event(struct e*/ td->lastx = td->x; td->lasty = td->y; + td->lastz = td->z; }/*
@@ -129,8 +134,9 @@ static void egalax_filter_event(struct e* the oldest on the panel, the one we want for single touch */ if (!td->first && td->activity) { -input_event (input,EV_ABS ,ABS_X , td->lastx); -input_event (input,EV_ABS ,ABS_Y , td->lasty); +input_event (input,EV_ABS ,ABS_X , td->lastx >>3 ); +input_event (input,EV_ABS ,ABS_Y , td->lasty >>3 ); +input_event (input,EV_ABS ,ABS_PRESSURE , td->lastz); }if (!td->valid) {
drivers/hid/usbhid/hid-quirks.c +0 -1
@@ -33,7 +33,6 @@ static const struct hid_blacklist { { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD }, { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD }, - { USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
PATCH 101/223 gspca - sonixj: Fix a regression of sensors hv7131r and mi0360
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= <[email protected]>
commit 0303a90a744662e934877a5d637a43197229274b upstream.
The bug was introduced by commit 23a98274cc348880ecb6803307c254448084953a applying values of sensor sp80708 to sensors hv7131r and mi0360.
--- drivers/media/video/gspca/sonixj.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/video/gspca/sonixj.c +1 -2
@@ -2488,8 +2488,7 @@ static int sd_start(struct gspca_dev *gs reg1 =0x44 ; reg17 =0xa2 ;break ; -default : -/* case SENSOR_SP80708: */ +case SENSOR_SP80708 : init = sp80708_sensor_param1;if (mode) {/*?? reg1 = 0x04; * 320 clk 48Mhz */
PATCH 104/223 KVM: Write protect memory after slot swap
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Michael S. Tsirkin <[email protected]>
commit edde99ce05290e50ce0b3495d209e54e6349ab47 upstream.
I have observed the following bug trigger:
1. userspace calls GET_DIRTY_LOG
2. kvm_mmu_slot_remove_write_access is called and makes a page ro
3. page fault happens and makes the page writeable fault is logged in the bitmap appropriately
4. kvm_vm_ioctl_get_dirty_log swaps slot pointers
a lot of time passes
5. guest writes into the page
6. userspace calls GET_DIRTY_LOG
At point (5), bitmap is clean and page is writeable, thus, guest modification of memory is not logged and GET_DIRTY_LOG returns an empty bitmap.
The rule is that all pages are either dirty in the current bitmap, or write-protected, which is violated here.
It seems that just moving kvm_mmu_slot_remove_write_access down to after the slot pointer swap should fix this bug.
--- arch/x86/kvm/x86.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/x86/kvm/x86.c +5 -4
@@ -2825,10 +2825,6 @@ int kvm_vm_ioctl_get_dirty_log(struct kvif (is_dirty) {struct kvm_memslots *slots, *old_slots; -spin_lock (&kvm->mmu_lock); -kvm_mmu_slot_remove_write_access (kvm, log->slot); -spin_unlock (&kvm->mmu_lock); - slots =kzalloc (sizeof (struct kvm_memslots ),GFP_KERNEL );if (!slots) goto out_free;
@@ -2841,6 +2837,11 @@ int kvm_vm_ioctl_get_dirty_log(struct kvsynchronize_srcu_expedited (&kvm->srcu); dirty_bitmap = old_slots->memslots[log->slot].dirty_bitmap;kfree (old_slots); + +spin_lock (&kvm->mmu_lock); +kvm_mmu_slot_remove_write_access (kvm, log->slot); +spin_unlock (&kvm->mmu_lock); + } r =0 ;
PATCH 106/223 KVM: Correct ordering of ldt reload wrt fs/gs reload
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Avi Kivity <[email protected]>
commit 0a77fe4c188e25917799f2356d4aa5e6d80c39a2 upstream.
If fs or gs refer to the ldt, they must be reloaded after the ldt. Reorder the code to that effect.
Userspace code that uses the ldt with kvm is nonexistent, so this doesn't fix a user-visible bug.
--- arch/x86/kvm/svm.c | 2 +- arch/x86/kvm/vmx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kvm/svm.c +1 -1
@@ -3184,9 +3184,9 @@ static void svm_vcpu_run(struct kvm_vcpu vcpu->arch.regs[VCPU_REGS_RSP ] = svm->vmcb->save.rsp; vcpu->arch.regs[VCPU_REGS_RIP ] = svm->vmcb->save.rip; +kvm_load_ldt (ldt_selector);kvm_load_fs (fs_selector);kvm_load_gs (gs_selector); -kvm_load_ldt (ldt_selector);load_host_msrs (vcpu);reload_tss (vcpu);
arch/x86/kvm/vmx.c +2 -2
@@ -791,8 +791,6 @@ static void __vmx_load_host_state(struct ++vmx->vcpu.stat.host_state_reload; vmx->host_state.loaded =0 ; -if (vmx->host_state.fs_reload_needed) -kvm_load_fs (vmx->host_state.fs_sel);if (vmx->host_state.gs_ldt_reload_needed) {kvm_load_ldt (vmx->host_state.ldt_sel);/*
@@ -806,6 +804,8 @@ static void __vmx_load_host_state(struct#endif local_irq_restore (flags); } +if (vmx->host_state.fs_reload_needed) +loadsegment (fs, vmx->host_state.fs_sel);reload_tss ();#ifdef CONFIG_X86_64 if (is_long_mode (&vmx->vcpu)) {
PATCH 108/223 ASoC: wm8961 - clear WM8961_DACSLOPE bit for normal mode
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Axel Lin <[email protected]>
commit 08b1a38465cab8c2224a5202c7a3b5e5f5630894 upstream.
DACSLOPE bit of Register 06h ADC and DAC Control 2:
0: Normal mode
1: Sloping stop-band mode
Thus in the case of normal mode, we should clear DACSLOPE bit.
--- sound/soc/codecs/wm8961.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm8961.c +1 -1
@@ -711,7 +711,7 @@ static int wm8961_hw_params(struct snd_pif (fs <=24000 ) reg |=WM8961_DACSLOPE ;else - reg &=WM8961_DACSLOPE ; + reg &= ~WM8961_DACSLOPE ;snd_soc_write (codec,WM8961_ADC_DAC_CONTROL_2 , reg);return 0 ;
PATCH 105/223 KVM: x86: fix information leak to userland
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Vasiliy Kulikov <[email protected]>
commit 97e69aa62f8b5d338d6cff49be09e37cc1262838 upstream.
Structures kvm_vcpu_events, kvm_debugregs, kvm_pit_state2 and kvm_clock_data are copied to userland with some padding and reserved fields unitialized. It leads to leaking of contents of kernel stack memory. We have to initialize them to zero.
In patch v1 Jan Kiszka suggested to fill reserved fields with zeros instead of memset'ting the whole struct. It makes sense as these fields are explicitly marked as padding. No more fields need zeroing.
--- arch/x86/kvm/x86.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +6 -1
@@ -2220,6 +2220,7 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_ !kvm_exception_is_soft (vcpu->arch.exception.nr); events->exception.nr = vcpu->arch.exception.nr; events->exception.has_error_code = vcpu->arch.exception.has_error_code; + events->exception.pad =0 ; events->exception.error_code = vcpu->arch.exception.error_code; events->interrupt.injected =
@@ -2233,13 +2234,14 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_ events->nmi.injected = vcpu->arch.nmi_injected; events->nmi.pending = vcpu->arch.nmi_pending; events->nmi.masked = kvm_x86_ops->get_nmi_mask (vcpu); + events->nmi.pad =0 ; events->sipi_vector = vcpu->arch.sipi_vector; events->flags = (KVM_VCPUEVENT_VALID_NMI_PENDING |KVM_VCPUEVENT_VALID_SIPI_VECTOR |KVM_VCPUEVENT_VALID_SHADOW ); - +memset (&events->reserved,0 ,sizeof (events->reserved));vcpu_put (vcpu); }
@@ -2289,6 +2291,7 @@ static void kvm_vcpu_ioctl_x86_get_debug dbgregs->dr6 = vcpu->arch.dr6; dbgregs->dr7 = vcpu->arch.dr7; dbgregs->flags =0 ; +memset (&dbgregs->reserved,0 ,sizeof (dbgregs->reserved));vcpu_put (vcpu); }
@@ -2756,6 +2759,7 @@ static int kvm_vm_ioctl_get_pit2(struct sizeof(ps->channels)); ps->flags = kvm->arch.vpit->pit_state.flags;mutex_unlock (&kvm->arch.vpit->pit_state.lock); +memset (&ps->reserved,0 ,sizeof (ps->reserved));return r; }
@@ -3153,6 +3157,7 @@ long kvm_arch_vm_ioctl(struct file *filp now_ns =timespec_to_ns (&now); user_ns.clock = kvm->arch.kvmclock_offset + now_ns; user_ns.flags =0 ; +memset (&user_ns.pad,0 ,sizeof (user_ns.pad)); r = -EFAULT ;if (copy_to_user (argp, &user_ns,sizeof (user_ns)))
PATCH 109/223 ASoC: wm8961 - clear WM8961_MCLKDIV bit for freq <= 16500000
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Axel Lin <[email protected]>
commit 2f7dceeda4708f470fd927adb3861bd8ebbe2310 upstream.
MCLKDIV bit of Register 04h Clocking1:
0 : Divide by 1
1 : Divide by 2
Thus in the case of freq <= 16500000, we should clear MCLKDIV bit.
--- sound/soc/codecs/wm8961.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm8961.c +1 -1
@@ -736,7 +736,7 @@ static int wm8961_set_sysclk(struct snd_ freq /=2 ; }else {dev_dbg (codec->dev,"Using MCLK/1 for %dHz MCLK\n" , freq); - reg &=WM8961_MCLKDIV ; + reg &= ~WM8961_MCLKDIV ; }snd_soc_write (codec,WM8961_CLOCKING1 , reg);
PATCH 116/223 ALSA: hda: Add speaker pin to automute Acer Aspire 8943G
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Daniel T Chen <[email protected]>
commit 2df03514de41f3bbb5623f2e7f2bf594e49cb2ec upstream.
Add clause for handling Acer Aspire 8943G's subwoofer as additional speaker pin for automuting.
--- sound/pci/hda/patch_realtek.c | 8 ++++++++ 1 file changed, 8 insertions(+)
sound/pci/hda/patch_realtek.c +8 -0
@@ -18680,10 +18680,17 @@ static void alc662_auto_init(struct hda_ }enum { +ALC662_FIXUP_ASPIRE ,ALC662_FIXUP_IDEAPAD , };static const struct alc_fixup alc662_fixups[] = { + [ALC662_FIXUP_ASPIRE ] = { + .pins = (const struct alc_pincfg []) { + {0x15 ,0x99130112 },/* subwoofer */ + { } + } + }, [ALC662_FIXUP_IDEAPAD ] = { .pins = (const struct alc_pincfg []) { {0x17 ,0x99130112 },/* subwoofer */
@@ -18693,6 +18700,7 @@ static const struct alc_fixup alc662_fix };static struct snd_pci_quirk alc662_fixup_tbl[] = { +SND_PCI_QUIRK (0x1025 ,0x038b ,"Acer Aspire 8943G" ,ALC662_FIXUP_ASPIRE ),SND_PCI_QUIRK (0x17aa ,0x38af ,"Lenovo Ideapad Y550P" ,ALC662_FIXUP_IDEAPAD ),SND_PCI_QUIRK (0x17aa ,0x3a0d ,"Lenovo Ideapad Y550" ,ALC662_FIXUP_IDEAPAD ), {}
PATCH 115/223 ALSA: hda - Added fixup for Lenovo Y550P
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Valentine Sinitsyn <[email protected]>
commit d41185882b828896ccecac319c9f65f708baaf0d upstream.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -18693,6 +18693,7 @@ static const struct alc_fixup alc662_fix };static struct snd_pci_quirk alc662_fixup_tbl[] = { +SND_PCI_QUIRK (0x17aa ,0x38af ,"Lenovo Ideapad Y550P" ,ALC662_FIXUP_IDEAPAD ),SND_PCI_QUIRK (0x17aa ,0x3a0d ,"Lenovo Ideapad Y550" ,ALC662_FIXUP_IDEAPAD ), {} };
PATCH 114/223 ALSA: HDA: Add fixup pins for Ideapad Y550
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: David Henningsson <[email protected]>
commit 6cb3b707f95954ac18f19b4b3919af235738371a upstream.
By adding the subwoofer as a speaker pin, it is treated correctly when auto-muting.
--- sound/pci/hda/patch_realtek.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +25 -1
@@ -18679,6 +18679,26 @@ static void alc662_auto_init(struct hda_alc_inithook (codec); } +enum { +ALC662_FIXUP_IDEAPAD , +}; + +static const struct alc_fixup alc662_fixups[] = { + [ALC662_FIXUP_IDEAPAD ] = { + .pins = (const struct alc_pincfg []) { + {0x17 ,0x99130112 },/* subwoofer */ + { } + } + }, +}; + +static struct snd_pci_quirk alc662_fixup_tbl[] = { +SND_PCI_QUIRK (0x17aa ,0x3a0d ,"Lenovo Ideapad Y550" ,ALC662_FIXUP_IDEAPAD ), + {} +}; + + +static int patch_alc662 (struct hda_codec *codec) {struct alc_spec *spec;
@@ -18711,6 +18731,7 @@ static int patch_alc662(struct hda_codec }if (board_config ==ALC662_AUTO ) { +alc_pick_fixup (codec, alc662_fixup_tbl, alc662_fixups,1 );/* automatic parse from the BIOS config */ err =alc662_parse_auto_config (codec);if (err <0 ) {
@@ -18769,8 +18790,11 @@ static int patch_alc662(struct hda_codec spec->vmaster_nid =0x02 ; codec->patch_ops = alc_patch_ops; -if (board_config ==ALC662_AUTO ) +if (board_config ==ALC662_AUTO ) { spec->init_hook = alc662_auto_init; +alc_pick_fixup (codec, alc662_fixup_tbl, alc662_fixups,0 ); + } +#ifdef CONFIG_SND_HDA_POWER_SAVE if (!spec->loopback.amplist) spec->loopback.amplist = alc662_loopbacks;
PATCH 122/223 ALSA: hda: Use "alienware" model quirk for another SSID
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Daniel T Chen <[email protected]>
commit 0defe09ca70daccdc83abd9c3c24cd89ae6a1141 upstream.
The original reporter states that headphone jacks do not appear to work. Upon inspecting his codec dump, and upon further testing, it is confirmed that the "alienware" model quirk is correct.
--- sound/pci/hda/patch_sigmatel.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_sigmatel.c +2 -0
@@ -1625,6 +1625,8 @@ static struct snd_pci_quirk stac92hd73xxstatic struct snd_pci_quirk stac92hd73xx_codec_id_cfg_tbl[] = {SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x02a1 ,"Alienware M17x" ,STAC_ALIENWARE_M17X ), +SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x043a , +"Alienware M17x" ,STAC_ALIENWARE_M17X ), {}/* terminator */ };
PATCH 121/223 ALSA: Fix SNDCTL_DSP_RESET ioctl for OSS emulation
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 60686aa0086a14f8b15c83a09f3df1eebe3aab3c upstream.
In OSS emulation, SNDCTL_DSP_RESET ioctl needs the reset of the internal buffer state in addition to drop of the running streams. Otherwise the succeeding access becomes inconsistent.
--- sound/core/oss/pcm_oss.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
sound/core/oss/pcm_oss.c +11 -8
@@ -1510,16 +1510,19 @@ static ssize_t snd_pcm_oss_read1(structstatic int snd_pcm_oss_reset (struct snd_pcm_oss_file *pcm_oss_file) {struct snd_pcm_substream *substream; +struct snd_pcm_runtime *runtime; +int i; - substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK ]; -if (substream !=NULL ) { +for (i =0 ; i <2 ; i++) { + substream = pcm_oss_file->streams[i]; +if (!substream) +continue ; + runtime = substream->runtime;snd_pcm_kernel_ioctl (substream,SNDRV_PCM_IOCTL_DROP ,NULL ); - substream->runtime->oss.prepare =1 ; - } - substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_CAPTURE ]; -if (substream !=NULL ) { -snd_pcm_kernel_ioctl (substream,SNDRV_PCM_IOCTL_DROP ,NULL ); - substream->runtime->oss.prepare =1 ; + runtime->oss.prepare =1 ; + runtime->oss.buffer_used =0 ; + runtime->oss.prev_hw_ptr_period =0 ; + runtime->oss.period_ptr =0 ; }return 0 ; }
PATCH 127/223 mm/vfs: revalidate page->mapping in do_generic_file_read()
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Dave Hansen <[email protected]>
commit 8d056cb965b8fb7c53c564abf28b1962d1061cd3 upstream.
70 hours into some stress tests of a 2.6.32-based enterprise kernel, we ran into a NULL dereference in here:
int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc,
unsigned long from)
{
----> struct inode *inode = page->mapping->host;
It looks like page->mapping was the culprit. (xmon trace is below). After closer examination, I realized that do_generic_file_read() does a find_get_page(), and eventually locks the page before calling block_is_partially_uptodate(). However, it doesn't revalidate the page->mapping after the page is locked. So, there's a small window between the find_get_page() and ->is_partially_uptodate() where the page could get truncated and page->mapping cleared.
We _have_ a reference, so it can't get reclaimed, but it certainly can be truncated.
I think the correct thing is to check page->mapping after the trylock_page(), and jump out if it got truncated. This patch has been running in the test environment for a month or so now, and we have not seen this bug pop up again.
xmon info:
1f:mon> e
cpu 0x1f: Vector: 300 (Data Access) at [c0000002ae36f770]
pc: c0000000001e7a6c: .block_is_partially_uptodate+0xc/0x100
lr: c000000000142944: .generic_file_aio_read+0x1e4/0x770
sp: c0000002ae36f9f0
msr: 8000000000009032
dar: 0
dsisr: 40000000
current = 0xc000000378f99e30
paca = 0xc000000000f66300
pid = 21946, comm = bash
1f:mon> r
R00 = 0025c0500000006d R16 = 0000000000000000
R01 = c0000002ae36f9f0 R17 = c000000362cd3af0
R02 = c000000000e8cd80 R18 = ffffffffffffffff
R03 = c0000000031d0f88 R19 = 0000000000000001
R04 = c0000002ae36fa68 R20 = c0000003bb97b8a0
R05 = 0000000000000000 R21 = c0000002ae36fa68
R06 = 0000000000000000 R22 = 0000000000000000
R07 = 0000000000000001 R23 = c0000002ae36fbb0
R08 = 0000000000000002 R24 = 0000000000000000
R09 = 0000000000000000 R25 = c000000362cd3a80
R10 = 0000000000000000 R26 = 0000000000000002
R11 = c0000000001e7b60 R27 = 0000000000000000
R12 = 0000000042000484 R28 = 0000000000000001
R13 = c000000000f66300 R29 = c0000003bb97b9b8
R14 = 0000000000000001 R30 = c000000000e28a08
R15 = 000000000000ffff R31 = c0000000031d0f88
pc = c0000000001e7a6c .block_is_partially_uptodate+0xc/0x100
lr = c000000000142944 .generic_file_aio_read+0x1e4/0x770
msr = 8000000000009032 cr = 22000488
ctr = c0000000001e7a60 xer = 0000000020000000 trap = 300
dar = 0000000000000000 dsisr = 40000000
1f:mon> t
[link register ] c000000000142944 .generic_file_aio_read+0x1e4/0x770
[c0000002ae36f9f0] c000000000142a14 .generic_file_aio_read+0x2b4/0x770 (unreliable)
[c0000002ae36fb40] c0000000001b03e4 .do_sync_read+0xd4/0x160
[c0000002ae36fce0] c0000000001b153c .vfs_read+0xec/0x1f0
[c0000002ae36fd80] c0000000001b1768 .SyS_read+0x58/0xb0
[c0000002ae36fe30] c00000000000852c syscall_exit+0x0/0x40
--- Exception: c00 (System Call) at 00000080a840bc54
SP (fffca15df30) is in userspace
1f:mon> di c0000000001e7a6c
c0000000001e7a6c e9290000 ld r9,0(r9)
c0000000001e7a70 418200c0 beq c0000000001e7b30 # .block_is_partially_uptodate+0xd0/0x100
c0000000001e7a74 e9440008 ld r10,8(r4)
c0000000001e7a78 78a80020 clrldi r8,r5,32
c0000000001e7a7c 3c000001 lis r0,1
c0000000001e7a80 812900a8 lwz r9,168(r9)
c0000000001e7a84 39600001 li r11,1
c0000000001e7a88 7c080050 subf r0,r8,r0
c0000000001e7a8c 7f805040 cmplw cr7,r0,r10
c0000000001e7a90 7d6b4830 slw r11,r11,r9
c0000000001e7a94 796b0020 clrldi r11,r11,32
c0000000001e7a98 419d00a8 bgt cr7,c0000000001e7b40 # .block_is_partially_uptodate+0xe0/0x100
c0000000001e7a9c 7fa55840 cmpld cr7,r5,r11
c0000000001e7aa0 7d004214 add r8,r0,r8
c0000000001e7aa4 79080020 clrldi r8,r8,32
c0000000001e7aa8 419c0078 blt cr7,c0000000001e7b20 # .block_is_partially_uptodate+0xc0/0x100--- mm/filemap.c | 3 +++ 1 file changed, 3 insertions(+)
mm/filemap.c +3 -0
@@ -1010,6 +1010,9 @@ find_page: goto page_not_up_to_date;if (!trylock_page (page)) goto page_not_up_to_date; +/* Did it get truncated before we got the lock? */ +if (!page->mapping) + goto page_not_up_to_date_locked;if (!mapping->a_ops->is_partially_uptodate (page, desc, offset)) goto page_not_up_to_date_locked;
PATCH 128/223 bio: take care not overflow page count when mapping/copying user data
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit cb4644cac4a2797afc847e6c92736664d4b0ea34 upstream.
If the iovec is being set up in a way that causes uaddr + PAGE_SIZE to overflow, we could end up attempting to map a huge number of pages. Check for this invalid input type.
--- fs/bio.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
fs/bio.c +13 -1
@@ -834,6 +834,12 @@ struct bio *bio_copy_user_iov(struct req end = (uaddr + iov[i].iov_len +PAGE_SIZE -1 ) >>PAGE_SHIFT ; start = uaddr >>PAGE_SHIFT ; +/* +* Overflow, abort +*/ +if (end < start) +return ERR_PTR (-EINVAL ); + nr_pages += end - start; len += iov[i].iov_len; }
@@ -961,6 +967,12 @@ static struct bio *__bio_map_user_iov(stunsigned long end = (uaddr + len +PAGE_SIZE -1 ) >>PAGE_SHIFT ;unsigned long start = uaddr >>PAGE_SHIFT ; +/* +* Overflow, abort +*/ +if (end < start) +return ERR_PTR (-EINVAL ); + nr_pages += end - start;/* * buffer must be aligned to at least hardsector size for now
@@ -988,7 +1000,7 @@ static struct bio *__bio_map_user_iov(stunsigned long start = uaddr >>PAGE_SHIFT ;const int local_nr_pages = end - start;const int page_limit = cur_page + local_nr_pages; - + ret =get_user_pages_fast (uaddr, local_nr_pages, write_to_vm, &pages[cur_page]);if (ret < local_nr_pages) {
PATCH 133/223 drm/radeon/kms: fix interlaced and doublescan handling
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit c49948f4bd39e27dd06a1cdb0c3743ca2a734f5e upstream.
--- drivers/gpu/drm/radeon/radeon_connectors.c | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
drivers/gpu/drm/radeon/radeon_connectors.c +34 -0
@@ -1083,6 +1083,8 @@ radeon_add_atom_connector(struct drm_dev rdev->mode_info.load_detect_property, 1); connector->polled =DRM_CONNECTOR_POLL_CONNECT ; + connector->interlace_allowed = true; + connector->doublescan_allowed = true;break ;case DRM_MODE_CONNECTOR_DVIA :drm_connector_init (dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
@@ -1096,6 +1098,8 @@ radeon_add_atom_connector(struct drm_devdrm_connector_attach_property (&radeon_connector->base, rdev->mode_info.load_detect_property,1 ); + connector->interlace_allowed = true; + connector->doublescan_allowed = true;break ;case DRM_MODE_CONNECTOR_DVII :case DRM_MODE_CONNECTOR_DVID :
@@ -1122,6 +1126,11 @@ radeon_add_atom_connector(struct drm_dev rdev->mode_info.load_detect_property, 1); } + connector->interlace_allowed = true; +if (connector_type ==DRM_MODE_CONNECTOR_DVII ) + connector->doublescan_allowed = true; +else + connector->doublescan_allowed = false;break ;case DRM_MODE_CONNECTOR_HDMIA :case DRM_MODE_CONNECTOR_HDMIB :
@@ -1142,6 +1151,11 @@ radeon_add_atom_connector(struct drm_dev rdev->mode_info.coherent_mode_property, 1); subpixel_order = SubPixelHorizontalRGB; + connector->interlace_allowed = true; +if (connector_type ==DRM_MODE_CONNECTOR_HDMIB ) + connector->doublescan_allowed = true; +else + connector->doublescan_allowed = false;break ;case DRM_MODE_CONNECTOR_DisplayPort:case DRM_MODE_CONNECTOR_eDP:
@@ -1172,6 +1186,9 @@ radeon_add_atom_connector(struct drm_devdrm_connector_attach_property (&radeon_connector->base, rdev->mode_info.coherent_mode_property,1 ); + connector->interlace_allowed = true; +/* in theory with a DP to VGA converter... */ + connector->doublescan_allowed = false;break ;case DRM_MODE_CONNECTOR_SVIDEO :case DRM_MODE_CONNECTOR_Composite:
@@ -1187,6 +1204,8 @@ radeon_add_atom_connector(struct drm_dev rdev->mode_info.tv_std_property, radeon_atombios_get_tv_info(rdev)); } + connector->interlace_allowed = false; + connector->doublescan_allowed = false;break ;case DRM_MODE_CONNECTOR_LVDS : radeon_dig_connector =kzalloc (sizeof (struct radeon_connector_atom_dig ),GFP_KERNEL );
@@ -1206,6 +1225,8 @@ radeon_add_atom_connector(struct drm_dev dev->mode_config.scaling_mode_property, DRM_MODE_SCALE_FULLSCREEN); subpixel_order = SubPixelHorizontalRGB; + connector->interlace_allowed = false; + connector->doublescan_allowed = false;break ; }
@@ -1277,6 +1298,8 @@ radeon_add_legacy_connector(struct drm_d rdev->mode_info.load_detect_property, 1); connector->polled =DRM_CONNECTOR_POLL_CONNECT ; + connector->interlace_allowed = true; + connector->doublescan_allowed = true;break ;case DRM_MODE_CONNECTOR_DVIA :drm_connector_init (dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
@@ -1290,6 +1313,8 @@ radeon_add_legacy_connector(struct drm_ddrm_connector_attach_property (&radeon_connector->base, rdev->mode_info.load_detect_property,1 ); + connector->interlace_allowed = true; + connector->doublescan_allowed = true;break ;case DRM_MODE_CONNECTOR_DVII :case DRM_MODE_CONNECTOR_DVID :
@@ -1307,6 +1332,11 @@ radeon_add_legacy_connector(struct drm_d 1); } subpixel_order = SubPixelHorizontalRGB; + connector->interlace_allowed = true; +if (connector_type ==DRM_MODE_CONNECTOR_DVII ) + connector->doublescan_allowed = true; +else + connector->doublescan_allowed = false;break ;case DRM_MODE_CONNECTOR_SVIDEO :case DRM_MODE_CONNECTOR_Composite:
@@ -1329,6 +1359,8 @@ radeon_add_legacy_connector(struct drm_d rdev->mode_info.tv_std_property, radeon_combios_get_tv_info(rdev)); } + connector->interlace_allowed = false; + connector->doublescan_allowed = false;break ;case DRM_MODE_CONNECTOR_LVDS :drm_connector_init (dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type);
@@ -1342,6 +1374,8 @@ radeon_add_legacy_connector(struct drm_d dev->mode_config.scaling_mode_property, DRM_MODE_SCALE_FULLSCREEN); subpixel_order = SubPixelHorizontalRGB; + connector->interlace_allowed = false; + connector->doublescan_allowed = false;break ; }
PATCH 132/223 drm/radeon/kms: Fix retrying ttm_bo_init() after it failed once.
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]>
commit 2b66b50b12cabc05f05543e792d4c9c2465d5702 upstream.
If ttm_bo_init() returns failure, it already destroyed the BO, so we need to retry from scratch.
--- drivers/gpu/drm/radeon/radeon_object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_object.c +2 -2
@@ -102,6 +102,8 @@ int radeon_bo_create(struct radeon_devic type = ttm_bo_type_device; } *bo_ptr =NULL ; + +retry: bo =kzalloc (sizeof (struct radeon_bo ),GFP_KERNEL );if (bo ==NULL )return -ENOMEM ;
@@ -109,8 +111,6 @@ int radeon_bo_create(struct radeon_devic bo->gobj = gobj; bo->surface_reg =-1 ;INIT_LIST_HEAD (&bo->list); - -retry:radeon_ttm_placement_from_domain (bo, domain);/* Kernel allocation are uninterruptible */ mutex_lock (&rdev->vram_mutex);
PATCH 138/223 sched: fix RCU lockdep splat from task_group()
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 6506cf6ce68d78a5470a8360c965dafe8e4b78e3 upstream.
This addresses the following RCU lockdep splat:
[0.051203] CPU0: AMD QEMU Virtual CPU version 0.12.4 stepping 03
[0.052999] lockdep: fixing up alternatives.
[0.054105]
[0.054106] ===================================================
[0.054999] [ INFO: suspicious rcu_dereference_check() usage. ]
[0.054999] ---------------------------------------------------
[0.054999] kernel/sched.c:616 invoked rcu_dereference_check() without protection!
[0.054999]
[0.054999] other info that might help us debug this:
[0.054999]
[0.054999]
[0.054999] rcu_scheduler_active = 1, debug_locks = 1
[0.054999] 3 locks held by swapper/1:
[0.054999] #0: (cpu_add_remove_lock){+.+.+.}, at: [<ffffffff814be933>] cpu_up+0x42/0x6a
[0.054999] #1: (cpu_hotplug.lock){+.+.+.}, at: [<ffffffff810400d8>] cpu_hotplug_begin+0x2a/0x51
[0.054999] #2: (&rq->lock){-.-...}, at: [<ffffffff814be2f7>] init_idle+0x2f/0x113
[0.054999]
[0.054999] stack backtrace:
[0.054999] Pid: 1, comm: swapper Not tainted 2.6.35 #1
[0.054999] Call Trace:
[0.054999] [<ffffffff81068054>] lockdep_rcu_dereference+0x9b/0xa3
[0.054999] [<ffffffff810325c3>] task_group+0x7b/0x8a
[0.054999] [<ffffffff810325e5>] set_task_rq+0x13/0x40
[0.054999] [<ffffffff814be39a>] init_idle+0xd2/0x113
[0.054999] [<ffffffff814be78a>] fork_idle+0xb8/0xc7
[0.054999] [<ffffffff81068717>] ? mark_held_locks+0x4d/0x6b
[0.054999] [<ffffffff814bcebd>] do_fork_idle+0x17/0x2b
[0.054999] [<ffffffff814bc89b>] native_cpu_up+0x1c1/0x724
[0.054999] [<ffffffff814bcea6>] ? do_fork_idle+0x0/0x2b
[0.054999] [<ffffffff814be876>] _cpu_up+0xac/0x127
[0.054999] [<ffffffff814be946>] cpu_up+0x55/0x6a
[0.054999] [<ffffffff81ab562a>] kernel_init+0xe1/0x1ff
[0.054999] [<ffffffff81003854>] kernel_thread_helper+0x4/0x10
[0.054999] [<ffffffff814c353c>] ? restore_args+0x0/0x30
[0.054999] [<ffffffff81ab5549>] ? kernel_init+0x0/0x1ff
[0.054999] [<ffffffff81003850>] ? kernel_thread_helper+0x0/0x10
[0.056074] Booting Node 0, Processors #1lockdep: fixing up alternatives.
[0.130045] #2lockdep: fixing up alternatives.
[0.203089] #3 Ok.
[0.275286] Brought up 4 CPUs
[0.276005] Total of 4 processors activated (16017.17 BogoMIPS).The cgroup_subsys_state structures referenced by idle tasks are never freed, because the idle tasks should be part of the root cgroup, which is not removable.
The problem is that while we do in-fact hold rq->lock, the newly spawned idle thread's cpu is not yet set to the correct cpu so the lockdep check in task_group():
lockdep_is_held(&task_rq(p)->lock)
will fail.
But this is a chicken and egg problem. Setting the CPU's runqueue requires that the CPU's runqueue already be set. ;-)
So insert an RCU read-side critical section to avoid the complaint.
--- kernel/sched.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
kernel/sched.c +12 -0
@@ -5157,7 +5157,19 @@ void __cpuinit init_idle(struct task_str idle->se.exec_start =sched_clock ();cpumask_copy (&idle->cpus_allowed,cpumask_of (cpu)); +/* +* We're having a chicken and egg problem, even though we are +* holding rq->lock, the cpu isn't yet set to this cpu so the +* lockdep check in task_group() will fail. +* +* Similar case to sched_fork(). / Alternatively we could +* use task_rq_lock() here and obtain the other rq->lock. +* +* Silence PROVE_RCU +*/ +rcu_read_lock ();__set_task_cpu (idle, cpu); +rcu_read_unlock (); rq->curr = rq->idle = idle;#if defined(CONFIG_SMP ) && defined(__ARCH_WANT_UNLOCKED_CTXSW)
PATCH 137/223 intel-gtt: fix gtt_total_entries detection
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Vetter <[email protected]>
commit e5e408fc94595aab897f613b6f4e2f5b36870a6f upstream.
In commit f1befe71 Chris Wilson added some code to clear the full gtt on g33/pineview instead of just the mappable part. The code looks like it was copy-pasted from agp/intel-gtt.c, at least an identical piece of code is still there (in intel_i830_init_gtt_entries). This lead to a regression in 2.6.35 which was supposedly fixed in commit e7b96f28
Now this commit makes absolutely no sense to me. It seems to be slightly confused about chipset generations - it references docs for 4th gen but the regression concerns 3rd gen g33. Luckily the the g33 gmch docs are available with the GMCH Graphics Control pci config register definitions. The other (bigger problem) is that the new check in there uses the i830 stolen mem bits (.5M, 1M or 8M of stolen mem). They are different since the i855GM.
The most likely case is that it hits the 512M fallback, which was probably the right thing for the boxes this was tested on.
So the original approach by Chris Wilson seems to be wrong and the current code is definitely wrong. There is a third approach by Jesse Barnes from his RFC patch "Who wants a bigger GTT mapping range?" where he simply shoves g33 in the same clause like later chipset generations.
I've asked him and Jesse confirmed that this should work. So implement it.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16891$
--- drivers/char/agp/intel-gtt.c | 63 ++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 36 deletions(-)
drivers/char/agp/intel-gtt.c +27 -36
@@ -531,7 +531,7 @@ static void intel_i830_init_gtt_entries(pci_read_config_word (agp_bridge->dev,I830_GMCH_CTRL , &gmch_ctrl); -if (IS_I965 ) { +if (IS_G33 ||IS_I965 ) {u32 pgetbl_ctl; pgetbl_ctl =readl (intel_private.registers+I810_PGETBL_CTL );
@@ -564,22 +564,6 @@ static void intel_i830_init_gtt_entries( size =512 ; } size +=4 ;/* add in BIOS popup space */ - }else if (IS_G33 && !IS_PINEVIEW ) { -/* G33's GTT size defined in gmch_ctrl */ -switch (gmch_ctrl &G33_PGETBL_SIZE_MASK ) { -case G33_PGETBL_SIZE_1M : - size =1024 ; -break ; -case G33_PGETBL_SIZE_2M : - size =2048 ; -break ; -default : -dev_info (&agp_bridge->dev->dev, -"unknown page table size 0x%x, assuming 512KB\n" , - (gmch_ctrl &G33_PGETBL_SIZE_MASK )); - size =512 ; - } - size +=4 ; }else if (IS_G4X ||IS_PINEVIEW ) {/* On 4 series hardware, GTT stolen is separate from graphics * stolen, ignore it in stolen gtt entries counting. However,
@@ -1250,24 +1234,31 @@ static int intel_i915_get_gtt_size(void)int size;if (IS_G33 ) { -u16 gmch_ctrl; +u32 pgetbl_ctl; + pgetbl_ctl =readl (intel_private.registers+I810_PGETBL_CTL ); -/* G33's GTT size defined in gmch_ctrl */ -pci_read_config_word (agp_bridge->dev,I830_GMCH_CTRL , &gmch_ctrl); -switch (gmch_ctrl &I830_GMCH_GMS_MASK ) { -case I830_GMCH_GMS_STOLEN_512 : +switch (pgetbl_ctl &I965_PGETBL_SIZE_MASK ) { +case I965_PGETBL_SIZE_128KB : + size =128 ; +break ; +case I965_PGETBL_SIZE_256KB : + size =256 ; +break ; +case I965_PGETBL_SIZE_512KB : size =512 ;break ; -case I830_GMCH_GMS_STOLEN_1024 : +case I965_PGETBL_SIZE_1MB : size =1024 ;break ; -case I830_GMCH_GMS_STOLEN_8192 : - size =8 *1024 ; +case I965_PGETBL_SIZE_2MB : + size =2048 ; +break ; +case I965_PGETBL_SIZE_1_5MB : + size =1024 +512 ;break ;default : -dev_info (&agp_bridge->dev->dev, -"unknown page table size 0x%x, assuming 512KB\n" , - (gmch_ctrl &I830_GMCH_GMS_MASK )); +dev_info (&intel_private.pcidev->dev, +"unknown page table size, assuming 512KB\n" ); size =512 ; } }else {
@@ -1299,14 +1290,6 @@ static int intel_i915_create_gatt_table(pci_read_config_dword (intel_private.pcidev,I915_MMADDR , &temp);pci_read_config_dword (intel_private.pcidev,I915_PTEADDR , &temp2); - gtt_map_size =intel_i915_get_gtt_size (); - - intel_private.gtt =ioremap (temp2, gtt_map_size); -if (!intel_private.gtt) -return -ENOMEM ; - - intel_private.gtt_total_size = gtt_map_size /4 ; - temp &=0xfff80000 ; intel_private.registers =ioremap (temp,128 *4096 );
@@ -1315,6 +1298,14 @@ static int intel_i915_create_gatt_table(return -ENOMEM ; } + gtt_map_size =intel_i915_get_gtt_size (); + + intel_private.gtt =ioremap (temp2, gtt_map_size); +if (!intel_private.gtt) +return -ENOMEM ; + + intel_private.gtt_total_size = gtt_map_size /4 ; + temp =readl (intel_private.registers+I810_PGETBL_CTL ) &0xfffff000 ;global_cache_flush ();/* FIXME: ? */
PATCH 142/223 xHCI: fix wMaxPacketSize mask
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Andiry Xu <[email protected]>
commit dc07c91b9b4067022210e68d914a6890a4d70622 upstream.
USB2.0 spec 9.6.6 says: For all endpoints, bit 10..0 specify the maximum packet size(in bytes).
So the wMaxPacketSize mask should be 0x7ff rather than 0x3ff.
This patch should be queued for the stable tree. The bug in xhci_endpoint_init() was present as far back as 2.6.31, and the bug in xhci_get_max_esit_payload() was present when the function was introduced in 2.6.34.
--- drivers/usb/host/xhci-mem.c | 4 ++-- drivers/usb/host/xhci.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-mem.c +2 -2
@@ -1086,7 +1086,7 @@ static inline u32 xhci_get_max_esit_paylif (udev->speed ==USB_SPEED_SUPER )return ep->ss_ep_comp.wBytesPerInterval; - max_packet = ep->desc.wMaxPacketSize &0x3ff ; + max_packet =GET_MAX_PACKET (ep->desc.wMaxPacketSize); max_burst = (ep->desc.wMaxPacketSize &0x1800 ) >>11 ;/* A 0 in max burst means 1 transfer per ESIT */ return max_packet * (max_burst +1 );
@@ -1165,7 +1165,7 @@ int xhci_endpoint_init(struct xhci_hcd */* Fall through */ case USB_SPEED_FULL :case USB_SPEED_LOW : - max_packet = ep->desc.wMaxPacketSize &0x3ff ; + max_packet =GET_MAX_PACKET (ep->desc.wMaxPacketSize); ep_ctx->ep_info2 |=MAX_PACKET (max_packet);break ;default :
drivers/usb/host/xhci.h +5 -0
@@ -614,6 +614,11 @@ struct xhci_ep_ctx {#define MAX_PACKET_MASK (0xffff << 16)#define MAX_PACKET_DECODED (p) (((p) >> 16) & 0xffff) +/* Get max packet size from ep desc. Bit 10..0 specify the max packet size. +* USB2.0 spec 9.6.6. +*/ +#define GET_MAX_PACKET (p) ((p) & 0x7ff) +/* tx_info bitmasks */ #define AVG_TRB_LENGTH_FOR_EP (p) ((p) & 0xffff)#define MAX_ESIT_PAYLOAD_FOR_EP (p) (((p) & 0xffff) << 16)
PATCH 143/223 xhci: Fix reset-device and configure-endpoint commands
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Paul Zimmerman <[email protected]>
commit 7a3783efffc7bc2e702d774e47fad5b8e37e9ad1 upstream.
We have been having problems with the USB-IF Gold Tree tests when plugging and unplugging devices from the tree. I have seen that the reset-device and configure-endpoint commands, which are invoked from xhci_discover_or_reset_device() and xhci_configure_endpoint(), will sometimes time out.
After much debugging, I determined that the commands themselves do not actually time out, but rather their completion events do not get delivered to the right place.
This happens when the command ring has just wrapped around, and it's enqueue pointer is left pointing to the link TRB. xhci_discover_or_reset_device() and xhci_configure_endpoint() use the enqueue pointer directly as their command TRB pointer, without checking whether it's pointing to the link TRB.
When the completion event arrives, if the command TRB is pointing to the link TRB, the check against the command ring dequeue pointer in handle_cmd_in_cmd_wait_list() fails, so the completion inside the command does not get signaled.
The patch below fixes the timeout problem for me.
This should be queued for the 2.6.35 and 2.6.36 stable trees.
--- drivers/usb/host/xhci.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/usb/host/xhci.c +18 -0
@@ -1224,6 +1224,15 @@ static int xhci_configure_endpoint(struc cmd_completion = command->completion; cmd_status = &command->status; command->command_trb = xhci->cmd_ring->enqueue; + +/* Enqueue pointer can be left pointing to the link TRB, +* we must handle that +*/ +if ((command->command_trb->link.control &TRB_TYPE_BITMASK ) + ==TRB_TYPE (TRB_LINK )) + command->command_trb = + xhci->cmd_ring->enq_seg->next->trbs; +list_add_tail (&command->cmd_list, &virt_dev->cmd_list); }else { in_ctx = virt_dev->in_ctx;
@@ -1933,6 +1942,15 @@ int xhci_reset_device(struct usb_hcd *hc/* Attempt to submit the Reset Device command to the command ring */ spin_lock_irqsave (&xhci->lock, flags); reset_device_cmd->command_trb = xhci->cmd_ring->enqueue; + +/* Enqueue pointer can be left pointing to the link TRB, +* we must handle that +*/ +if ((reset_device_cmd->command_trb->link.control &TRB_TYPE_BITMASK ) + ==TRB_TYPE (TRB_LINK )) + reset_device_cmd->command_trb = + xhci->cmd_ring->enq_seg->next->trbs; +list_add_tail (&reset_device_cmd->cmd_list, &virt_dev->cmd_list); ret =xhci_queue_reset_device (xhci, slot_id);if (ret) {
PATCH 146/223 USB: gadget: AT91: fix typo in atmel_usba_udc driver
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Josh Wu <[email protected]>
commit b48809518631880207796b4aab0fc39c2f036754 upstream.
compile fix for bug introduced by 969affff547027)
--- drivers/usb/gadget/atmel_usba_udc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/atmel_usba_udc.c +1 -1
@@ -2016,7 +2016,7 @@ static int __init usba_udc_probe(struct } }else {/* gpio_request fail so use -EINVAL for gpio_is_valid */ - ubc->vbus_pin = -EINVAL ; + udc->vbus_pin = -EINVAL ; } }
PATCH 150/223 usb: misc: sisusbvga: fix information leak to userland
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Vasiliy Kulikov <[email protected]>
commit 5dc92cf1d0b4b0debbd2e333b83f9746c103533d upstream.
Structure sisusb_info is copied to userland with "sisusb_reserved" field uninitialized. It leads to leaking of contents of kernel stack memory.
--- drivers/usb/misc/sisusbvga/sisusb.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/misc/sisusbvga/sisusb.c +1 -0
@@ -3008,6 +3008,7 @@ sisusb_ioctl(struct file *file, unsigned#else x.sisusb_conactive =0 ;#endif +memset (x.sisusb_reserved,0 ,sizeof (x.sisusb_reserved));if (copy_to_user ((void __user *)arg, &x,sizeof (x))) retval = -EFAULT ;
PATCH 149/223 USB: option: fix when the driver is loaded incorrectly for some Huawei devices.
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: ma rui <[email protected]>
commit 58c0d9d70109bd7e82bdb9517007311a48499960 upstream.
When huawei datacard with PID 0x14AC is insterted into Linux system, the present kernel will load the "option" driver to all the interfaces. But actually, some interfaces run as other function and do not need "option" driver.
In this path, we modify the id_tables, when the PID is 0x14ac ,VID is 0x12d1, Only when the interface's Class is 0xff,Subclass is 0xff, Pro is 0xff, it does need "option" driver.
--- drivers/usb/serial/option.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/option.c +1 -1
@@ -492,7 +492,7 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) }, - { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC, 0xff, 0xff, 0xff) }, { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) }, { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */
PATCH 154/223 USB: EHCI: fix obscure race in ehci_endpoint_disable
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit 02e2c51ba3e80acde600721ea784c3ef84da5ea1 upstream.
This patch (as1435) fixes an obscure and unlikely race in ehci-hcd. When an async URB is unlinked, the corresponding QH is removed from the async list. If the QH's endpoint is then disabled while the URB is being given back, ehci_endpoint_disable() won't find the QH on the async list, causing it to believe that the QH has been lost. This will lead to a memory leak at best and quite possibly to an oops.
The solution is to trust usbcore not to lose track of endpoints. If the QH isn't on the async list then it doesn't need to be taken off the list, but the driver should still wait for the QH to become IDLE before disabling it.
In theory this fixes Bugzilla #20182. In fact the race is so rare that it's not possible to tell whether the bug is still present. However, adding delays and making other changes to force the race seems to show that the patch works.
--- drivers/usb/host/ehci-hcd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/usb/host/ehci-hcd.c +5 -5
@@ -1009,10 +1009,11 @@ rescan: tmp && tmp != qh; tmp = tmp->qh_next.qh)continue ; -/* periodic qh self-unlinks on empty */ -if (!tmp) - goto nogood; -unlink_async (ehci, qh); +/* periodic qh self-unlinks on empty, and a COMPLETING qh +* may already be unlinked. +*/ +if (tmp) +unlink_async (ehci, qh);/* FALL THROUGH */ case QH_STATE_UNLINK :/* wait for hw to finish? */ case QH_STATE_UNLINK_WAIT :
@@ -1029,7 +1030,6 @@ idle_timeout: }/* else FALL THROUGH */ default : -nogood:/* caller was supposed to have unlinked any requests; * that's not our job. just leak this memory. */
PATCH 156/223 USB: atm: ueagle-atm: fix up some permissions on the sysfs files
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit e502ac5e1eca99d7dc3f12b2a6780ccbca674858 upstream.
Some of the sysfs files had the incorrect permissions. Some didn't make sense at all (writable for a file that you could not write to?)
--- drivers/usb/atm/ueagle-atm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/usb/atm/ueagle-atm.c +3 -4
@@ -2291,7 +2291,7 @@ out:return ret; } -static DEVICE_ATTR(stat_status, S_IWUGO | S_IRUGO, read_status, reboot); +static DEVICE_ATTR(stat_status, S_IWUSR | S_IRUGO, read_status, reboot);static ssize_t read_human_status (struct device *dev,struct device_attribute *attr,char *buf)
@@ -2354,8 +2354,7 @@ out:return ret; } -static DEVICE_ATTR(stat_human_status, S_IWUGO | S_IRUGO, - read_human_status, NULL); +static DEVICE_ATTR(stat_human_status, S_IRUGO, read_human_status, NULL);static ssize_t read_delin (struct device *dev,struct device_attribute *attr,char *buf)
@@ -2387,7 +2386,7 @@ out:return ret; } -static DEVICE_ATTR(stat_delin, S_IWUGO | S_IRUGO, read_delin, NULL); +static DEVICE_ATTR(stat_delin, S_IRUGO, read_delin, NULL);#define UEA_ATTR (name, reset) \ \
PATCH 159/223 USB: misc: trancevibrator: fix up a sysfs attribute permission
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit d489a4b3926bad571d404ca6508f6744b9602776 upstream.
It should not be writable by any user.
--- drivers/usb/misc/trancevibrator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/trancevibrator.c +1 -1
@@ -86,7 +86,7 @@ static ssize_t set_speed(struct device *return count; } -static DEVICE_ATTR(speed, S_IWUGO | S_IRUGO, show_speed, set_speed); +static DEVICE_ATTR(speed, S_IRUGO | S_IWUSR, show_speed, set_speed);static int tv_probe (struct usb_interface *interface,const struct usb_device_id *id)
PATCH 161/223 USB: ftdi_sio: Add ID for RT Systems USB-29B radio cable
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Michael Stuermer <[email protected]>
commit 28942bb6a9dd4e2ed793675e515cfb8297ed355b upstream.
Another variant of the RT Systems programming cable for ham radios.
--- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 1 + 2 files changed, 2 insertions(+)
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -696,6 +696,7 @@ static struct usb_device_id id_table_com .driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk }, { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_SERIAL_VX7_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_CT29B_PID) }, { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) }, { USB_DEVICE(FTDI_VID, FTDI_PHI_FISCO_PID) }, { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
drivers/usb/serial/ftdi_sio_ids.h +1 -0
@@ -721,6 +721,7 @@*/ #define RTSYSTEMS_VID 0x2100/* Vendor ID */ #define RTSYSTEMS_SERIAL_VX7_PID 0x9e52/* Serial converter for VX-7 Radios using FT232RL */ +#define RTSYSTEMS_CT29B_PID 0x9e54/* CT29B Radio Cable */ /* * Bayer Ascensia Contour blood glucose meter USB-converter cable.
PATCH 164/223 e1000: fix screaming IRQ
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Anupam Chanda <[email protected]>
commit ab08853fab2093e5c6f5de56827a4c93dce4b055 upstream.
VMWare reports that the e1000 driver has a bug when bringing down the interface, such that interrupts are not disabled in the hardware but the driver stops reporting that it consumed the interrupt.
The fix is to set the driver's "down" flag later in the routine, after all the timers and such have exited, preventing the interrupt handler from being called and exiting early without handling the interrupt.
--- drivers/net/e1000/e1000_main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/e1000/e1000_main.c +8 -4
@@ -31,7 +31,7 @@char e1000_driver_name[] ="e1000" ;static char e1000_driver_string[] ="Intel(R) PRO/1000 Network Driver" ; -#define DRV_VERSION "7.3.21-k6-NAPI" +#define DRV_VERSION "7.3.21-k8-NAPI"const char e1000_driver_version[] =DRV_VERSION ;static const char e1000_copyright[] ="Copyright (c) 1999-2006 Intel Corporation." ;
@@ -483,9 +483,6 @@ void e1000_down(struct e1000_adapter *adstruct net_device *netdev = adapter->netdev;u32 rctl, tctl; -/* signal that we're down so the interrupt handler does not -* reschedule our watchdog timer */ -set_bit (__E1000_DOWN, &adapter->flags);/* disable receives in the hardware */ rctl =er32 (RCTL );
@@ -506,6 +503,13 @@ void e1000_down(struct e1000_adapter *ade1000_irq_disable (adapter); +/* +* Setting DOWN must be after irq_disable to prevent +* a screaming interrupt. Setting DOWN also prevents +* timers and tasks from rescheduling. +*/ +set_bit (__E1000_DOWN, &adapter->flags); +del_timer_sync (&adapter->tx_fifo_stall_timer);del_timer_sync (&adapter->watchdog_timer);del_timer_sync (&adapter->phy_info_timer);
PATCH 166/223 acpi-cpufreq: fix a memleak when unloading driver
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Rui <[email protected]>
commit dab5fff14df2cd16eb1ad4c02e83915e1063fece upstream.
We didn't free per_cpu(acfreq_data, cpu)->freq_table when acpi_freq driver is unloaded.
Resulting in the following messages in /sys/kernel/debug/kmemleak:
unreferenced object 0xf6450e80 (size 64):
comm "modprobe", pid 1066, jiffies 4294677317 (age 19290.453s) hex dump (first 32 bytes):
00 00 00 00 e8 a2 24 00 01 00 00 00 00 9f 24 00 ......$.......$.
02 00 00 00 00 6a 18 00 03 00 00 00 00 35 0c 00 .....j.......5..
backtrace:
[<c123ba97>] kmemleak_alloc+0x27/0x50
[<c109f96f>] __kmalloc+0xcf/0x110
[<f9da97ee>] acpi_cpufreq_cpu_init+0x1ee/0x4e4 [acpi_cpufreq]
[<c11cd8d2>] cpufreq_add_dev+0x142/0x3a0
[<c11920b7>] sysdev_driver_register+0x97/0x110
[<c11cce56>] cpufreq_register_driver+0x86/0x140
[<f9dad080>] 0xf9dad080
[<c1001130>] do_one_initcall+0x30/0x160
[<c10626e9>] sys_init_module+0x99/0x1e0
[<c1002d97>] sysenter_do_call+0x12/0x26
[<ffffffff>] 0xffffffffhttps://bugzilla.kernel.org/show_bug.cgi?id=15807#c21
--- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +1 -0
@@ -704,6 +704,7 @@ static int acpi_cpufreq_cpu_exit(structper_cpu (acfreq_data, policy->cpu) =NULL ;acpi_processor_unregister_performance (data->acpi_data, policy->cpu); +kfree (data->freq_table);kfree (data); }
PATCH 169/223 saa7134: Fix autodetect for Behold A7 and H7 TV cards
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Dmitri Belimov <[email protected]>
commit 35bbe587d0959712b69540077c9e0fd27d3e6baf upstream.
The entries for those cards are after the generic entries, so they don't work, in practice. Moving them to happen before the generic entres fix the issue.
--- drivers/media/video/saa7134/saa7134-cards.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/media/video/saa7134/saa7134-cards.c +12 -12
@@ -6631,6 +6631,18 @@ struct pci_device_id saa7134_pci_tbl[] = .subdevice = 0x6655, .driver_data = SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S, }, { + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x5ace, /* Beholder Intl. Ltd. */ + .subdevice = 0x7190, + .driver_data = SAA7134_BOARD_BEHOLD_H7, + }, { + .vendor = PCI_VENDOR_ID_PHILIPS, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, + .subvendor = 0x5ace, /* Beholder Intl. Ltd. */ + .subdevice = 0x7090, + .driver_data = SAA7134_BOARD_BEHOLD_A7, + }, { /* --- boards without eeprom + subsystem ID --- */ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -6668,18 +6680,6 @@ struct pci_device_id saa7134_pci_tbl[] = .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, .driver_data = SAA7134_BOARD_UNKNOWN, - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7133, - .subvendor = 0x5ace, /* Beholder Intl. Ltd. */ - .subdevice = 0x7190, - .driver_data = SAA7134_BOARD_BEHOLD_H7, - }, { - .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7133, - .subvendor = 0x5ace, /* Beholder Intl. Ltd. */ - .subdevice = 0x7090, - .driver_data = SAA7134_BOARD_BEHOLD_A7, },{/* --- end of list --- */ }
PATCH 170/223 fuse: fix attributes after open(O_TRUNC)
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Ken Sumrall <[email protected]>
commit a0822c55779d9319939eac69f00bb729ea9d23da upstream.
The attribute cache for a file was not being cleared when a file is opened with O_TRUNC.
If the filesystem's open operation truncates the file ("atomic_o_trunc" feature flag is set) then the kernel should invalidate the cached st_mtime and st_ctime attributes.
Also i_size should be explicitly be set to zero as it is used sometimes without refreshing the cache.
--- fs/fuse/file.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/fuse/file.c +10 -0
@@ -134,6 +134,7 @@ EXPORT_SYMBOL_GPL(fuse_do_open);void fuse_finish_open (struct inode *inode,struct file *file) {struct fuse_file *ff = file->private_data; +struct fuse_conn *fc =get_fuse_conn (inode);if (ff->open_flags &FOPEN_DIRECT_IO ) file->f_op = &fuse_direct_io_file_operations;
@@ -141,6 +142,15 @@ void fuse_finish_open(struct inode *inodinvalidate_inode_pages2 (inode->i_mapping);if (ff->open_flags &FOPEN_NONSEEKABLE )nonseekable_open (inode, file); +if (fc->atomic_o_trunc && (file->f_flags &O_TRUNC )) { +struct fuse_inode *fi =get_fuse_inode (inode); + +spin_lock (&fc->lock); + fi->attr_version = ++fc->attr_version; +i_size_write (inode,0 ); +spin_unlock (&fc->lock); +fuse_invalidate_attr (inode); + } }int fuse_open_common (struct inode *inode,struct file *file,bool isdir)
PATCH 168/223 PNPACPI: cope with invalid device IDs
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
commit 420a0f66378c84b00b0e603e4d38210102dbe367 upstream.
If primary ID (HID) is invalid try locating first valid ID on compatible ID list before giving up.
This helps, for example, to recognize i8042 AUX port on Sony Vaio VPCZ1 which uses SNYSYN0003 as HID. Without the patch users are forced to boot with i8042.nopnp to make use of their touchpads.
--- drivers/pnp/pnpacpi/core.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
drivers/pnp/pnpacpi/core.c +24 -5
@@ -28,7 +28,7 @@#include "../base.h" #include "pnpacpi.h" -static int num =0 ; +static int num;/* We need only to blacklist devices that have already an acpi driver that * can't use pnp layer. We don't need to blacklist device that are directly
@@ -157,11 +157,24 @@ struct pnp_protocol pnpacpi_protocol = { };EXPORT_SYMBOL (pnpacpi_protocol); +static char *pnpacpi_get_id (struct acpi_device *device) +{ +struct acpi_hardware_id *id; + +list_for_each_entry (id, &device->pnp.ids, list) { +if (ispnpidacpi (id->id)) +return id->id; + } + +return NULL ; +} +static int __init pnpacpi_add_device (struct acpi_device *device) {acpi_handle temp =NULL ;acpi_status status;struct pnp_dev *dev; +char *pnpid;struct acpi_hardware_id *id;/*
@@ -169,11 +182,17 @@ static int __init pnpacpi_add_device(str* driver should not be loaded. */ status =acpi_get_handle (device->handle,"_CRS" , &temp); -if (ACPI_FAILURE (status) || !ispnpidacpi (acpi_device_hid (device)) || -is_exclusive_device (device) || (!device->status.present)) +if (ACPI_FAILURE (status)) +return 0 ; + + pnpid =pnpacpi_get_id (device); +if (!pnpid) +return 0 ; + +if (is_exclusive_device (device) || !device->status.present)return 0 ; - dev =pnp_alloc_dev (&pnpacpi_protocol, num,acpi_device_hid (device)); + dev =pnp_alloc_dev (&pnpacpi_protocol, num, pnpid);if (!dev)return -ENOMEM ;
@@ -204,7 +223,7 @@ static int __init pnpacpi_add_device(strpnpacpi_parse_resource_option_data (dev);list_for_each_entry (id, &device->pnp.ids, list) { -if (!strcmp (id->id,acpi_device_hid (device))) +if (!strcmp (id->id, pnpid))continue ;if (!ispnpidacpi (id->id))continue ;
PATCH 176/223 nommu: yield CPU while disposing VM
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Steven J. Magnani <[email protected]>
commit 04c3496152394d17e3bc2316f9731ee3e8a026bc upstream.
Depending on processor speed, page size, and the amount of memory a process is allowed to amass, cleanup of a large VM may freeze the system for many seconds. This can result in a watchdog timeout.
Make sure other tasks receive some service when cleaning up large VMs.
--- mm/nommu.c | 1 + 1 file changed, 1 insertion(+)
mm/nommu.c +1 -0
@@ -1673,6 +1673,7 @@ void exit_mmap(struct mm_struct *mm) mm->mmap = vma->vm_next;delete_vma_from_mm (vma);delete_vma (mm, vma); +cond_resched (); }kleave ("" );
PATCH 181/223 ARM: 6464/2: fix spinlock recursion in adjust_pte()
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Mika Westerberg <[email protected]>
commit 4e54d93d3c9846ba1c2644ad06463dafa690d1b7 upstream.
When running following code in a machine which has VIVT caches and USE_SPLIT_PTLOCKS is not defined:
fd = open("/etc/passwd", O_RDONLY);
addr = mmap(NULL, 4096, PROT_READ, MAP_SHARED, fd, 0);
addr2 = mmap(NULL, 4096, PROT_READ, MAP_SHARED, fd, 0);
v = *((int *)addr);we will hang in spinlock recursion in the page fault handler:
BUG: spinlock recursion on CPU#0, mmap_test/717
lock: c5e295d8, .magic: dead4ead, .owner: mmap_test/717,
.owner_cpu: 0
[<c0026604>] (unwind_backtrace+0x0/0xec)
[<c014ee48>] (do_raw_spin_lock+0x40/0x140)
[<c0027f68>] (update_mmu_cache+0x208/0x250)
[<c0079db4>] (__do_fault+0x320/0x3ec)
[<c007af7c>] (handle_mm_fault+0x2f0/0x6d8)
[<c0027834>] (do_page_fault+0xdc/0x1cc)
[<c00202d0>] (do_DataAbort+0x34/0x94)This comes from the fact that when USE_SPLIT_PTLOCKS is not defined, the only lock protecting the page tables is mm->page_table_lock which is already locked before update_mmu_cache() is called.
--- arch/arm/mm/fault-armv.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
arch/arm/mm/fault-armv.c +26 -2
@@ -65,6 +65,30 @@ static int do_adjust_pte(struct vm_area_return ret; } +#if USE_SPLIT_PTLOCKS +/* +* If we are using split PTE locks, then we need to take the page +* lock here. Otherwise we are using shared mm->page_table_lock +* which is already locked, thus cannot take it. +*/ +static inline void do_pte_lock (spinlock_t *ptl) +{ +/* +* Use nested version here to indicate that we are already +* holding one similar spinlock. +*/ +spin_lock_nested (ptl,SINGLE_DEPTH_NESTING ); +} + +static inline void do_pte_unlock (spinlock_t *ptl) +{ +spin_unlock (ptl); +} +#else /* !USE_SPLIT_PTLOCKS */ +static inline void do_pte_lock (spinlock_t *ptl) {} +static inline void do_pte_unlock (spinlock_t *ptl) {} +#endif /* USE_SPLIT_PTLOCKS */ +static int adjust_pte (struct vm_area_struct *vma,unsigned long address,unsigned long pfn) {
@@ -89,11 +113,11 @@ static int adjust_pte(struct vm_area_str*/ ptl =pte_lockptr (vma->vm_mm, pmd); pte =pte_offset_map_nested (pmd, address); -spin_lock (ptl); +do_pte_lock (ptl); ret =do_adjust_pte (vma, address, pfn, pte); -spin_unlock (ptl); +do_pte_unlock (ptl);pte_unmap_nested (pte);return ret;
PATCH 182/223 ARM: 6489/1: thumb2: fix incorrect optimisation in usracc
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Will Deacon <[email protected]>
commit 1142b71d85894dcff1466dd6c871ea3c89e0352c upstream.
Commit 8b592783 added a Thumb-2 variant of usracc which, when it is called with \rept=2, calls usraccoff once with an offset of 0 and secondly with a hard-coded offset of 4 in order to avoid incrementing the pointer again. If \inc != 4 then we will store the data to the wrong offset from \ptr. Luckily, the only caller that passes \rept=2 to this function is __clear_user so we haven't been actively corrupting user data.
This patch fixes usracc to pass \inc instead of #4 to usraccoff when it is called a second time.
--- arch/arm/include/asm/assembler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/include/asm/assembler.h +1 -1
@@ -215,7 +215,7 @@ @ Slightly optimised to avoid incrementing the pointer twice usraccoff \instr, \reg, \ptr, \inc, 0, \cond, \abort .if \rept == 2 - usraccoff \instr, \reg, \ptr, \inc, 4, \cond, \abort + usraccoff \instr, \reg, \ptr, \inc, \inc, \cond, \abort .endif add\cond \ptr, #\rept * \inc
PATCH 180/223 perf_events: Fix perf_counter_mmap() hook in mprotect()
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Pekka Enberg <[email protected]>
commit 63bfd7384b119409685a17d5c58f0b56e5dc03da upstream.
As pointed out by Linus, commit dab5855 ("perf_counter: Add mmap event hooks to mprotect()") is fundamentally wrong as mprotect_fixup() can free 'vma' due to merging. Fix the problem by moving perf_event_mmap() hook to mprotect_fixup().
Note: there's another successful return path from mprotect_fixup() if old flags equal to new flags. We don't, however, need to call perf_event_mmap() there because 'perf' already knows the VMA is executable.
--- mm/mprotect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/mprotect.c +1 -1
@@ -211,6 +211,7 @@ success:mmu_notifier_invalidate_range_end (mm, start, end);vm_stat_account (mm, oldflags, vma->vm_file, -nrpages);vm_stat_account (mm, newflags, vma->vm_file, nrpages); +perf_event_mmap (vma);return 0 ; fail:
@@ -299,7 +300,6 @@ SYSCALL_DEFINE3(mprotect, unsigned long, error =mprotect_fixup (vma, &prev, nstart, tmp, newflags);if (error) goto out; -perf_event_mmap (vma); nstart = tmp;if (nstart < prev->vm_end)
PATCH 179/223 DECnet: don't leak uninitialized stack byte
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Dan Rosenberg <[email protected]>
commit 3c6f27bf33052ea6ba9d82369fb460726fb779c0 upstream.
A single uninitialized padding byte is leaked to userspace.
--- net/decnet/af_decnet.c | 2 ++ 1 file changed, 2 insertions(+)
net/decnet/af_decnet.c +2 -0
@@ -1556,6 +1556,8 @@ static int __dn_getsockopt(struct socketif (r_len >sizeof (struct linkinfo_dn )) r_len =sizeof (struct linkinfo_dn ); +memset (&link,0 ,sizeof (link)); +switch (sock->state) {case SS_CONNECTING : link.idn_linkstate =LL_CONNECTING ;
PATCH 184/223 leds: fix bug with reading NAS SS4200 dmi code
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
commit 50d431e8a15701b599c98afe2b464eb33c952477 upstream.
While running randconfg with ktest.pl I stumbled upon this bug:
BUG: unable to handle kernel NULL pointer dereference at 0000000000000003 IP: [<ffffffff815fe44f>] strstr+0x39/0x86 PGD 0 Oops: 0000 [#1] SMP last sysfs file: CPU 0 Modules linked in:
Pid: 1, comm: swapper Not tainted 2.6.37-rc1-test+ #6 DG965MQ/
RIP: 0010:[<ffffffff815fe44f>] [<ffffffff815fe44f>] strstr+0x39/0x86 RSP: 0018:ffff8800797cbd80 EFLAGS: 00010213 RAX: 0000000000000000 RBX: 0000000000000003 RCX: ffffffffffffffff RDX: 0000000000000000 RSI: ffffffff82eb7ac9 RDI: 0000000000000003 RBP: ffff8800797cbda0 R08: ffff880000000003 R09: 0000000000030725 R10: ffff88007d294c00 R11: 0000000000014c00 R12: 0000000000000020 R13: ffffffff82eb7ac9 R14: ffffffffffffffff R15: ffffffff82eb7b08 FS: 0000000000000000(0000) GS:ffff88007d200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000003 CR3: 0000000002a1d000 CR4: 00000000000006f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process swapper (pid: 1, threadinfo ffff8800797ca000, task ffff8800797d0000) Stack: 00000000000000ba ffffffff82eb7ac9 ffffffff82eb7ab8 00000000000000ba ffff8800797cbdf0 ffffffff81e2050f ffff8800797cbdc0 00000000815f913b ffff8800797cbe00 ffffffff82eb7ab8 0000000000000000 0000000000000000 Call Trace: [<ffffffff81e2050f>] dmi_matches+0x117/0x154 [<ffffffff81e205d7>] dmi_check_system+0x3d/0x8d [<ffffffff82e1ad25>] ? nas_gpio_init+0x0/0x2c8 [<ffffffff82e1ad49>] nas_gpio_init+0x24/0x2c8 [<ffffffff820d750d>] ? wm8350_led_init+0x0/0x20 [<ffffffff82e1ad25>] ? nas_gpio_init+0x0/0x2c8 [<ffffffff810022f7>] do_one_initcall+0xab/0x1b2 [<ffffffff82da749c>] kernel_init+0x248/0x331 [<ffffffff8100e624>] kernel_thread_helper+0x4/0x10 [<ffffffff82da7254>] ? kernel_init+0x0/0x331
Found that the nas_led_whitelist dmi_system_id structure array had no NULL end delimiter, causing the dmi_check_system() loop to read an undefined entry.
--- drivers/leds/leds-ss4200.c | 1 + 1 file changed, 1 insertion(+)
drivers/leds/leds-ss4200.c +1 -0
@@ -102,6 +102,7 @@ static struct dmi_system_id __initdata n DMI_MATCH(DMI_PRODUCT_VERSION, "1.00.00") } }, + {} };/*
PATCH 188/223 Staging: samsung-laptop: fix up some sysfs attribute permissions
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 90c05b97fdec8d2196e420d98f774bab731af7aa upstream.
They should not be writable by any user
--- drivers/staging/samsung-laptop/samsung-laptop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/samsung-laptop/samsung-laptop.c +1 -1
@@ -356,7 +356,7 @@ static ssize_t set_silent_state(struct d }return count; } -static DEVICE_ATTR(silent, S_IWUGO | S_IRUGO, +static DEVICE_ATTR(silent, S_IRUSR | S_IRUGO, get_silent_state, set_silent_state);
PATCH 190/223 Staging: frontier: fix up some sysfs attribute permissions
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 3bad28ec006ad6ab2bca4e5103860b75391e3c9d and 2a767fda5d0d8dcff465724dfad6ee131489b3f2 upstream merged together.
They should not be writable by any user
--- drivers/staging/frontier/tranzport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/frontier/tranzport.c +1 -1
@@ -204,7 +204,7 @@ static void usb_tranzport_abort_transfer t->value = temp; \return count; \ } \ - static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value); + static DEVICE_ATTR(value, S_IWUSR | S_IRUGO, show_##value, set_##value);show_int (enable);show_int (offline);
PATCH 194/223 ARM: 6456/1: Fix for building DEBUG with sa11xx_base.c as a module.
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Marcelo Roberto Jimenez <[email protected]>
commit b9f515e3e3861abbaa093359f7c6f31283695228 upstream.
This patch fixes a compilation issue when compiling PCMCIA SA1100 support as a module with PCMCIA_DEBUG enabled. The symbol soc_pcmcia_debug was not beeing exported.
ARM: pcmcia: Fix for building DEBUG with sa11xx_base.c as a module.
This patch fixes a compilation issue when compiling PCMCIA SA1100 support as a module with PCMCIA_DEBUG enabled. The symbol soc_pcmcia_debug was not beeing exported.
--- drivers/pcmcia/soc_common.c | 1 + 1 file changed, 1 insertion(+)
drivers/pcmcia/soc_common.c +1 -0
@@ -65,6 +65,7 @@ void soc_pcmcia_debug(struct soc_pcmcia_ va_end(args); } } +EXPORT_SYMBOL (soc_pcmcia_debug);#endif
PATCH 199/223 net: Truncate recvfrom and sendto length to INT_MAX.
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit 253eacc070b114c2ec1f81b067d2fed7305467b0 upstream.
--- net/socket.c | 4 ++++ 1 file changed, 4 insertions(+)
net/socket.c +4 -0
@@ -1652,6 +1652,8 @@ SYSCALL_DEFINE6(sendto, int, fd, void __struct iovec iov;int fput_needed; +if (len >INT_MAX ) + len =INT_MAX ; sock =sockfd_lookup_light (fd, &err, &fput_needed);if (!sock) goto out;
@@ -1709,6 +1711,8 @@ SYSCALL_DEFINE6(recvfrom, int, fd, voidint err, err2;int fput_needed; +if (size >INT_MAX ) + size =INT_MAX ; sock =sockfd_lookup_light (fd, &err, &fput_needed);if (!sock) goto out;
PATCH 198/223 genirq: Fix incorrect proc spurious output
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Kenji Kaneshige <[email protected]>
commit 25c9170ed64a6551beefe9315882f754e14486f4 upstream.
Since commit a1afb637(switch /proc/irq/*/spurious to seq_file) all /proc/irq/XX/spurious files show the information of irq 0.
Current irq_spurious_proc_open() passes on NULL as the 3rd argument, which is used as an IRQ number in irq_spurious_proc_show(), to the single_open(). Because of this, all the /proc/irq/XX/spurious file shows IRQ 0 information regardless of the IRQ number.
To fix the problem, irq_spurious_proc_open() must pass on the appropreate data (IRQ number) to single_open().
LKML-Reference: <[email protected]>
--- kernel/irq/proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/irq/proc.c +1 -1
@@ -214,7 +214,7 @@ static int irq_spurious_proc_show(structstatic int irq_spurious_proc_open (struct inode *inode,struct file *file) { -return single_open (file, irq_spurious_proc_show,NULL ); +return single_open (file, irq_spurious_proc_show,PDE (inode)->data); }static const struct file_operations irq_spurious_proc_fops = {
PATCH 197/223 nohz/s390: fix arch_needs_cpu() return value on offline cpus
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
commit 398812159e328478ae49b4bd01f0d71efea96c39 upstream.
This fixes the same problem as described in the patch "nohz: fix printk_needs_cpu() return value on offline cpus" for the arch_needs_cpu() primitive:
arch_needs_cpu() may return 1 if called on offline cpus. When a cpu gets offlined it schedules the idle process which, before killing its own cpu, will call tick_nohz_stop_sched_tick().
That function in turn will call arch_needs_cpu() in order to check if the local tick can be disabled. On offline cpus this function should naturally return 0 since regardless if the tick gets disabled or not the cpu will be dead short after. That is besides the fact that __cpu_disable() should already have made sure that no interrupts on the offlined cpu will be delivered anyway.
In this case it prevents tick_nohz_stop_sched_tick() to call select_nohz_load_balancer(). No idea if that really is a problem. However what made me debug this is that on 2.6.32 the function get_nohz_load_balancer() is used within __mod_timer() to select a cpu on which a timer gets enqueued. If arch_needs_cpu() returns 1 then the nohz_load_balancer cpu doesn't get updated when a cpu gets offlined. It may contain the cpu number of an offline cpu. In turn timers get enqueued on an offline cpu and not very surprisingly they never expire and cause system hangs.
This has been observed 2.6.32 kernels. On current kernels __mod_timer() uses get_nohz_timer_target() which doesn't have that problem. However there might be other problems because of the too early exit tick_nohz_stop_sched_tick() in case a cpu goes offline.
This specific bug was indrocuded with 3c5d92a0 "nohz: Introduce arch_needs_cpu".
In this case a cpu hotplug notifier is used to fix the issue in order to keep the normal/fast path small. All we need to do is to clear the condition that makes arch_needs_cpu() return 1 since it is just a performance improvement which is supposed to keep the local tick running for a short period if a cpu goes idle. Nothing special needs to be done except for clearing the condition.
--- arch/s390/kernel/vtime.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/s390/kernel/vtime.c +19 -0
@@ -19,6 +19,7 @@#include <linux/kernel_stat.h> #include <linux/rcupdate.h> #include <linux/posix-timers.h> +#include <linux/cpu.h> #include <asm/s390_ext.h> #include <asm/timer.h>
@@ -565,6 +566,23 @@ void init_cpu_vtimer(void)__ctl_set_bit (0 ,10 ); } +static int __cpuinit s390_nohz_notify (struct notifier_block *self, +unsigned long action,void *hcpu) +{ +struct s390_idle_data *idle; +long cpu = (long ) hcpu; + + idle = &per_cpu (s390_idle, cpu); +switch (action) { +case CPU_DYING : +case CPU_DYING_FROZEN : + idle->nohz_delay =0 ; +default : +break ; + } +return NOTIFY_OK ; +} +void __init vtime_init (void ) {/* request the cpu timer external interrupt */
@@ -573,5 +591,6 @@ void __init vtime_init(void)/* Enable cpu timer interrupts on the boot cpu. */ init_cpu_vtimer (); +cpu_notifier (s390_nohz_notify,0 ); }
PATCH 201/223 Input: i8042 - add Sony VAIO VPCZ122GX to nomux list
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
[Note that the mainline will not have this particular fix but rather will blacklist entire VAIO line based off DMI board name. For stable I am being a bit more cautious and blacklist one particular product.]
Trying to query/activate active multiplexing mode on this VAIO makes both keyboard and touchpad inoperable. Futher kernels will blacklist entire VAIO line, however here we blacklist just one particular model.
--- drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/input/serio/i8042-x86ia64io.h +7 -0
@@ -333,6 +333,13 @@ static const struct dmi_system_id __init }, }, { +/* Sony Vaio VPCZ122GX */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Sony Corporation" ), + DMI_MATCH(DMI_PRODUCT_NAME, "VPCZ122GX"), + }, + }, + {/* Sony Vaio FS-115b */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
PATCH 207/223 can-bcm: fix minor heap overflow
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Hartkopp <[email protected]>
commit 0597d1b99fcfc2c0eada09a698f85ed413d4ba84 upstream.
On 64-bit platforms the ASCII representation of a pointer may be up to 17 bytes long. This patch increases the length of the buffer accordingly.
http://marc.info/?l=linux-netdev&m=128872251418192&w=2
--- net/can/bcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/can/bcm.c +1 -1
@@ -125,7 +125,7 @@ struct bcm_sock {struct list_head tx_ops;unsigned long dropped_usr_msgs;struct proc_dir_entry *bcm_proc_read; -char procname [9 ];/* pointer printed in ASCII with \0 */ +char procname [20 ];/* pointer printed in ASCII with \0 */ };static inline struct bcm_sock *bcm_sk (const struct sock *sk)
PATCH 210/223 econet: disallow NULL remote addr for sendmsg(), fixes CVE-2010-3849
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Phil Blundell <[email protected]>
commit fa0e846494792e722d817b9d3d625a4ef4896c96 upstream.
Later parts of econet_sendmsg() rely on saddr != NULL, so return early with EINVAL if NULL was passed otherwise an oops may occur.
--- net/econet/af_econet.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-)
net/econet/af_econet.c +8 -18
@@ -297,23 +297,14 @@ static int econet_sendmsg(struct kiocb *mutex_lock (&econet_mutex); -if (saddr ==NULL ) { -struct econet_sock *eo =ec_sk (sk); - - addr.station = eo->station; - addr.net = eo->net; - port = eo->port; - cb = eo->cb; - }else { -if (msg->msg_namelen <sizeof (struct sockaddr_ec )) { -mutex_unlock (&econet_mutex); -return -EINVAL ; - } - addr.station = saddr->addr.station; - addr.net = saddr->addr.net; - port = saddr->port; - cb = saddr->cb; - } +if (saddr ==NULL || msg->msg_namelen <sizeof (struct sockaddr_ec )) { +mutex_unlock (&econet_mutex); +return -EINVAL ; + } + addr.station = saddr->addr.station; + addr.net = saddr->addr.net; + port = saddr->port; + cb = saddr->cb;/* Look for a device with the right network number. */ dev = net2dev_map[addr.net];
@@ -351,7 +342,6 @@ static int econet_sendmsg(struct kiocb * eb = (struct ec_cb *)&skb->cb; -/* BUG: saddr may be NULL */ eb->cookie = saddr->cookie; eb->sec = *saddr; eb->sent = ec_tx_done;
PATCH 213/223 rds: Integer overflow in RDS cmsg handling
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Dan Rosenberg <[email protected]>
commit 218854af84038d828a32f061858b1902ed2beec6 upstream.
In rds_cmsg_rdma_args(), the user-provided args->nr_local value is restricted to less than UINT_MAX. This seems to need a tighter upper bound, since the calculation of total iov_size can overflow, resulting in a small sock_kmalloc() allocation. This would probably just result in walking off the heap and crashing when calling rds_rdma_pages() with a high count value. If it somehow doesn't crash here, then memory corruption could occur soon after.
--- net/rds/rdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/rds/rdma.c +1 -1
@@ -474,7 +474,7 @@ static struct rds_rdma_op *rds_rdma_prep goto out; } -if (args->nr_local > (u64 )UINT_MAX ) { +if (args->nr_local >UIO_MAXIOV ) { ret = -EMSGSIZE ; goto out; }
PATCH 215/223 r8169: fix rx checksum offload
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit adea1ac7effbddbe60a9de6d63462bfe79289e59 upstream.
While porting GRO to r8169, I found this driver has a bug in its rx path.
All skbs given to network stack had their ip_summed set to CHECKSUM_NONE, while hardware said they had correct TCP/UDP checksums.
The reason is driver sets skb->ip_summed on the original skb before the copy eventually done by copybreak. The fresh skb gets the ip_summed = CHECKSUM_NONE value, forcing network stack to recompute checksum, and preventing my GRO patch to work.
Fix is to make the ip_summed setting after skb copy.
Note : rx_copybreak current value is 16383, so all frames are copied...
--- drivers/net/r8169.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/r8169.c +2 -4
@@ -4458,9 +4458,8 @@ static inline int rtl8169_fragmented_frareturn (status & (FirstFrag | LastFrag)) != (FirstFrag | LastFrag); } -static inline void rtl8169_rx_csum (struct sk_buff *skb,struct RxDesc *desc) +static inline void rtl8169_rx_csum (struct sk_buff *skb,u32 opts1) { -u32 opts1 =le32_to_cpu (desc->opts1);u32 status = opts1 & RxProtoMask; if (((status == RxProtoTCP) && !(opts1 & TCPFail)) ||
@@ -4554,8 +4553,6 @@ static int rtl8169_rx_interrupt(struct ncontinue ; } -rtl8169_rx_csum (skb, desc); -if (rtl8169_try_rx_copy (&skb, tp, pkt_size, addr)) {pci_dma_sync_single_for_device (pdev, addr, pkt_size,PCI_DMA_FROMDEVICE );
@@ -4566,6 +4563,7 @@ static int rtl8169_rx_interrupt(struct n tp->Rx_skbuff[entry] =NULL ; } +rtl8169_rx_csum (skb, status);skb_put (skb, pkt_size); skb->protocol =eth_type_trans (skb, dev);
PATCH 217/223 r8169: fix checksum broken
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Shan Wei <[email protected]>
commit d5d3ebe3be5c5123f2d444e186717f45284151e2 upstream.
If r8196 received packets with invalid sctp/igmp(not tcp, udp) checksum, r8196 set skb->ip_summed wit CHECKSUM_UNNECESSARY. This cause that upper protocol don't check checksum field.
I am not family with r8196 driver. I try to guess the meaning of RxProtoIP and IPFail. RxProtoIP stands for received IPv4 packet that upper protocol is not tcp and udp. !(opts1 & IPFail) is true means that driver correctly to check checksum in IPv4 header.
If it's right, I think we should not set ip_summed wit CHECKSUM_UNNECESSARY for my sctp packets with invalid checksum.
If it's not right, please tell me.
--- drivers/net/r8169.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/r8169.c +1 -2
@@ -4463,8 +4463,7 @@ static inline void rtl8169_rx_csum(strucu32 status = opts1 & RxProtoMask;if (((status == RxProtoTCP) && !(opts1 & TCPFail)) || - ((status == RxProtoUDP) && !(opts1 & UDPFail)) || - ((status == RxProtoIP) && !(opts1 & IPFail))) + ((status == RxProtoUDP) && !(opts1 & UDPFail))) skb->ip_summed =CHECKSUM_UNNECESSARY ;else skb->ip_summed =CHECKSUM_NONE ;
PATCH 220/223 Export 'get_pipe_info()' to other users
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit c66fb347946ebdd5b10908866ecc9fa05ee2cf3d upstream.
And in particular, use it in 'pipe_fcntl()'.
The other pipe functions do not need to use the 'careful' version, since they are only ever called for things that are already known to be pipes.
The normal read/write/ioctl functions are called through the file operations structures, so if a file isn't a pipe, they'd never get called. But pipe_fcntl() is special, and called directly from the generic fcntl code, and needs to use the same careful function that the splice code is using.
--- fs/pipe.c | 2 +- fs/splice.c | 11 ----------- include/linux/pipe_fs_i.h | 12 ++++++++++++ 3 files changed, 13 insertions(+), 12 deletions(-)
fs/pipe.c +1 -1
@@ -1202,7 +1202,7 @@ long pipe_fcntl(struct file *file, unsigstruct pipe_inode_info *pipe;long ret; - pipe = file->f_path.dentry->d_inode->i_pipe; + pipe =get_pipe_info (file);if (!pipe)return -EBADF ;
fs/splice.c +0 -11
@@ -1323,17 +1323,6 @@ long do_splice_direct(struct file *in, lstatic int splice_pipe_to_pipe (struct pipe_inode_info *ipipe,struct pipe_inode_info *opipe,size_t len,unsigned int flags); -/* -* After the inode slimming patch, i_pipe/i_bdev/i_cdev share the same -* location, so checking ->i_pipe is not enough to verify that this is a -* pipe. -*/ -static inline struct pipe_inode_info *get_pipe_info (struct file *file) -{ -struct inode *i = file->f_path.dentry->d_inode; - -return S_ISFIFO (i->i_mode) ? i->i_pipe :NULL ; -}/* * Determine where to splice to/from.
include/linux/pipe_fs_i.h +12 -0
@@ -161,4 +161,16 @@ void generic_pipe_buf_release(struct pip/* for F_SETPIPE_SZ and F_GETPIPE_SZ */ long pipe_fcntl (struct file *,unsigned int ,unsigned long arg); +/* +* After the inode slimming patch, i_pipe/i_bdev/i_cdev share the same +* location, so checking ->i_pipe is not enough to verify that this is a +* pipe. +*/ +static inline struct pipe_inode_info *get_pipe_info (struct file *file) +{ +struct inode *i = file->f_path.dentry->d_inode; + +return S_ISFIFO (i->i_mode) ? i->i_pipe :NULL ; +} +#endif
PATCH 222/223 Fix pktcdvd ioctl dev_minor range check
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Dan Rosenberg <[email protected]>
Upstream 252a52aa4fa22a668f019e55b3aac3ff71ec1c29
The PKT_CTRL_CMD_STATUS device ioctl retrieves a pointer to a pktcdvd_device from the global pkt_devs array. The index into this array is provided directly by the user and is a signed integer, so the comparison to ensure that it falls within the bounds of this array will fail when provided with a negative index.
This can be used to read arbitrary kernel memory or cause a crash due to an invalid pointer dereference. This can be exploited by users with permission to open /dev/pktcdvd/control (on many distributions, this is readable by group "cdrom").
--- drivers/block/pktcdvd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/pktcdvd.c +1 -1
@@ -2368,7 +2368,7 @@ static void pkt_release_dev(struct pktcdpkt_shrink_pktlist (pd); } -static struct pktcdvd_device *pkt_find_dev_from_minor (int dev_minor) +static struct pktcdvd_device *pkt_find_dev_from_minor (unsigned int dev_minor) {if (dev_minor >=MAX_WRITERS )return NULL ;
PATCH 223/223 Bump release to 2.6.35.10
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
--- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 35 -EXTRAVERSION = .9 +EXTRAVERSION = .10 NAME = Yokohama # *DOCUMENTATION*
PATCH 221/223 Un-inline get_pipe_info() helper function
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit 72083646528d4887b920deb71b37e09bc7d227bb upstream.
This avoids some include-file hell, and the function isn't really important enough to be inlined anyway.
--- fs/pipe.c | 12 ++++++++++++ include/linux/pipe_fs_i.h | 13 +------------ 2 files changed, 13 insertions(+), 12 deletions(-)
fs/pipe.c +12 -0
@@ -1197,6 +1197,18 @@ int pipe_proc_fn(struct ctl_table *tablereturn ret; } +/* +* After the inode slimming patch, i_pipe/i_bdev/i_cdev share the same +* location, so checking ->i_pipe is not enough to verify that this is a +* pipe. +*/ +struct pipe_inode_info *get_pipe_info (struct file *file) +{ +struct inode *i = file->f_path.dentry->d_inode; + +return S_ISFIFO (i->i_mode) ? i->i_pipe :NULL ; +} +long pipe_fcntl (struct file *file,unsigned int cmd,unsigned long arg) {struct pipe_inode_info *pipe;
include/linux/pipe_fs_i.h +1 -12
@@ -160,17 +160,6 @@ void generic_pipe_buf_release(struct pip/* for F_SETPIPE_SZ and F_GETPIPE_SZ */ long pipe_fcntl (struct file *,unsigned int ,unsigned long arg); - -/* -* After the inode slimming patch, i_pipe/i_bdev/i_cdev share the same -* location, so checking ->i_pipe is not enough to verify that this is a -* pipe. -*/ -static inline struct pipe_inode_info *get_pipe_info (struct file *file) -{ -struct inode *i = file->f_path.dentry->d_inode; - -return S_ISFIFO (i->i_mode) ? i->i_pipe :NULL ; -} +struct pipe_inode_info *get_pipe_info (struct file *file);#endif
PATCH 219/223 Rename 'pipe_info()' to 'get_pipe_info()'
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit 71993e62a47dabddf10302807d6aa260455503f4 upstream.
.. and change it to take the 'file' pointer instead of an inode, since that's what all users want anyway.
The renaming is preparatory to exporting it to other users. The old 'pipe_info()' name was too generic and is already used elsewhere, so before making the function public we need to use a more specific name.
--- fs/splice.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
fs/splice.c +9 -10
@@ -1328,12 +1328,11 @@ static int splice_pipe_to_pipe(struct pi* location, so checking ->i_pipe is not enough to verify that this is a * pipe. */ -static inline struct pipe_inode_info *pipe_info (struct inode *inode) +static inline struct pipe_inode_info *get_pipe_info (struct file *file) { -if (S_ISFIFO (inode->i_mode)) -return inode->i_pipe; +struct inode *i = file->f_path.dentry->d_inode; -return NULL ; +return S_ISFIFO (i->i_mode) ? i->i_pipe :NULL ; }/*
@@ -1348,8 +1347,8 @@ static long do_splice(struct file *in, lloff_t offset, *off;long ret; - ipipe =pipe_info (in->f_path.dentry->d_inode); - opipe =pipe_info (out->f_path.dentry->d_inode); + ipipe =get_pipe_info (in); + opipe =get_pipe_info (out);if (ipipe && opipe) {if (off_in || off_out)
@@ -1567,7 +1566,7 @@ static long vmsplice_to_user(struct fileint error;long ret; - pipe =pipe_info (file->f_path.dentry->d_inode); + pipe =get_pipe_info (file);if (!pipe)return -EBADF ;
@@ -1654,7 +1653,7 @@ static long vmsplice_to_pipe(struct file };long ret; - pipe =pipe_info (file->f_path.dentry->d_inode); + pipe =get_pipe_info (file);if (!pipe)return -EBADF ;
@@ -2034,8 +2033,8 @@ static int link_pipe(struct pipe_inode_istatic long do_tee (struct file *in,struct file *out,size_t len,unsigned int flags) { -struct pipe_inode_info *ipipe =pipe_info (in->f_path.dentry->d_inode); -struct pipe_inode_info *opipe =pipe_info (out->f_path.dentry->d_inode); +struct pipe_inode_info *ipipe =get_pipe_info (in); +struct pipe_inode_info *opipe =get_pipe_info (out);int ret = -EINVAL ;/*
PATCH 218/223 nmi: fix clock comparator revalidation
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
commit e8129c642155616d9e2160a75f103e127c8c3708 upstream.
On each machine check all registers are revalidated. The save area for the clock comparator however only contains the upper most seven bytes of the former contents, if valid.
Therefore the machine check handler uses a store clock instruction to get the current time and writes that to the clock comparator register which in turn will generate an immediate timer interrupt. However within the lowcore the expected time of the next timer interrupt is stored. If the interrupt happens before that time the handler won't be called. In turn the clock comparator won't be reprogrammed and therefore the interrupt condition stays pending which causes an interrupt loop until the expected time is reached.
On NOHZ machines this can result in unresponsive machines since the time of the next expected interrupted can be a couple of days in the future.
To fix this just revalidate the clock comparator register with the expected value.
In addition the special handling for udelay must be changed as well.
--- arch/s390/kernel/nmi.c | 10 ++++------ arch/s390/lib/delay.c | 14 +++++++++----- 2 files changed, 13 insertions(+), 11 deletions(-)
arch/s390/kernel/nmi.c +4 -6
@@ -95,7 +95,6 @@ EXPORT_SYMBOL_GPL(s390_handle_mcck); static int notrace s390_revalidate_registers(struct mci *mci) {int kill_task; -u64 tmpclock;u64 zero;void *fpt_save_area, *fpt_creg_save_area;
@@ -214,11 +213,10 @@ static int notrace s390_revalidate_regis : "0", "cc");#endif /* Revalidate clock comparator register */ - asmvolatile ( -" stck 0(%1)\n" -" sckc 0(%1)" - :"=m" (tmpclock) :"a" (&(tmpclock)) :"cc" ,"memory" ); - +if (S390_lowcore.clock_comparator ==-1 ) +set_clock_comparator (S390_lowcore.mcck_clock); +else +set_clock_comparator (S390_lowcore.clock_comparator);/* Check if old PSW is valid */ if (!mci->wp)/*
arch/s390/lib/delay.c +9 -5
@@ -29,17 +29,21 @@ static void __udelay_disabled(unsigned l {unsigned long mask, cr0, cr0_saved;u64 clock_saved; +u64 end; + mask = psw_kernel_bits |PSW_MASK_WAIT |PSW_MASK_EXT ; + end =get_clock () + (usecs <<12 ); clock_saved =local_tick_disable (); -set_clock_comparator (get_clock () + (usecs <<12 ));__ctl_store (cr0_saved,0 ,0 ); cr0 = (cr0_saved &0xffff00e0 ) |0x00000800 ;__ctl_load (cr0 ,0 ,0 ); - mask = psw_kernel_bits |PSW_MASK_WAIT |PSW_MASK_EXT ;lockdep_off (); -trace_hardirqs_on (); -__load_psw_mask (mask); -local_irq_disable (); +do { +set_clock_comparator (end); +trace_hardirqs_on (); +__load_psw_mask (mask); +local_irq_disable (); + }while (get_clock () < end);lockdep_on ();__ctl_load (cr0_saved,0 ,0 );local_tick_enable (clock_saved);
PATCH 216/223 r8169: (re)init phy on resume
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Stanislaw Gruszka <[email protected]>
commit fccec10b33503a2b1197c8e7a3abd30443bedb08 upstream.
Fix switching device to low-speed mode after resume reported in:
https://bugzilla.redhat.com/show_bug.cgi?id=502974
--- drivers/net/r8169.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/r8169.c +5 -0
@@ -4893,6 +4893,9 @@ static int rtl8169_resume(struct device {struct pci_dev *pdev =to_pci_dev (device);struct net_device *dev =pci_get_drvdata (pdev); +struct rtl8169_private *tp =netdev_priv (dev); + +rtl8169_init_phy (dev, tp);if (netif_running (dev))__rtl8169_resume (dev);
@@ -4933,6 +4936,8 @@ static int rtl8169_runtime_resume(struct tp->saved_wolopts =0 ;spin_unlock_irq (&tp->lock); +rtl8169_init_phy (dev, tp); +__rtl8169_resume (dev);return 0 ;
PATCH 214/223 cfg80211: fix extension channel checks to initiate communication
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Luis R. Rodriguez <[email protected]>
commit 9236d838c920e90708570d9bbd7bb82d30a38130 upstream.
When operating in a mode that initiates communication and using HT40 we should fail if we cannot use both primary and secondary channels to initiate communication. Our current ht40 allowmap only covers STA mode of operation, for beaconing modes we need a check on the fly as the mode of operation is dynamic and there other flags other than disable which we should read to check if we can initiate communication.
Do not allow for initiating communication if our secondary HT40 channel has is either disabled, has a passive scan flag, a no-ibss flag or is a radar channel. Userspace now has similar checks but this is also needed in-kernel.
--- net/wireless/chan.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+)
net/wireless/chan.c +51 -0
@@ -43,6 +43,36 @@ rdev_freq_to_chan(struct cfg80211_registreturn chan; } +static bool can_beacon_sec_chan (struct wiphy *wiphy, +struct ieee80211_channel *chan, +enum nl80211_channel_type channel_type) +{ +struct ieee80211_channel *sec_chan; +int diff; + +switch (channel_type) { +case NL80211_CHAN_HT40PLUS : + diff =20 ; +case NL80211_CHAN_HT40MINUS : + diff =-20 ; +default : +return false; + } + + sec_chan =ieee80211_get_channel (wiphy, chan->center_freq + diff); +if (!sec_chan) +return false; + +/* we'll need a DFS capability later */ +if (sec_chan->flags & (IEEE80211_CHAN_DISABLED | +IEEE80211_CHAN_PASSIVE_SCAN | +IEEE80211_CHAN_NO_IBSS | +IEEE80211_CHAN_RADAR )) +return false; + +return true; +} +int cfg80211_set_freq (struct cfg80211_registered_device *rdev,struct wireless_dev *wdev,int freq,enum nl80211_channel_type channel_type)
@@ -67,6 +97,27 @@ int cfg80211_set_freq(struct cfg80211_reif (!chan)return -EINVAL ; +/* Both channels should be able to initiate communication */ +if (wdev && (wdev->iftype ==NL80211_IFTYPE_ADHOC || + wdev->iftype ==NL80211_IFTYPE_AP || + wdev->iftype ==NL80211_IFTYPE_AP_VLAN || + wdev->iftype ==NL80211_IFTYPE_MESH_POINT )) { +switch (channel_type) { +case NL80211_CHAN_HT40PLUS : +case NL80211_CHAN_HT40MINUS : +if (!can_beacon_sec_chan (&rdev->wiphy, chan, + channel_type)) { +printk (KERN_DEBUG +"cfg80211: Secondary channel not " +"allowed to initiate communication\n" ); +return -EINVAL ; + } +break ; +default : +break ; + } + } + result = rdev->ops->set_channel (&rdev->wiphy, wdev ? wdev->netdev :NULL , chan, channel_type);
PATCH 212/223 econet: fix CVE-2010-3848
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Phil Blundell <[email protected]>
commit a27e13d370415add3487949c60810e36069a23a6 upstream.
Don't declare variable sized array of iovecs on the stack since this could cause stack overflow if msg->msgiovlen is large. Instead, coalesce the user-supplied data into a new buffer and use a single iovec for it.
--- net/econet/af_econet.c | 62 ++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 31 deletions(-)
net/econet/af_econet.c +31 -31
@@ -31,6 +31,7 @@#include <linux/skbuff.h> #include <linux/udp.h> #include <linux/slab.h> +#include <linux/vmalloc.h> #include <net/sock.h> #include <net/inet_common.h> #include <linux/stat.h>
@@ -276,12 +277,12 @@ static int econet_sendmsg(struct kiocb *#endif #ifdef CONFIG_ECONET_AUNUDP struct msghdr udpmsg; -struct iovec iov[msg->msg_iovlen+1 ]; +struct iovec iov[2 ];struct aunhdr ah;struct sockaddr_in udpdest;__kernel_size_t size; -int i;mm_segment_t oldfs; +char *userbuf;#endif /*
@@ -319,17 +320,17 @@ static int econet_sendmsg(struct kiocb * } } -if (len +15 > dev->mtu) { -mutex_unlock (&econet_mutex); -return -EMSGSIZE ; - } -if (dev->type ==ARPHRD_ECONET ) {/* Real hardware Econet. We're not worthy etc. */ #ifdef CONFIG_ECONET_NATIVE unsigned short proto =0 ;int res; +if (len +15 > dev->mtu) { +mutex_unlock (&econet_mutex); +return -EMSGSIZE ; + } +dev_hold (dev); skb = sock_alloc_send_skb(sk, len+LL_ALLOCATED_SPACE(dev),
@@ -405,6 +406,11 @@ static int econet_sendmsg(struct kiocb *return -ENETDOWN ;/* No socket - can't send */ } +if (len >32768 ) { + err = -E2BIG ; + goto error; + } +/* Make up a UDP datagram and hand it off to some higher intellect. */ memset (&udpdest,0 ,sizeof (udpdest));
@@ -436,36 +442,26 @@ static int econet_sendmsg(struct kiocb */* tack our header on the front of the iovec */ size =sizeof (struct aunhdr ); -/* -* XXX: that is b0rken. We can't mix userland and kernel pointers -* in iovec, since on a lot of platforms copy_from_user() will -* *not* work with the kernel and userland ones at the same time, -* regardless of what we do with set_fs(). And we are talking about -* econet-over-ethernet here, so "it's only ARM anyway" doesn't -* apply. Any suggestions on fixing that code? -- AV -*/ iov[0 ].iov_base = (void *)&ah; iov[0 ].iov_len = size; -for (i =0 ; i < msg->msg_iovlen; i++) { -void __user *base = msg->msg_iov[i].iov_base; -size_t iov_len = msg->msg_iov[i].iov_len; -/* Check it now since we switch to KERNEL_DS later. */ -if (!access_ok (VERIFY_READ , base, iov_len)) { -mutex_unlock (&econet_mutex); -return -EFAULT ; - } - iov[i+1 ].iov_base = base; - iov[i+1 ].iov_len = iov_len; - size += iov_len; + + userbuf =vmalloc (len); +if (userbuf ==NULL ) { + err = -ENOMEM ; + goto error; } + iov[1 ].iov_base = userbuf; + iov[1 ].iov_len = len; + err =memcpy_fromiovec (userbuf, msg->msg_iov, len); +if (err) + goto error_free_buf; +/* Get a skbuff (no data, just holds our cb information) */ if ((skb =sock_alloc_send_skb (sk,0 , msg->msg_flags &MSG_DONTWAIT , - &err)) ==NULL ) { -mutex_unlock (&econet_mutex); -return err; - } + &err)) ==NULL ) + goto error_free_buf; eb = (struct ec_cb *)&skb->cb;
@@ -481,7 +477,7 @@ static int econet_sendmsg(struct kiocb * udpmsg.msg_name = (void *)&udpdest; udpmsg.msg_namelen =sizeof (udpdest); udpmsg.msg_iov = &iov[0 ]; - udpmsg.msg_iovlen = msg->msg_iovlen +1 ; + udpmsg.msg_iovlen =2 ; udpmsg.msg_control =NULL ; udpmsg.msg_controllen =0 ; udpmsg.msg_flags=0 ;
@@ -489,9 +485,13 @@ static int econet_sendmsg(struct kiocb * oldfs =get_fs ();set_fs (KERNEL_DS );/* More privs :-) */ err =sock_sendmsg (udpsock, &udpmsg, size);set_fs (oldfs); + +error_free_buf: +vfree (userbuf);#else err = -EPROTOTYPE ;#endif + error:mutex_unlock (&econet_mutex);return err;
PATCH 211/223 econet: fix CVE-2010-3850
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Phil Blundell <[email protected]>
commit 16c41745c7b92a243d0874f534c1655196c64b74 upstream.
Add missing check for capable(CAP_NET_ADMIN) in SIOCSIFADDR operation.
--- net/econet/af_econet.c | 3 +++ 1 file changed, 3 insertions(+)
net/econet/af_econet.c +3 -0
@@ -661,6 +661,9 @@ static int ec_dev_ioctl(struct socket *s err =0 ;switch (cmd) {case SIOCSIFADDR : +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; + edev = dev->ec_ptr;if (edev ==NULL ) {/* Magic up a new one. */
PATCH 209/223 crypto: padlock - Fix AES-CBC handling on odd-block-sized input
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <[email protected]>
commit c054a076a1bd4731820a9c4d638b13d5c9bf5935 upstream.
On certain VIA chipsets AES-CBC requires the input/output to be a multiple of 64 bytes. We had a workaround for this but it was buggy as it sent the whole input for processing when it is meant to only send the initial number of blocks which makes the rest a multiple of 64 bytes.
As expected this causes memory corruption whenever the workaround kicks in.
--- drivers/crypto/padlock-aes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/padlock-aes.c +1 -1
@@ -286,7 +286,7 @@ static inline u8 *padlock_xcrypt_cbc(conif (initial) asmvolatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ :"+S" (input),"+D" (output),"+a" (iv) - :"d" (control_word),"b" (key),"c" (count)); + :"d" (control_word),"b" (key),"c" (initial)); asmvolatile (".byte 0xf3,0x0f,0xa7,0xd0" /* rep xcryptcbc */ : "+S" (input), "+D" (output), "+a" (iv)
PATCH 208/223 x25: Prevent crashing when parsing bad X.25 facilities
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Dan Rosenberg <[email protected]>
commit 5ef41308f94dcbb3b7afc56cdef1c2ba53fa5d2f upstream.
Now with improved comma support.
On parsing malformed X.25 facilities, decrementing the remaining length may cause it to underflow. Since the length is an unsigned integer, this will result in the loop continuing until the kernel crashes.
This patch adds checks to ensure decrementing the remaining length does not cause it to wrap around.
--- net/x25/x25_facilities.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/x25/x25_facilities.c +9 -3
@@ -61,6 +61,8 @@ int x25_parse_facilities(struct sk_buffwhile (len >0 ) {switch (*p &X25_FAC_CLASS_MASK ) {case X25_FAC_CLASS_A : +if (len <2 ) +return 0 ;switch (*p) {case X25_FAC_REVERSE :if ((p[1 ] &0x81 ) ==0x81 ) {
@@ -104,6 +106,8 @@ int x25_parse_facilities(struct sk_buff len -=2 ;break ;case X25_FAC_CLASS_B : +if (len <3 ) +return 0 ;switch (*p) {case X25_FAC_PACKET_SIZE : facilities->pacsize_in = p[1 ];
@@ -125,6 +129,8 @@ int x25_parse_facilities(struct sk_buff len -=3 ;break ;case X25_FAC_CLASS_C : +if (len <4 ) +return 0 ;printk (KERN_DEBUG "X.25: unknown facility %02X, " "values %02X, %02X, %02X\n" , p[0 ], p[1 ], p[2 ], p[3 ]);
@@ -132,6 +138,8 @@ int x25_parse_facilities(struct sk_buff len -=4 ;break ;case X25_FAC_CLASS_D : +if (len < p[1 ] +2 ) +return 0 ;switch (*p) {case X25_FAC_CALLING_AE :if (p[1 ] >X25_MAX_DTE_FACIL_LEN || p[1 ] <=1 )
@@ -149,9 +157,7 @@ int x25_parse_facilities(struct sk_buffbreak ;default :printk (KERN_DEBUG "X.25: unknown facility %02X," -"length %d, values %02X, %02X, " -"%02X, %02X\n" , - p[0 ], p[1 ], p[2 ], p[3 ], p[4 ], p[5 ]); +"length %d\n" , p[0 ], p[1 ]);break ; } len -= p[1 ] +2 ;
PATCH 206/223 filter: make sure filters dont read uninitialized memory
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: David S. Miller <[email protected]>
commit 57fe93b374a6b8711995c2d466c502af9f3a08bb upstream.
There is a possibility malicious users can get limited information about uninitialized stack mem array. Even if sk_run_filter() result is bound to packet length (0 .. 65535), we could imagine this can be used by hostile user.
Initializing mem[] array, like Dan Rosenberg suggested in his patch is expensive since most filters dont even use this array.
Its hard to make the filter validation in sk_chk_filter(), because of the jumps. This might be done later.
In this patch, I use a bitmap (a single long var) so that only filters using mem[] loads/stores pay the price of added security checks.
For other filters, additional cost is a single instruction.
[ Since we access fentry->k a lot now, cache it in a local variable
and mark filter entry pointer as const. -DaveM ]
--- net/core/filter.c | 64 +++++++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 29 deletions(-)
net/core/filter.c +35 -29
@@ -112,39 +112,41 @@ EXPORT_SYMBOL(sk_filter);*/ unsigned int sk_run_filter (struct sk_buff *skb,struct sock_filter *filter,int flen) { -struct sock_filter *fentry;/* We walk down these */ void *ptr;u32 A =0 ;/* Accumulator */ u32 X =0 ;/* Index Register */ u32 mem[BPF_MEMWORDS ];/* Scratch Memory Store */ +unsigned long memvalid =0 ;u32 tmp;int k;int pc; +BUILD_BUG_ON (BPF_MEMWORDS >BITS_PER_LONG );/* * Process array of filter instructions. */ for (pc =0 ; pc < flen; pc++) { - fentry = &filter[pc]; +const struct sock_filter *fentry = &filter[pc]; +u32 f_k = fentry->k;switch (fentry->code) {case BPF_S_ALU_ADD_X :A +=X ;continue ;case BPF_S_ALU_ADD_K : -A += fentry->k; +A += f_k;continue ;case BPF_S_ALU_SUB_X :A -=X ;continue ;case BPF_S_ALU_SUB_K : -A -= fentry->k; +A -= f_k;continue ;case BPF_S_ALU_MUL_X :A *=X ;continue ;case BPF_S_ALU_MUL_K : -A *= fentry->k; +A *= f_k;continue ;case BPF_S_ALU_DIV_X :if (X ==0 )
@@ -152,49 +154,49 @@ unsigned int sk_run_filter(struct sk_bufA /=X ;continue ;case BPF_S_ALU_DIV_K : -A /= fentry->k; +A /= f_k;continue ;case BPF_S_ALU_AND_X :A &=X ;continue ;case BPF_S_ALU_AND_K : -A &= fentry->k; +A &= f_k;continue ;case BPF_S_ALU_OR_X :A |=X ;continue ;case BPF_S_ALU_OR_K : -A |= fentry->k; +A |= f_k;continue ;case BPF_S_ALU_LSH_X :A <<=X ;continue ;case BPF_S_ALU_LSH_K : -A <<= fentry->k; +A <<= f_k;continue ;case BPF_S_ALU_RSH_X :A >>=X ;continue ;case BPF_S_ALU_RSH_K : -A >>= fentry->k; +A >>= f_k;continue ;case BPF_S_ALU_NEG :A = -A ;continue ;case BPF_S_JMP_JA : - pc += fentry->k; + pc += f_k;continue ;case BPF_S_JMP_JGT_K : - pc += (A > fentry->k) ? fentry->jt : fentry->jf; + pc += (A > f_k) ? fentry->jt : fentry->jf;continue ;case BPF_S_JMP_JGE_K : - pc += (A >= fentry->k) ? fentry->jt : fentry->jf; + pc += (A >= f_k) ? fentry->jt : fentry->jf;continue ;case BPF_S_JMP_JEQ_K : - pc += (A == fentry->k) ? fentry->jt : fentry->jf; + pc += (A == f_k) ? fentry->jt : fentry->jf;continue ;case BPF_S_JMP_JSET_K : - pc += (A & fentry->k) ? fentry->jt : fentry->jf; + pc += (A & f_k) ? fentry->jt : fentry->jf;continue ;case BPF_S_JMP_JGT_X : pc += (A >X ) ? fentry->jt : fentry->jf;
@@ -209,7 +211,7 @@ unsigned int sk_run_filter(struct sk_buf pc += (A &X ) ? fentry->jt : fentry->jf;continue ;case BPF_S_LD_W_ABS : - k = fentry->k; + k = f_k; load_w: ptr =load_pointer (skb, k,4 , &tmp);if (ptr !=NULL ) {
@@ -218,7 +220,7 @@ load_w: }break ;case BPF_S_LD_H_ABS : - k = fentry->k; + k = f_k; load_h: ptr =load_pointer (skb, k,2 , &tmp);if (ptr !=NULL ) {
@@ -227,7 +229,7 @@ load_h: }break ;case BPF_S_LD_B_ABS : - k = fentry->k; + k = f_k; load_b: ptr =load_pointer (skb, k,1 , &tmp);if (ptr !=NULL ) {
@@ -242,32 +244,34 @@ load_b:X = skb->len;continue ;case BPF_S_LD_W_IND : - k =X + fentry->k; + k =X + f_k; goto load_w;case BPF_S_LD_H_IND : - k =X + fentry->k; + k =X + f_k; goto load_h;case BPF_S_LD_B_IND : - k =X + fentry->k; + k =X + f_k; goto load_b;case BPF_S_LDX_B_MSH : - ptr =load_pointer (skb, fentry->k,1 , &tmp); + ptr =load_pointer (skb, f_k,1 , &tmp);if (ptr !=NULL ) {X = (*(u8 *)ptr &0xf ) <<2 ;continue ; }return 0 ;case BPF_S_LD_IMM : -A = fentry->k; +A = f_k;continue ;case BPF_S_LDX_IMM : -X = fentry->k; +X = f_k;continue ;case BPF_S_LD_MEM : -A = mem[fentry->k]; +A = (memvalid & (1UL << f_k)) ? + mem[f_k] :0 ;continue ;case BPF_S_LDX_MEM : -X = mem[fentry->k]; +X = (memvalid & (1UL << f_k)) ? + mem[f_k] :0 ;continue ;case BPF_S_MISC_TAX :X =A ;
@@ -276,14 +280,16 @@ load_b:A =X ;continue ;case BPF_S_RET_K : -return fentry->k; +return f_k;case BPF_S_RET_A :return A ;case BPF_S_ST : - mem[fentry->k] =A ; + memvalid |=1UL << f_k; + mem[f_k] =A ;continue ;case BPF_S_STX : - mem[fentry->k] =X ; + memvalid |=1UL << f_k; + mem[f_k] =X ;continue ;default :WARN_ON (1 );
Richard Weinberger
maintainerRe: [PATCH] [64/223] hostfs: fix UML crash: remove f_spare from hostfs
In reply to Andi KleenAndi,
Am Montag 13 Dezember 2010, 00:46:02 schrieb Andi Kleen:
Quoted 2 lines
2.6.35-longterm review patch. If anyone has any objections, please let me know.
This patch is not needed on 2.6.35.
It makes only sense on >= 2.6.36.
Thanks,
//richard
Quoted 77 lines
------------------
From: Richard Weinberger <[email protected]>commit
1b627d5771312c92404b66f0a0b16f66036dd2e1upstream.
365b1818("addf_flagsto struct statfs(64)") resizedf_sparewithin struct statfs which caused a UML crash. There is no need to copyf_spare.Signed-off-by Richard Weinberger <[email protected]>Reported-by Toralf Förster <[email protected]>Tested-by Toralf Förster <[email protected]>Cc Christoph Hellwig <[email protected]>Cc Al Viro <[email protected]>Cc Jeff Dike <[email protected]>Signed-off-by Andrew Morton <[email protected]>Signed-off-by Linus Torvalds <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Signed-off-by Andi Kleen <[email protected]>--- fs/hostfs/hostfs.h | 3 +-- fs/hostfs/hostfs_kern.c | 2 +- fs/hostfs/hostfs_user.c | 9 ++------- 3 files changed, 4 insertions(+), 10 deletions(-)Index:
linux/fs/hostfs/hostfs.h
===================================================================fs/hostfs/hostfs.h +1
-2@@ -86,7 +86,6 @@ extern int rename_file(char *from, charextern int do_statfs (char *root,long *bsize_out,long long *blocks_out,long long *bfree_out,long long *bavail_out,long long *files_out,long long *ffree_out, -void *fsid_out,int fsid_size,long *namelen_out, -long *spare_out); +void *fsid_out,int fsid_size,long *namelen_out);#endif Index:
linux/fs/hostfs/hostfs_kern.c
===================================================================fs/hostfs/hostfs_kern.c +1
-1@@ -272,7 +272,7 @@ int hostfs_statfs(struct dentry *dentry, err =do_statfs (HOSTFS_I (dentry->d_sb->s_root->d_inode)->host_filename, &sf->f_bsize, &f_blocks, &f_bfree, &f_bavail, &f_files, &f_ffree, &sf->f_fsid,sizeof (sf->f_fsid), - &sf->f_namelen, sf->f_spare); + &sf->f_namelen);if (err)return err; sf->f_blocks = f_blocks;Index:
linux/fs/hostfs/hostfs_user.c
===================================================================fs/hostfs/hostfs_user.c +2
-7@@ -402,8 +402,7 @@ int rename_file(char *from, char *to)int do_statfs (char *root,long *bsize_out,long long *blocks_out,long long *bfree_out,long long *bavail_out,long long *files_out,long long *ffree_out, -void *fsid_out,int fsid_size,long *namelen_out, -long *spare_out) +void *fsid_out,int fsid_size,long *namelen_out) {struct statfs64 buf;int err;@@ -422,10 +421,6 @@ int do_statfs(char *root, long *bsize_ousizeof (buf.f_fsid) > fsid_size ? fsid_size : sizeof(buf.f_fsid)); *namelen_out = buf.f_namelen; - spare_out[0 ] = buf.f_spare[0 ]; - spare_out[1 ] = buf.f_spare[1 ]; - spare_out[2 ] = buf.f_spare[2 ]; - spare_out[3 ] = buf.f_spare[3 ]; - spare_out[4 ] = buf.f_spare[4 ]; +return 0 ; }
PATCH 205/223 net: optimize Berkeley Packet Filter (BPF) processing
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
Gcc is currenlty not in the ability to optimize the switch statement in sk_run_filter() because of dense case labels. This patch replace the OR'd labels with ordered sequenced case labels. The sk_chk_filter() function is modified to patch/replace the original OPCODES in a ordered but equivalent form. gcc is now in the ability to transform the switch statement in sk_run_filter into a jump table of complexity O(1).
Until this patch gcc generates a sequence of conditional branches (O(n) of 567 byte .text segment size (arch x86_64):
7ff: 8b 06 mov (%rsi),%eax 801: 66 83 f8 35 cmp $0x35,%ax 805: 0f 84 d0 02 00 00 je adb <sk_run_filter+0x31d> 80b: 0f 87 07 01 00 00 ja 918 <sk_run_filter+0x15a> 811: 66 83 f8 15 cmp $0x15,%ax 815: 0f 84 c5 02 00 00 je ae0 <sk_run_filter+0x322> 81b: 77 73 ja 890 <sk_run_filter+0xd2> 81d: 66 83 f8 04 cmp $0x4,%ax 821: 0f 84 17 02 00 00 je a3e <sk_run_filter+0x280> 827: 77 29 ja 852 <sk_run_filter+0x94> 829: 66 83 f8 01 cmp $0x1,%ax
[...]
With the modification the compiler translate the switch statement into the following jump table fragment:
7ff: 66 83 3e 2c cmpw $0x2c,(%rsi) 803: 0f 87 1f 02 00 00 ja a28 <sk_run_filter+0x26a> 809: 0f b7 06 movzwl (%rsi),%eax 80c: ff 24 c5 00 00 00 00 jmpq *0x0(,%rax,8) 813: 44 89 e3 mov %r12d,%ebx 816: e9 43 03 00 00 jmpq b5e <sk_run_filter+0x3a0> 81b: 41 89 dc mov %ebx,%r12d 81e: e9 3b 03 00 00 jmpq b5e <sk_run_filter+0x3a0>
Furthermore, I reordered the instructions to reduce cache line misses by order the most common instruction to the start.
--- include/linux/filter.h | 48 +++++++++++ net/core/filter.c | 212 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 209 insertions(+), 51 deletions(-)
include/linux/filter.h +48 -0
@@ -91,6 +91,54 @@ struct sock_fprog { /* Required for SO_A#define BPF_TAX 0x00#define BPF_TXA 0x80 +enum { +BPF_S_RET_K =0 , +BPF_S_RET_A , +BPF_S_ALU_ADD_K , +BPF_S_ALU_ADD_X , +BPF_S_ALU_SUB_K , +BPF_S_ALU_SUB_X , +BPF_S_ALU_MUL_K , +BPF_S_ALU_MUL_X , +BPF_S_ALU_DIV_X , +BPF_S_ALU_AND_K , +BPF_S_ALU_AND_X , +BPF_S_ALU_OR_K , +BPF_S_ALU_OR_X , +BPF_S_ALU_LSH_K , +BPF_S_ALU_LSH_X , +BPF_S_ALU_RSH_K , +BPF_S_ALU_RSH_X , +BPF_S_ALU_NEG , +BPF_S_LD_W_ABS , +BPF_S_LD_H_ABS , +BPF_S_LD_B_ABS , +BPF_S_LD_W_LEN , +BPF_S_LD_W_IND , +BPF_S_LD_H_IND , +BPF_S_LD_B_IND , +BPF_S_LD_IMM , +BPF_S_LDX_W_LEN , +BPF_S_LDX_B_MSH , +BPF_S_LDX_IMM , +BPF_S_MISC_TAX , +BPF_S_MISC_TXA , +BPF_S_ALU_DIV_K , +BPF_S_LD_MEM , +BPF_S_LDX_MEM , +BPF_S_ST , +BPF_S_STX , +BPF_S_JMP_JA , +BPF_S_JMP_JEQ_K , +BPF_S_JMP_JEQ_X , +BPF_S_JMP_JGE_K , +BPF_S_JMP_JGE_X , +BPF_S_JMP_JGT_K , +BPF_S_JMP_JGT_X , +BPF_S_JMP_JSET_K , +BPF_S_JMP_JSET_X , +}; +#ifndef BPF_MAXINSNS #define BPF_MAXINSNS 4096#endif
net/core/filter.c +161 -51
397 lines not on this page · raw message
PATCH 204/223 memory corruption in X.25 facilities parsing
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: andrew hendry <[email protected]>
commit a6331d6f9a4298173b413cf99a40cc86a9d92c37 upstream.
--- net/x25/x25_facilities.c | 8 ++++---- net/x25/x25_in.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-)
net/x25/x25_facilities.c +4 -4
@@ -134,15 +134,15 @@ int x25_parse_facilities(struct sk_buffcase X25_FAC_CLASS_D :switch (*p) {case X25_FAC_CALLING_AE : -if (p[1 ] >X25_MAX_DTE_FACIL_LEN ) -break ; +if (p[1 ] >X25_MAX_DTE_FACIL_LEN || p[1 ] <=1 ) +return 0 ; dte_facs->calling_len = p[2 ];memcpy (dte_facs->calling_ae, &p[3 ], p[1 ] -1 ); *vc_fac_mask |=X25_MASK_CALLING_AE ;break ;case X25_FAC_CALLED_AE : -if (p[1 ] >X25_MAX_DTE_FACIL_LEN ) -break ; +if (p[1 ] >X25_MAX_DTE_FACIL_LEN || p[1 ] <=1 ) +return 0 ; dte_facs->called_len = p[2 ];memcpy (dte_facs->called_ae, &p[3 ], p[1 ] -1 ); *vc_fac_mask |=X25_MASK_CALLED_AE ;
net/x25/x25_in.c +2 -0
@@ -119,6 +119,8 @@ static int x25_state1_machine(struct soc &x25->vc_facil_mask);if (len >0 )skb_pull (skb, len); +else +return -1 ;/* * Copy any Call User Data. */
PATCH 203/223 OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Peter Ujfalusi <[email protected]>
commit 0e4905c0199d683497833be60a428c784d7575b8 upstream.
Implement the suggested workaround for OMAP3 regarding to sDMA draining issue, when the channel is disabled on the fly.
This errata affects the following configuration:
sDMA transfer is source synchronized
Buffering is enabled
SmartStandby is selected.
The issue can be easily reproduced by creating overrun situation while recording audio.
Either introduce load to the CPU:
nice -19 arecord -D hw:0 -M -B 10000 -F 5000 -f dat > /dev/null & \
dd if=/dev/urandom of=/dev/null
or suspending the arecord, and resuming it:
arecord -D hw:0 -M -B 10000 -F 5000 -f dat > /dev/null CTRL+Z; fg; CTRL+Z; fg; ...
In case of overrun audio stops DMA, and restarts it (without reseting the sDMA channel). When we hit this errata in stop case (sDMA drain did not complete), at the coming start the sDMA will not going to be operational (it is still draining).
This leads to DMA stall condition.
On OMAP3 we can recover with sDMA channel reset, it has been observed that by introducing unrelated sDMA activity might also help (reading from MMC for example).
The same errata exists for OMAP2, where the suggestion is to disable the buffering to avoid this type of error.
On OMAP3 the suggestion is to set sDMA to NoStandby before disabling the channel, and wait for the drain to finish, than configure sDMA to SmartStandby again.
--- arch/arm/plat-omap/dma.c | 36 ++++++++++++++++++++++++++++++++-- arch/arm/plat-omap/include/plat/dma.h | 3 ++ 2 files changed, 37 insertions(+), 2 deletions(-)
arch/arm/plat-omap/dma.c +34 -2
@@ -30,6 +30,7 @@#include <linux/irq.h> #include <linux/io.h> #include <linux/slab.h> +#include <linux/delay.h> #include <asm/system.h> #include <mach/hardware.h>
@@ -1021,8 +1022,39 @@ void omap_stop_dma(int lch)dma_write (0 ,CICR (lch)); l =dma_read (CCR (lch)); - l &= ~OMAP_DMA_CCR_EN ; -dma_write (l,CCR (lch)); +/* OMAP3 Errata i541: sDMA FIFO draining does not finish */ +if (cpu_is_omap34xx () && (l &OMAP_DMA_CCR_SEL_SRC_DST_SYNC )) { +int i =0 ; +u32 sys_cf; + +/* Configure No-Standby */ + l =dma_read (OCP_SYSCONFIG ); + sys_cf = l; + l &= ~DMA_SYSCONFIG_MIDLEMODE_MASK ; + l |=DMA_SYSCONFIG_MIDLEMODE (DMA_IDLEMODE_NO_IDLE ); +dma_write (l ,OCP_SYSCONFIG ); + + l =dma_read (CCR (lch)); + l &= ~OMAP_DMA_CCR_EN ; +dma_write (l,CCR (lch)); + +/* Wait for sDMA FIFO drain */ + l =dma_read (CCR (lch)); +while (i <100 && (l & (OMAP_DMA_CCR_RD_ACTIVE | +OMAP_DMA_CCR_WR_ACTIVE ))) { +udelay (5 ); + i++; + l =dma_read (CCR (lch)); + } +if (i >=100 ) +printk (KERN_ERR "DMA drain did not complete on " +"lch %d\n" , lch); +/* Restore OCP_SYSCONFIG */ +dma_write (sys_cf,OCP_SYSCONFIG ); + }else { + l &= ~OMAP_DMA_CCR_EN ; +dma_write (l,CCR (lch)); + }if (!omap_dma_in_1510_mode () && dma_chan[lch].next_lch !=-1 ) {int next_lch, cur_lch = lch;
arch/arm/plat-omap/include/plat/dma.h +3 -0
@@ -335,6 +335,9 @@#define OMAP2_DMA_MISALIGNED_ERR_IRQ (1 << 11)#define OMAP_DMA_CCR_EN (1 << 7) +#define OMAP_DMA_CCR_RD_ACTIVE (1 << 9) +#define OMAP_DMA_CCR_WR_ACTIVE (1 << 10) +#define OMAP_DMA_CCR_SEL_SRC_DST_SYNC (1 << 24)#define OMAP_DMA_CCR_BUFFERING_DISABLE (1 << 25)#define OMAP_DMA_DATA_TYPE_S8 0x00
PATCH 202/223 omap: dma: Fix buffering disable bit setting for omap24xx
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Jarkko Nikula <[email protected]>
commit 3e57f1626b5febe5cc99aa6870377deef3ae03cc upstream.
An errata workaround for omap24xx is not setting the buffering disable bit 25 what is the purpose but channel enable bit 7 instead.
Background for this fix is the DMA stalling issue with ASoC omap-mcbsp driver. Peter Ujfalusi <[email protected]> has found an issue in recording that the DMA stall could happen if there were a buffer overrun detected by ALSA and the DMA was stopped and restarted due that. This problem is known to occur on both OMAP2420 and OMAP3. It can recover on OMAP3 after dma free, dma request and reconfiguration cycle. However, on OMAP2420 it seems that only way to recover is a reset.
Problem was not visible before the commit c12abc0. That commit changed that the McBSP transmitter/receiver is released from reset only when needed. That is, only enabled McBSP transmitter without transmission was able to prevent this DMA stall problem in receiving side and underlying problem did not show up until now. McBSP transmitter itself seems to no be reason since DMA stall does not recover by enabling the transmission after stall.
Debugging showed that there were a DMA write active during DMA stop time and it never completed even when restarting the DMA. Experimenting showed that the DMA buffering disable bit could be used to avoid stalling when using source synchronized transfers. However that could have performance hit and OMAP3 TRM states that buffering disable is not allowed for destination synchronized transfers so subsequent patch will implement a method to complete DMA writes when stopping.
This patch is based on assumtion that complete lock-up on OMAP2420 is different but related problem. I don't have access to OMAP2420 errata but I believe this old workaround here is put for a reason but unfortunately a wrong bit was typed and problem showed up only now.
--- arch/arm/plat-omap/dma.c | 14 ++++++++++---- arch/arm/plat-omap/include/plat/dma.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-)
arch/arm/plat-omap/dma.c +10 -4
@@ -993,11 +993,17 @@ void omap_start_dma(int lch) l =dma_read (CCR (lch));/* -* Errata: On ES2.0 BUFFERING disable must be set. -* This will always fail on ES1.0 +* Errata: Inter Frame DMA buffering issue (All OMAP2420 and +* OMAP2430ES1.0): DMA will wrongly buffer elements if packing and +* bursting is enabled. This might result in data gets stalled in +* FIFO at the end of the block. +* Workaround: DMA channels must have BUFFERING_DISABLED bit set to +* guarantee no data will stay in the DMA FIFO in case inter frame +* buffering occurs. */ -if (cpu_is_omap24xx ()) - l |=OMAP_DMA_CCR_EN ; +if (cpu_is_omap2420 () || + (cpu_is_omap2430 () && (omap_type () ==OMAP2430_REV_ES1_0 ))) + l |=OMAP_DMA_CCR_BUFFERING_DISABLE ; l |=OMAP_DMA_CCR_EN ;dma_write (l,CCR (lch));
arch/arm/plat-omap/include/plat/dma.h +1 -0
@@ -335,6 +335,7 @@#define OMAP2_DMA_MISALIGNED_ERR_IRQ (1 << 11)#define OMAP_DMA_CCR_EN (1 << 7) +#define OMAP_DMA_CCR_BUFFERING_DISABLE (1 << 25)#define OMAP_DMA_DATA_TYPE_S8 0x00#define OMAP_DMA_DATA_TYPE_S16 0x01
PATCH 200/223 net: Limit socket I/O iovec total length to INT_MAX.
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: David S. Miller <[email protected]>
commit 8acfe468b0384e834a303f08ebc4953d72fb690a upstream.
This helps protect us from overflow issues down in the individual protocol sendmsg/recvmsg handlers. Once we hit INT_MAX we truncate out the rest of the iovec by setting the iov_len members to zero.
This works because:
1) For SOCK_STREAM and SOCK_SEQPACKET sockets, partial writes are allowed and the application will just continue with another write to send the rest of the data.
2) For datagram oriented sockets, where there must be a one-to-one correspondance between write() calls and packets on the wire, INT_MAX is going to be far larger than the packet size limit the protocol is going to check for and signal with -EMSGSIZE.
Based upon a patch by Linus Torvalds.
--- net/compat.c | 10 ++++++---- net/core/iovec.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-)
net/compat.c +6 -4
@@ -41,10 +41,12 @@ static inline int iov_from_user_compat_tcompat_size_t len;if (get_user (len, &uiov32->iov_len) || -get_user (buf, &uiov32->iov_base)) { - tot_len = -EFAULT ; -break ; - } +get_user (buf, &uiov32->iov_base)) +return -EFAULT ; + +if (len >INT_MAX - tot_len) + len =INT_MAX - tot_len; + tot_len += len; kiov->iov_base =compat_ptr (buf); kiov->iov_len = (__kernel_size_t ) len;
net/core/iovec.c +7 -8
@@ -59,14 +59,13 @@ int verify_iovec(struct msghdr *m, struc err =0 ;for (ct =0 ; ct < m->msg_iovlen; ct++) { - err += iov[ct].iov_len; -/* -* Goal is not to verify user data, but to prevent returning -* negative value, which is interpreted as errno. -* Overflow is still possible, but it is harmless. -*/ -if (err <0 ) -return -EMSGSIZE ; +size_t len = iov[ct].iov_len; + +if (len >INT_MAX - err) { + len =INT_MAX - err; + iov[ct].iov_len = len; + } + err += len; }return err;
PATCH 196/223 wmi: use memcmp instead of strncmp to compare GUIDs
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Thadeu Lima de Souza Cascardo <[email protected]>
commit 8b14d7b22c61f17ccb869e0047d9df6dd9f50a9f upstream.
While looking for the duplicates in /sys/class/wmi/, I couldn't find them. The code that looks for duplicates uses strncmp in a binary GUID, which may contain zero bytes. The right function is memcmp, which is also used in another section of wmi code.
It was finding 49142400-C6A3-40FA-BADB-8A2652834100 as a duplicate of 39142400-C6A3-40FA-BADB-8A2652834100. Since the first byte is the fourth printed, they were found as equal by strncmp.
--- drivers/platform/x86/wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/platform/x86/wmi.c +1 -1
@@ -795,7 +795,7 @@ static bool guid_already_parsed(const ch wblock = list_entry(p, struct wmi_block, list); gblock = &wblock->gblock; -if (strncmp (gblock->guid, guid_string,16 ) ==0 ) +if (memcmp (gblock->guid, guid_string,16 ) ==0 )return true; }return false;
PATCH 193/223 perf: Fix inherit vs. context rotation bug
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
commit dddd3379a619a4cb8247bfd3c94ca9ae3797aa2e upstream.
It was found that sometimes children of tasks with inherited events had one extra event. Eventually it turned out to be due to the list rotation no being exclusive with the list iteration in the inheritance code.
Cure this by temporarily disabling the rotation while we inherit the events.
LKML-Reference: <new-submission>
--- include/linux/perf_event.h | 1 + kernel/perf_event.c | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-)
include/linux/perf_event.h +1 -0
@@ -764,6 +764,7 @@ struct perf_event_context {int nr_active;int is_active;int nr_stat; +int rotate_disable;atomic_t refcount;struct task_struct *task;
kernel/perf_event.c +20 -2
@@ -1609,8 +1609,12 @@ static void rotate_ctx(struct perf_event {raw_spin_lock (&ctx->lock); -/* Rotate the first entry last of non-pinned groups */ -list_rotate_left (&ctx->flexible_groups); +/* +* Rotate the first entry last of non-pinned groups. Rotation might be +* disabled by the inheritance code. +*/ +if (!ctx->rotate_disable) +list_rotate_left (&ctx->flexible_groups);raw_spin_unlock (&ctx->lock); }
@@ -5596,6 +5600,7 @@ int perf_event_init_task(struct task_strstruct perf_event *event;struct task_struct *parent = current;int inherited_all =1 ; +unsigned long flags;int ret =0 ; child->perf_event_ctxp =NULL ;
@@ -5636,6 +5641,15 @@ int perf_event_init_task(struct task_strbreak ; } +/* +* We can't hold ctx->lock when iterating the ->flexible_group list due +* to allocations, but we need to prevent rotation because +* rotate_ctx() will change the list from interrupt context. +*/ +raw_spin_lock_irqsave (&parent_ctx->lock, flags); + parent_ctx->rotate_disable =1 ; +raw_spin_unlock_irqrestore (&parent_ctx->lock, flags); +list_for_each_entry (event, &parent_ctx->flexible_groups, group_entry) { ret =inherit_task_group (event, parent, parent_ctx, child, &inherited_all);
@@ -5643,6 +5657,10 @@ int perf_event_init_task(struct task_strbreak ; } +raw_spin_lock_irqsave (&parent_ctx->lock, flags); + parent_ctx->rotate_disable =0 ; +raw_spin_unlock_irqrestore (&parent_ctx->lock, flags); + child_ctx = child->perf_event_ctxp;if (child_ctx && inherited_all) {
PATCH 195/223 PM / Hibernate: Fix memory corruption related to swap
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
commit c9e664f1fdf34aa8cede047b206deaa8f1945af0 upstream.
There is a problem that swap pages allocated before the creation of a hibernation image can be released and used for storing the contents of different memory pages while the image is being saved. Since the kernel stored in the image doesn't know of that, it causes memory corruption to occur after resume from hibernation, especially on systems with relatively small RAM that need to swap often.
This issue can be addressed by keeping the GFP_IOFS bits clear in gfp_allowed_mask during the entire hibernation, including the saving of the image, until the system is finally turned off or the hibernation is aborted. Unfortunately, for this purpose it's necessary to rework the way in which the hibernate and suspend code manipulates gfp_allowed_mask.
This change is based on an earlier patch from Hugh Dickins.
--- include/linux/gfp.h | 4 ++-- kernel/power/hibernate.c | 22 ++++++++++++---------- kernel/power/suspend.c | 5 ++--- kernel/power/user.c | 2 ++ mm/page_alloc.c | 19 ++++++++++++------- 5 files changed, 30 insertions(+), 22 deletions(-)
include/linux/gfp.h +2 -2
@@ -339,7 +339,7 @@ void drain_local_pages(void *dummy);extern gfp_t gfp_allowed_mask; -extern void set_gfp_allowed_mask (gfp_t mask); -extern gfp_t clear_gfp_allowed_mask (gfp_t mask); +extern void pm_restrict_gfp_mask (void ); +extern void pm_restore_gfp_mask (void );#endif /* __LINUX_GFP_H */
kernel/power/hibernate.c +12 -10
@@ -324,7 +324,6 @@ static int create_image(int platform_modint hibernation_snapshot (int platform_mode) {int error; -gfp_t saved_mask; error =platform_begin (platform_mode);if (error)
@@ -336,7 +335,7 @@ int hibernation_snapshot(int platform_mo goto Close;suspend_console (); - saved_mask =clear_gfp_allowed_mask (GFP_IOFS ); +pm_restrict_gfp_mask (); error =dpm_suspend_start (PMSG_FREEZE );if (error) goto Recover_platform;
@@ -345,7 +344,10 @@ int hibernation_snapshot(int platform_mo goto Recover_platform; error =create_image (platform_mode); -/* Control returns here after successful restore */ +/* +* Control returns here (1) after the image has been created or the +* image creation has failed and (2) after a successful restore. +*/ Resume_devices:/* We may need to release the preallocated image pages here. */
@@ -354,7 +356,10 @@ int hibernation_snapshot(int platform_modpm_resume_end (in_suspend ? (error ?PMSG_RECOVER :PMSG_THAW ) :PMSG_RESTORE ); -set_gfp_allowed_mask (saved_mask); + +if (error || !in_suspend) +pm_restore_gfp_mask (); +resume_console (); Close:platform_end (platform_mode);
@@ -449,17 +454,16 @@ static int resume_target_kernel(bool plaint hibernation_restore (int platform_mode) {int error; -gfp_t saved_mask;pm_prepare_console ();suspend_console (); - saved_mask =clear_gfp_allowed_mask (GFP_IOFS ); +pm_restrict_gfp_mask (); error =dpm_suspend_start (PMSG_QUIESCE );if (!error) { error =resume_target_kernel (platform_mode);dpm_resume_end (PMSG_RECOVER ); } -set_gfp_allowed_mask (saved_mask); +pm_restore_gfp_mask ();resume_console ();pm_restore_console ();return error;
@@ -473,7 +477,6 @@ int hibernation_restore(int platform_modint hibernation_platform_enter (void ) {int error; -gfp_t saved_mask;if (!hibernation_ops)return -ENOSYS ;
@@ -489,7 +492,6 @@ int hibernation_platform_enter(void) entering_platform_hibernation = true;suspend_console (); - saved_mask =clear_gfp_allowed_mask (GFP_IOFS ); error =dpm_suspend_start (PMSG_HIBERNATE );if (error) {if (hibernation_ops->recover)
@@ -527,7 +529,6 @@ int hibernation_platform_enter(void) Resume_devices: entering_platform_hibernation = false;dpm_resume_end (PMSG_RESTORE ); -set_gfp_allowed_mask (saved_mask);resume_console (); Close:
@@ -635,6 +636,7 @@ int hibernate(void)swsusp_free ();if (!error)power_down (); +pm_restore_gfp_mask (); }else {pr_debug ("PM: Image restored successfully.\n" ); }
kernel/power/suspend.c +2 -3
@@ -196,7 +196,6 @@ static int suspend_enter(suspend_state_tint suspend_devices_and_enter (suspend_state_t state) {int error; -gfp_t saved_mask;if (!suspend_ops)return -ENOSYS ;
@@ -207,7 +206,7 @@ int suspend_devices_and_enter(suspend_st goto Close; }suspend_console (); - saved_mask =clear_gfp_allowed_mask (GFP_IOFS ); +pm_restrict_gfp_mask ();suspend_test_start (); error =dpm_suspend_start (PMSG_SUSPEND );if (error) {
@@ -224,7 +223,7 @@ int suspend_devices_and_enter(suspend_stsuspend_test_start ();dpm_resume_end (PMSG_RESUME );suspend_test_finish ("resume devices" ); -set_gfp_allowed_mask (saved_mask); +pm_restore_gfp_mask ();resume_console (); Close:if (suspend_ops->end)
kernel/power/user.c +2 -0
@@ -263,6 +263,7 @@ static long snapshot_ioctl(struct file *case SNAPSHOT_UNFREEZE :if (!data->frozen || data->ready)break ; +pm_restore_gfp_mask ();thaw_processes ();usermodehelper_enable (); data->frozen =0 ;
@@ -275,6 +276,7 @@ static long snapshot_ioctl(struct file * error = -EPERM ;break ; } +pm_restore_gfp_mask (); error =hibernation_snapshot (data->platform_support);if (!error) error =put_user (in_suspend, (int __user *)arg);
mm/page_alloc.c +12 -7
@@ -103,19 +103,24 @@ gfp_t gfp_allowed_mask __read_mostly = G* only be modified with pm_mutex held, unless the suspend/hibernate code is * guaranteed not to run in parallel with that modification). */ -void set_gfp_allowed_mask (gfp_t mask) + +static gfp_t saved_gfp_mask; + +void pm_restore_gfp_mask (void ) {WARN_ON (!mutex_is_locked (&pm_mutex)); - gfp_allowed_mask = mask; +if (saved_gfp_mask) { + gfp_allowed_mask = saved_gfp_mask; + saved_gfp_mask =0 ; + } } -gfp_t clear_gfp_allowed_mask (gfp_t mask) +void pm_restrict_gfp_mask (void ) { -gfp_t ret = gfp_allowed_mask; -WARN_ON (!mutex_is_locked (&pm_mutex)); - gfp_allowed_mask &= ~mask; -return ret; +WARN_ON (saved_gfp_mask); + saved_gfp_mask = gfp_allowed_mask; + gfp_allowed_mask &= ~GFP_IOFS ; }#endif /* CONFIG_PM_SLEEP */
PATCH 192/223 Staging: batman-adv: ensure that eth_type_trans gets linear memory
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Marek Lindner <[email protected]>
commit b6faaae1a15a352d68b3e3cd8b840e56709820bf upstream.
eth_type_trans tries to pull data with the length of the ethernet header from the skb. We only ensured that enough data for the first ethernet header and the batman header is available in non-paged memory of the skb and not for the ethernet after the batman header.
eth_type_trans would fail sometimes with drivers which don't ensure that all there data is perfectly linearised.
The failure was noticed through a kernel bug Oops generated by the skb_pull inside eth_type_trans.
--- drivers/staging/batman-adv/soft-interface.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/staging/batman-adv/soft-interface.c +4 -0
@@ -295,6 +295,10 @@ void interface_rx(struct sk_buff *skb, iskb_pull_rcsum (skb, hdr_size);/* skb_set_mac_header(skb, -sizeof(struct ethhdr));*/ +if (unlikely (!pskb_may_pull (skb,ETH_HLEN ))) { +kfree_skb (skb); +return ; + } skb->dev = dev; skb->protocol =eth_type_trans (skb, dev);
PATCH 191/223 staging: rtl8187se: Change panic to warn when RF switch turned off
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Larry Finger <[email protected]>
commit f36d83a8cb7224f45fdfa1129a616dff56479a09 upstream.
This driver issues a kernel panic over conditions that do not justify such drastic action. Change these to log entries with a stack dump.
This patch fixes the system crash reported in
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/674285.
--- drivers/staging/rtl8187se/r8185b_init.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)
drivers/staging/rtl8187se/r8185b_init.c +23 -9
@@ -268,8 +268,12 @@ HwHSSIThreeWire( }udelay (10 ); } -if (TryCnt ==TC_3W_POLL_MAX_TRY_CNT ) -panic ("HwThreeWire(): CmdReg: %#X RE|WE bits are not clear!!\n" , u1bTmp); +if (TryCnt ==TC_3W_POLL_MAX_TRY_CNT ) { +printk (KERN_ERR "rtl8187se: HwThreeWire(): CmdReg:" +" %#X RE|WE bits are not clear!!\n" , u1bTmp); +dump_stack (); +return 0 ; + }// RTL8187S HSSI Read/Write Function u1bTmp =read_nic_byte (dev,RF_SW_CONFIG );
@@ -309,13 +313,23 @@ HwHSSIThreeWire(int idx;int ByteCnt = nDataBufBitCnt /8 ;//printk("%d\n",nDataBufBitCnt); -if ((nDataBufBitCnt %8 ) !=0 ) -panic ("HwThreeWire(): nDataBufBitCnt(%d) should be multiple of 8!!!\n" , - nDataBufBitCnt); - -if (nDataBufBitCnt >64 ) -panic ("HwThreeWire(): nDataBufBitCnt(%d) should <= 64!!!\n" , - nDataBufBitCnt); +if ((nDataBufBitCnt %8 ) !=0 ) { +printk (KERN_ERR "rtl8187se: " +"HwThreeWire(): nDataBufBitCnt(%d)" +" should be multiple of 8!!!\n" , + nDataBufBitCnt); +dump_stack (); + nDataBufBitCnt +=8 ; + nDataBufBitCnt &= ~7 ; + } + +if (nDataBufBitCnt >64 ) { +printk (KERN_ERR "rtl8187se: HwThreeWire():" +" nDataBufBitCnt(%d) should <= 64!!!\n" , + nDataBufBitCnt); +dump_stack (); + nDataBufBitCnt =64 ; + }for (idx =0 ; idx < ByteCnt; idx++) {
PATCH 189/223 Staging: samsung-laptop: fix up my fixup for some sysfs attribute permissions
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 4d7bc388b44e42a1feafa35e50eef4f24d6ca59d upstream.
They should be writable by root, not readable. Doh, stupid me with the wrong flags.
--- drivers/staging/samsung-laptop/samsung-laptop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/samsung-laptop/samsung-laptop.c +1 -1
@@ -356,7 +356,7 @@ static ssize_t set_silent_state(struct d }return count; } -static DEVICE_ATTR(silent, S_IRUSR | S_IRUGO, +static DEVICE_ATTR(silent, S_IWUSR | S_IRUGO, get_silent_state, set_silent_state);
PATCH 185/223 Staging: udlfb: fix up some sysfs attribute permissions
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit cc9ca9dfddda46b1802d325891a69d7efdbe1f1e and cc9ca9dfddda46b1802d325891a69d7efdbe1f1e upstream merged together.
They should not be writable by any user
--- drivers/staging/udlfb/udlfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/udlfb/udlfb.c +1 -1
@@ -1143,7 +1143,7 @@ static struct device_attribute fb_device__ATTR_RO (metrics_bytes_sent),__ATTR_RO (metrics_cpu_kcycles_used),__ATTR_RO (metrics_misc), -__ATTR (metrics_reset,S_IWUGO ,NULL , metrics_reset_store), +__ATTR (metrics_reset,S_IWUSR ,NULL , metrics_reset_store), __ATTR_RW(use_defio), };
PATCH 187/223 Staging: iio: adis16220: fix up my fixup for some sysfs attribute permissions
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit c9e51d9e4bee3da47623622884f4828e079a0581 upstream.
They should be writable by root, not readable. Doh, stupid me with the wrong flags.
--- drivers/staging/iio/accel/adis16220_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/iio/accel/adis16220_core.c +1 -1
@@ -506,7 +506,7 @@ static IIO_DEVICE_ATTR(reset, S_IWUSR, N adis16220_write_reset, 0);#define IIO_DEV_ATTR_CAPTURE (_store) \ - IIO_DEVICE_ATTR(capture, S_IRUSR, NULL, _store, 0) + IIO_DEVICE_ATTR(capture, S_IWUSR, NULL, _store, 0)static IIO_DEV_ATTR_CAPTURE (adis16220_write_capture);
PATCH 186/223 Staging: iio: adis16220: fix up some sysfs attribute permissions
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 1d904e8950c86e670ace237eaea1d48cd81e94df upstream.
They should not be writable by any user
--- drivers/staging/iio/accel/adis16220_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/iio/accel/adis16220_core.c +1 -1
@@ -506,7 +506,7 @@ static IIO_DEVICE_ATTR(reset, S_IWUSR, N adis16220_write_reset, 0);#define IIO_DEV_ATTR_CAPTURE (_store) \ - IIO_DEVICE_ATTR(capture, S_IWUGO, NULL, _store, 0) + IIO_DEVICE_ATTR(capture, S_IRUSR, NULL, _store, 0)static IIO_DEV_ATTR_CAPTURE (adis16220_write_capture);
PATCH 183/223 ARM: 6482/2: Fix find_next_zero_bit and related assembly
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: James Jones <[email protected]>
commit 0e91ec0c06d2cd15071a6021c94840a50e6671aa upstream.
The find_next_bit, find_first_bit, find_next_zero_bit and find_first_zero_bit functions were not properly clamping to the maxbit argument at the bit level. They were instead only checking maxbit at the byte level. To fix this, add a compare and a conditional move instruction to the end of the common bit-within-the- byte code used by all the functions and be sure not to clobber the maxbit argument before it is used.
--- arch/arm/lib/findbit.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm/lib/findbit.S +4 -2
@@ -174,8 +174,8 @@ ENDPROC(_find_next_bit_be) */ .L_found: #if __LINUX_ARM_ARCH__ >= 5 - rsb r1, r3, #0 - and r3, r3, r1 + rsb r0, r3, #0 + and r3, r3, r0 clz r3, r3 rsb r3, r3, #31 add r0, r2, r3
@@ -190,5 +190,7 @@ ENDPROC(_find_next_bit_be) addeq r2, r2, #1 mov r0, r2 #endif + cmp r1, r0 @ Clamp to maxbit + movlo r0, r1 mov pc, lr
PATCH 178/223 mmc: fix rmmod race for hosts using card-detection polling
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Guennadi Liakhovetski <[email protected]>
commit d9bcbf343ec63e1104b5276195888ee06b4d086f upstream.
MMC hosts that poll for card detection by defining the MMC_CAP_NEEDS_POLL flag have a race on rmmod, where the delayed work is cancelled without waiting for completed polling. To prevent this a _sync version of the work cancellation has to be used.
--- drivers/mmc/core/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/core/core.c +1 -1
@@ -1160,7 +1160,7 @@ void mmc_stop_host(struct mmc_host *hostif (host->caps &MMC_CAP_DISABLE )cancel_delayed_work (&host->disable); -cancel_delayed_work (&host->detect); +cancel_delayed_work_sync (&host->detect);mmc_flush_scheduled_work ();/* clear pm flags now and let card drivers set them as needed */
PATCH 177/223 x86: Ignore trap bits on single step exceptions
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Frederic Weisbecker <[email protected]>
commit 6c0aca288e726405b01dacb12cac556454d34b2a upstream.
When a single step exception fires, the trap bits, used to signal hardware breakpoints, are in a random state.
These trap bits might be set if another exception will follow, like a breakpoint in the next instruction, or a watchpoint in the previous one. Or there can be any junk there.
So if we handle these trap bits during the single step exception, we are going to handle an exception twice, or we are going to handle junk.
Just ignore them in this case.
This fixes https://bugzilla.kernel.org/show_bug.cgi?id=21332
--- arch/x86/kernel/hw_breakpoint.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/kernel/hw_breakpoint.c +4 -0
@@ -421,6 +421,10 @@ static int __kprobes hw_breakpoint_handl dr6_p = (unsigned long *)ERR_PTR (args->err); dr6 = *dr6_p; +/* If it's a single step, TRAP bits are random */ +if (dr6 &DR_STEP ) +return NOTIFY_DONE ; +/* Do an early return if no trap bits are set in DR6 */ if ((dr6 &DR_TRAP_BITS ) ==0 )return NOTIFY_DONE ;
PATCH 175/223 backlight: grab ops_lock before testing bd->ops
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <[email protected]>
commit d1d73578e053b981c3611e5a211534290d24a5eb upstream.
According to the comment describing ops_lock in the definition of struct backlight_device and when comparing with other functions in backlight.c the mutex must be hold when checking ops to be non-NULL.
Fixes a problem added by c835ee7f4154992e6 ("backlight: Add suspend/resume support to the backlight core") in Jan 2009.
--- drivers/video/backlight/backlight.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/video/backlight/backlight.c +6 -6
@@ -197,12 +197,12 @@ static int backlight_suspend(struct devi {struct backlight_device *bd =to_backlight_device (dev); -if (bd->ops->options &BL_CORE_SUSPENDRESUME ) { -mutex_lock (&bd->ops_lock); +mutex_lock (&bd->ops_lock); +if (bd->ops && bd->ops->options &BL_CORE_SUSPENDRESUME ) { bd->props.state |=BL_CORE_SUSPENDED ;backlight_update_status (bd); -mutex_unlock (&bd->ops_lock); } +mutex_unlock (&bd->ops_lock);return 0 ; }
@@ -211,12 +211,12 @@ static int backlight_resume(struct devic {struct backlight_device *bd =to_backlight_device (dev); -if (bd->ops->options &BL_CORE_SUSPENDRESUME ) { -mutex_lock (&bd->ops_lock); +mutex_lock (&bd->ops_lock); +if (bd->ops && bd->ops->options &BL_CORE_SUSPENDRESUME ) { bd->props.state &= ~BL_CORE_SUSPENDED ;backlight_update_status (bd); -mutex_unlock (&bd->ops_lock); } +mutex_unlock (&bd->ops_lock);return 0 ; }
PATCH 174/223 uml: disable winch irq before freeing handler data
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Will Newton <[email protected]>
commit 69e83dad5207f8f03c9699e57e1febb114383cb8 upstream.
Disable the winch irq early to make sure we don't take an interrupt part way through the freeing of the handler data, resulting in a crash on shutdown:
winch_interrupt : read failed, errno = 9
fd 13 is losing SIGWINCH support
------------[ cut here ]------------ WARNING: at lib/list_debug.c:48 list_del+0xc6/0x100() list_del corruption, next is LIST_POISON1 (00100100) 082578c8: [<081fd77f>] dump_stack+0x22/0x24 082578e0: [<0807a18a>] warn_slowpath_common+0x5a/0x80 08257908: [<0807a23e>] warn_slowpath_fmt+0x2e/0x30 08257920: [<08172196>] list_del+0xc6/0x100 08257940: [<08060244>] free_winch+0x14/0x80 08257958: [<080606fb>] winch_interrupt+0xdb/0xe0 08257978: [<080a65b5>] handle_IRQ_event+0x35/0xe0 08257998: [<080a8717>] handle_edge_irq+0xb7/0x170 082579bc: [<08059bc4>] do_IRQ+0x34/0x50 082579d4: [<08059e1b>] sigio_handler+0x5b/0x80 082579ec: [<0806a374>] sig_handler_common+0x44/0xb0 08257a68: [<0806a538>] sig_handler+0x38/0x50 08257a78: [<0806a77c>] handle_signal+0x5c/0xa0 08257a9c: [<0806be28>] hard_handler+0x18/0x20 08257aac: [<00c14400>] 0xc14400
--- arch/um/drivers/line.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/um/drivers/line.c +3 -2
@@ -727,6 +727,9 @@ struct winch {static void free_winch (struct winch *winch,int free_irq_ok) { +if (free_irq_ok) +free_irq (WINCH_IRQ , winch); +list_del (&winch->list);if (winch->pid !=-1 )
@@ -735,8 +738,6 @@ static void free_winch(struct winch *winos_close_file (winch->fd);if (winch->stack !=0 )free_stack (winch->stack,0 ); -if (free_irq_ok) -free_irq (WINCH_IRQ , winch);kfree (winch); }
Re: [PATCH] [64/223] hostfs: fix UML crash: remove f_spare from hostfs
In reply to Richard WeinbergerQuoted 8 lines · Richard Weinberger
Andi,
Am Montag 13 Dezember 2010, 00:46:02 schrieb Andi Kleen:
Quoted 2 lines
2.6.35-longterm review patch. If anyone has any objections, please let me know.
This patch is not needed on 2.6.35.
It makes only sense on >= 2.6.36.
Dropped. Thanks.
-Andi
PATCH 173/223 cifs: fix another memleak, in cifs_root_iget
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Oskar Schirmer <[email protected]>
commit a7851ce73b9fdef53f251420e6883cf4f3766534 upstream.
cifs_root_iget allocates full_path through cifs_build_path_to_root, but fails to kfree it upon cifs_get_inode_info* failure.
Make all failure exit paths traverse clean up handling at the end of the function.
--- fs/cifs/inode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/cifs/inode.c +6 -6
@@ -804,8 +804,10 @@ struct inode *cifs_root_iget(struct supe rc =cifs_get_inode_info (&inode, full_path,NULL , sb, xid,NULL ); -if (!inode) -return ERR_PTR (-ENOMEM ); +if (!inode) { + inode =ERR_PTR (rc); + goto out; + }if (rc && cifs_sb->tcon->ipc) {cFYI (1 ,"ipc connection - fake read inode" );
@@ -816,13 +818,11 @@ struct inode *cifs_root_iget(struct supe inode->i_uid = cifs_sb->mnt_uid; inode->i_gid = cifs_sb->mnt_gid; }else if (rc) { -kfree (full_path); -_FreeXid (xid);iget_failed (inode); -return ERR_PTR (rc); + inode =ERR_PTR (rc); } - +out:kfree (full_path);/* can not call macro FreeXid here since in a void func * TODO: This is no longer true
PATCH 172/223 do_exit(): make sure that we run with get_fs() == USER_DS
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Nelson Elhage <[email protected]>
commit 33dd94ae1ccbfb7bf0fb6c692bc3d1c4269e6177 upstream.
If a user manages to trigger an oops with fs set to KERNEL_DS, fs is not otherwise reset before do_exit(). do_exit may later (via mm_release in fork.c) do a put_user to a user-controlled address, potentially allowing a user to leverage an oops into a controlled write into kernel memory.
This is only triggerable in the presence of another bug, but this potentially turns a lot of DoS bugs into privilege escalations, so it's worth fixing. I have proof-of-concept code which uses this bug along with CVE-2010-3849 to write a zero to an arbitrary kernel address, so I've tested that this is not theoretical.
A more logical place to put this fix might be when we know an oops has occurred, before we call do_exit(), but that would involve changing every architecture, in multiple places.
Let's just stick it in do_exit instead.
--- kernel/exit.c | 9 +++++++++ 1 file changed, 9 insertions(+)
kernel/exit.c +9 -0
@@ -900,6 +900,15 @@ NORET_TYPE void do_exit(long code)if (unlikely (!tsk->pid))panic ("Attempted to kill the idle task!" ); +/* +* If do_exit is called because this processes oopsed, it's possible +* that get_fs() was left as KERNEL_DS, so reset it to USER_DS before +* continuing. Amongst other possible reasons, this is to prevent +* mm_release()->clear_child_tid() from writing to a user-controlled +* kernel address. +*/ +set_fs (USER_DS ); +tracehook_report_exit (&code);validate_creds_for_do_exit (tsk);
PATCH 171/223 cs5535-gpio: apply CS5536 errata workaround for GPIOs
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Andres Salomon <[email protected]>
commit 853ff88324a248a9f5da6e110850223db353ec07 upstream.
The AMD Geode CS5536 Companion Device Silicon Revision B1 Specification Update mentions the follow as issue #36:
"Atomic write transactions to the atomic GPIO High Bank Feature Bit
registers should only affect the bits selected [...]"
"after Suspend, an atomic write transaction [...] will clear all
non-selected bits of the accessed register."
In other words, writing to the high bank for a single GPIO bit will clear every other GPIO bit (but only sometimes after a suspend).
The workaround described is obvious and simple; do a read-modify-write. This patch does that, and documents why we're doing it.
--- drivers/gpio/cs5535-gpio.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/gpio/cs5535-gpio.c +14 -2
@@ -56,6 +56,18 @@ static struct cs5535_gpio_chip {* registers, see include/linux/cs5535.h. */ +static void errata_outl (u32 val,unsigned long addr) +{ +/* +* According to the CS5536 errata (#36), after suspend +* a write to the high bank GPIO register will clear all +* non-selected bits; the recommended workaround is a +* read-modify-write operation. +*/ + val |=inl (addr); +outl (val, addr); +} +static void __cs5535_gpio_set (struct cs5535_gpio_chip *chip,unsigned offset,unsigned int reg) {
@@ -64,7 +76,7 @@ static void __cs5535_gpio_set(struct cs5outl (1 << offset, chip->base + reg); else /* high bank register */ - outl(1 << (offset - 16), chip->base + 0x80 + reg); + errata_outl(1 << (offset - 16), chip->base + 0x80 + reg); }void cs5535_gpio_set (unsigned offset,unsigned int reg)
@@ -86,7 +98,7 @@ static void __cs5535_gpio_clear(struct coutl (1 << (offset +16 ), chip->base + reg); else/* high bank register */ - outl(1 << offset, chip->base + 0x80 + reg); + errata_outl(1 << offset, chip->base + 0x80 + reg); }void cs5535_gpio_clear (unsigned offset,unsigned int reg)
PATCH 167/223 ACPI: debugfs custom_method open to non-root
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Dave Jones <[email protected]>
commit ed3aada1bf34c5a9e98af167f125f8a740fc726a upstream.
Currently we have:
--w--w--w-. 1 root root 0 2010-11-11 14:56 /sys/kernel/debug/acpi/custom_method
which is just crazy. Change this to --w-------.
--- drivers/acpi/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/debug.c +1 -1
@@ -258,7 +258,7 @@ static int acpi_debugfs_init(void)if (!acpi_dir) goto err; - cm_dentry =debugfs_create_file ("custom_method" ,S_IWUGO , + cm_dentry =debugfs_create_file ("custom_method" ,S_IWUSR , acpi_dir,NULL , &cm_fops);if (!cm_dentry) goto err;
PATCH 165/223 ACPI battery: support percentage battery remaining capacity
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Zhang Rui <[email protected]>
commit 557d58687dcdee6bc00c1a8f1fd4e0eac8fefce9 upstream.
According to the ACPI spec, some kinds of primary battery can report percentage battery remaining capacity directly to OS.
In this case, it reports the LastFullChargedCapacity == 100, BatteryPresentRate = 0xFFFFFFFF, and BatteryRemaingCapacity a percentage value, which actually means RemainingBatteryPercentage.
Now we found some battery follows this rule even if it's a rechargeable.
https://bugzilla.kernel.org/show_bug.cgi?id=15979
Handle these batteries correctly in ACPI battery driver so that they won't break userspace.
--- drivers/acpi/battery.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-)
drivers/acpi/battery.c +37 -1
@@ -98,6 +98,7 @@ enum {* due to bad math. */ ACPI_BATTERY_QUIRK_SIGNED16_CURRENT , + ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, }; struct acpi_battery {
@@ -413,6 +414,8 @@ static int acpi_battery_get_info(struct result =extract_package (battery, buffer.pointer, info_offsets,ARRAY_SIZE (info_offsets));kfree (buffer.pointer); +if (test_bit (ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY , &battery->flags)) + battery->full_charge_capacity = battery->design_capacity;return result; }
@@ -449,6 +452,10 @@ static int acpi_battery_get_state(struct battery->rate_now != -1) battery->rate_now =abs ((s16 )battery->rate_now); +if (test_bit (ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY , &battery->flags) + && battery->capacity_now >=0 && battery->capacity_now <=100 ) + battery->capacity_now = (battery->capacity_now * + battery->full_charge_capacity) /100 ;return result; }
@@ -562,6 +569,33 @@ static void acpi_battery_quirks(struct a } } +/* +* According to the ACPI spec, some kinds of primary batteries can +* report percentage battery remaining capacity directly to OS. +* In this case, it reports the Last Full Charged Capacity == 100 +* and BatteryPresentRate == 0xFFFFFFFF. +* +* Now we found some battery reports percentage remaining capacity +* even if it's rechargeable. +* https://bugzilla.kernel.org/show_bug.cgi?id=15979 +* +* Handle this correctly so that they won't break userspace. +*/ +static void acpi_battery_quirks2 (struct acpi_battery *battery) +{ +if (test_bit (ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY , &battery->flags)) +return ; + +if (battery->full_charge_capacity ==100 && + battery->rate_now ==ACPI_BATTERY_VALUE_UNKNOWN && + battery->capacity_now >=0 && battery->capacity_now <=100 ) { +set_bit (ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY , &battery->flags); + battery->full_charge_capacity = battery->design_capacity; + battery->capacity_now = (battery->capacity_now * + battery->full_charge_capacity) /100 ; + } +} +static int acpi_battery_update (struct acpi_battery *battery) {int result, old_present =acpi_battery_present (battery);
@@ -587,7 +621,9 @@ static int acpi_battery_update(struct acif (!battery->bat.dev)sysfs_add_battery (battery);#endif -return acpi_battery_get_state (battery); + result =acpi_battery_get_state (battery); +acpi_battery_quirks2 (battery); +return result; }/* --------------------------------------------------------------------------
PATCH 163/223 USB: fix autosuspend bug in usb-serial
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Alan Stern <[email protected]>
commit abf03184a31a3286fc0ab30f838ddee8ba9f9b7b upstream.
This patch (as1437) fixes a bug in the usb-serial autosuspend handling. Since the usb-serial core now has autosuspend support, it must set the .supports_autosuspend member in every serial driver it registers. Otherwise the usb_autopm_get_interface() call won't work.
This fixes Bugzilla #23012.
--- drivers/usb/serial/usb-serial.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/serial/usb-serial.c +3 -0
@@ -52,6 +52,7 @@ static struct usb_driver usb_serial_driv .suspend = usb_serial_suspend, .resume = usb_serial_resume, .no_dynamic_id = 1, + .supports_autosuspend = 1, };/* There is no MODULE_DEVICE_TABLE for usbserial.c. Instead
@@ -1344,6 +1345,8 @@ int usb_serial_register(struct usb_seriareturn -ENODEV ;fixup_generic (driver); +if (driver->usb_driver) + driver->usb_driver->supports_autosuspend =1 ;if (!driver->description) driver->description = driver->driver.name;
PATCH 162/223 USB: serial: ftdi_sio: Vardaan USB RS422/485 converter PID added
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Jacques Viviers <[email protected]>
commit 6fdbad8021151a9e93af8159a6232c8f26415c09 upstream.
Add the PID for the Vardaan Enterprises VEUSB422R3 USB to RS422/485 converter. It uses the same chip as the FTDI_8U232AM_PID 0x6001.
This should also work with the stable branches for:
2.6.31, 2.6.32, 2.6.33, 2.6.34, 2.6.35, 2.6.36
--- drivers/usb/serial/ftdi_sio.c | 1 + drivers/usb/serial/ftdi_sio_ids.h | 3 +++ 2 files changed, 4 insertions(+)
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -201,6 +201,7 @@ static struct usb_device_id id_table_com { USB_DEVICE(FTDI_VID, FTDI_MTXORB_5_PID) }, { USB_DEVICE(FTDI_VID, FTDI_MTXORB_6_PID) }, { USB_DEVICE(FTDI_VID, FTDI_R2000KU_TRUE_RNG) }, + { USB_DEVICE(FTDI_VID, FTDI_VARDAAN_PID) }, { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0100_PID) }, { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0101_PID) }, { USB_DEVICE(MTXORB_VID, MTXORB_FTDI_RANGE_0102_PID) },
drivers/usb/serial/ftdi_sio_ids.h +3 -0
@@ -114,6 +114,9 @@/* Lenz LI-USB Computer Interface. */ #define FTDI_LENZ_LIUSB_PID 0xD780 +/* Vardaan Enterprises Serial Interface VEUSB422R3 */ +#define FTDI_VARDAAN_PID 0xF070 +/* * Xsens Technologies BV products (http://www.xsens.com). */
PATCH 160/223 USB: misc: usbsevseg: fix up some sysfs attribute permissions
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit e24d7ace4e822debcb78386bf279c9aba4d7fbd1 upstream.
They should not be writable by any user.
--- drivers/usb/misc/usbsevseg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/usb/misc/usbsevseg.c +4 -6
@@ -192,7 +192,7 @@ static ssize_t set_attr_##name(struct de \return count; \ } \ -static DEVICE_ATTR(name, S_IWUGO | S_IRUGO, show_attr_##name, set_attr_##name); +static DEVICE_ATTR(name, S_IRUGO | S_IWUSR, show_attr_##name, set_attr_##name);static ssize_t show_attr_text (struct device *dev,struct device_attribute *attr,char *buf)
@@ -223,7 +223,7 @@ static ssize_t set_attr_text(struct devireturn count; } -static DEVICE_ATTR(text, S_IWUGO | S_IRUGO, show_attr_text, set_attr_text); +static DEVICE_ATTR(text, S_IRUGO | S_IWUSR, show_attr_text, set_attr_text);static ssize_t show_attr_decimals (struct device *dev,struct device_attribute *attr,char *buf)
@@ -272,8 +272,7 @@ static ssize_t set_attr_decimals(structreturn count; } -static DEVICE_ATTR(decimals, S_IWUGO | S_IRUGO, - show_attr_decimals, set_attr_decimals); +static DEVICE_ATTR(decimals, S_IRUGO | S_IWUSR, show_attr_decimals, set_attr_decimals);static ssize_t show_attr_textmode (struct device *dev,struct device_attribute *attr,char *buf)
@@ -319,8 +318,7 @@ static ssize_t set_attr_textmode(structreturn -EINVAL ; } -static DEVICE_ATTR(textmode, S_IWUGO | S_IRUGO, - show_attr_textmode, set_attr_textmode); +static DEVICE_ATTR(textmode, S_IRUGO | S_IWUSR, show_attr_textmode, set_attr_textmode);MYDEV_ATTR_SIMPLE_UNSIGNED (powered, update_display_powered);
PATCH 158/223 USB: misc: usbled: fix up some sysfs attribute permissions
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit 48f115470e68d443436b76b22dad63ffbffd6b97 upstream.
They should not be writable by any user.
--- drivers/usb/misc/usbled.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/misc/usbled.c +1 -1
@@ -94,7 +94,7 @@ static ssize_t set_##value(struct devicechange_color (led); \return count; \ } \ -static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value); +static DEVICE_ATTR(value, S_IRUGO | S_IWUSR, show_##value, set_##value);show_set (blue);show_set (red);show_set (green);
PATCH 157/223 USB: misc: cypress_cy7c63: fix up some sysfs attribute permissions
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit c990600d340641150f7270470a64bd99a5c0b225 upstream.
They should not be writable by any user.
--- drivers/usb/misc/cypress_cy7c63.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/usb/misc/cypress_cy7c63.c +2 -4
@@ -196,11 +196,9 @@ static ssize_t get_port1_handler(structreturn read_port (dev, attr, buf,1 ,CYPRESS_READ_PORT_ID1 ); } -static DEVICE_ATTR(port0, S_IWUGO | S_IRUGO, - get_port0_handler, set_port0_handler); +static DEVICE_ATTR(port0, S_IRUGO | S_IWUSR, get_port0_handler, set_port0_handler); -static DEVICE_ATTR(port1, S_IWUGO | S_IRUGO, - get_port1_handler, set_port1_handler); +static DEVICE_ATTR(port1, S_IRUGO | S_IWUSR, get_port1_handler, set_port1_handler); static int cypress_probe(struct usb_interface *interface,
PATCH 155/223 USB: storage: sierra_ms: fix sysfs file attribute
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman <[email protected]>
commit d9624e75f6ad94d8a0718c1fafa89186d271a78c upstream.
A non-writable sysfs file shouldn't have writable attributes.
--- drivers/usb/storage/sierra_ms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/storage/sierra_ms.c +1 -1
@@ -121,7 +121,7 @@ static ssize_t show_truinst(struct devic }return result; } -static DEVICE_ATTR(truinst, S_IWUGO | S_IRUGO, show_truinst, NULL); +static DEVICE_ATTR(truinst, S_IRUGO, show_truinst, NULL);int sierra_ms_init (struct us_data *us) {
PATCH 153/223 Staging: rt2870: Add USB ID for Buffalo Airstation WLI-UC-GN
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: John Tapsell <[email protected]>
commit 251d380034c6c34efe75ffb89d863558ba68ec6a upstream.
This was tested to successfully enable the hardware.
--- drivers/staging/rt2860/usb_main_dev.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/rt2860/usb_main_dev.c +1 -0
@@ -182,6 +182,7 @@ struct usb_device_id rtusb_usb_id[] = { {USB_DEVICE(0x2001, 0x3C09)}, /* D-Link */ {USB_DEVICE(0x2001, 0x3C0A)}, /* D-Link 3072 */ {USB_DEVICE(0x2019, 0xED14)}, /* Planex Communications, Inc. */ + {USB_DEVICE(0x0411, 0x015D)}, /* Buffalo Airstation WLI-UC-GN */ {} /* Terminating entry */ };
PATCH 152/223 usb: core: fix information leak to userland
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Vasiliy Kulikov <[email protected]>
commit 886ccd4520064408ce5876cfe00554ce52ecf4a7 upstream.
Structure usbdevfs_connectinfo is copied to userland with padding byted after "slow" field uninitialized. It leads to leaking of contents of kernel stack memory.
--- drivers/usb/core/devio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/usb/core/devio.c +4 -3
@@ -965,10 +965,11 @@ static int proc_getdriver(struct dev_stastatic int proc_connectinfo (struct dev_state *ps,void __user *arg) { -struct usbdevfs_connectinfo ci; +struct usbdevfs_connectinfo ci = { + .devnum = ps->dev->devnum, + .slow = ps->dev->speed ==USB_SPEED_LOW + }; - ci.devnum = ps->dev->devnum; - ci.slow = ps->dev->speed ==USB_SPEED_LOW ;if (copy_to_user (arg, &ci,sizeof (ci)))return -EFAULT ;return 0 ;
PATCH 151/223 usb: misc: iowarrior: fix information leak to userland
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Vasiliy Kulikov <[email protected]>
commit eca67aaeebd6e5d22b0d991af1dd0424dc703bfb upstream.
Structure iowarrior_info is copied to userland with padding byted between "serial" and "revision" fields uninitialized. It leads to leaking of contents of kernel stack memory.
--- drivers/usb/misc/iowarrior.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/misc/iowarrior.c +1 -0
@@ -552,6 +552,7 @@ static long iowarrior_ioctl(struct file/* needed for power consumption */ struct usb_config_descriptor *cfg_descriptor = &dev->udev->actconfig->desc; +memset (&info,0 ,sizeof (info));/* directly from the descriptor */ info.vendor =le16_to_cpu (dev->udev->descriptor.idVendor); info.product = dev->product_id;
PATCH 148/223 USB: ftdi_sio: add device IDs for Milkymist One JTAG/serial
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Sebastien Bourdeauducq <[email protected]>
commit 7fea0f714ffb3f303d4b66933af2df2f5584c9bf upstream.
Add the USB IDs for the Milkymist One FTDI-based JTAG/serial adapter
(http://projects.qi-hardware.com/index.php/p/mmone-jtag-serial-cable/)
to the ftdi_sio driver and disable the first serial channel (used as JTAG from userspace).
--- drivers/usb/serial/ftdi_sio.c | 2 ++ drivers/usb/serial/ftdi_sio_ids.h | 7 +++++++ 2 files changed, 9 insertions(+)
drivers/usb/serial/ftdi_sio.c +2 -0
@@ -794,6 +794,8 @@ static struct usb_device_id id_table_com { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LOGBOOKML_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_LS_LOGBOOK_PID) }, { USB_DEVICE(FTDI_VID, FTDI_SCIENCESCOPE_HS_LOGBOOK_PID) }, + { USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID), + .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, { }, /* Optional parameter entry */ { } /* Terminating entry */ };
drivers/usb/serial/ftdi_sio_ids.h +7 -0
@@ -1100,3 +1100,10 @@#define FTDI_SCIENCESCOPE_LOGBOOKML_PID 0xFF18#define FTDI_SCIENCESCOPE_LS_LOGBOOK_PID 0xFF1C#define FTDI_SCIENCESCOPE_HS_LOGBOOK_PID 0xFF1D + +/* +* Milkymist One JTAG/Serial +*/ +#define QIHARDWARE_VID 0x20B7 +#define MILKYMISTONE_JTAGSERIAL_PID 0x0713 +
PATCH 147/223 usb: musb: fix kernel oops when loading musb_hdrc module for the 2nd time
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
commit b212091474a5f967979e62c5c24687ee4d0342d9 upstream.
musb driver still may write MUSB_DEVCTL register after clock is disabled in musb_platform_exit, which may cause the kernel oops[1] when musb_hdrc module is loaded for the 2nd time.
The patch fixes the kernel oops in this case.
[1] kernel oops when loading musb_hdrc module for the 2nd time
[ 93.380279] musb_hdrc: version 6.0, musb-dma, otg (peripheral+host), debug=5 [ 93.387847] bus: 'platform': add driver musb_hdrc [ 93.388153] bus: 'platform': driver_probe_device: matched device musb_hdrc with driver musb_hdrc [ 93.388183] bus: 'platform': really_probe: probing driver musb_hdrc with device musb_hdrc [ 93.405090] HS USB OTG: revision 0x33, sysconfig 0x2010, sysstatus 0x1, intrfsel 0x1, simenable 0x0 [ 93.405364] musb_hdrc: ConfigData=0xde (UTMI-8, dyn FIFOs, bulk combine, bulk split, HB-ISO Rx, HB-ISO Tx, SoftConn) [ 93.405395] musb_hdrc: MHDRC RTL version 1.400 [ 93.405426] musb_hdrc: setup fifo_mode 3 [ 93.405456] musb_hdrc: 7/31 max ep, 3648/16384 memory [ 93.405487] musb_core_init 1524: musb_hdrc: hw_ep 0shared, max 64 [ 93.405487] musb_core_init 1524: musb_hdrc: hw_ep 1tx, doublebuffer, max 512 [ 93.405517] musb_core_init 1533: musb_hdrc: hw_ep 1rx, doublebuffer, max 512 [ 93.405548] musb_core_init 1524: musb_hdrc: hw_ep 2tx, max 512 [ 93.405578] musb_core_init 1533: musb_hdrc: hw_ep 2rx, max 512 [ 93.405578] musb_core_init 1524: musb_hdrc: hw_ep 3shared, max 256 [ 93.405609] musb_core_init 1524: musb_hdrc: hw_ep 4shared, max 256 [ 93.405853] musb_platform_try_idle 133: b_idle inactive, for idle timer for 7 ms [ 93.405944] device: 'gadget': device_add [ 93.406921] PM: Adding info for No Bus:gadget [ 93.406951] musb_init_controller 2136: OTG mode, status 0, dev80 [ 93.407379] musb_do_idle 51: musb_do_idle: state=1 [ 93.408233] musb_hdrc musb_hdrc: USB OTG mode controller at fa0ab000 using DMA, IRQ 92 [ 93.416656] driver: 'musb_hdrc': driver_bound: bound to device 'musb_hdrc' [ 93.416687] bus: 'platform': really_probe: bound device musb_hdrc to driver musb_hdrc [ 124.486938] bus: 'platform': remove driver musb_hdrc [ 124.490509] twl4030_usb twl4030_usb: twl4030_phy_suspend [ 124.491424] device: 'gadget': device_unregister [ 124.491424] PM: Removing info for No Bus:gadget [ 124.495269] gadget: musb_gadget_release [ 124.498992] driver: 'musb_hdrc': driver_release [ 129.569366] musb_hdrc: version 6.0, musb-dma, otg (peripheral+host), debug=5 [ 129.576934] bus: 'platform': add driver musb_hdrc [ 129.577209] bus: 'platform': driver_probe_device: matched device musb_hdrc with driver musb_hdrc [ 129.577239] bus: 'platform': really_probe: probing driver musb_hdrc with device musb_hdrc [ 129.592651] twl4030_usb twl4030_usb: twl4030_phy_resume [ 129.592681] Unhandled fault: external abort on non-linefetch (0x1028) at 0xfa0ab404 [ 129.600830] Internal error: : 1028 [#1] [ 129.604858] last sysfs file: /sys/devices/platform/i2c_omap.3/i2c-3/i2c-dev/i2c-3/dev [ 129.613067] Modules linked in: musb_hdrc(+) [last unloaded: musb_hdrc] [ 129.619964] CPU: 0 Not tainted (2.6.36-next-20101021+ #372) [ 129.626281] PC is at musb_platform_init+0xb0/0x1c8 [musb_hdrc] [ 129.632415] LR is at mark_held_locks+0x64/0x94 [ 129.637084] pc : [<bf032198>] lr : [<c00ad7c4>] psr: 20000013 [ 129.637084] sp : c6d5fcb0 ip : c6d5fc38 fp : c6d5fcd4 [ 129.649139] r10: c6e72180 r9 : fa0ab000 r8 : c05612e8 [ 129.654602] r7 : 0000005c r6 : c0559cc8 r5 : c6e72180 r4 : c0561548 [ 129.661468] r3 : 04d60047 r2 : fa0ab000 r1 : c07169d8 r0 : 00000000 [ 129.668304] Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user [ 129.675811] Control: 10c5387d Table: 86e4c019 DAC: 00000015 [ 129.681823] Process insmod (pid: 554, stack limit = 0xc6d5e2f0) [ 129.688049] Stack: (0xc6d5fcb0 to 0xc6d60000) [ 129.692626] fca0: fa0ab000 c0555c54 c6d5fcd4 c0561548 [ 129.701202] fcc0: 00000003 c05612e0 c6d5fe04 c6d5fcd8 bf03140c bf0320f4 c6d5fd9c c6d5fce8 [ 129.709808] fce0: c015cb94 c041448c c06d9d10 ffffffff c6d5fd14 c6d5fd00 c00adbec c6d5fd40 [ 129.718383] fd00: c015d478 c6d5fdb0 c6d5fd24 c00a9d18 c6d5e000 60000013 bf02a4ac c05612bc [ 129.726989] fd20: c0414fb4 c00a9cf0 c6d5fd54 c6d5fd38 c015bbdc c0244280 c6e8b7b0 c7929330 [ 129.735565] fd40: c6d5fdb0 c6d5fdb0 c6d5fd7c c6e7227c c015c010 c015bb90 c015c2ac c6d5fdb0 [ 129.744171] fd60: c7929330 c6d5fdb0 c7929330 c6e8b7b0 c6d5fd9c 00000000 c7929330 c6e8b7b0 [ 129.752746] fd80: c6d5fdb0 00000000 00000001 00000000 c6d5fde4 c6d5fda0 c015d478 c015cb74 [ 129.761322] fda0: c056138c 00000000 c6d5fdcc c6d5fdb8 c7929330 00000000 c056138c c05612e8 [ 129.769927] fdc0: 00000000 c05612f0 c0c5d62c c06f6e00 c73217c0 00000000 c6d5fdf4 c05612e8 [ 129.778503] fde0: c05612e8 bf02a2e4 c0c5d62c c06f6e00 c73217c0 00000000 c6d5fe14 c6d5fe08 [ 129.787109] fe00: c029a398 bf0311c8 c6d5fe4c c6d5fe18 c0299120 c029a384 c7919140 22222222 [ 129.795684] fe20: c6d5fe4c c05612e8 c056131c bf02a2e4 c0299278 c06f6e00 c73217c0 00000000 [ 129.804290] fe40: c6d5fe6c c6d5fe50 c0299314 c0299020 00000000 c6d5fe70 bf02a2e4 c0299278 [ 129.812866] fe60: c6d5fe94 c6d5fe70 c02987d4 c0299284 c7825060 c78c6618 00000000 bf02a2e4 [ 129.821441] fe80: c06e4c98 00000000 c6d5fea4 c6d5fe98 c0298ea4 c0298778 c6d5fedc c6d5fea8 [ 129.830047] fea0: c0297f84 c0298e8c bf02716c 000b9008 bf02a2e4 bf02a2d0 000b9008 bf02a2e4 [ 129.838623] fec0: 00000000 c06f6e00 bf031000 00000000 c6d5fefc c6d5fee0 c0299614 c0297ec0 [ 129.847229] fee0: bf02a2d0 000b9008 bf02a388 00000000 c6d5ff0c c6d5ff00 c029a868 c02995a8 [ 129.855804] ff00: c6d5ff24 c6d5ff10 c029a88c c029a818 0010281c 000b9008 c6d5ff34 c6d5ff28 [ 129.864410] ff20: bf03104c c029a878 c6d5ff7c c6d5ff38 c00463dc bf03100c 00000000 00000000 [ 129.872985] ff40: 00000000 0010281c 000b9008 bf02a388 00000000 0010281c 000b9008 bf02a388 [ 129.881591] ff60: 00000000 c00521c8 c6d5e000 00000000 c6d5ffa4 c6d5ff80 c00bb9b8 c00463ac [ 129.890167] ff80: c00adc88 c00ada68 00097e8e bebbfcf4 0010281c 00000080 00000000 c6d5ffa8 [ 129.898742] ffa0: c0052000 c00bb908 00097e8e bebbfcf4 402c9008 0010281c 000b9008 bebbfe5a [ 129.907348] ffc0: 00097e8e bebbfcf4 0010281c 00000080 00000014 bebbfcf4 bebbfe06 0000005b [ 129.915924] ffe0: bebbf9a0 bebbf990 0001a108 40263ec0 60000010 402c9008 011b0000 0000007c [ 129.924499] Backtrace: [ 129.927185] [<bf0320e8>] (musb_platform_init+0x0/0x1c8 [musb_hdrc]) from [<bf03140c>] (musb_probe+0x250/0xf2c [musb_hdrc]) [ 129.938781] r6:c05612e0 r5:00000003 r4:c0561548 [ 129.943695] [<bf0311bc>] (musb_probe+0x0/0xf2c [musb_hdrc]) from [<c029a398>] (platform_drv_probe+0x20/0x24) [ 129.954040] [<c029a378>] (platform_drv_probe+0x0/0x24) from [<c0299120>] (driver_probe_device+0x10c/0x264) [ 129.964172] [<c0299014>] (driver_probe_device+0x0/0x264) from [<c0299314>] (__driver_attach+0x9c/0xa0) [ 129.973968] [<c0299278>] (__driver_attach+0x0/0xa0) from [<c02987d4>] (bus_for_each_dev+0x68/0x94) [ 129.983367] r7:c0299278 r6:bf02a2e4 r5:c6d5fe70 r4:00000000 [ 129.989349] [<c029876c>] (bus_for_each_dev+0x0/0x94) from [<c0298ea4>] (driver_attach+0x24/0x28) [ 129.998565] r7:00000000 r6:c06e4c98 r5:bf02a2e4 r4:00000000 [ 130.004547] [<c0298e80>] (driver_attach+0x0/0x28) from [<c0297f84>] (bus_add_driver+0xd0/0x274) [ 130.013671] [<c0297eb4>] (bus_add_driver+0x0/0x274) from [<c0299614>] (driver_register+0x78/0x158) [ 130.023101] [<c029959c>] (driver_register+0x0/0x158) from [<c029a868>] (platform_driver_register+0x5c/0x60) [ 130.033325] r7:00000000 r6:bf02a388 r5:000b9008 r4:bf02a2d0 [ 130.039276] [<c029a80c>] (platform_driver_register+0x0/0x60) from [<c029a88c>] (platform_driver_probe+0x20/0xa8) [ 130.050018] [<c029a86c>] (platform_driver_probe+0x0/0xa8) from [<bf03104c>] (musb_init+0x4c/0x54 [musb_hdrc]) [ 130.060424] r5:000b9008 r4:0010281c [ 130.064239] [<bf031000>] (musb_init+0x0/0x54 [musb_hdrc]) from [<c00463dc>] (do_one_initcall+0x3c/0x1c0) [ 130.074218] [<c00463a0>] (do_one_initcall+0x0/0x1c0) from [<c00bb9b8>] (sys_init_module+0xbc/0x1d0) [ 130.083709] [<c00bb8fc>] (sys_init_module+0x0/0x1d0) from [<c0052000>] (ret_fast_syscall+0x0/0x3c) [ 130.093109] r7:00000080 r6:0010281c r5:bebbfcf4 r4:00097e8e [ 130.099090] Code: 0a000046 e3a01001 e12fff33 e59520e4 (e5923404) [ 130.105621] ---[ end trace 1d0bd69deb79164d ]---
--- drivers/usb/musb/musb_core.c | 1 - 1 file changed, 1 deletion(-)
drivers/usb/musb/musb_core.c +0 -1
@@ -2244,7 +2244,6 @@ static int __exit musb_remove(struct pla#endif musb_writeb (musb->mregs,MUSB_DEVCTL ,0 );musb_platform_exit (musb); -musb_writeb (musb->mregs,MUSB_DEVCTL ,0 );musb_free (musb);iounmap (ctrl_base);
PATCH 145/223 xhci: Don't let the USB core disable SuperSpeed ports.
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Sarah Sharp <[email protected]>
commit 6dd0a3a7e0793dbeae1b951f091025d8cf896cb4 upstream.
Disabling SuperSpeed ports is a Very Bad Thing (TM). It disables SuperSpeed terminations, which means that devices will never connect at SuperSpeed on that port. For USB 2.0/1.1 ports, disabling the port meant that the USB core could always get a connect status change later. That's not true with USB 3.0 ports.
Do not let the USB core disable SuperSpeed ports. We can't rely on the device speed in the port status registers, since that isn't valid until there's a USB device connected to the port. Instead, we use the port speed array that's created from the Extended Capabilities registers.
--- drivers/usb/host/xhci-hub.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/host/xhci-hub.c +7 -0
@@ -132,6 +132,13 @@ static u32 xhci_port_state_to_neutral(u3static void xhci_disable_port (struct xhci_hcd *xhci,u16 wIndex,u32 __iomem *addr,u32 port_status) { +/* Don't allow the USB core to disable SuperSpeed ports. */ +if (xhci->port_array[wIndex] ==0x03 ) { +xhci_dbg (xhci,"Ignoring request to disable " +"SuperSpeed port.\n" ); +return ; + } +/* Write 1 to disable the port */ xhci_writel (xhci, port_status |PORT_PE , addr); port_status =xhci_readl (xhci, addr);
PATCH 144/223 xhci: Setup array of USB 2.0 and USB 3.0 ports.
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Sarah Sharp <[email protected]>
commit da6699ce4a889c3795624ccdcfe7181cc89f18e8 upstream.
An xHCI host controller contains USB 2.0 and USB 3.0 ports, which can occur in any order in the PORTSC registers. We cannot read the port speed bits in the PORTSC registers at init time to determine the port speed, since those bits are only valid when a USB device is plugged into the port.
Instead, we read the "Supported Protocol Capability" registers in the xHC Extended Capabilities space. Those describe the protocol, port offset in the PORTSC registers, and port count. We use those registers to create two arrays of pointers to the PORTSC registers, one for USB 3.0 ports, and another for USB 2.0 ports. A third array keeps track of the port protocol major revision, and is indexed with the internal xHCI port number.
This commit is a bit big, but it should be queued for stable because the "Don't let the USB core disable SuperSpeed ports" patch depends on it. There is no other way to determine which ports are SuperSpeed ports without this patch.
--- drivers/usb/host/xhci-mem.c | 164 ++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/host/xhci.h | 27 +++++++ 2 files changed, 191 insertions(+)
drivers/usb/host/xhci-mem.c +164 -0
@@ -1457,6 +1457,13 @@ void xhci_mem_cleanup(struct xhci_hcd *x xhci->dcbaa =NULL ;scratchpad_free (xhci); + + xhci->num_usb2_ports =0 ; + xhci->num_usb3_ports =0 ; +kfree (xhci->usb2_ports); +kfree (xhci->usb3_ports); +kfree (xhci->port_array); + xhci->page_size =0 ; xhci->page_shift =0 ; }
@@ -1617,6 +1624,161 @@ static int xhci_check_trb_in_td_math(strreturn 0 ; } +static void xhci_add_in_port (struct xhci_hcd *xhci,unsigned int num_ports, +u32 __iomem *addr,u8 major_revision) +{ +u32 temp, port_offset, port_count; +int i; + +if (major_revision >0x03 ) { +xhci_warn (xhci,"Ignoring unknown port speed, " +"Ext Cap %p, revision = 0x%x\n" , + addr, major_revision); +/* Ignoring port protocol we can't understand. FIXME */ +return ; + } + +/* Port offset and count in the third dword, see section 7.2 */ + temp =xhci_readl (xhci, addr +2 ); + port_offset =XHCI_EXT_PORT_OFF (temp); + port_count =XHCI_EXT_PORT_COUNT (temp); +xhci_dbg (xhci,"Ext Cap %p, port offset = %u, " +"count = %u, revision = 0x%x\n" , + addr, port_offset, port_count, major_revision); +/* Port count includes the current port offset */ +if (port_offset ==0 || (port_offset + port_count -1 ) > num_ports) +/* WTF? "Valid values are ‘1’ to MaxPorts" */ +return ; + port_offset--; +for (i = port_offset; i < (port_offset + port_count); i++) { +/* Duplicate entry. Ignore the port if the revisions differ. */ +if (xhci->port_array[i] !=0 ) { +xhci_warn (xhci,"Duplicate port entry, Ext Cap %p," +" port %u\n" , addr, i); +xhci_warn (xhci,"Port was marked as USB %u, " +"duplicated as USB %u\n" , + xhci->port_array[i], major_revision); +/* Only adjust the roothub port counts if we haven't +* found a similar duplicate. +*/ +if (xhci->port_array[i] != major_revision && + xhci->port_array[i] != (u8) -1 ) { +if (xhci->port_array[i] ==0x03 ) + xhci->num_usb3_ports--; +else + xhci->num_usb2_ports--; + xhci->port_array[i] = (u8) -1 ; + } +/* FIXME: Should we disable the port? */ + } + xhci->port_array[i] = major_revision; +if (major_revision ==0x03 ) + xhci->num_usb3_ports++; +else + xhci->num_usb2_ports++; + } +/* FIXME: Should we disable ports not in the Extended Capabilities? */ +} + +/* +* Scan the Extended Capabilities for the "Supported Protocol Capabilities" that +* specify what speeds each port is supposed to be. We can't count on the port +* speed bits in the PORTSC register being correct until a device is connected, +* but we need to set up the two fake roothubs with the correct number of USB +* 3.0 and USB 2.0 ports at host controller initialization time. +*/ +static int xhci_setup_port_arrays (struct xhci_hcd *xhci,gfp_t flags) +{ +u32 __iomem *addr; +u32 offset; +unsigned int num_ports; +int i, port_index; + + addr = &xhci->cap_regs->hcc_params; + offset =XHCI_HCC_EXT_CAPS (xhci_readl (xhci, addr)); +if (offset ==0 ) { +xhci_err (xhci,"No Extended Capability registers, " +"unable to set up roothub.\n" ); +return -ENODEV ; + } + + num_ports =HCS_MAX_PORTS (xhci->hcs_params1); + xhci->port_array =kzalloc (sizeof (*xhci->port_array)*num_ports, flags); +if (!xhci->port_array) +return -ENOMEM ; + +/* +* For whatever reason, the first capability offset is from the +* capability register base, not from the HCCPARAMS register. +* See section 5.3.6 for offset calculation. +*/ + addr = &xhci->cap_regs->hc_capbase + offset; +while (1 ) { +u32 cap_id; + + cap_id =xhci_readl (xhci, addr); +if (XHCI_EXT_CAPS_ID (cap_id) ==XHCI_EXT_CAPS_PROTOCOL ) +xhci_add_in_port (xhci, num_ports, addr, + (u8 )XHCI_EXT_PORT_MAJOR (cap_id)); + offset =XHCI_EXT_CAPS_NEXT (cap_id); +if (!offset || (xhci->num_usb2_ports + xhci->num_usb3_ports) + == num_ports) +break ; +/* +* Once you're into the Extended Capabilities, the offset is +* always relative to the register holding the offset. +*/ + addr += offset; + } + +if (xhci->num_usb2_ports ==0 && xhci->num_usb3_ports ==0 ) { +xhci_warn (xhci,"No ports on the roothubs?\n" ); +return -ENODEV ; + } +xhci_dbg (xhci,"Found %u USB 2.0 ports and %u USB 3.0 ports.\n" , + xhci->num_usb2_ports, xhci->num_usb3_ports); +/* +* Note we could have all USB 3.0 ports, or all USB 2.0 ports. +* Not sure how the USB core will handle a hub with no ports... +*/ +if (xhci->num_usb2_ports) { + xhci->usb2_ports =kmalloc (sizeof (*xhci->usb2_ports)* + xhci->num_usb2_ports, flags); +if (!xhci->usb2_ports) +return -ENOMEM ; + + port_index =0 ; +for (i =0 ; i < num_ports; i++) +if (xhci->port_array[i] !=0x03 ) { + xhci->usb2_ports[port_index] = + &xhci->op_regs->port_status_base + +NUM_PORT_REGS *i; +xhci_dbg (xhci,"USB 2.0 port at index %u, " +"addr = %p\n" , i, + xhci->usb2_ports[port_index]); + port_index++; + } + } +if (xhci->num_usb3_ports) { + xhci->usb3_ports =kmalloc (sizeof (*xhci->usb3_ports)* + xhci->num_usb3_ports, flags); +if (!xhci->usb3_ports) +return -ENOMEM ; + + port_index =0 ; +for (i =0 ; i < num_ports; i++) +if (xhci->port_array[i] ==0x03 ) { + xhci->usb3_ports[port_index] = + &xhci->op_regs->port_status_base + +NUM_PORT_REGS *i; +xhci_dbg (xhci,"USB 3.0 port at index %u, " +"addr = %p\n" , i, + xhci->usb3_ports[port_index]); + port_index++; + } + } +return 0 ; +}int xhci_mem_init (struct xhci_hcd *xhci,gfp_t flags) {
@@ -1797,6 +1959,8 @@ int xhci_mem_init(struct xhci_hcd *xhci,if (scratchpad_alloc (xhci, flags)) goto fail; +if (xhci_setup_port_arrays (xhci, flags)) + goto fail;return 0 ;
drivers/usb/host/xhci.h +27 -0
@@ -448,6 +448,24 @@ struct xhci_doorbell_array {/** +* struct xhci_protocol_caps +* @revision: major revision, minor revision, capability ID, +* and next capability pointer. +* @name_string: Four ASCII characters to say which spec this xHC +* follows, typically "USB ". +* @port_info: Port offset, count, and protocol-defined information. +*/ +struct xhci_protocol_caps { +u32 revision; +u32 name_string; +u32 port_info; +}; + +#define XHCI_EXT_PORT_MAJOR (x) (((x) >> 24) & 0xff) +#define XHCI_EXT_PORT_OFF (x) ((x) & 0xff) +#define XHCI_EXT_PORT_COUNT (x) (((x) >> 8) & 0xff) + +/** * struct xhci_container_ctx * @type: Type of context. Used to calculated offsets to contained contexts. * @size: Size of the context data
@@ -1187,6 +1205,15 @@ struct xhci_hcd {#define XHCI_LINK_TRB_QUIRK (1 << 0)#define XHCI_RESET_EP_QUIRK (1 << 1)#define XHCI_NEC_HOST (1 << 2) + +/* Is each xHCI roothub port a USB 3.0, USB 2.0, or USB 1.1 port? */ +u8 *port_array; +/* Array of pointers to USB 3.0 PORTSC registers */ +u32 __iomem **usb3_ports; +unsigned int num_usb3_ports; +/* Array of pointers to USB 2.0 PORTSC registers */ +u32 __iomem **usb2_ports; +unsigned int num_usb2_ports; };/* For testing purposes */
PATCH 141/223 PCI: fix offset check for sysfs mmapped files
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Darrick J. Wong <[email protected]>
commit 8c05cd08a7504b855c265263e84af61aabafa329 upstream.
I just loaded 2.6.37-rc2 on my machines, and I noticed that X no longer starts. Running an strace of the X server shows that it's doing this:
open("/sys/bus/pci/devices/0000:07:00.0/resource0", O_RDWR) = 10mmap(NULL, 16777216, PROT_READ|PROT_WRITE, MAP_SHARED, 10, 0) = -1 EINVAL (Invalid argument)
This code seems to be asking for a shared read/write mapping of 16MB worth of BAR0 starting at file offset 0, and letting the kernel assign a starting address. Unfortunately, this -EINVAL causes X not to start. Looking into dmesg, there's a complaint like so:
process "Xorg" tried to map 0x01000000 bytes at page 0x00000000 on 0000:07:00.0 BAR 0 (start 0x 96000000, size 0x 1000000)
...with the following code in pci_mmap_fits:
pci_start = (mmap_api == PCI_MMAP_SYSFS) ?
pci_resource_start(pdev, resno) >> PAGE_SHIFT : 0;
if (start >= pci_start && start < pci_start + size &&
start + nr <= pci_start + size)It looks like the logic here is set up such that when the mmap call comes via sysfs, the check in pci_mmap_fits wants vma->vm_pgoff to be between the resource's start and end address, and the end of the vma to be no farther than the end. However, the sysfs PCI resource files always start at offset zero, which means that this test always fails for programs that mmap the sysfs files. Given the comment in the original commit 3b519e4ea618b6943a82931630872907f9ac2c2b, I _think_ the old procfs files require that the file offset be equal to the resource's base address when mmapping.
I think what we want here is for pci_start to be 0 when mmap_api == PCI_MMAP_PROCFS. The following patch makes that change, after which the Matrox and Mach64 X drivers work again.
--- drivers/pci/pci-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pci-sysfs.c +1 -1
@@ -715,7 +715,7 @@ int pci_mmap_fits(struct pci_dev *pdev, nr = (vma->vm_end - vma->vm_start) >>PAGE_SHIFT ; start = vma->vm_pgoff; size = ((pci_resource_len (pdev, resno) -1 ) >>PAGE_SHIFT ) +1 ; - pci_start = (mmap_api ==PCI_MMAP_SYSFS ) ? + pci_start = (mmap_api ==PCI_MMAP_PROCFS ) ?pci_resource_start (pdev, resno) >>PAGE_SHIFT :0 ;if (start >= pci_start && start < pci_start + size && start + nr <= pci_start + size)
PATCH 140/223 PCI: fix size checks for mmap() on /proc/bus/pci files
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Martin Wilck <[email protected]>
commit 3b519e4ea618b6943a82931630872907f9ac2c2b upstream.
The checks for valid mmaps of PCI resources made through /proc/bus/pci files that were introduced in 9eff02e2042f96fb2aedd02e032eca1c5333d767 have several problems:
1. mmap() calls on /proc/bus/pci files are made with real file offsets > 0, whereas under /sys/bus/pci/devices, the start of the resource corresponds to offset 0. This may lead to false negatives in pci_mmap_fits(), which implicitly assumes the /sys/bus/pci/devices layout.
2. The loop in proc_bus_pci_mmap doesn't skip empty resouces. This leads to false positives, because pci_mmap_fits() doesn't treat empty resources correctly (the calculated size is 1 << (8*sizeof(resource_size_t)-PAGE_SHIFT) in this case!).
3. If a user maps resources with BAR > 0, pci_mmap_fits will emit bogus WARNINGS for the first resources that don't fit until the correct one is found.
On many controllers the first 2-4 BARs are used, and the others are empty. In this case, an mmap attempt will first fail on the non-empty BARs (including the "right" BAR because of 1.) and emit bogus WARNINGS because of 3., and finally succeed on the first empty BAR because of 2. This is certainly not the intended behaviour.
This patch addresses all 3 issues.
Updated with an enum type for the additional parameter for pci_mmap_fits().
--- drivers/pci/pci-sysfs.c | 22 ++++++++++++++++------ drivers/pci/pci.h | 7 ++++++- drivers/pci/proc.c | 2 +- 3 files changed, 23 insertions(+), 8 deletions(-)
drivers/pci/pci-sysfs.c +16 -6
@@ -705,17 +705,21 @@ void pci_remove_legacy_files(struct pci_#ifdef HAVE_PCI_MMAP -int pci_mmap_fits (struct pci_dev *pdev,int resno,struct vm_area_struct *vma) +int pci_mmap_fits (struct pci_dev *pdev,int resno,struct vm_area_struct *vma, +enum pci_mmap_api mmap_api) { -unsigned long nr, start, size; +unsigned long nr, start, size, pci_start; +if (pci_resource_len (pdev, resno) ==0 ) +return 0 ; nr = (vma->vm_end - vma->vm_start) >>PAGE_SHIFT ; start = vma->vm_pgoff; size = ((pci_resource_len (pdev, resno) -1 ) >>PAGE_SHIFT ) +1 ; -if (start < size && size - start >= nr) + pci_start = (mmap_api ==PCI_MMAP_SYSFS ) ? +pci_resource_start (pdev, resno) >>PAGE_SHIFT :0 ; +if (start >= pci_start && start < pci_start + size && + start + nr <= pci_start + size)return 1 ; -WARN (1 ,"process \"%s\" tried to map 0x%08lx-0x%08lx on %s BAR %d (size 0x%08lx)\n" , - current->comm, start, start+nr,pci_name (pdev), resno, size);return 0 ; }
@@ -745,8 +749,14 @@ pci_mmap_resource(struct kobject *kobj,if (i >=PCI_ROM_RESOURCE )return -ENODEV ; -if (!pci_mmap_fits (pdev, i, vma)) +if (!pci_mmap_fits (pdev, i, vma,PCI_MMAP_SYSFS )) { +WARN (1 ,"process \"%s\" tried to map 0x%08lx bytes " +"at page 0x%08lx on %s BAR %d (start 0x%16Lx, size 0x%16Lx)\n" , + current->comm, vma->vm_end-vma->vm_start, vma->vm_pgoff, +pci_name (pdev), i, +pci_resource_start (pdev, i),pci_resource_len (pdev, i));return -EINVAL ; + }/* pci_mmap_page_range() expects the same kind of entry as coming * from /proc/bus/pci/ which is a "user visible" value. If this is
drivers/pci/pci.h +6 -1
@@ -13,8 +13,13 @@ extern int pci_create_sysfs_dev_files(stextern void pci_remove_sysfs_dev_files (struct pci_dev *pdev);extern void pci_cleanup_rom (struct pci_dev *dev);#ifdef HAVE_PCI_MMAP +enum pci_mmap_api { +PCI_MMAP_SYSFS ,/* mmap on /sys/bus/pci/devices/<BDF>/resource<N> */ +PCI_MMAP_PROCFS /* mmap on /proc/bus/pci/<BDF> */ +};extern int pci_mmap_fits (struct pci_dev *pdev,int resno, -struct vm_area_struct *vma); +struct vm_area_struct *vmai, +enum pci_mmap_api mmap_api);#endif int pci_probe_reset_function (struct pci_dev *dev);
drivers/pci/proc.c +1 -1
@@ -260,7 +260,7 @@ static int proc_bus_pci_mmap(struct file/* Make sure the caller is mapping a real resource for this device */ for (i =0 ; i <PCI_ROM_RESOURCE ; i++) { -if (pci_mmap_fits (dev, i, vma)) +if (pci_mmap_fits (dev, i, vma,PCI_MMAP_PROCFS ))break ; }
PATCH 139/223 libata: fix NULL sdev dereference race in atapi_qc_complete()
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit 2a5f07b5ec098edc69e05fdd2f35d3fbb1235723 upstream.
SCSI commands may be issued between __scsi_add_device() and dev->sdev assignment, so it's unsafe for ata_qc_complete() to dereference dev->sdev->locked without checking whether it's NULL or not. Fix it.
--- drivers/ata/libata-scsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/ata/libata-scsi.c +4 -1
@@ -2577,8 +2577,11 @@ static void atapi_qc_complete(struct ata* * If door lock fails, always clear sdev->locked to * avoid this infinite loop. +* +* This may happen before SCSI scan is complete. Make +* sure qc->dev->sdev isn't NULL before dereferencing. */ -if (qc->cdb[0 ] ==ALLOW_MEDIUM_REMOVAL ) +if (qc->cdb[0 ] ==ALLOW_MEDIUM_REMOVAL && qc->dev->sdev) qc->dev->sdev->locked =0 ; qc->scsicmd->result =SAM_STAT_CHECK_CONDITION ;
PATCH 136/223 drm/i915/sdvo: Always add a 30ms delay to make SDVO TV detection reliable
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Chris Wilson <[email protected]>
commit ba84cd1f2b5dd49bda9300c5a11373f7e14c3c66 upstream.
Commit d09c23de intended to add a 30ms delay to give the ADD time to detect any TVs connected. However, it used the sdvo->is_tv flag to do so which is dependent upon the previous detection result and not whether the output supports TVs.
--- drivers/gpu/drm/i915/intel_sdvo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_sdvo.c +4 -4
@@ -1580,10 +1580,10 @@ static enum drm_connector_status intel_sintel_sdvo_write_cmd (intel_encoder,SDVO_CMD_GET_ATTACHED_DISPLAYS ,NULL ,0 ); -if (sdvo_priv->is_tv) { -/* add 30ms delay when the output type is SDVO-TV */ -mdelay (30 ); - } +/* add 30ms delay when the output type might be TV */ +if (sdvo_priv->caps.output_flags & + (SDVO_OUTPUT_SVID0 |SDVO_OUTPUT_CVBS0 )) +mdelay (30 ); status =intel_sdvo_read_response (intel_encoder, &response,2 );DRM_DEBUG_KMS ("SDVO response %d %d\n" , response &0xff , response >>8 );
PATCH 135/223 exec: copy-and-paste the fixes into compat_do_execve() paths
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
commit 114279be2120a916e8a04feeb2ac976a10016f2f upstream.
Note: this patch targets 2.6.37 and tries to be as simple as possible. That is why it adds more copy-and-paste horror into fs/compat.c and uglifies fs/exec.c, this will be cleanuped later.
compat_copy_strings() plays with bprm->vma/mm directly and thus has two problems: it lacks the RLIMIT_STACK check and argv/envp memory is not visible to oom killer.
Export acct_arg_size() and get_arg_page(), change compat_copy_strings() to use get_arg_page(), change compat_do_execve() to do acct_arg_size(0) as do_execve() does.
Add the fatal_signal_pending/cond_resched checks into compat_count() and compat_copy_strings(), this matches the code in fs/exec.c and certainly makes sense.
--- fs/compat.c | 28 +++++++++++++++------------- fs/exec.c | 8 ++++---- include/linux/binfmts.h | 4 ++++ 3 files changed, 23 insertions(+), 17 deletions(-)
fs/compat.c +15 -13
@@ -1376,6 +1376,10 @@ static int compat_count(compat_uptr_t __ argv++;if (i++ >= max)return -E2BIG ; + +if (fatal_signal_pending (current)) +return -ERESTARTNOHAND ; +cond_resched (); } }return i;
@@ -1417,6 +1421,12 @@ static int compat_copy_strings(int argc,while (len >0 ) {int offset, bytes_to_copy; +if (fatal_signal_pending (current)) { + ret = -ERESTARTNOHAND ; + goto out; + } +cond_resched (); + offset = pos %PAGE_SIZE ;if (offset ==0 ) offset =PAGE_SIZE ;
@@ -1433,18 +1443,8 @@ static int compat_copy_strings(int argc,if (!kmapped_page || kpos != (pos &PAGE_MASK )) {struct page *page; -#ifdef CONFIG_STACK_GROWSUP - ret =expand_stack_downwards (bprm->vma, pos); -if (ret <0 ) { -/* We've exceed the stack rlimit. */ - ret = -E2BIG ; - goto out; - } -#endif - ret =get_user_pages (current, bprm->mm, pos, -1 ,1 ,1 , &page,NULL ); -if (ret <=0 ) { -/* We've exceed the stack rlimit. */ + page =get_arg_page (bprm, pos,1 ); +if (!page) { ret = -E2BIG ; goto out; }
@@ -1565,8 +1565,10 @@ int compat_do_execve(char * filename,return retval; out: -if (bprm->mm) +if (bprm->mm) { +acct_arg_size (bprm,0 );mmput (bprm->mm); + } out_file:if (bprm->file) {
fs/exec.c +4 -4
@@ -158,7 +158,7 @@ out:#ifdef CONFIG_MMU -static void acct_arg_size (struct linux_binprm *bprm,unsigned long pages) +void acct_arg_size (struct linux_binprm *bprm,unsigned long pages) {struct mm_struct *mm = current->mm;long diff = (long )(pages - bprm->vma_pages);
@@ -177,7 +177,7 @@ static void acct_arg_size(struct linux_b#endif } -static struct page *get_arg_page (struct linux_binprm *bprm,unsigned long pos, +struct page *get_arg_page (struct linux_binprm *bprm,unsigned long pos,int write) {struct page *page;
@@ -291,11 +291,11 @@ static bool valid_arg_len(struct linux_b#else -static inline void acct_arg_size (struct linux_binprm *bprm,unsigned long pages) +void acct_arg_size (struct linux_binprm *bprm,unsigned long pages) { } -static struct page *get_arg_page (struct linux_binprm *bprm,unsigned long pos, +struct page *get_arg_page (struct linux_binprm *bprm,unsigned long pos,int write) {struct page *page;
include/linux/binfmts.h +4 -0
@@ -60,6 +60,10 @@ struct linux_binprm{unsigned long loader, exec; }; +extern void acct_arg_size (struct linux_binprm *bprm,unsigned long pages); +extern struct page *get_arg_page (struct linux_binprm *bprm,unsigned long pos, +int write); +#define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0#define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
PATCH 131/223 drm/radeon/kms: add workaround for dce3 ddc line vbios bug
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 3074adc8b6d9bf28b574a58241b958057a69a7a0 upstream.
fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=23752
--- drivers/gpu/drm/radeon/radeon_atombios.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/radeon/radeon_atombios.c +8 -0
@@ -84,6 +84,14 @@ static inline struct radeon_i2c_bus_recfor (i =0 ; i < num_indices; i++) { gpio = &i2c_info->asGPIO_Info[i]; +/* some DCE3 boards have bad data for this entry */ +if (ASIC_IS_DCE3 (rdev)) { +if ((i ==4 ) && + (gpio->usClkMaskRegisterIndex ==0x1fda ) && + (gpio->sucI2cId.ucAccess ==0x94 )) + gpio->sucI2cId.ucAccess =0x14 ; + } +if (gpio->sucI2cId.ucAccess == id) { i2c.mask_clk_reg =le16_to_cpu (gpio->usClkMaskRegisterIndex) *4 ; i2c.mask_data_reg =le16_to_cpu (gpio->usDataMaskRegisterIndex) *4 ;
PATCH 134/223 exec: make argv/envp memory visible to oom-killer
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Oleg Nesterov <[email protected]>
commit 3c77f845722158206a7209c45ccddc264d19319c upstream.
Brad Spengler published a local memory-allocation DoS that evades the OOM-killer (though not the virtual memory RLIMIT):
http://www.grsecurity.net/~spender/64bit_dos.c
execve()->copy_strings() can allocate a lot of memory, but this is not visible to oom-killer, nobody can see the nascent bprm->mm and take it into account.
With this patch get_arg_page() increments current's MM_ANONPAGES counter every time we allocate the new page for argv/envp. When do_execve() succeds or fails, we change this counter back.
Technically this is not 100% correct, we can't know if the new page is swapped out and turn MM_ANONPAGES into MM_SWAPENTS, but I don't think this really matters and everything becomes correct once exec changes ->mm or fails.
--- fs/exec.c | 32 ++++++++++++++++++++++++++++++-- include/linux/binfmts.h | 1 + 2 files changed, 31 insertions(+), 2 deletions(-)
fs/exec.c +30 -2
@@ -158,6 +158,25 @@ out:#ifdef CONFIG_MMU +static void acct_arg_size (struct linux_binprm *bprm,unsigned long pages) +{ +struct mm_struct *mm = current->mm; +long diff = (long )(pages - bprm->vma_pages); + +if (!mm || !diff) +return ; + + bprm->vma_pages = pages; + +#ifdef SPLIT_RSS_COUNTING +add_mm_counter (mm,MM_ANONPAGES , diff); +#else +spin_lock (&mm->page_table_lock); +add_mm_counter (mm,MM_ANONPAGES , diff); +spin_unlock (&mm->page_table_lock); +#endif +} +static struct page *get_arg_page (struct linux_binprm *bprm,unsigned long pos,int write) {
@@ -180,6 +199,8 @@ static struct page *get_arg_page(structunsigned long size = bprm->vma->vm_end - bprm->vma->vm_start;struct rlimit *rlim; +acct_arg_size (bprm, size /PAGE_SIZE ); +/* * We've historically supported up to 32 pages (ARG_MAX) * of argument strings even with small stacks
@@ -270,6 +291,10 @@ static bool valid_arg_len(struct linux_b#else +static inline void acct_arg_size (struct linux_binprm *bprm,unsigned long pages) +{ +} +static struct page *get_arg_page (struct linux_binprm *bprm,unsigned long pos,int write) {
@@ -991,6 +1016,7 @@ int flush_old_exec(struct linux_binprm */* * Release all of the old mmap stuff */ +acct_arg_size (bprm,0 ); retval =exec_mmap (bprm->mm);if (retval) goto out;
@@ -1415,8 +1441,10 @@ int do_execve(char * filename,return retval; out: -if (bprm->mm) -mmput (bprm->mm); +if (bprm->mm) { +acct_arg_size (bprm,0 ); +mmput (bprm->mm); + } out_file:if (bprm->file) {
include/linux/binfmts.h +1 -0
@@ -29,6 +29,7 @@ struct linux_binprm{char buf[BINPRM_BUF_SIZE ];#ifdef CONFIG_MMU struct vm_area_struct *vma; +unsigned long vma_pages;#else # define MAX_ARG_PAGES 32struct page *page[MAX_ARG_PAGES ];
PATCH 130/223 drm/radeon/kms: fix typos in disabled vbios code
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 0ec80d645661dda50acd417bdfcb33df2e5dd31e upstream.
6xx/7xx was hitting the wrong BUS_CNTL reg and bits.
--- drivers/gpu/drm/radeon/r600_reg.h | 1 + drivers/gpu/drm/radeon/radeon_bios.c | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/r600_reg.h +1 -0
@@ -86,6 +86,7 @@#define R600_HDP_NONSURFACE_BASE 0x2c04#define R600_BUS_CNTL 0x5420 +# define R600_BIOS_ROM_DIS (1 << 1)#define R600_CONFIG_CNTL 0x5424#define R600_CONFIG_MEMSIZE 0x5428#define R600_CONFIG_F0_BASE 0x542C
drivers/gpu/drm/radeon/radeon_bios.c +7 -6
@@ -130,6 +130,7 @@ static bool radeon_atrm_get_bios(struct }return true; } +static bool r700_read_disabled_bios (struct radeon_device *rdev) {uint32_t viph_control;
@@ -143,7 +144,7 @@ static bool r700_read_disabled_bios(strubool r; viph_control =RREG32 (RADEON_VIPH_CONTROL ); - bus_cntl =RREG32 (RADEON_BUS_CNTL ); + bus_cntl =RREG32 (R600_BUS_CNTL ); d1vga_control =RREG32 (AVIVO_D1VGA_CONTROL ); d2vga_control =RREG32 (AVIVO_D2VGA_CONTROL ); vga_render_control =RREG32 (AVIVO_VGA_RENDER_CONTROL );
@@ -152,7 +153,7 @@ static bool r700_read_disabled_bios(stru/* disable VIP */ WREG32 (RADEON_VIPH_CONTROL , (viph_control & ~RADEON_VIPH_EN ));/* enable the rom */ -WREG32 (RADEON_BUS_CNTL , (bus_cntl & ~RADEON_BUS_BIOS_DIS_ROM )); +WREG32 (R600_BUS_CNTL , (bus_cntl & ~R600_BIOS_ROM_DIS ));/* Disable VGA mode */ WREG32(AVIVO_D1VGA_CONTROL, (d1vga_control & ~(AVIVO_DVGA_CONTROL_MODE_ENABLE |
@@ -191,7 +192,7 @@ static bool r700_read_disabled_bios(stru cg_spll_status =RREG32 (R600_CG_SPLL_STATUS ); }WREG32 (RADEON_VIPH_CONTROL , viph_control); -WREG32 (RADEON_BUS_CNTL , bus_cntl); +WREG32 (R600_BUS_CNTL , bus_cntl);WREG32 (AVIVO_D1VGA_CONTROL , d1vga_control);WREG32 (AVIVO_D2VGA_CONTROL , d2vga_control);WREG32 (AVIVO_VGA_RENDER_CONTROL , vga_render_control);
@@ -216,7 +217,7 @@ static bool r600_read_disabled_bios(strubool r; viph_control =RREG32 (RADEON_VIPH_CONTROL ); - bus_cntl =RREG32 (RADEON_BUS_CNTL ); + bus_cntl =RREG32 (R600_BUS_CNTL ); d1vga_control =RREG32 (AVIVO_D1VGA_CONTROL ); d2vga_control =RREG32 (AVIVO_D2VGA_CONTROL ); vga_render_control =RREG32 (AVIVO_VGA_RENDER_CONTROL );
@@ -231,7 +232,7 @@ static bool r600_read_disabled_bios(stru/* disable VIP */ WREG32 (RADEON_VIPH_CONTROL , (viph_control & ~RADEON_VIPH_EN ));/* enable the rom */ -WREG32 (RADEON_BUS_CNTL , (bus_cntl & ~RADEON_BUS_BIOS_DIS_ROM )); +WREG32 (R600_BUS_CNTL , (bus_cntl & ~R600_BIOS_ROM_DIS ));/* Disable VGA mode */ WREG32(AVIVO_D1VGA_CONTROL, (d1vga_control & ~(AVIVO_DVGA_CONTROL_MODE_ENABLE |
@@ -262,7 +263,7 @@ static bool r600_read_disabled_bios(stru/* restore regs */ WREG32 (RADEON_VIPH_CONTROL , viph_control); -WREG32 (RADEON_BUS_CNTL , bus_cntl); +WREG32 (R600_BUS_CNTL , bus_cntl);WREG32 (AVIVO_D1VGA_CONTROL , d1vga_control);WREG32 (AVIVO_D2VGA_CONTROL , d2vga_control);WREG32 (AVIVO_VGA_RENDER_CONTROL , vga_render_control);
PATCH 129/223 drm/radeon/kms/atom: set sane defaults in atombios_get_encoder_mode()
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit c7a71fc761551dc8be8543f14a90d08cda4e77f9 upstream.
If there was no connector mapped to the encoder, atombios_get_encoder_mode() returned 0 which is the id for DP. Return something sane instead based on the encoder id. This avoids hitting the DP paths on non-DP encoders.
--- drivers/gpu/drm/radeon/radeon_encoders.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/radeon_encoders.c +15 -3
@@ -626,11 +626,23 @@ atombios_get_encoder_mode(struct drm_encstruct drm_connector *connector;struct radeon_connector *radeon_connector;struct radeon_connector_atom_dig *dig_connector; +struct radeon_encoder *radeon_encoder =to_radeon_encoder (encoder); connector =radeon_get_connector_for_encoder (encoder); -if (!connector) -return 0 ; - +if (!connector) { +switch (radeon_encoder->encoder_id) { +case ENCODER_OBJECT_ID_INTERNAL_UNIPHY : +case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1 : +case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2 : +case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA : +case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1 : +return ATOM_ENCODER_MODE_DVI ; +case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1 : +case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2 : +default : +return ATOM_ENCODER_MODE_CRT ; + } + } radeon_connector =to_radeon_connector (connector);switch (connector->connector_type) {
PATCH 126/223 latencytop: fix per task accumulator
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Ken Chen <[email protected]>
commit 38715258aa2e8cd94bd4aafadc544e5104efd551 upstream.
Per task latencytop accumulator prematurely terminates due to erroneous placement of latency_record_count. It should be incremented whenever a new record is allocated instead of increment on every latencytop event.
Also fix search iterator to only search known record events instead of blindly searching all pre-allocated space.
--- kernel/latencytop.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
kernel/latencytop.c +8 -9
@@ -194,14 +194,7 @@ __account_scheduler_latency(struct task_account_global_scheduler_latency (tsk, &lat); -/* -* short term hack; if we're > 32 we stop; future we recycle: -*/ - tsk->latency_record_count++; -if (tsk->latency_record_count >=LT_SAVECOUNT ) - goto out_unlock; - -for (i =0 ; i <LT_SAVECOUNT ; i++) { +for (i =0 ; i < tsk->latency_record_count; i++) {struct latency_record *mylat;int same =1 ;
@@ -227,8 +220,14 @@ __account_scheduler_latency(struct task_ } } +/* +* short term hack; if we're > 32 we stop; future we recycle: +*/ +if (tsk->latency_record_count >=LT_SAVECOUNT ) + goto out_unlock; +/* Allocated a new one: */ - i = tsk->latency_record_count; + i = tsk->latency_record_count++;memcpy (&tsk->latency_record[i], &lat,sizeof (struct latency_record )); out_unlock:
PATCH 125/223 radix-tree: fix RCU bug
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Nick Piggin <[email protected]>
commit 27d20fddc8af539464fc3ba499d6a830054c3bd6 upstream.
Salman Qazi describes the following radix-tree bug:
In the following case, we get can get a deadlock:
0. The radix tree contains two items, one has the index 0. 1. The reader (in this case find_get_pages) takes the rcu_read_lock. 2. The reader acquires slot(s) for item(s) including the index 0 item. 3. The non-zero index item is deleted, and as a consequence the other item is
moved to the root of the tree. The place where it used to be is queued for deletion after the readers finish.
3b. The zero item is deleted, removing it from the direct slot, it remains in
the rcu-delayed indirect node.
4. The reader looks at the index 0 slot, and finds that the page has 0 ref count
5. The reader looks at it again, hoping that the item will either be freed or the ref count will increase. This never happens, as the slot it is looking at will never be updated. Also, this slot can never be reclaimed because the reader is holding rcu_read_lock and is in an infinite loop.
The fix is to re-use the same "indirect" pointer case that requires a slot lookup retry into a general "retry the lookup" bit.
--- include/linux/radix-tree.h | 36 ++++++++++---------- lib/radix-tree.c | 78 +++++++++++++++++++++++++++++++-------------- mm/filemap.c | 26 +++++---------- 3 files changed, 84 insertions(+), 56 deletions(-)
include/linux/radix-tree.h +19 -17
@@ -36,17 +36,6 @@* RCU. */ #define RADIX_TREE_INDIRECT_PTR 1 -#define RADIX_TREE_RETRY ((void *)-1UL) - -static inline void *radix_tree_ptr_to_indirect (void *ptr) -{ -return (void *)((unsigned long )ptr |RADIX_TREE_INDIRECT_PTR ); -} - -static inline void *radix_tree_indirect_to_ptr (void *ptr) -{ -return (void *)((unsigned long )ptr & ~RADIX_TREE_INDIRECT_PTR ); -}static inline int radix_tree_is_indirect_ptr (void *ptr) {
@@ -138,16 +127,29 @@ do { \* removed. * * For use with radix_tree_lookup_slot(). Caller must hold tree at least read -* locked across slot lookup and dereference. More likely, will be used with -* radix_tree_replace_slot(), as well, so caller will hold tree write locked. +* locked across slot lookup and dereference. Not required if write lock is +* held (ie. items cannot be concurrently inserted). +* +* radix_tree_deref_retry must be used to confirm validity of the pointer if +* only the read lock is held. */ static inline void *radix_tree_deref_slot (void **pslot) { -void *ret =rcu_dereference (*pslot); -if (unlikely (radix_tree_is_indirect_ptr (ret))) - ret =RADIX_TREE_RETRY ; -return ret; +return rcu_dereference (*pslot); } + +/** +* radix_tree_deref_retry - check radix_tree_deref_slot +* @arg: pointer returned by radix_tree_deref_slot +* Returns: 0 if retry is not required, otherwise retry is required +* +* radix_tree_deref_retry must be used with radix_tree_deref_slot. +*/ +static inline int radix_tree_deref_retry (void *arg) +{ +return unlikely ((unsigned long )arg &RADIX_TREE_INDIRECT_PTR ); +} +/** * radix_tree_replace_slot - replace item in a slot * @pslot: pointer to slot, returned by radix_tree_lookup_slot
lib/radix-tree.c +55 -23
198 lines not on this page · raw message
mm/filemap.c +10 -16
@@ -631,7 +631,9 @@ repeat: pagep =radix_tree_lookup_slot (&mapping->page_tree, offset);if (pagep) { page =radix_tree_deref_slot (pagep); -if (unlikely (!page || page ==RADIX_TREE_RETRY )) +if (unlikely (!page)) + goto out; +if (radix_tree_deref_retry (page)) goto repeat;if (!page_cache_get_speculative (page))
@@ -647,6 +649,7 @@ repeat: goto repeat; } } +out:rcu_read_unlock ();return page;
@@ -764,12 +767,11 @@ repeat: page =radix_tree_deref_slot ((void **)pages[i]);if (unlikely (!page))continue ; -/* -* this can only trigger if nr_found == 1, making livelock -* a non issue. -*/ -if (unlikely (page ==RADIX_TREE_RETRY )) +if (radix_tree_deref_retry (page)) { +if (ret) + start = pages[ret-1 ]->index; goto restart; + }if (!page_cache_get_speculative (page)) goto repeat;
@@ -817,11 +819,7 @@ repeat: page =radix_tree_deref_slot ((void **)pages[i]);if (unlikely (!page))continue ; -/* -* this can only trigger if nr_found == 1, making livelock -* a non issue. -*/ -if (unlikely (page ==RADIX_TREE_RETRY )) +if (radix_tree_deref_retry (page)) goto restart;if (page->mapping ==NULL || page->index != index)
@@ -874,11 +872,7 @@ repeat: page =radix_tree_deref_slot ((void **)pages[i]);if (unlikely (!page))continue ; -/* -* this can only trigger if nr_found == 1, making livelock -* a non issue. -*/ -if (unlikely (page ==RADIX_TREE_RETRY )) +if (radix_tree_deref_retry (page)) goto restart;if (!page_cache_get_speculative (page))
PATCH 124/223 netfilter: NF_HOOK_COND has wrong conditional
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Eric Paris <[email protected]>
commit ac5aa2e3332ec04889074afdbd1479424d0227a5 upstream.
The NF_HOOK_COND returns 0 when it shouldn't due to what I believe to be an error in the code as the order of operations is not what was intended. C will evalutate == before =. Which means ret is getting set to the bool result, rather than the return value of the function call. The code says
if (ret = function() == 1)
when it meant to say:
if ((ret = function()) == 1)
Normally the compiler would warn, but it doesn't notice it because its a actually complex conditional and so the wrong code is wrapped in an explict set of () [exactly what the compiler wants you to do if this was intentional]. Fixing this means that errors when netfilter denies a packet get propagated back up the stack rather than lost.
Problem introduced by commit 2249065f (netfilter: get rid of the grossness in netfilter.h).
--- include/linux/netfilter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/netfilter.h +1 -1
@@ -215,7 +215,7 @@ NF_HOOK_COND(uint8_t pf, unsigned int hoint ret;if (!cond || - (ret =nf_hook_thresh (pf, hook, skb, in, out, okfn,INT_MIN ) ==1 )) + ((ret =nf_hook_thresh (pf, hook, skb, in, out, okfn,INT_MIN )) ==1 )) ret =okfn (skb);return ret; }
PATCH 123/223 netfilter: nf_conntrack: allow nf_ct_alloc_hashtable() to get highmem pages
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit 6b1686a71e3158d3c5f125260effce171cc7852b upstream.
commit ea781f197d6a8 (use SLAB_DESTROY_BY_RCU and get rid of call_rcu()) did a mistake in __vmalloc() call in nf_ct_alloc_hashtable().
I forgot to add __GFP_HIGHMEM, so pages were taken from LOWMEM only.
--- net/netfilter/nf_conntrack_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nf_conntrack_core.c +2 -1
@@ -1252,7 +1252,8 @@ void *nf_ct_alloc_hashtable(unsigned intif (!hash) { *vmalloced =1 ;printk (KERN_WARNING "nf_conntrack: falling back to vmalloc.\n" ); - hash =__vmalloc (sz,GFP_KERNEL | __GFP_ZERO,PAGE_KERNEL ); + hash =__vmalloc (sz,GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, +PAGE_KERNEL ); }if (hash && nulls)
PATCH 120/223 ALSA: HDA: Add an extra DAC for Realtek ALC887-VD
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: David Henningsson <[email protected]>
commit cc1c452e509aefc28f7ad2deed75bc69d4f915f7 upstream.
The patch enables ALC887-VD to use the DAC at nid 0x26, which makes it possible to use this DAC for e g Headphone volume.
--- sound/pci/hda/patch_realtek.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +3 -1
@@ -18357,6 +18357,8 @@ static inline hda_nid_t alc662_mix_to_dareturn 0x02 ; else if (nid >= 0x0c && nid <= 0x0e)return nid -0x0c +0x02 ; + else if (nid == 0x26) /* ALC887-VD has this DAC too */ + return 0x25; else return 0; }
@@ -18365,7 +18367,7 @@ static inline hda_nid_t alc662_mix_to_dastatic hda_nid_t alc662_dac_to_mix (struct hda_codec *codec,hda_nid_t pin,hda_nid_t dac) { -hda_nid_t mix[4 ]; +hda_nid_t mix[5 ];int i, num; num =snd_hda_get_connections (codec, pin, mix,ARRAY_SIZE (mix));
PATCH 119/223 ALSA: hda - Fix ALC660-VD/ALC861-VD capture/playback mixers
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Herton Ronaldo Krzesinski <[email protected]>
commit 7167594a3da7dcc33203b85d62e519594baee390 upstream.
The mixer nids passed to alc_auto_create_input_ctls are wrong: 0x15 is a pin, and 0x09 is the ADC on both ALC660-VD/ALC861-VD. Thus with current code, input playback volume/switches and input source mixer controls are not created, and recording doesn't work. Select correct mixers, 0x0b (input playback mixer) and 0x22 (capture source mixer).
Reference: https://qa.mandriva.com/show_bug.cgi?id=61159
--- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/patch_realtek.c +1 -1
@@ -16302,7 +16302,7 @@ static struct alc_config_preset alc861vdstatic int alc861vd_auto_create_input_ctls (struct hda_codec *codec,const struct auto_pin_cfg *cfg) { -return alc_auto_create_input_ctls (codec, cfg,0x15 ,0x09 ,0 ); +return alc_auto_create_input_ctls (codec, cfg,0x0b ,0x22 ,0 ); }
PATCH 118/223 ALSA: hda - Use ALC_INIT_DEFAULT for really default initialization
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 5a8cfb4e8ae317d283f84122ed20faa069c5e0c4 upstream.
When SKU assid gives no valid bits for 0x38, the driver didn't take any action, so far. This resulted in the missing initialization for external amps, etc, thus the silent output in the end.
Especially users hit this problem on ALC888 newly since 2.6.35, where the driver doesn't force to use ALC_INIT_DEFAULT any more.
This patch sets the default initialization scheme to use ALC_INIT_DEFAULT when no valid bits are set for SKU assid.
Reference:
https://bugzilla.redhat.com/show_bug.cgi?id=657388
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -1391,6 +1391,7 @@ do_sku: spec->init_amp =ALC_INIT_GPIO3 ;break ;case 5 : +default : spec->init_amp =ALC_INIT_DEFAULT ;break ; }
PATCH 117/223 ALSA: hda: Add Samsung R720 SSID for subwoofer pin fixup
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Daniel T Chen <[email protected]>
commit a0e90acc657990511c83bc69965bfd3c63386d45 upstream.
The original reporter states that the subwoofer does not mute when inserting headphones. We need an entry for his machine's SSID in the subwoofer pin fixup list, so add it there (verified using hda_analyzer).
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -18701,6 +18701,7 @@ static const struct alc_fixup alc662_fixstatic struct snd_pci_quirk alc662_fixup_tbl[] = {SND_PCI_QUIRK (0x1025 ,0x038b ,"Acer Aspire 8943G" ,ALC662_FIXUP_ASPIRE ), +SND_PCI_QUIRK (0x144d ,0xc051 ,"Samsung R720" ,ALC662_FIXUP_IDEAPAD ),SND_PCI_QUIRK (0x17aa ,0x38af ,"Lenovo Ideapad Y550P" ,ALC662_FIXUP_IDEAPAD ),SND_PCI_QUIRK (0x17aa ,0x3a0d ,"Lenovo Ideapad Y550" ,ALC662_FIXUP_IDEAPAD ), {}
PATCH 113/223 ALSA: ac97: Apply quirk for Dell Latitude D610 binding Master and Headphone controls
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Daniel T Chen <[email protected]>
commit 0613a59456980161d0cd468bae6c63d772743102 upstream.
The original reporter states: "The Master mixer does not change the volume from the headphone output (which is affected by the headphone mixer). Instead it only seems to control the on-board speaker volume. This confuses PulseAudio greatly as the Master channel is merged into the volume mix."
Fix this symptom by applying the hp_only quirk for the reporter's SSID. The fix is applicable to all stable kernels.
--- sound/pci/intel8x0.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/pci/intel8x0.c +6 -0
@@ -1866,6 +1866,12 @@ static struct ac97_quirk ac97_quirks[] _ }, { .subvendor = 0x1028, + .subdevice = 0x0182, + .name = "Dell Latitude D610", /* STAC9750/51 */ + .type =AC97_TUNE_HP_ONLY + }, + { + .subvendor = 0x1028, .subdevice = 0x0186, .name ="Dell Latitude D810" ,/* cf. Malone #41015 */ .type = AC97_TUNE_HP_MUTE_LED
PATCH 112/223 ALSA: hda - Fixed ALC887-VD initial error
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Kailang Yang <[email protected]>
commit 01e0f1378c47947b825eac05c98697ab1be1c86f upstream.
ALC887-VD is like ALC888-VD. It can not be initialized as ALC882.
--- sound/pci/hda/patch_realtek.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
sound/pci/hda/patch_realtek.c +5 -2
@@ -18783,7 +18783,10 @@ static int patch_alc888(struct hda_codec {if ((alc_read_coef_idx (codec,0 ) &0x00f0 )==0x0030 ){kfree (codec->chip_name); - codec->chip_name =kstrdup ("ALC888-VD" ,GFP_KERNEL ); +if (codec->vendor_id ==0x10ec0887 ) + codec->chip_name =kstrdup ("ALC887-VD" ,GFP_KERNEL ); +else + codec->chip_name =kstrdup ("ALC888-VD" ,GFP_KERNEL );if (!codec->chip_name) {alc_free (codec);return -ENOMEM ;
@@ -18825,7 +18828,7 @@ static struct hda_codec_preset snd_hda_p { .id = 0x10ec0885, .rev = 0x100103, .name = "ALC889A", .patch = patch_alc882 }, { .id = 0x10ec0885, .name = "ALC885", .patch = patch_alc882 }, - { .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc882 }, + { .id = 0x10ec0887, .name = "ALC887", .patch = patch_alc888 }, { .id = 0x10ec0888, .rev = 0x100101, .name = "ALC1200", .patch = patch_alc882 }, { .id = 0x10ec0888, .name = "ALC888", .patch = patch_alc888 },
PATCH 111/223 firewire: ohci: fix race in AR split packet handling
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Clemens Ladisch <[email protected]>
commit a1f805e5e73a8fe166b71c6592d3837df0cd5e2e upstream.
When handling an AR buffer that has been completely filled, we assumed that its descriptor will not be read by the controller and can be overwritten. However, when the last received packet happens to end at the end of the buffer, the controller might not yet have moved on to the next buffer and might read the branch address later. If we overwrite and free the page before that, the DMA context will either go dead because of an invalid Z value, or go off into some random memory.
To fix this, ensure that the descriptor does not get overwritten by using only the actual buffer instead of the entire page for reassembling the split packet. Furthermore, to avoid freeing the page too early, move on to the next buffer only when some data in it guarantees that the controller has moved on.
This should eliminate the remaining firewire-net problems.
--- drivers/firewire/ohci.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-)
drivers/firewire/ohci.c +23 -16
@@ -695,20 +695,19 @@ static void ar_context_tasklet(unsigned*/ offset = offsetof(struct ar_buffer , data); - start = buffer = ab; + start = ab; start_bus =le32_to_cpu (ab->descriptor.data_address) - offset; + buffer = ab->data; ab = ab->next; d = &ab->descriptor; - size = buffer +PAGE_SIZE - ctx->pointer; + size = start +PAGE_SIZE - ctx->pointer;/* valid buffer data in the next page */ rest =le16_to_cpu (d->req_count) -le16_to_cpu (d->res_count);/* what actually fits in this page */ - size2 =min (rest, (size_t )PAGE_SIZE - size); + size2 =min (rest, (size_t )PAGE_SIZE - offset - size);memmove (buffer, ctx->pointer, size);memcpy (buffer + size, ab->data, size2); - ctx->current_buffer = ab; - ctx->pointer = (void *) ab->data + rest;while (size >0 ) {void *next =handle_ar_packet (ctx, buffer);
@@ -727,22 +726,30 @@ static void ar_context_tasklet(unsigned size -= pktsize;/* fill up this page again */ size3 =min (rest - size2, - (size_t )PAGE_SIZE - size - size2); + (size_t )PAGE_SIZE - offset - size - size2);memcpy (buffer + size + size2, (void *) ab->data + size2, size3); size2 += size3; } -/* handle the packets that are fully in the next page */ - buffer = (void *) ab->data + (buffer - (start + size)); - end = (void *) ab->data + rest; - -while (buffer < end) - buffer =handle_ar_packet (ctx, buffer); - -dma_free_coherent (ohci->card.device,PAGE_SIZE , - start, start_bus); -ar_context_add_page (ctx); +if (rest >0 ) { +/* handle the packets that are fully in the next page */ + buffer = (void *) ab->data + + (buffer - (start + offset + size)); + end = (void *) ab->data + rest; + +while (buffer < end) + buffer =handle_ar_packet (ctx, buffer); + + ctx->current_buffer = ab; + ctx->pointer = end; + +dma_free_coherent (ohci->card.device,PAGE_SIZE , + start, start_bus); +ar_context_add_page (ctx); + }else { + ctx->pointer = start +PAGE_SIZE ; + } }else { buffer = ctx->pointer; ctx->pointer = end =
PATCH 110/223 firewire: ohci: fix buffer overflow in AR split packet handling
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Clemens Ladisch <[email protected]>
commit 85f7ffd5d2b320f73912b15fe8cef34bae297daf upstream.
When the controller had to split a received asynchronous packet into two buffers, the driver tries to reassemble it by copying both parts into the first page. However, if size + rest > PAGE_SIZE, i.e., if the yet unhandled packets before the split packet, the split packet itself, and any received packets after the split packet are together larger than one page, then the memory after the first page would get overwritten.
To fix this, do not try to copy the data of all unhandled packets at once, but copy the possibly needed data every time when handling a packet.
This gets rid of most of the infamous crashes and data corruptions when using firewire-net.
--- drivers/firewire/ohci.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-)
drivers/firewire/ohci.c +32 -3
@@ -684,7 +684,7 @@ static void ar_context_tasklet(unsigned d = &ab->descriptor;if (d->res_count ==0 ) { -size_t size, rest, offset; +size_t size, size2, rest, pktsize, size3, offset;dma_addr_t start_bus;void *start;
@@ -701,12 +701,41 @@ static void ar_context_tasklet(unsigned ab = ab->next; d = &ab->descriptor; size = buffer +PAGE_SIZE - ctx->pointer; +/* valid buffer data in the next page */ rest =le16_to_cpu (d->req_count) -le16_to_cpu (d->res_count); +/* what actually fits in this page */ + size2 =min (rest, (size_t )PAGE_SIZE - size);memmove (buffer, ctx->pointer, size); -memcpy (buffer + size, ab->data, rest); +memcpy (buffer + size, ab->data, size2); ctx->current_buffer = ab; ctx->pointer = (void *) ab->data + rest; - end = buffer + size + rest; + +while (size >0 ) { +void *next =handle_ar_packet (ctx, buffer); + pktsize = next - buffer; +if (pktsize >= size) { +/* +* We have handled all the data that was +* originally in this page, so we can now +* continue in the next page. +*/ + buffer = next; +break ; + } +/* move the next packet to the start of the buffer */ +memmove (buffer, next, size + size2 - pktsize); + size -= pktsize; +/* fill up this page again */ + size3 =min (rest - size2, + (size_t )PAGE_SIZE - size - size2); +memcpy (buffer + size + size2, + (void *) ab->data + size2, size3); + size2 += size3; + } + +/* handle the packets that are fully in the next page */ + buffer = (void *) ab->data + (buffer - (start + size)); + end = (void *) ab->data + rest;while (buffer < end) buffer =handle_ar_packet (ctx, buffer);
PATCH 107/223 ASoC: Remove volatility from WM8900 POWER1 register
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Mark Brown <[email protected]>
commit 6d212d8e86fb4221bd91b9266b7567ee2b83bd01 upstream.
Not all bits can be read back from POWER1 so avoid corruption when using a read/modify/write cycle by marking it non-volatile - the only thing we read back from it is the chip revision which has diagnostic value only. We can re-add later but that's a more invasive change than is suitable for a bugfix.
--- sound/soc/codecs/wm8900.c | 6 ------ 1 file changed, 6 deletions(-)
sound/soc/codecs/wm8900.c +0 -6
@@ -188,7 +188,6 @@ static int wm8900_volatile_register(unsi {switch (reg) {case WM8900_REG_ID : -case WM8900_REG_POWER1 :return 1 ;default :return 0 ;
@@ -1236,11 +1235,6 @@ static __devinit int wm8900_i2c_probe(st goto err; } -/* Read back from the chip */ - reg =snd_soc_read (codec,WM8900_REG_POWER1 ); - reg = (reg >>12 ) &0xf ; -dev_info (&i2c->dev,"WM8900 revision %d\n" , reg); -wm8900_reset (codec);/* Turn the chip on */
PATCH 103/223 drivers/media/video/cx23885/cx23885-core.c: fix cx23885_dev_checkrevision()
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Andrew Morton <[email protected]>
commit abe1def46d84aa27d3f84d729204b162e8c64d76 upstream.
It was missing the `break'.
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=18672
--- drivers/media/video/cx23885/cx23885-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/video/cx23885/cx23885-core.c +1 -0
@@ -737,6 +737,7 @@ static void cx23885_dev_checkrevision(stcase 0x0e :/* CX23887-15Z */ dev->hwrevision =0xc0 ; +break ;case 0x0f :/* CX23887-14Z */ dev->hwrevision =0xb1 ;
PATCH 102/223 hdpvr: Add missing URB_NO_TRANSFER_DMA_MAP flag
In reply to Andi Kleen2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------
From: James M McLaren <[email protected]>
commit 4f5c933abb34532dc962185c999509b97a97fa1b upstream.
Necessary on arm.
--- drivers/media/video/hdpvr/hdpvr-video.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/video/hdpvr/hdpvr-video.c +1 -0
@@ -157,6 +157,7 @@ int hdpvr_alloc_buffers(struct hdpvr_dev mem, dev->bulk_in_size, hdpvr_read_bulk_callback, buf); + buf->urb->transfer_flags |=URB_NO_TRANSFER_DMA_MAP ; buf->status =BUFSTAT_AVAILABLE ;list_add_tail (&buf->buff_list, &dev->free_buff_list); }