Skip to content

Commit 01f6750

Browse files
torvaldstorvalds
committed
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: radeonfb/aty128fb: Disable broken early resume hook for PowerBooks hvc_console: Remove tty->low_latency on pseries backends powerpc: fix linkstation and storcenter compilation breakage powerpc/4xx: Enable SERIAL_OF support by default for Virtex platforms
2 parents 932088b + d801cec commit 01f6750

File tree

10 files changed

+64
-111
lines changed

10 files changed

+64
-111
lines changed

‎arch/powerpc/configs/40x/virtex_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y
686686
CONFIG_SERIAL_CORE=y
687687
CONFIG_SERIAL_CORE_CONSOLE=y
688688
# CONFIG_SERIAL_JSM is not set
689-
# CONFIG_SERIAL_OF_PLATFORM is not set
689+
CONFIG_SERIAL_OF_PLATFORM=y
690690
# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
691691
CONFIG_UNIX98_PTYS=y
692692
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

‎arch/powerpc/configs/44x/virtex5_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y
691691
CONFIG_SERIAL_CORE=y
692692
CONFIG_SERIAL_CORE_CONSOLE=y
693693
# CONFIG_SERIAL_JSM is not set
694-
# CONFIG_SERIAL_OF_PLATFORM is not set
694+
CONFIG_SERIAL_OF_PLATFORM=y
695695
# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
696696
CONFIG_UNIX98_PTYS=y
697697
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set

‎arch/powerpc/configs/linkstation_defconfig‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Linux kernel version: 2.6.29-rc2
4-
# Mon Jan 26 15:35:29 2009
3+
# Linux kernel version: 2.6.29-rc6
4+
# Fri Mar 6 00:07:38 2009
55
#
66
# CONFIG_PPC64 is not set
77

@@ -71,6 +71,15 @@ CONFIG_POSIX_MQUEUE=y
7171
# CONFIG_BSD_PROCESS_ACCT is not set
7272
# CONFIG_TASKSTATS is not set
7373
# CONFIG_AUDIT is not set
74+
75+
#
76+
# RCU Subsystem
77+
#
78+
CONFIG_CLASSIC_RCU=y
79+
# CONFIG_TREE_RCU is not set
80+
# CONFIG_PREEMPT_RCU is not set
81+
# CONFIG_TREE_RCU_TRACE is not set
82+
# CONFIG_PREEMPT_RCU_TRACE is not set
7483
CONFIG_IKCONFIG=y
7584
CONFIG_IKCONFIG_PROC=y
7685
CONFIG_LOG_BUF_SHIFT=14
@@ -88,6 +97,7 @@ CONFIG_NAMESPACES=y
8897
# CONFIG_IPC_NS is not set
8998
# CONFIG_USER_NS is not set
9099
# CONFIG_PID_NS is not set
100+
# CONFIG_NET_NS is not set
91101
CONFIG_BLK_DEV_INITRD=y
92102
CONFIG_INITRAMFS_SOURCE=""
93103
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -153,11 +163,6 @@ CONFIG_DEFAULT_AS=y
153163
# CONFIG_DEFAULT_CFQ is not set
154164
# CONFIG_DEFAULT_NOOP is not set
155165
CONFIG_DEFAULT_IOSCHED="anticipatory"
156-
CONFIG_CLASSIC_RCU=y
157-
# CONFIG_TREE_RCU is not set
158-
# CONFIG_PREEMPT_RCU is not set
159-
# CONFIG_TREE_RCU_TRACE is not set
160-
# CONFIG_PREEMPT_RCU_TRACE is not set
161166
# CONFIG_FREEZER is not set
162167

163168
#
@@ -294,7 +299,6 @@ CONFIG_NET=y
294299
#
295300
# Networking options
296301
#
297-
# CONFIG_NET_NS is not set
298302
CONFIG_COMPAT_NET_DEV_OPS=y
299303
CONFIG_PACKET=y
300304
CONFIG_PACKET_MMAP=y
@@ -508,8 +512,8 @@ CONFIG_MTD_CONCAT=y
508512
CONFIG_MTD_PARTITIONS=y
509513
# CONFIG_MTD_TESTS is not set
510514
# CONFIG_MTD_REDBOOT_PARTS is not set
511-
# CONFIG_MTD_CMDLINE_PARTS is not set
512-
# CONFIG_MTD_OF_PARTS is not set
515+
CONFIG_MTD_CMDLINE_PARTS=y
516+
CONFIG_MTD_OF_PARTS=y
513517
# CONFIG_MTD_AR7_PARTS is not set
514518

