3.4.45-stable review
Subsystems (21)
Greg Kroah-Hartman
maintainercover 3.4.45-stable review
This is the start of the stable review cycle for the 3.4.45 release. There are 26 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 me know.
Responses should be made by Sat May 11 22:32:50 UTC 2013. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.4.45-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.4.45-rc1
Jerry Hoemann <[email protected]>
x86/mm: account for PGDIR_SIZE alignment
Chen Gang <[email protected]>
kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()
Steven Rostedt (Red Hat) <[email protected]>
tracing: Fix ftrace_dump()
Alex Deucher <[email protected]>
drm/radeon: fix handling of v6 power tables
Alex Deucher <[email protected]>
drm/radeon: add new richland pci ids
Alex Deucher <[email protected]>
drm/radeon: fix possible segfault when parsing pm tables
Alex Deucher <[email protected]>
drm/radeon: fix endian bugs in atom_allocate_fb_scratch()
Alex Deucher <[email protected]>
drm/radeon/evergreen+: don't enable HPD interrupts on eDP/LVDS
Alex Deucher <[email protected]>
drm/radeon: add some new SI PCI ids
Alex Deucher <[email protected]>
drm/radeon: disable the crtcs in mc_stop (evergreen+) (v2)
Alex Deucher <[email protected]>
drm/radeon: properly lock disp in mc_stop/resume for evergreen+
Alex Deucher <[email protected]>
drm/radeon/dce6: add missing display reg for tiling setup
Alex Deucher <[email protected]>
drm/radeon: don't use get_engine_clock() on APUs
David Müller <[email protected]>
drm/i915: Fall back to bit banging mode for DVO transmitter detection
Christian Lamparter <[email protected]>
drm/i915: Add no-lvds quirk for Fujitsu Esprimo Q900
Rafał Bilski <[email protected]>
cpufreq / Longhaul: Disable driver by default
Stefan Bader <[email protected]>
r8169: fix 8168evl frame padding.
Theodore Ts'o <[email protected]>
ext4: add check for inodes_count overflow in new resize ioctl
Hans Schillstrom <[email protected]>
ipvs: ip_vs_sip_fill_param() BUG: bad check of return value
Sarah Sharp <[email protected]>
xhci: Don't warn on empty ring for suspended devices.
Peter Zijlstra <[email protected]>
perf/x86/intel/lbr: Demand proper privileges for PERF_SAMPLE_BRANCH_KERNEL
Peter Zijlstra <[email protected]>
perf/x86/intel/lbr: Fix LBR filter
Benjamin Herrenschmidt <[email protected]>
net/eth/ibmveth: Fixup retrieval of MAC address
David Jeffery <[email protected]>
autofs - remove autofs dentry mount check
Vaidyanathan Srinivasan <[email protected]>
powerpc: fix numa distance for form0 device tree
Anton Blanchard <[email protected]>
powerpc: Emulate non privileged DSCR read and write
-------------
Diffstat:
Makefile | 4 +- arch/powerpc/include/asm/ppc-opcode.h | 4 ++ arch/powerpc/kernel/traps.c | 10 ++++- arch/powerpc/mm/numa.c | 2 +- arch/x86/kernel/cpu/perf_event_intel_lbr.c | 27 +++++++++--- arch/x86/mm/init.c | 5 +++ drivers/cpufreq/longhaul.c | 10 ++++- drivers/gpu/drm/i915/intel_dvo.c | 13 +++++- drivers/gpu/drm/i915/intel_lvds.c | 8 ++++ drivers/gpu/drm/radeon/atom.c | 6 +-- drivers/gpu/drm/radeon/evergreen.c | 67 ++++++++++++++++++++++++++++-- drivers/gpu/drm/radeon/evergreen_reg.h | 2 + drivers/gpu/drm/radeon/ni.c | 8 +++- drivers/gpu/drm/radeon/nid.h | 4 ++ drivers/gpu/drm/radeon/radeon_atombios.c | 21 ++++++---- drivers/gpu/drm/radeon/radeon_pm.c | 6 ++- drivers/gpu/drm/radeon/si.c | 1 + drivers/gpu/drm/radeon/sid.h | 2 + drivers/net/ethernet/ibm/ibmveth.c | 23 +++++----- drivers/net/ethernet/realtek/r8169.c | 9 ++++ drivers/usb/host/xhci-ring.c | 23 ++++++---- fs/autofs4/expire.c | 9 ---- fs/ext4/resize.c | 4 ++ include/drm/drm_pciids.h | 5 +++ kernel/audit_tree.c | 2 +- kernel/trace/trace.c | 62 ++++++++++++--------------- kernel/trace/trace_selftest.c | 9 ++-- net/netfilter/ipvs/ip_vs_pe_sip.c | 6 +-- 28 files changed, 248 insertions(+), 104 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/26 powerpc: Emulate non privileged DSCR read and write
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anton Blanchard <[email protected]>
commit 73d2fb758e678c93bc76d40876c2359f0729b0ef upstream.
POWER8 allows read and write of the DSCR in userspace. We added kernel emulation so applications could always use the instructions regardless of the CPU type.
Unfortunately there are two SPRs for the DSCR and we only added emulation for the privileged one. Add code to match the non privileged one.
A simple test was created to verify the fix:
http://ozlabs.org/~anton/junkcode/user_dscr_test.c
Without the patch we get a SIGILL and it passes with the patch.
--- arch/powerpc/include/asm/ppc-opcode.h | 4 ++++ arch/powerpc/kernel/traps.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/ppc-opcode.h +4 -0
@@ -45,6 +45,10 @@#define PPC_INST_MFSPR_DSCR_MASK 0xfc1fffff#define PPC_INST_MTSPR_DSCR 0x7c1103a6#define PPC_INST_MTSPR_DSCR_MASK 0xfc1fffff +#define PPC_INST_MFSPR_DSCR_USER 0x7c0302a6 +#define PPC_INST_MFSPR_DSCR_USER_MASK 0xfc1fffff +#define PPC_INST_MTSPR_DSCR_USER 0x7c0303a6 +#define PPC_INST_MTSPR_DSCR_USER_MASK 0xfc1fffff#define PPC_INST_SLBFEE 0x7c0007a7#define PPC_INST_STRING 0x7c00042a
arch/powerpc/kernel/traps.c +8 -2
@@ -960,7 +960,10 @@ static int emulate_instruction(struct pt#ifdef CONFIG_PPC64 /* Emulate the mfspr rD, DSCR. */ -if (((instword &PPC_INST_MFSPR_DSCR_MASK ) ==PPC_INST_MFSPR_DSCR ) && +if ((((instword &PPC_INST_MFSPR_DSCR_USER_MASK ) == +PPC_INST_MFSPR_DSCR_USER ) || + ((instword &PPC_INST_MFSPR_DSCR_MASK ) == +PPC_INST_MFSPR_DSCR )) &&cpu_has_feature (CPU_FTR_DSCR )) {PPC_WARN_EMULATED (mfdscr, regs); rd = (instword >>21 ) &0x1f ;
@@ -968,7 +971,10 @@ static int emulate_instruction(struct ptreturn 0 ; }/* Emulate the mtspr DSCR, rD. */ -if (((instword &PPC_INST_MTSPR_DSCR_MASK ) ==PPC_INST_MTSPR_DSCR ) && +if ((((instword &PPC_INST_MTSPR_DSCR_USER_MASK ) == +PPC_INST_MTSPR_DSCR_USER ) || + ((instword &PPC_INST_MTSPR_DSCR_MASK ) == +PPC_INST_MTSPR_DSCR )) &&cpu_has_feature (CPU_FTR_DSCR )) {PPC_WARN_EMULATED (mtdscr, regs); rd = (instword >>21 ) &0x1f ;
Greg Kroah-Hartman
maintainerPATCH 2/26 powerpc: fix numa distance for form0 device tree
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vaidyanathan Srinivasan <[email protected]>
commit 7122beeee7bc1757682049780179d7c216dd1c83 upstream.
The following commit breaks numa distance setup for old powerpc systems that use form0 encoding in device tree.
commit 41eab6f88f24124df89e38067b3766b7bef06ddb powerpc/numa: Use form 1 affinity to setup node distance
Device tree node /rtas/ibm,associativity-reference-points would index into /cpus/PowerPCxxxx/ibm,associativity based on form0 or form1 encoding detected by ibm,architecture-vec-5 property.
All modern systems use form1 and current kernel code is correct. However, on older systems with form0 encoding, the numa distance will get hard coded as LOCAL_DISTANCE for all nodes. This causes task scheduling anomaly since scheduler will skip building numa level domain (topmost domain with all cpus) if all numa distances are same. (value of 'level' in sched_init_numa() will remain 0)
Prior to the above commit:
((from) == (to) ? LOCAL_DISTANCE : REMOTE_DISTANCE)
Restoring compatible behavior with this patch for old powerpc systems with device tree where numa distance are encoded as form0.
--- arch/powerpc/mm/numa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/mm/numa.c +1 -1
@@ -201,7 +201,7 @@ int __node_distance(int a, int b)int distance =LOCAL_DISTANCE ;if (!form1_affinity) -return distance; +return ((a == b) ?LOCAL_DISTANCE :REMOTE_DISTANCE );for (i =0 ; i < distance_ref_points_depth; i++) {if (distance_lookup_table[a][i] == distance_lookup_table[b][i])
Greg Kroah-Hartman
maintainerPATCH 3/26 autofs - remove autofs dentry mount check
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Jeffery <[email protected]>
commit ce8a5dbdf9e709bdaf4618d7ef8cceb91e8adc69 upstream.
When checking if an autofs mount point is busy it isn't sufficient to only check if it's a mount point.
For example, if the mount of an offset mountpoint in a tree is denied for this host by its export and the dentry becomes a process working directory the check incorrectly returns the mount as not in use at expire.
This can happen since the default when mounting within a tree is nostrict, which means ingnore mount fails on mounts within the tree and continue. The nostrict option is meant to allow mounting in this case.
--- fs/autofs4/expire.c | 9 --------- 1 file changed, 9 deletions(-)
fs/autofs4/expire.c +0 -9
@@ -61,15 +61,6 @@ static int autofs4_mount_busy(struct vfs/* This is an autofs submount, we can't expire it */ if (autofs_type_indirect (sbi->type)) goto done; - -/* -* Otherwise it's an offset mount and we need to check -* if we can umount its mount, if there is one. -*/ -if (!d_mountpoint (path.dentry)) { - status =0 ; - goto done; - } }/* Update the expiry counter if fs is busy */
Greg Kroah-Hartman
maintainerPATCH 4/26 net/eth/ibmveth: Fixup retrieval of MAC address
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Herrenschmidt <[email protected]>
commit 13f85203e1060da83d9ec1c1c5a63343eaab8de4 upstream.
Some ancient pHyp versions used to create a 8 bytes local-mac-address property in the device-tree instead of a 6 bytes one for veth.
The Linux driver code to deal with that is an insane hack which also happens to break with some choices of MAC addresses in qemu by testing for a bit in the address rather than just looking at the size of the property.
Sanitize this by doing the latter instead.
--- drivers/net/ethernet/ibm/ibmveth.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/net/ethernet/ibm/ibmveth.c +10 -13
@@ -1327,7 +1327,7 @@ static const struct net_device_ops ibmvestatic int __devinit ibmveth_probe (struct vio_dev *dev,const struct vio_device_id *id) { -int rc, i; +int rc, i, mac_len;struct net_device *netdev;struct ibmveth_adapter *adapter;unsigned char *mac_addr_p;
@@ -1337,11 +1337,19 @@ static int __devinit ibmveth_probe(struc dev->unit_address); mac_addr_p = (unsigned char *)vio_get_attribute (dev,VETH_MAC_ADDR , -NULL ); + &mac_len);if (!mac_addr_p) {dev_err (&dev->dev,"Can't find VETH_MAC_ADDR attribute\n" );return -EINVAL ; } +/* Workaround for old/broken pHyp */ +if (mac_len ==8 ) + mac_addr_p +=2 ; +else if (mac_len !=6 ) { +dev_err (&dev->dev,"VETH_MAC_ADDR attribute wrong len %d\n" , + mac_len); +return -EINVAL ; + } mcastFilterSize_p = (unsigned int *)vio_get_attribute (dev,VETH_MCAST_FILTER_SIZE ,NULL );
@@ -1366,17 +1374,6 @@ static int __devinit ibmveth_probe(strucnetif_napi_add (netdev, &adapter->napi, ibmveth_poll,16 ); -/* -* Some older boxes running PHYP non-natively have an OF that returns -* a 8-byte local-mac-address field (and the first 2 bytes have to be -* ignored) while newer boxes' OF return a 6-byte field. Note that -* IEEE 1275 specifies that local-mac-address must be a 6-byte field. -* The RPA doc specifies that the first byte must be 10b, so we'll -* just look for it to solve this 8 vs. 6 byte field issue -*/ -if ((*mac_addr_p &0x3 ) !=0x02 ) - mac_addr_p +=2 ; - adapter->mac_addr =0 ;memcpy (&adapter->mac_addr, mac_addr_p,6 );
Greg Kroah-Hartman
maintainerPATCH 5/26 perf/x86/intel/lbr: Fix LBR filter
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 6e15eb3ba6c0249c9e8c783517d131b47db995ca upstream.
The LBR 'from' adddress is under full userspace control; ensure we validate it before reading from it.
Note: is_module_text_address() can potentially be quite expensive; for those running into that with high overhead in modules optimize it using an RCU backed rb-tree.
--- arch/x86/kernel/cpu/perf_event_intel_lbr.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_lbr.c +12 -2
@@ -442,8 +442,18 @@ static int branch_type(unsigned long froreturn X86_BR_NONE ; addr = buf; - }else - addr = (void *)from; + }else { +/* +* The LBR logs any address in the IP, even if the IP just +* faulted. This means userspace can control the from address. +* Ensure we don't blindy read any address by validating it is +* a known text address. +*/ +if (kernel_text_address (from)) + addr = (void *)from; +else +return X86_BR_NONE ; + }/* * decoder needs to know the ABI especially
Greg Kroah-Hartman
maintainerPATCH 6/26 perf/x86/intel/lbr: Demand proper privileges for PERF_SAMPLE_BRANCH_KERNEL
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 7cc23cd6c0c7d7f4bee057607e7ce01568925717 upstream.
We should always have proper privileges when requesting kernel data.
--- arch/x86/kernel/cpu/perf_event_intel_lbr.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_lbr.c +10 -3
@@ -310,7 +310,7 @@ void intel_pmu_lbr_read(void)* - in case there is no HW filter * - in case the HW filter has errata or limitations */ -static void intel_pmu_setup_sw_lbr_filter (struct perf_event *event) +static int intel_pmu_setup_sw_lbr_filter (struct perf_event *event) {u64 br_type = event->attr.branch_sample_type;int mask =0 ;
@@ -318,8 +318,11 @@ static void intel_pmu_setup_sw_lbr_filteif (br_type &PERF_SAMPLE_BRANCH_USER ) mask |=X86_BR_USER ; -if (br_type &PERF_SAMPLE_BRANCH_KERNEL ) +if (br_type &PERF_SAMPLE_BRANCH_KERNEL ) { +if (perf_paranoid_kernel () && !capable (CAP_SYS_ADMIN )) +return -EACCES ; mask |=X86_BR_KERNEL ; + }/* we ignore BRANCH_HV here */
@@ -339,6 +342,8 @@ static void intel_pmu_setup_sw_lbr_filte* be used by fixup code for some CPU */ event->hw.branch_reg.reg = mask; + +return 0 ; }/*
@@ -386,7 +391,9 @@ int intel_pmu_setup_lbr_filter(struct pe/* * setup SW LBR filter */ -intel_pmu_setup_sw_lbr_filter (event); + ret =intel_pmu_setup_sw_lbr_filter (event); +if (ret) +return ret;/* * setup HW LBR filter, if any
Greg Kroah-Hartman
maintainerPATCH 7/26 xhci: Dont warn on empty ring for suspended devices.
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sarah Sharp <[email protected]>
commit a83d6755814e4614ba77e15d82796af0f695c6b8 upstream.
When a device attached to the roothub is suspended, the endpoint rings are stopped. The host may generate a completion event with the completion code set to 'Stopped' or 'Stopped Invalid' when the ring is halted. The current xHCI code prints a warning in that case, which can be really annoying if the USB device is coming into and out of suspend.
Remove the unnecessary warning.
--- drivers/usb/host/xhci-ring.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
drivers/usb/host/xhci-ring.c +15 -8
@@ -2459,14 +2459,21 @@ static int handle_tx_event(struct xhci_h* TD list. */ if (list_empty (&ep_ring->td_list)) { -xhci_warn (xhci,"WARN Event TRB for slot %d ep %d " -"with no TDs queued?\n" , -TRB_TO_SLOT_ID (le32_to_cpu (event->flags)), - ep_index); -xhci_dbg (xhci,"Event TRB with TRB type ID %u\n" , - (le32_to_cpu (event->flags) & -TRB_TYPE_BITMASK )>>10 ); -xhci_print_trb_offsets (xhci, (union xhci_trb *) event); +/* +* A stopped endpoint may generate an extra completion +* event if the device was suspended. Don't print +* warnings. +*/ +if (!(trb_comp_code ==COMP_STOP || + trb_comp_code ==COMP_STOP_INVAL )) { +xhci_warn (xhci,"WARN Event TRB for slot %d ep %d with no TDs queued?\n" , +TRB_TO_SLOT_ID (le32_to_cpu (event->flags)), + ep_index); +xhci_dbg (xhci,"Event TRB with TRB type ID %u\n" , + (le32_to_cpu (event->flags) & +TRB_TYPE_BITMASK )>>10 ); +xhci_print_trb_offsets (xhci, (union xhci_trb *) event); + }if (ep->skip) { ep->skip = false; xhci_dbg(xhci, "td_list is empty while skip "
Greg Kroah-Hartman
maintainerPATCH 8/26 ipvs: ip_vs_sip_fill_param() BUG: bad check of return value
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Schillstrom <[email protected]>
commit f7a1dd6e3ad59f0cfd51da29dfdbfd54122c5916 upstream.
The reason for this patch is crash in kmemdup caused by returning from get_callid with uniialized matchoff and matchlen.
Removing Zero check of matchlen since it's done by ct_sip_get_header()
BUG: unable to handle kernel paging request at ffff880457b5763f IP: [<ffffffff810df7fc>] kmemdup+0x2e/0x35 PGD 27f6067 PUD 0 Oops: 0000 [#1] PREEMPT SMP Modules linked in: xt_state xt_helper nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_mangle xt_connmark xt_conntrack ip6_tables nf_conntrack_ftp ip_vs_ftp nf_nat xt_tcpudp iptable_mangle xt_mark ip_tables x_tables ip_vs_rr ip_vs_lblcr ip_vs_pe_sip ip_vs nf_conntrack_sip nf_conntrack bonding igb i2c_algo_bit i2c_core CPU 5 Pid: 0, comm: swapper/5 Not tainted 3.9.0-rc5+ #5 /S1200KP RIP: 0010:[<ffffffff810df7fc>] [<ffffffff810df7fc>] kmemdup+0x2e/0x35 RSP: 0018:ffff8803fea03648 EFLAGS: 00010282 RAX: ffff8803d61063e0 RBX: 0000000000000003 RCX: 0000000000000003 RDX: 0000000000000003 RSI: ffff880457b5763f RDI: ffff8803d61063e0 RBP: ffff8803fea03658 R08: 0000000000000008 R09: 0000000000000011 R10: 0000000000000011 R11: 00ffffffff81a8a3 R12: ffff880457b5763f R13: ffff8803d67f786a R14: ffff8803fea03730 R15: ffffffffa0098e90 FS: 0000000000000000(0000) GS:ffff8803fea00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffff880457b5763f CR3: 0000000001a0c000 CR4: 00000000001407e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process swapper/5 (pid: 0, threadinfo ffff8803ee18c000, task ffff8803ee18a480) Stack: ffff8803d822a080 000000000000001c ffff8803fea036c8 ffffffffa000937a ffffffff81f0d8a0 000000038135fdd5 ffff880300000014 ffff880300110000 ffffffff150118ac ffff8803d7e8a000 ffff88031e0118ac 0000000000000000 Call Trace: <IRQ> [<ffffffffa000937a>] ip_vs_sip_fill_param+0x13a/0x187 [ip_vs_pe_sip] [<ffffffffa007b209>] ip_vs_sched_persist+0x2c6/0x9c3 [ip_vs] [<ffffffff8107dc53>] ? __lock_acquire+0x677/0x1697 [<ffffffff8100972e>] ? native_sched_clock+0x3c/0x7d [<ffffffff8100972e>] ? native_sched_clock+0x3c/0x7d [<ffffffff810649bc>] ? sched_clock_cpu+0x43/0xcf [<ffffffffa007bb1e>] ip_vs_schedule+0x181/0x4ba [ip_vs]
...
--- net/netfilter/ipvs/ip_vs_pe_sip.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
net/netfilter/ipvs/ip_vs_pe_sip.c +1 -5
@@ -37,14 +37,10 @@ static int get_callid(const char *dptr,if (ret >0 )break ;if (!ret) -return 0 ; +return -EINVAL ; dataoff += *matchoff; } -/* Empty callid is useless */ -if (!*matchlen) -return -EINVAL ; -/* Too large is useless */ if (*matchlen >IP_VS_PEDATA_MAXLEN )return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 9/26 ext4: add check for inodes_count overflow in new resize ioctl
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Theodore Ts'o <[email protected]>
commit 3f8a6411fbada1fa482276591e037f3b1adcf55b upstream.
Addresses-Red-Hat-Bugzilla: #913245
--- fs/ext4/resize.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/ext4/resize.c +4 -0
@@ -1630,6 +1630,10 @@ int ext4_resize_fs(struct super_block *sreturn 0 ;ext4_get_group_no_and_offset (sb, n_blocks_count -1 , &n_group, &offset); +if (n_group > (0xFFFFFFFFUL /EXT4_INODES_PER_GROUP (sb))) { +ext4_warning (sb,"resize would cause inodes_count overflow" ); +return -EINVAL ; + }ext4_get_group_no_and_offset (sb, o_blocks_count -1 , &o_group, &offset); n_desc_blocks = (n_group + EXT4_DESC_PER_BLOCK(sb)) /
Greg Kroah-Hartman
maintainerPATCH 10/26 r8169: fix 8168evl frame padding.
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Bader <[email protected]>
commit e5195c1f31f399289347e043d6abf3ffa80f0005 upstream.
--- drivers/net/ethernet/realtek/r8169.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/net/ethernet/realtek/r8169.c +9 -0
@@ -5168,6 +5168,14 @@ static netdev_tx_t rtl8169_start_xmit(st goto err_stop_0; } +/* 8168evl does not automatically pad to minimum length. */ +if (unlikely (tp->mac_version ==RTL_GIGA_MAC_VER_34 && + skb->len <ETH_ZLEN )) { +if (skb_padto (skb,ETH_ZLEN )) + goto err_update_stats; +skb_put (skb,ETH_ZLEN - skb->len); + } +if (unlikely (le32_to_cpu (txd->opts1) & DescOwn)) goto err_stop_0;
@@ -5239,6 +5247,7 @@ err_dma_1:rtl8169_unmap_tx_skb (d, tp->tx_skb + entry, txd); err_dma_0:dev_kfree_skb (skb); +err_update_stats: dev->stats.tx_dropped++;return NETDEV_TX_OK ;
Greg Kroah-Hartman
maintainerPATCH 11/26 cpufreq / Longhaul: Disable driver by default
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafał Bilski <[email protected]>
commit b5811bc469c0dbebb4f947800b9b234a9c0a68dc upstream.
This is only solution I can think of. User decides if he wants this driver on his machine. I don't have enough knowledge and time to find the reason why same code works on some machines and doesn't on others which use the same, or very similar, chipset and processor.
--- drivers/cpufreq/longhaul.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/cpufreq/longhaul.c +9 -1
@@ -77,7 +77,7 @@ static unsigned int longhaul_index;static int scale_voltage;static int disable_acpi_c3;static int revid_errata; - +static int enable;/* Clock ratios multiplied by 10 */ static int mults[32 ];
@@ -965,6 +965,10 @@ static int __init longhaul_init(void)if (!x86_match_cpu (longhaul_id))return -ENODEV ; +if (!enable) { + printk(KERN_ERR PFX "Option \"enable\" not set. Aborting.\n"); +return -ENODEV ; + }#ifdef CONFIG_SMP if (num_online_cpus () >1 ) { printk(KERN_ERR PFX "More than 1 CPU detected, "
@@ -1021,6 +1025,10 @@ MODULE_PARM_DESC(scale_voltage, "Scale v* such. */ module_param (revid_errata, int,0644 );MODULE_PARM_DESC (revid_errata,"Ignore CPU Revision ID" ); +/* By default driver is disabled to prevent incompatible +* system freeze. */ +module_param (enable, int,0644 ); +MODULE_PARM_DESC (enable,"Enable driver" );MODULE_AUTHOR ("Dave Jones <[email protected]>" );MODULE_DESCRIPTION ("Longhaul driver for VIA Cyrix processors." );
Greg Kroah-Hartman
maintainerPATCH 12/26 drm/i915: Add no-lvds quirk for Fujitsu Esprimo Q900
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Lamparter <[email protected]>
commit 9e9dd0e889c76c786e8f2e164c825c3c06dea30c upstream.
The "Mobile Sandy Bridge CPUs" in the Fujitsu Esprimo Q900 mini desktop PCs are probably misleading the LVDS detection code in intel_lvds_supported. Nothing is connected to the LVDS ports in these systems.
--- drivers/gpu/drm/i915/intel_lvds.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_lvds.c +8 -0
@@ -793,6 +793,14 @@ static const struct dmi_system_id intel_ DMI_MATCH(DMI_PRODUCT_NAME, "X7SPA-H"), }, }, + { + .callback = intel_no_lvds_dmi_callback, + .ident = "Fujitsu Esprimo Q900", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Q900"), + }, + }, { }/* terminating entry */ };
Greg Kroah-Hartman
maintainerPATCH 13/26 drm/i915: Fall back to bit banging mode for DVO transmitter detection
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Müller <[email protected]>
commit e4bfff54ed3f5de88f5358504c78c2cb037813aa upstream.
As discussed in this thread
http://lists.freedesktop.org/archives/dri-devel/2013-April/037411.html
GMBUS based DVO transmitter detection seems to be unreliable which could result in an unusable DVO port.
The attached patch fixes this by falling back to bit banging mode for the time DVO transmitter detection is in progress.
--- drivers/gpu/drm/i915/intel_dvo.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dvo.c +12 -1
@@ -370,6 +370,7 @@ void intel_dvo_init(struct drm_device *dconst struct intel_dvo_device *dvo = &intel_dvo_devices[i];struct i2c_adapter *i2c;int gpio; +bool dvoinit;/* Allow the I2C driver info to specify the GPIO to be used in * special cases, but otherwise default to what's defined
@@ -389,7 +390,17 @@ void intel_dvo_init(struct drm_device *d i2c = &dev_priv->gmbus[gpio].adapter; intel_dvo->dev = *dvo; -if (!dvo->dev_ops->init (&intel_dvo->dev, i2c)) + +/* GMBUS NAK handling seems to be unstable, hence let the +* transmitter detection run in bit banging mode for now. +*/ +intel_gmbus_force_bit (i2c, true); + + dvoinit = dvo->dev_ops->init (&intel_dvo->dev, i2c); + +intel_gmbus_force_bit (i2c, false); + +if (!dvoinit)continue ; intel_encoder->type =INTEL_OUTPUT_DVO ;
Greg Kroah-Hartman
maintainerPATCH 14/26 drm/radeon: dont use get_engine_clock() on APUs
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit bf05d9985111f85ed6922c134567b96eb789283b upstream.
It doesn't work reliably. Just report back the currently selected engine clock.
Partially fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=62493
--- drivers/gpu/drm/radeon/radeon_pm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_pm.c +5 -1
@@ -872,7 +872,11 @@ static int radeon_debugfs_pm_info(structstruct radeon_device *rdev = dev->dev_private;seq_printf (m,"default engine clock: %u0 kHz\n" , rdev->pm.default_sclk); -seq_printf (m,"current engine clock: %u0 kHz\n" ,radeon_get_engine_clock (rdev)); +/* radeon_get_engine_clock is not reliable on APUs so just print the current clock */ +if ((rdev->family >=CHIP_PALM ) && (rdev->flags &RADEON_IS_IGP )) +seq_printf (m,"current engine clock: %u0 kHz\n" , rdev->pm.current_sclk); +else +seq_printf (m,"current engine clock: %u0 kHz\n" ,radeon_get_engine_clock (rdev));seq_printf (m,"default memory clock: %u0 kHz\n" , rdev->pm.default_mclk);if (rdev->asic->pm.get_memory_clock)seq_printf (m,"current memory clock: %u0 kHz\n" ,radeon_get_memory_clock (rdev));
Greg Kroah-Hartman
maintainerPATCH 15/26 drm/radeon/dce6: add missing display reg for tiling setup
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 7c1c7c18fc752b2a1d07597286467ef186312463 upstream.
A new tiling config register for the display blocks was added on DCE6.
May fix:
https://bugs.freedesktop.org/show_bug.cgi?id=62889
https://bugs.freedesktop.org/show_bug.cgi?id=57919
--- drivers/gpu/drm/radeon/ni.c | 2 ++ drivers/gpu/drm/radeon/nid.h | 4 ++++ drivers/gpu/drm/radeon/si.c | 1 + drivers/gpu/drm/radeon/sid.h | 2 ++ 4 files changed, 9 insertions(+)
drivers/gpu/drm/radeon/ni.c +2 -0
@@ -911,6 +911,8 @@ static void cayman_gpu_init(struct radeoWREG32 (GB_BACKEND_MAP , gb_backend_map);WREG32 (GB_ADDR_CONFIG , gb_addr_config);WREG32 (DMIF_ADDR_CONFIG , gb_addr_config); +if (ASIC_IS_DCE6 (rdev)) +WREG32 (DMIF_ADDR_CALC , gb_addr_config);WREG32 (HDP_ADDR_CONFIG , gb_addr_config);/* primary versions */
drivers/gpu/drm/radeon/nid.h +4 -0
@@ -42,6 +42,10 @@#define CAYMAN_MAX_TCC_MASK 0xFF#define DMIF_ADDR_CONFIG 0xBD4 + +/* DCE6 only */ +#define DMIF_ADDR_CALC 0xC00 +#define SRBM_GFX_CNTL 0x0E44#define RINGID (x) (((x) & 0x3) << 0)#define VMID (x) (((x) & 0x7) << 0)
drivers/gpu/drm/radeon/si.c +1 -0
@@ -1799,6 +1799,7 @@ static void si_gpu_init(struct radeon_de rdev->config.si.backend_map = gb_backend_map;WREG32 (GB_ADDR_CONFIG , gb_addr_config);WREG32 (DMIF_ADDR_CONFIG , gb_addr_config); +WREG32 (DMIF_ADDR_CALC , gb_addr_config);WREG32 (HDP_ADDR_CONFIG , gb_addr_config);/* primary versions */
drivers/gpu/drm/radeon/sid.h +2 -0
@@ -55,6 +55,8 @@#define DMIF_ADDR_CONFIG 0xBD4 +#define DMIF_ADDR_CALC 0xC00 +#define SRBM_STATUS 0xE50#define CC_SYS_RB_BACKEND_DISABLE 0xe80
Greg Kroah-Hartman
maintainerPATCH 16/26 drm/radeon: properly lock disp in mc_stop/resume for evergreen+
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 968c01664ccbe0e46c19a1af662c4c266a904203 upstream.
Need to wait for the new addresses to take affect before re-enabling the MC.
--- drivers/gpu/drm/radeon/evergreen.c | 47 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/radeon/evergreen_reg.h | 2 + 2 files changed, 45 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +43 -4
@@ -1147,18 +1147,14 @@ void evergreen_mc_stop(struct radeon_devif (!(tmp &EVERGREEN_CRTC_BLANK_DATA_EN )) {radeon_wait_for_vblank (rdev, i); tmp |=EVERGREEN_CRTC_BLANK_DATA_EN ; -WREG32 (EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i],1 );WREG32 (EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i], tmp); -WREG32 (EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i],0 ); } }else { tmp =RREG32 (EVERGREEN_CRTC_CONTROL + crtc_offsets[i]);if (!(tmp &EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE )) {radeon_wait_for_vblank (rdev, i); tmp |=EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE ; -WREG32 (EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i],1 );WREG32 (EVERGREEN_CRTC_CONTROL + crtc_offsets[i], tmp); -WREG32 (EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i],0 ); } }/* wait for the next frame */
@@ -1185,6 +1181,22 @@ void evergreen_mc_stop(struct radeon_dev }/* wait for the MC to settle */ udelay (100 ); + +/* lock double buffered regs */ +for (i =0 ; i < rdev->num_crtc; i++) { +if (save->crtc_enabled[i]) { + tmp =RREG32 (EVERGREEN_GRPH_UPDATE + crtc_offsets[i]); +if (!(tmp &EVERGREEN_GRPH_UPDATE_LOCK )) { + tmp |=EVERGREEN_GRPH_UPDATE_LOCK ; +WREG32 (EVERGREEN_GRPH_UPDATE + crtc_offsets[i], tmp); + } + tmp =RREG32 (EVERGREEN_MASTER_UPDATE_LOCK + crtc_offsets[i]); +if (!(tmp &1 )) { + tmp |=1 ; +WREG32 (EVERGREEN_MASTER_UPDATE_LOCK + crtc_offsets[i], tmp); + } + } + } }void evergreen_mc_resume (struct radeon_device *rdev,struct evergreen_mc_save *save)
@@ -1206,6 +1218,33 @@ void evergreen_mc_resume(struct radeon_dWREG32 (EVERGREEN_VGA_MEMORY_BASE_ADDRESS_HIGH ,upper_32_bits (rdev->mc.vram_start));WREG32 (EVERGREEN_VGA_MEMORY_BASE_ADDRESS , (u32 )rdev->mc.vram_start); +/* unlock regs and wait for update */ +for (i =0 ; i < rdev->num_crtc; i++) { +if (save->crtc_enabled[i]) { + tmp =RREG32 (EVERGREEN_MASTER_UPDATE_MODE + crtc_offsets[i]); +if ((tmp &0x3 ) !=0 ) { + tmp &= ~0x3 ; +WREG32 (EVERGREEN_MASTER_UPDATE_MODE + crtc_offsets[i], tmp); + } + tmp =RREG32 (EVERGREEN_GRPH_UPDATE + crtc_offsets[i]); +if (tmp &EVERGREEN_GRPH_UPDATE_LOCK ) { + tmp &= ~EVERGREEN_GRPH_UPDATE_LOCK ; +WREG32 (EVERGREEN_GRPH_UPDATE + crtc_offsets[i], tmp); + } + tmp =RREG32 (EVERGREEN_MASTER_UPDATE_LOCK + crtc_offsets[i]); +if (tmp &1 ) { + tmp &= ~1 ; +WREG32 (EVERGREEN_MASTER_UPDATE_LOCK + crtc_offsets[i], tmp); + } +for (j =0 ; j < rdev->usec_timeout; j++) { + tmp =RREG32 (EVERGREEN_GRPH_UPDATE + crtc_offsets[i]); +if ((tmp &EVERGREEN_GRPH_SURFACE_UPDATE_PENDING ) ==0 ) +break ; +udelay (1 ); + } + } + } +/* unblackout the MC */ tmp =RREG32 (MC_SHARED_BLACKOUT_CNTL ); tmp &= ~BLACKOUT_MODE_MASK ;
drivers/gpu/drm/radeon/evergreen_reg.h +2 -0
@@ -225,6 +225,8 @@#define EVERGREEN_CRTC_STATUS_POSITION 0x6e90#define EVERGREEN_MASTER_UPDATE_MODE 0x6ef8#define EVERGREEN_CRTC_UPDATE_LOCK 0x6ed4 +#define EVERGREEN_MASTER_UPDATE_LOCK 0x6ef4 +#define EVERGREEN_MASTER_UPDATE_MODE 0x6ef8#define EVERGREEN_DC_GPIO_HPD_MASK 0x64b0#define EVERGREEN_DC_GPIO_HPD_A 0x64b4
Greg Kroah-Hartman
maintainerPATCH 17/26 drm/radeon: disable the crtcs in mc_stop (evergreen+) (v2)
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit abf1457bbbe4c62066bd03c6d31837dea28644dc upstream.
Just disabling the mem requests should be enough, but that doesn't seem to work correctly on efi systems.
May fix:
https://bugs.freedesktop.org/show_bug.cgi?id=57567
https://bugs.freedesktop.org/show_bug.cgi?id=43655
https://bugzilla.kernel.org/show_bug.cgi?id=56441
v2: blank displays first, then disable.
--- drivers/gpu/drm/radeon/evergreen.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/gpu/drm/radeon/evergreen.c +12 -0
@@ -1146,6 +1146,7 @@ void evergreen_mc_stop(struct radeon_dev tmp =RREG32 (EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i]);if (!(tmp &EVERGREEN_CRTC_BLANK_DATA_EN )) {radeon_wait_for_vblank (rdev, i); +WREG32 (EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i],1 ); tmp |=EVERGREEN_CRTC_BLANK_DATA_EN ;WREG32 (EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i], tmp); }
@@ -1153,8 +1154,10 @@ void evergreen_mc_stop(struct radeon_dev tmp =RREG32 (EVERGREEN_CRTC_CONTROL + crtc_offsets[i]);if (!(tmp &EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE )) {radeon_wait_for_vblank (rdev, i); +WREG32 (EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i],1 ); tmp |=EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE ;WREG32 (EVERGREEN_CRTC_CONTROL + crtc_offsets[i], tmp); +WREG32 (EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i],0 ); } }/* wait for the next frame */
@@ -1164,6 +1167,15 @@ void evergreen_mc_stop(struct radeon_devbreak ;udelay (1 ); } + +/* XXX this is a hack to avoid strange behavior with EFI on certain systems */ +WREG32 (EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i],1 ); + tmp =RREG32 (EVERGREEN_CRTC_CONTROL + crtc_offsets[i]); + tmp &= ~EVERGREEN_CRTC_MASTER_EN ; +WREG32 (EVERGREEN_CRTC_CONTROL + crtc_offsets[i], tmp); +WREG32 (EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i],0 ); + save->crtc_enabled[i] = false; +/* ***** */ }else { save->crtc_enabled[i] = false; }
Greg Kroah-Hartman
maintainerPATCH 18/26 drm/radeon: add some new SI PCI ids
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 18932a28419596bc9403770f5d8a108c5433fe59 upstream.
--- include/drm/drm_pciids.h | 3 +++ 1 file changed, 3 insertions(+)
include/drm/drm_pciids.h +3 -0
@@ -231,6 +231,7 @@ {0x1002, 0x6819, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_PITCAIRN|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6821, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6822, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6823, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6824, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
@@ -238,11 +239,13 @@ {0x1002, 0x6827, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6829, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x682A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x682B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x682D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x682F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6830, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6831, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \ + {0x1002, 0x6835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6838, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \ {0x1002, 0x6839, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VERDE|RADEON_NEW_MEMMAP}, \
Greg Kroah-Hartman
maintainerPATCH 19/26 drm/radeon/evergreen+: dont enable HPD interrupts on eDP/LVDS
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 2e97be73e5f74a317232740ae82eb8f95326a660 upstream.
Avoids potential interrupt storms when the display is disabled.
May fix:
https://bugzilla.kernel.org/show_bug.cgi?id=56041
--- drivers/gpu/drm/radeon/evergreen.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/radeon/evergreen.c +10 -0
@@ -445,6 +445,16 @@ void evergreen_hpd_init(struct radeon_delist_for_each_entry (connector, &dev->mode_config.connector_list, head) {struct radeon_connector *radeon_connector =to_radeon_connector (connector); + +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP || + connector->connector_type ==DRM_MODE_CONNECTOR_LVDS ) { +/* don't try to enable hpd on eDP or LVDS avoid breaking the +* aux dp channel on imac and help (but not completely fix) +* https://bugzilla.redhat.com/show_bug.cgi?id=726143 +* also avoid interrupt storms during dpms. +*/ +continue ; + }switch (radeon_connector->hpd.hpd) {case RADEON_HPD_1 :WREG32 (DC_HPD1_CONTROL , tmp);
Greg Kroah-Hartman
maintainerPATCH 20/26 drm/radeon: fix endian bugs in atom_allocate_fb_scratch()
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit beb71fc61c2cad64e347f164991b8ef476529e64 upstream.
--- drivers/gpu/drm/radeon/atom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/atom.c +3 -3
@@ -1389,10 +1389,10 @@ int atom_allocate_fb_scratch(struct atom firmware_usage = (struct _ATOM_VRAM_USAGE_BY_FIRMWARE *)(ctx->bios + data_offset);DRM_DEBUG ("atom firmware requested %08x %dkb\n" , - firmware_usage->asFirmwareVramReserveInfo[0 ].ulStartAddrUsedByFirmware, - firmware_usage->asFirmwareVramReserveInfo[0 ].usFirmwareUseInKb); +le32_to_cpu (firmware_usage->asFirmwareVramReserveInfo[0 ].ulStartAddrUsedByFirmware), +le16_to_cpu (firmware_usage->asFirmwareVramReserveInfo[0 ].usFirmwareUseInKb)); - usage_bytes = firmware_usage->asFirmwareVramReserveInfo[0 ].usFirmwareUseInKb *1024 ; + usage_bytes =le16_to_cpu (firmware_usage->asFirmwareVramReserveInfo[0 ].usFirmwareUseInKb) *1024 ; } ctx->scratch_size_bytes =0 ;if (usage_bytes ==0 )
Greg Kroah-Hartman
maintainerPATCH 21/26 drm/radeon: fix possible segfault when parsing pm tables
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit f8e6bfc2ce162855fa4f9822a45659f4b542c960 upstream.
If we have a empty power table, bail early and allocate the default power state.
Should fix:
https://bugs.freedesktop.org/show_bug.cgi?id=63865
--- drivers/gpu/drm/radeon/radeon_atombios.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_atombios.c +9 -1
@@ -1998,6 +1998,8 @@ static int radeon_atombios_parse_power_t num_modes = power_info->info.ucNumOfPowerModeEntries;if (num_modes >ATOM_MAX_NUMBEROF_POWER_BLOCK ) num_modes =ATOM_MAX_NUMBEROF_POWER_BLOCK ; +if (num_modes ==0 ) +return state_index; rdev->pm.power_state =kzalloc (sizeof (struct radeon_power_state ) * num_modes,GFP_KERNEL );if (!rdev->pm.power_state)return state_index;
@@ -2396,6 +2398,8 @@ static int radeon_atombios_parse_power_t power_info = (union power_info *)(mode_info->atom_context->bios + data_offset);radeon_atombios_add_pplib_thermal_controller (rdev, &power_info->pplib.sThermalController); +if (power_info->pplib.ucNumStates ==0 ) +return state_index; rdev->pm.power_state =kzalloc (sizeof (struct radeon_power_state ) * power_info->pplib.ucNumStates,GFP_KERNEL );if (!rdev->pm.power_state)
@@ -2494,6 +2498,8 @@ static int radeon_atombios_parse_power_t non_clock_info_array = (struct _NonClockInfoArray *) (mode_info->atom_context->bios + data_offset +le16_to_cpu (power_info->pplib.usNonClockInfoArrayOffset)); +if (state_array->ucNumEntries ==0 ) +return state_index; rdev->pm.power_state =kzalloc (sizeof (struct radeon_power_state ) * state_array->ucNumEntries,GFP_KERNEL );if (!rdev->pm.power_state)
@@ -2584,7 +2590,9 @@ void radeon_atombios_get_power_modes(strdefault :break ; } - }else { + } + +if (state_index ==0 ) { rdev->pm.power_state =kzalloc (sizeof (struct radeon_power_state ),GFP_KERNEL );if (rdev->pm.power_state) { rdev->pm.power_state[0].clock_info =
Greg Kroah-Hartman
maintainerPATCH 22/26 drm/radeon: add new richland pci ids
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 62d1f92e06aef9665d71ca7e986b3047ecf0b3c7 upstream.
--- drivers/gpu/drm/radeon/ni.c | 6 ++++-- include/drm/drm_pciids.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/ni.c +4 -2
@@ -668,7 +668,8 @@ static void cayman_gpu_init(struct radeo (rdev->pdev->device ==0x990F ) || (rdev->pdev->device ==0x9910 ) || (rdev->pdev->device ==0x9917 ) || - (rdev->pdev->device == 0x9999)) { + (rdev->pdev->device ==0x9999 ) || + (rdev->pdev->device == 0x999C)) { rdev->config.cayman.max_simds_per_se = 6; rdev->config.cayman.max_backends_per_se =2 ; } else if ((rdev->pdev->device == 0x9903) ||
@@ -677,7 +678,8 @@ static void cayman_gpu_init(struct radeo (rdev->pdev->device ==0x990D ) || (rdev->pdev->device ==0x990E ) || (rdev->pdev->device ==0x9913 ) || - (rdev->pdev->device == 0x9918)) { + (rdev->pdev->device ==0x9918 ) || + (rdev->pdev->device == 0x999D)) { rdev->config.cayman.max_simds_per_se = 4; rdev->config.cayman.max_backends_per_se =2 ; } else if ((rdev->pdev->device == 0x9919) ||
include/drm/drm_pciids.h +2 -0
@@ -597,6 +597,8 @@ {0x1002, 0x9999, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x999A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x999B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x999C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x999D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x99A0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x99A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x99A4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_ARUBA|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
Greg Kroah-Hartman
maintainerPATCH 23/26 drm/radeon: fix handling of v6 power tables
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 441e76ca83ac604eaf0f046def96d8e3a27eea28 upstream.
The code was mis-handling variable sized arrays.
--- drivers/gpu/drm/radeon/radeon_atombios.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/radeon_atombios.c +5 -6
@@ -2482,6 +2482,7 @@ static int radeon_atombios_parse_power_tint index =GetIndexIntoMasterTable (DATA , PowerPlayInfo);u16 data_offset;u8 frev, crev; +u8 *power_state_offset;if (!atom_parse_data_header (mode_info->atom_context, index,NULL , &frev, &crev, &data_offset))
@@ -2504,11 +2505,11 @@ static int radeon_atombios_parse_power_t state_array->ucNumEntries, GFP_KERNEL);if (!rdev->pm.power_state)return state_index; + power_state_offset = (u8 *)state_array->states;for (i =0 ; i < state_array->ucNumEntries; i++) { mode_index =0 ; - power_state = (union pplib_power_state *)&state_array->states[i]; -/* XXX this might be an inagua bug... */ - non_clock_array_index = i;/* power_state->v2.nonClockInfoIndex */ + power_state = (union pplib_power_state *)power_state_offset; + non_clock_array_index = power_state->v2.nonClockInfoIndex; non_clock_info = (struct _ATOM_PPLIB_NONCLOCK_INFO *) &non_clock_info_array->nonClockInfo[non_clock_array_index]; rdev->pm.power_state[i].clock_info = kzalloc(sizeof(struct radeon_pm_clock_info) *
@@ -2520,9 +2521,6 @@ static int radeon_atombios_parse_power_tif (power_state->v2.ucNumDPMLevels) {for (j =0 ; j < power_state->v2.ucNumDPMLevels; j++) { clock_array_index = power_state->v2.clockInfoIndex[j]; -/* XXX this might be an inagua bug... */ -if (clock_array_index >= clock_info_array->ucNumEntries) -continue ; clock_info = (union pplib_clock_info *) &clock_info_array->clockInfo[clock_array_index * clock_info_array->ucEntrySize]; valid = radeon_atombios_parse_pplib_clock_info(rdev,
@@ -2544,6 +2542,7 @@ static int radeon_atombios_parse_power_t non_clock_info); state_index++; } + power_state_offset +=2 + power_state->v2.ucNumDPMLevels; }/* if multiple clock modes, mark the lowest as no display */ for (i =0 ; i < state_index; i++) {
Greg Kroah-Hartman
maintainerPATCH 24/26 tracing: Fix ftrace_dump()
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (Red Hat)" <[email protected]>
commit 7fe70b579c9e3daba71635e31b6189394e7b79d3 upstream.
ftrace_dump() had a lot of issues. What ftrace_dump() does, is when ftrace_dump_on_oops is set (via a kernel parameter or sysctl), it will dump out the ftrace buffers to the console when either a oops, panic, or a sysrq-z occurs.
This was written a long time ago when ftrace was fragile to recursion. But it wasn't written well even for that.
There's a possible deadlock that can occur if a ftrace_dump() is happening and an NMI triggers another dump. This is because it grabs a lock before checking if the dump ran.
It also totally disables ftrace, and tracing for no good reasons.
As the ring_buffer now checks if it is read via a oops or NMI, where there's a chance that the buffer gets corrupted, it will disable itself. No need to have ftrace_dump() do the same.
ftrace_dump() is now cleaned up where it uses an atomic counter to make sure only one dump happens at a time. A simple atomic_inc_return() is enough that is needed for both other CPUs and NMIs. No need for a spinlock, as if one CPU is running the dump, no other CPU needs to do it too.
The tracing_on variable is turned off and not turned on. The original code did this, but it wasn't pretty. By just disabling this variable we get the result of not seeing traces that happen between crashes.
For sysrq-z, it doesn't get turned on, but the user can always write a '1' to the tracing_on file. If they are using sysrq-z, then they should know about tracing_on.
The new code is much easier to read and less error prone. No more deadlock possibility when an NMI triggers here.
--- kernel/trace/trace.c | 62 +++++++++++++++++------------------------- kernel/trace/trace_selftest.c | 9 +++--- 2 files changed, 31 insertions(+), 40 deletions(-)
kernel/trace/trace.c +26 -36
@@ -4855,36 +4855,32 @@ void trace_init_global_iter(struct trace iter->cpu_file =TRACE_PIPE_ALL_CPU ; } -static void -__ftrace_dump (bool disable_tracing,enum ftrace_dump_mode oops_dump_mode) +void ftrace_dump (enum ftrace_dump_mode oops_dump_mode) { -static arch_spinlock_t ftrace_dump_lock = - (arch_spinlock_t )__ARCH_SPIN_LOCK_UNLOCKED;/* use static because iter can be a bit big for the stack */ static struct trace_iterator iter; +static atomic_t dump_running;unsigned int old_userobj; -static int dump_ran;unsigned long flags;int cnt =0 , cpu; -/* only one dump */ -local_irq_save (flags); -arch_spin_lock (&ftrace_dump_lock); -if (dump_ran) - goto out; - - dump_ran =1 ; +/* Only allow one dump user at a time. */ +if (atomic_inc_return (&dump_running) !=1 ) { +atomic_dec (&dump_running); +return ; + } +/* +* Always turn off tracing when we dump. +* We don't need to show trace output of what happens +* between multiple crashes. +* +* If the user does a sysrq-z, then they can re-enable +* tracing with echo 1 > tracing_on. +*/ tracing_off (); -/* Did function tracer already get disabled? */ -if (ftrace_is_dead ()) { -printk ("# WARNING: FUNCTION TRACING IS CORRUPTED\n" ); -printk ("# MAY BE MISSING FUNCTION EVENTS\n" ); - } - -if (disable_tracing) -ftrace_kill (); +local_irq_save (flags);trace_init_global_iter (&iter);
@@ -4917,6 +4913,12 @@ __ftrace_dump(bool disable_tracing, enumprintk (KERN_TRACE "Dumping ftrace buffer:\n" ); +/* Did function tracer already get disabled? */ +if (ftrace_is_dead ()) { +printk ("# WARNING: FUNCTION TRACING IS CORRUPTED\n" ); +printk ("# MAY BE MISSING FUNCTION EVENTS\n" ); + } +/* * We need to stop all tracing on all CPUS to read the * the next buffer. This is a bit expensive, but is
@@ -4956,26 +4958,14 @@ __ftrace_dump(bool disable_tracing, enumprintk (KERN_TRACE "---------------------------------\n" ); out_enable: -/* Re-enable tracing if requested */ -if (!disable_tracing) { - trace_flags |= old_userobj; + trace_flags |= old_userobj; -for_each_tracing_cpu (cpu) { -atomic_dec (&iter.tr->data[cpu]->disabled); - } -tracing_on (); +for_each_tracing_cpu (cpu) { +atomic_dec (&iter.tr->data[cpu]->disabled); } - - out: -arch_spin_unlock (&ftrace_dump_lock); +atomic_dec (&dump_running);local_irq_restore (flags); } - -/* By default: disable tracing after the dump */ -void ftrace_dump (enum ftrace_dump_mode oops_dump_mode) -{ -__ftrace_dump (true, oops_dump_mode); -}EXPORT_SYMBOL_GPL (ftrace_dump);__init static int tracer_alloc_buffers (void )
kernel/trace/trace_selftest.c +5 -4
@@ -461,8 +461,6 @@ trace_selftest_startup_function(struct t/* Maximum number of functions to trace before diagnosing a hang */ #define GRAPH_MAX_FUNC_TEST 100000000 -static void -__ftrace_dump (bool disable_tracing,enum ftrace_dump_mode oops_dump_mode);static unsigned int graph_hang_thresh;/* Wrap the real function entry probe to avoid possible hanging */
@@ -472,8 +470,11 @@ static int trace_graph_entry_watchdog(stif (unlikely (++graph_hang_thresh >GRAPH_MAX_FUNC_TEST )) {ftrace_graph_stop ();printk (KERN_WARNING "BUG: Function graph tracer hang!\n" ); -if (ftrace_dump_on_oops) -__ftrace_dump (false,DUMP_ALL ); +if (ftrace_dump_on_oops) { +ftrace_dump (DUMP_ALL ); +/* ftrace_dump() disables tracing */ +tracing_on (); + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 25/26 kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Gang <[email protected]>
commit 12b2f117f3bf738c1a00a6f64393f1953a740bd4 upstream.
audit_trim_trees() calls get_tree(). If a failure occurs we must call put_tree().
--- kernel/audit_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/audit_tree.c +1 -1
@@ -608,9 +608,9 @@ void audit_trim_trees(void) }spin_unlock (&hash_lock);trim_marked (tree); -put_tree (tree);drop_collected_mounts (root_mnt); skip_it: +put_tree (tree);mutex_lock (&audit_filter_mutex); }list_del (&cursor);
Greg Kroah-Hartman
maintainerPATCH 26/26 x86/mm: account for PGDIR_SIZE alignment
In reply to Greg Kroah-Hartman3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerry Hoemann <[email protected]>
Patch for -stable. Function find_early_table_space removed upstream.
Fixes panic in alloc_low_page due to pgt_buf overflow during init_memory_mapping.
find_early_table_space sizes pgt_buf based upon the size of the memory being mapped, but it does not take into account the alignment of the memory. When the region being mapped spans a 512GB (PGDIR_SIZE) alignment, a panic from alloc_low_pages occurs.
kernel_physical_mapping_init takes into account PGDIR_SIZE alignment. This causes an extra call to alloc_low_page to be made. This extra call isn't accounted for by find_early_table_space and causes a kernel panic.
Change is to take into account PGDIR_SIZE alignment in find_early_table_space.
--- arch/x86/mm/init.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/mm/init.c +5 -0
@@ -45,11 +45,15 @@ static void __init find_early_table_spacint i;unsigned long puds =0 , pmds =0 , ptes =0 , tables;unsigned long start =0 , good_end; +unsigned long pgd_extra =0 ;phys_addr_t base;for (i =0 ; i < nr_range; i++) {unsigned long range, extra; +if ((mr[i].end >>PGDIR_SHIFT ) - (mr[i].start >>PGDIR_SHIFT )) + pgd_extra++; + range = mr[i].end - mr[i].start; puds += (range +PUD_SIZE -1 ) >>PUD_SHIFT ;
@@ -74,6 +78,7 @@ static void __init find_early_table_spac tables =roundup (puds *sizeof (pud_t),PAGE_SIZE ); tables +=roundup (pmds *sizeof (pmd_t),PAGE_SIZE ); tables +=roundup (ptes *sizeof (pte_t),PAGE_SIZE ); + tables += (pgd_extra *PAGE_SIZE );#ifdef CONFIG_X86_32 /* for fixmap */
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.4.45 release. There are 26 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 me know.
Responses should be made by Sat May 11 22:32:50 UTC 2013. Anything received after that time might be too late.
Quoted 7 lines
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.4.45-rc1.gzand the diffstat can be found below.
thanks,
greg k-h
Patches applied cleanly to 3.0.77, 3.4.44, 3.8.12, and 3.9.1
Compiled and booted on the following systems:
Samsung Series 9 900X4C Intel Corei5:
(3.4.45-rc1, 3.8.13-rc1, and 3.9.2-rc1)
HP ProBook 6475b AMD A10-4600M APU with Radeon(tm) HD Graphics:
(3.0.78-rc1, 3.4.45-rc1, 3.8.13-rc1, and 3.9.2-rc1)dmesgs for all releases look good. No regressions compared to the previous dmesgs for each of these releases.
Cross-compile testing:
HP Compaq dc7700 SFF desktop: x86-64 Intel Core-i2:
(3.0.78-rc1, 3.4.45-rc1, 3.8.13-rc1, and 3.9.2-rc1)
Cross-compile tests results:
alpha: defconfig passed on all
arm: defconfig passed on all
arm64: not applicable to 3.0.y, 3.4.y. defconfig passed on 3.8.y, and 3.9.y
c6x: not applicable to 3.0.y, defconfig passed on 3.4.y, 3.8.y, and 3.9.y
mips: defconfig passed on all
mipsel: defconfig passed on all
powerpc: wii_defconfig passed on all
sh: defconfig passed on all
sparc: defconfig passed on all
tile: tilegx_defconfig passed on all
thanks,
-- Shuah
Shuah Khan, Linux Kernel Developer - Open Source Group Samsung Research America (Silicon Valley) [email protected] | (970) 672-0658
At Thu, 9 May 2013 15:34:14 -0700,
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.4.45 release. There are 26 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 me know.
Responses should be made by Sat May 11 22:32:50 UTC 2013. Anything received after that time might be too late.
This kernel can be built and boot without any problem. Building a kernel with this kernel also works fine.
- Build Machine: debian wheezy x86_64
CPU: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz x 4
memory: 8GB
- Test machine: debian wheezy x86_64(KVM guest on the Build Machine)
vCPU: x2
memory: 2GB
I reviewed the following patch and it looks good to me.
Quoted 2 lines
Chen Gang <[email protected]>
kernel/audit_tree.c: tree will leak memory when failure occurs inaudit_trim_trees()
Thanks,
Satoru