515519
#
@@ -587,7 +591,6 @@ CONFIG_MTD_PHYSMAP=y
587591
# LPDDR flash memory drivers
588592
#
589593
# CONFIG_MTD_LPDDR is not set
590-
# CONFIG_MTD_QINFO_PROBE is not set
591594

592595
#
593596
# UBI - Unsorted block images
@@ -617,13 +620,19 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
617620
# CONFIG_BLK_DEV_HD is not set
618621
CONFIG_MISC_DEVICES=y
619622
# CONFIG_PHANTOM is not set
620-
# CONFIG_EEPROM_93CX6 is not set
621623
# CONFIG_SGI_IOC4 is not set
622624
# CONFIG_TIFM_CORE is not set
623625
# CONFIG_ICS932S401 is not set
624626
# CONFIG_ENCLOSURE_SERVICES is not set
625627
# CONFIG_HP_ILO is not set
626628
# CONFIG_C2PORT is not set
629+
630+
#
631+
# EEPROM support
632+
#
633+
# CONFIG_EEPROM_AT24 is not set
634+
CONFIG_EEPROM_LEGACY=m
635+
# CONFIG_EEPROM_93CX6 is not set
627636
CONFIG_HAVE_IDE=y
628637
# CONFIG_IDE is not set
629638

@@ -839,6 +848,7 @@ CONFIG_R8169=y
839848
# CONFIG_QLA3XXX is not set
840849
# CONFIG_ATL1 is not set
841850
# CONFIG_ATL1E is not set
851+
# CONFIG_ATL1C is not set
842852
# CONFIG_JME is not set
843853
CONFIG_NETDEV_10000=y
844854
# CONFIG_CHELSIO_T1 is not set
@@ -1037,8 +1047,6 @@ CONFIG_I2C_MPC=y
10371047
# Miscellaneous I2C Chip support
10381048
#
10391049
# CONFIG_DS1682 is not set
1040-
# CONFIG_EEPROM_AT24 is not set
1041-
CONFIG_EEPROM_LEGACY=m
10421050
# CONFIG_SENSORS_PCF8574 is not set
10431051
# CONFIG_PCF8575 is not set
10441052
# CONFIG_SENSORS_PCA9539 is not set

‎arch/powerpc/configs/storcenter_defconfig‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Linux kernel version: 2.6.29-rc2
4-
# Mon Jan 26 15:35:46 2009
3+
# Linux kernel version: 2.6.29-rc6
4+
# Fri Mar 6 00:09:08 2009
55
#
66
# CONFIG_PPC64 is not set
77

@@ -71,6 +71,15 @@ CONFIG_SYSVIPC_SYSCTL=y
7171
# CONFIG_BSD_PROCESS_ACCT is not set
7272
# CONFIG_TASKSTATS is not set
7373
# CONFIG_AUDIT is not set
74+
75+
#
76+
# RCU Subsystem
77+
#
78+
CONFIG_CLASSIC_RCU=y
79+
# CONFIG_TREE_RCU is not set
80+
# CONFIG_PREEMPT_RCU is not set
81+
# CONFIG_TREE_RCU_TRACE is not set
82+
# CONFIG_PREEMPT_RCU_TRACE is not set
7483
# CONFIG_IKCONFIG is not set
7584
CONFIG_LOG_BUF_SHIFT=14
7685
CONFIG_GROUP_SCHED=y
@@ -144,11 +153,6 @@ CONFIG_IOSCHED_CFQ=y
144153
CONFIG_DEFAULT_CFQ=y
145154
# CONFIG_DEFAULT_NOOP is not set
146155
CONFIG_DEFAULT_IOSCHED="cfq"
147-
CONFIG_CLASSIC_RCU=y
148-
# CONFIG_TREE_RCU is not set
149-
# CONFIG_PREEMPT_RCU is not set
150-
# CONFIG_TREE_RCU_TRACE is not set
151-
# CONFIG_PREEMPT_RCU_TRACE is not set
152156
# CONFIG_FREEZER is not set
153157

154158
#
@@ -377,8 +381,8 @@ CONFIG_MTD=y
377381
CONFIG_MTD_PARTITIONS=y
378382
# CONFIG_MTD_TESTS is not set
379383
# CONFIG_MTD_REDBOOT_PARTS is not set
380-
# CONFIG_MTD_CMDLINE_PARTS is not set
381-
# CONFIG_MTD_OF_PARTS is not set
384+
CONFIG_MTD_CMDLINE_PARTS=y
385+
CONFIG_MTD_OF_PARTS=y
382386
# CONFIG_MTD_AR7_PARTS is not set
383387

384388
#
@@ -452,7 +456,6 @@ CONFIG_MTD_PHYSMAP=y
452456
# LPDDR flash memory drivers
453457
#
454458
# CONFIG_MTD_LPDDR is not set
455-
# CONFIG_MTD_QINFO_PROBE is not set
456459

457460
#
458461
# UBI - Unsorted block images
@@ -478,13 +481,19 @@ CONFIG_BLK_DEV=y
478481
# CONFIG_BLK_DEV_HD is not set
479482
CONFIG_MISC_DEVICES=y
480483
# CONFIG_PHANTOM is not set
481-
# CONFIG_EEPROM_93CX6 is not set
482484
# CONFIG_SGI_IOC4 is not set
483485
# CONFIG_TIFM_CORE is not set
484486
# CONFIG_ICS932S401 is not set
485487
# CONFIG_ENCLOSURE_SERVICES is not set
486488
# CONFIG_HP_ILO is not set
487489
# CONFIG_C2PORT is not set
490+
491+
#
492+
# EEPROM support
493+
#
494+
# CONFIG_EEPROM_AT24 is not set
495+
# CONFIG_EEPROM_LEGACY is not set
496+
# CONFIG_EEPROM_93CX6 is not set
488497
CONFIG_HAVE_IDE=y
489498
CONFIG_IDE=y
490499

@@ -677,6 +686,7 @@ CONFIG_R8169=y
677686
# CONFIG_QLA3XXX is not set
678687
# CONFIG_ATL1 is not set
679688
# CONFIG_ATL1E is not set
689+
# CONFIG_ATL1C is not set
680690
# CONFIG_JME is not set
681691
# CONFIG_NETDEV_10000 is not set
682692
# CONFIG_TR is not set
@@ -818,8 +828,6 @@ CONFIG_I2C_MPC=y
818828
# Miscellaneous I2C Chip support
819829
#
820830
# CONFIG_DS1682 is not set
821-
# CONFIG_EEPROM_AT24 is not set
822-
# CONFIG_EEPROM_LEGACY is not set
823831
# CONFIG_SENSORS_PCF8574 is not set
824832
# CONFIG_PCF8575 is not set
825833
# CONFIG_SENSORS_PCA9539 is not set
@@ -1159,6 +1167,7 @@ CONFIG_JFFS2_RTIME=y
11591167
# CONFIG_SYSV_FS is not set
11601168
# CONFIG_UFS_FS is not set
11611169
# CONFIG_NETWORK_FILESYSTEMS is not set
1170+
CONFIG_EXPORTFS=m
11621171

11631172
#
11641173
# Partition Types

‎arch/powerpc/platforms/embedded6xx/linkstation.c‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#include <linux/kernel.h>
1414
#include <linux/initrd.h>
15-
#include <linux/mtd/physmap.h>
1615
#include <linux/of_platform.h>
1716

1817
#include <asm/time.h>
@@ -22,39 +21,6 @@
2221

2322
#include "mpc10x.h"
2423

25-
static struct mtd_partition linkstation_physmap_partitions[] = {
26-
{
27-
.name = "mtd_firmimg",
28-
.offset = 0x000000,
29-
.size = 0x300000,
30-
},
31-
{
32-
.name = "mtd_bootcode",
33-
.offset = 0x300000,
34-
.size = 0x070000,
35-
},
36-
{
37-
.name = "mtd_status",
38-
.offset = 0x370000,
39-
.size = 0x010000,
40-
},
41-
{
42-
.name = "mtd_conf",
43-
.offset = 0x380000,
44-
.size = 0x080000,
45-
},
46-
{
47-
.name = "mtd_allflash",
48-
.offset = 0x000000,
49-
.size = 0x400000,
50-
},
51-
{
52-
.name = "mtd_data",
53-
.offset = 0x310000,
54-
.size = 0x0f0000,
55-
},
56-
};
57-
5824
static __initdata struct of_device_id of_bus_ids[] = {
5925
{ .type = "soc", },
6026
{ .compatible = "simple-bus", },
@@ -99,10 +65,6 @@ static int __init linkstation_add_bridge(struct device_node *dev)
9965
static void __init linkstation_setup_arch(void)
10066
{
10167
struct device_node *np;
102-
#ifdef CONFIG_MTD_PHYSMAP
103-
physmap_set_partitions(linkstation_physmap_partitions,
104-
ARRAY_SIZE(linkstation_physmap_partitions));
105-
#endif
10668

10769
/* Lookup PCI host bridges */
10870
for_each_compatible_node(np, "pci", "mpc10x-pci")

‎arch/powerpc/platforms/embedded6xx/storcenter.c‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <linux/kernel.h>
1515
#include <linux/pci.h>
1616
#include <linux/initrd.h>
17-
#include <linux/mtd/physmap.h>
1817
#include <linux/of_platform.h>
1918

2019
#include <asm/system.h>
@@ -26,32 +25,6 @@
2625
#include "mpc10x.h"
2726

2827

29-
#ifdef CONFIG_MTD_PHYSMAP
30-
static struct mtd_partition storcenter_physmap_partitions[] = {
31-
{
32-
.name = "kernel",
33-
.offset = 0x000000,
34-
.size = 0x170000,
35-
},
36-
{
37-
.name = "rootfs",
38-
.offset = 0x170000,
39-
.size = 0x590000,
40-
},
41-
{
42-
.name = "uboot",
43-
.offset = 0x700000,
44-
.size = 0x040000,
45-
},
46-
{
47-
.name = "config",
48-
.offset = 0x740000,
49-
.size = 0x0c0000,
50-
},
51-
};
52-
#endif
53-
54-
5528
static __initdata struct of_device_id storcenter_of_bus[] = {
5629
{ .name = "soc", },
5730
{},
@@ -96,11 +69,6 @@ static void __init storcenter_setup_arch(void)
9669
{
9770
struct device_node *np;
9871

99-
#ifdef CONFIG_MTD_PHYSMAP
100-
physmap_set_partitions(storcenter_physmap_partitions,
101-
ARRAY_SIZE(storcenter_physmap_partitions));
102-
#endif
103-
10472
/* Lookup PCI host bridges */
10573
for_each_compatible_node(np, "pci", "mpc10x-pci")
10674
storcenter_add_bridge(np);

‎drivers/char/hvcs.c‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,15 +1139,6 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
11391139
hvcsd->tty = tty;
11401140
tty->driver_data = hvcsd;
11411141

1142-
/*
1143-
* Set this driver to low latency so that we actually have a chance at
1144-
* catching a throttled TTY after we flip_buffer_push. Otherwise the
1145-
* flush_to_async may not execute until after the kernel_thread has
1146-
* yielded and resumed the next flip_buffer_push resulting in data
1147-
* loss.
1148-
*/
1149-
tty->low_latency = 1;
1150-
11511142
memset(&hvcsd->buffer[0], 0x00, HVCS_BUFF_LEN);
11521143

11531144
/*

‎drivers/char/hvsi.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,6 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
810810
hp = &hvsi_ports[line];
811811

812812
tty->driver_data = hp;
813-
tty->low_latency = 1; /* avoid throttle/tty_flip_buffer_push race */
814813

815814
mb();
816815
if (hp->state == HVSI_FSP_DIED)

‎drivers/video/aty/aty128fb.c‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1853,13 +1853,14 @@ static void aty128_bl_exit(struct backlight_device *bd)
18531853
* Initialisation
18541854
*/
18551855

1856-
#ifdef CONFIG_PPC_PMAC
1856+
#ifdef CONFIG_PPC_PMAC__disabled
18571857
static void aty128_early_resume(void *data)
18581858
{
18591859
struct aty128fb_par *par = data;
18601860

18611861
if (try_acquire_console_sem())
18621862
return;
1863+
pci_restore_state(par->pdev);
18631864
aty128_do_resume(par->pdev);
18641865
release_console_sem();
18651866
}
@@ -1907,7 +1908,14 @@ static int __devinit aty128_init(struct pci_dev *pdev, const struct pci_device_i
19071908
/* Indicate sleep capability */
19081909
if (par->chip_gen == rage_M3) {
19091910
pmac_call_feature(PMAC_FTR_DEVICE_CAN_WAKE, NULL, 0, 1);
1911+
#if 0 /* Disable the early video resume hack for now as it's causing problems, among
1912+
* others we now rely on the PCI core restoring the config space for us, which
1913+
* isn't the case with that hack, and that code path causes various things to
1914+
* be called with interrupts off while they shouldn't. I'm leaving the code in
1915+
* as it can be useful for debugging purposes
1916+
*/
19101917
pmac_set_early_video_resume(aty128_early_resume, par);
1918+
#endif
19111919
}
19121920

19131921
/* Find default mode */

0 commit comments

Comments
 (0)