Skip to content

Commit e8e8fad

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Defconfig update microblaze: Optimize CACHE_LOOP_LIMITS and CACHE_RANGE_LOOP macros microblaze: Fix consistent-sync code microblaze: Define correct L1_CACHE_SHIFT value microblaze: cpuinfo shows cache line length microblaze: Fix kmalloc alignment on non-coherent DMA platforms microblaze: Fix typo fault in cache code microblaze: Fix consistent code microblaze: pci-dma: use include/linux/dma-mapping.h microblaze: page.h: Remove get_user_page and free_user_page microblaze: Remove "cache" optimized copy_page function microblaze: invoke oom-killer from page fault microblaze: fix divide by zero exception message microblaze: Add isa_dma_bridge_buggy to dma.h microblaze: Remove ancient code microblaze: Quiet section mismatch warnings for MMU version microblaze: Quiet section mismatch warnings microblaze: Fix IRQ entry/exit ftracing microblaze: resource/PCI: align functions now return start of resource microblaze: PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs
2 parents 325ce9e + 6513412 commit e8e8fad

File tree

24 files changed

+278
-343
lines changed

24 files changed

+278
-343
lines changed

‎arch/microblaze/configs/mmu_defconfig

Lines changed: 51 additions & 7 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.33-rc6
4-
# Wed Feb 3 10:02:59 2010
3+
# Linux kernel version: 2.6.34-rc6
4+
# Thu May 6 11:22:14 2010
55
#
66
CONFIG_MICROBLAZE=y
77
# CONFIG_SWAP is not set
@@ -22,8 +22,6 @@ CONFIG_GENERIC_CSUM=y
2222
CONFIG_STACKTRACE_SUPPORT=y
2323
CONFIG_LOCKDEP_SUPPORT=y
2424
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25-
# CONFIG_PCI is not set
26-
CONFIG_NO_DMA=y
2725
CONFIG_DTC=y
2826
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
2927
CONFIG_CONSTRUCTORS=y
@@ -56,7 +54,6 @@ CONFIG_RCU_FANOUT=32
5654
CONFIG_IKCONFIG=y
5755
CONFIG_IKCONFIG_PROC=y
5856
CONFIG_LOG_BUF_SHIFT=17
59-
# CONFIG_GROUP_SCHED is not set
6057
# CONFIG_CGROUPS is not set
6158
CONFIG_SYSFS_DEPRECATED=y
6259
CONFIG_SYSFS_DEPRECATED_V2=y
@@ -106,6 +103,8 @@ CONFIG_SLAB=y
106103
# CONFIG_SLOB is not set
107104
# CONFIG_PROFILING is not set
108105
CONFIG_HAVE_OPROFILE=y
106+
CONFIG_HAVE_DMA_ATTRS=y
107+
CONFIG_HAVE_DMA_API_DEBUG=y
109108

110109
#
111110
# GCOV-based kernel profiling
@@ -245,13 +244,20 @@ CONFIG_BINFMT_ELF=y
245244
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
246245
# CONFIG_HAVE_AOUT is not set
247246
# CONFIG_BINFMT_MISC is not set
247+
248+
#
249+
# Bus Options
250+
#
251+
# CONFIG_PCI is not set
252+
# CONFIG_PCI_DOMAINS is not set
253+
# CONFIG_PCI_SYSCALL is not set
254+
# CONFIG_ARCH_SUPPORTS_MSI is not set
248255
CONFIG_NET=y
249256

250257
#
251258
# Networking options
252259
#
253260
CONFIG_PACKET=y
254-
# CONFIG_PACKET_MMAP is not set
255261
CONFIG_UNIX=y
256262
CONFIG_XFRM=y
257263
# CONFIG_XFRM_USER is not set
@@ -341,7 +347,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
341347
# CONFIG_SYS_HYPERVISOR is not set
342348
# CONFIG_CONNECTOR is not set
343349
# CONFIG_MTD is not set
350+
CONFIG_OF_FLATTREE=y
344351
CONFIG_OF_DEVICE=y
352+
CONFIG_OF_MDIO=y
345353
# CONFIG_PARPORT is not set
346354
CONFIG_BLK_DEV=y
347355
# CONFIG_BLK_DEV_COW_COMMON is not set
@@ -370,6 +378,7 @@ CONFIG_MISC_DEVICES=y
370378
#
371379
# SCSI device support
372380
#
381+
CONFIG_SCSI_MOD=y
373382
# CONFIG_RAID_ATTRS is not set
374383
# CONFIG_SCSI is not set
375384
# CONFIG_SCSI_DMA is not set
@@ -383,9 +392,30 @@ CONFIG_NETDEVICES=y
383392
# CONFIG_EQUALIZER is not set
384393
# CONFIG_TUN is not set
385394
# CONFIG_VETH is not set
386-
# CONFIG_PHYLIB is not set
395+
CONFIG_PHYLIB=y
396+
397+
#
398+
# MII PHY device drivers
399+
#
400+
# CONFIG_MARVELL_PHY is not set
401+
# CONFIG_DAVICOM_PHY is not set
402+
# CONFIG_QSEMI_PHY is not set
403+
# CONFIG_LXT_PHY is not set
404+
# CONFIG_CICADA_PHY is not set
405+
# CONFIG_VITESSE_PHY is not set
406+
# CONFIG_SMSC_PHY is not set
407+
# CONFIG_BROADCOM_PHY is not set
408+
# CONFIG_ICPLUS_PHY is not set
409+
# CONFIG_REALTEK_PHY is not set
410+
# CONFIG_NATIONAL_PHY is not set
411+
# CONFIG_STE10XP is not set
412+
# CONFIG_LSI_ET1011C_PHY is not set
413+
# CONFIG_MICREL_PHY is not set
414+
# CONFIG_FIXED_PHY is not set
415+
# CONFIG_MDIO_BITBANG is not set
387416
CONFIG_NET_ETHERNET=y
388417
# CONFIG_MII is not set
418+
# CONFIG_ETHOC is not set
389419
# CONFIG_DNET is not set
390420
# CONFIG_IBM_NEW_EMAC_ZMII is not set
391421
# CONFIG_IBM_NEW_EMAC_RGMII is not set
@@ -394,6 +424,7 @@ CONFIG_NET_ETHERNET=y
394424
# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
395425
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
396426
# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
427+
# CONFIG_B44 is not set
397428
# CONFIG_KS8842 is not set
398429
# CONFIG_KS8851_MLL is not set
399430
CONFIG_XILINX_EMACLITE=y
@@ -444,6 +475,7 @@ CONFIG_SERIAL_UARTLITE=y
444475
CONFIG_SERIAL_UARTLITE_CONSOLE=y
445476
CONFIG_SERIAL_CORE=y
446477
CONFIG_SERIAL_CORE_CONSOLE=y
478+
# CONFIG_SERIAL_TIMBERDALE is not set
447479
# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
448480
CONFIG_UNIX98_PTYS=y
449481
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -471,6 +503,12 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
471503
# CONFIG_HWMON is not set
472504
# CONFIG_THERMAL is not set
473505
# CONFIG_WATCHDOG is not set
506+
CONFIG_SSB_POSSIBLE=y
507+
508+
#
509+
# Sonics Silicon Backplane
510+
#
511+
# CONFIG_SSB is not set
474512

475513
#
476514
# Multifunction device drivers
@@ -502,6 +540,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
502540
# CONFIG_NEW_LEDS is not set
503541
# CONFIG_ACCESSIBILITY is not set
504542
# CONFIG_RTC_CLASS is not set
543+
# CONFIG_DMADEVICES is not set
505544
# CONFIG_AUXDISPLAY is not set
506545
# CONFIG_UIO is not set
507546

@@ -572,6 +611,7 @@ CONFIG_MISC_FILESYSTEMS=y
572611
# CONFIG_BEFS_FS is not set
573612
# CONFIG_BFS_FS is not set
574613
# CONFIG_EFS_FS is not set
614+
# CONFIG_LOGFS is not set
575615
# CONFIG_CRAMFS is not set
576616
# CONFIG_SQUASHFS is not set
577617
# CONFIG_VXFS_FS is not set
@@ -595,6 +635,7 @@ CONFIG_SUNRPC=y
595635
# CONFIG_RPCSEC_GSS_KRB5 is not set
596636
# CONFIG_RPCSEC_GSS_SPKM3 is not set
597637
# CONFIG_SMB_FS is not set
638+
# CONFIG_CEPH_FS is not set
598639
CONFIG_CIFS=y
599640
CONFIG_CIFS_STATS=y
600641
CONFIG_CIFS_STATS2=y
@@ -696,6 +737,7 @@ CONFIG_SCHED_DEBUG=y
696737
# CONFIG_DEBUG_OBJECTS is not set
697738
CONFIG_DEBUG_SLAB=y
698739
# CONFIG_DEBUG_SLAB_LEAK is not set
740+
# CONFIG_DEBUG_KMEMLEAK is not set
699741
CONFIG_DEBUG_SPINLOCK=y
700742
# CONFIG_DEBUG_MUTEXES is not set
701743
# CONFIG_DEBUG_LOCK_ALLOC is not set
@@ -741,6 +783,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
741783
# CONFIG_KMEMTRACE is not set
742784
# CONFIG_WORKQUEUE_TRACER is not set
743785
# CONFIG_BLK_DEV_IO_TRACE is not set
786+
# CONFIG_DMA_API_DEBUG is not set
744787
# CONFIG_SAMPLES is not set
745788
CONFIG_EARLY_PRINTK=y
746789
# CONFIG_HEART_BEAT is not set
@@ -862,5 +905,6 @@ CONFIG_ZLIB_INFLATE=y
862905
CONFIG_DECOMPRESS_GZIP=y
863906
CONFIG_HAS_IOMEM=y
864907
CONFIG_HAS_IOPORT=y
908+
CONFIG_HAS_DMA=y
865909
CONFIG_HAVE_LMB=y
866910
CONFIG_NLATTR=y

‎arch/microblaze/configs/nommu_defconfig

Lines changed: 33 additions & 6 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.33-rc6
4-
# Wed Feb 3 10:03:21 2010
3+
# Linux kernel version: 2.6.34-rc6
4+
# Thu May 6 11:25:12 2010
55
#
66
CONFIG_MICROBLAZE=y
77
# CONFIG_SWAP is not set
@@ -22,8 +22,6 @@ CONFIG_GENERIC_CSUM=y
2222
CONFIG_STACKTRACE_SUPPORT=y
2323
CONFIG_LOCKDEP_SUPPORT=y
2424
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
25-
# CONFIG_PCI is not set
26-
CONFIG_NO_DMA=y
2725
CONFIG_DTC=y
2826
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
2927
CONFIG_CONSTRUCTORS=y
@@ -58,7 +56,6 @@ CONFIG_RCU_FANOUT=32
5856
CONFIG_IKCONFIG=y
5957
CONFIG_IKCONFIG_PROC=y
6058
CONFIG_LOG_BUF_SHIFT=17
61-
# CONFIG_GROUP_SCHED is not set
6259
# CONFIG_CGROUPS is not set
6360
CONFIG_SYSFS_DEPRECATED=y
6461
CONFIG_SYSFS_DEPRECATED_V2=y
@@ -96,6 +93,8 @@ CONFIG_SLAB=y
9693
# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set
9794
# CONFIG_PROFILING is not set
9895
CONFIG_HAVE_OPROFILE=y
96+
CONFIG_HAVE_DMA_ATTRS=y
97+
CONFIG_HAVE_DMA_API_DEBUG=y
9998

10099
#
101100
# GCOV-based kernel profiling
@@ -209,11 +208,14 @@ CONFIG_PROC_DEVICETREE=y
209208
#
210209
# Advanced setup
211210
#
211+
# CONFIG_ADVANCED_OPTIONS is not set
212212

213213
#
214214
# Default settings for advanced configuration options are used
215215
#
216+
CONFIG_LOWMEM_SIZE=0x30000000
216217
CONFIG_KERNEL_START=0x90000000
218+
CONFIG_TASK_SIZE=0x80000000
217219
CONFIG_SELECT_MEMORY_MODEL=y
218220
CONFIG_FLATMEM_MANUAL=y
219221
# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -235,13 +237,20 @@ CONFIG_BINFMT_FLAT=y
235237
# CONFIG_BINFMT_SHARED_FLAT is not set
236238
# CONFIG_HAVE_AOUT is not set
237239
# CONFIG_BINFMT_MISC is not set
240+
241+
#
242+
# Bus Options
243+
#
244+
# CONFIG_PCI is not set
245+
# CONFIG_PCI_DOMAINS is not set
246+
# CONFIG_PCI_SYSCALL is not set
247+
# CONFIG_ARCH_SUPPORTS_MSI is not set
238248
CONFIG_NET=y
239249

240250
#
241251
# Networking options
242252
#
243253
CONFIG_PACKET=y
244-
# CONFIG_PACKET_MMAP is not set
245254
CONFIG_UNIX=y
246255
CONFIG_XFRM=y
247256
# CONFIG_XFRM_USER is not set
@@ -413,6 +422,7 @@ CONFIG_MTD_UCLINUX=y
413422
# UBI - Unsorted block images
414423
#
415424
# CONFIG_MTD_UBI is not set
425+
CONFIG_OF_FLATTREE=y
416426
CONFIG_OF_DEVICE=y
417427
# CONFIG_PARPORT is not set
418428
CONFIG_BLK_DEV=y
@@ -442,6 +452,7 @@ CONFIG_MISC_DEVICES=y
442452
#
443453
# SCSI device support
444454
#
455+
CONFIG_SCSI_MOD=y
445456
# CONFIG_RAID_ATTRS is not set
446457
# CONFIG_SCSI is not set
447458
# CONFIG_SCSI_DMA is not set
@@ -458,6 +469,7 @@ CONFIG_NETDEVICES=y
458469
# CONFIG_PHYLIB is not set
459470
CONFIG_NET_ETHERNET=y
460471
# CONFIG_MII is not set
472+
# CONFIG_ETHOC is not set
461473
# CONFIG_DNET is not set
462474
# CONFIG_IBM_NEW_EMAC_ZMII is not set
463475
# CONFIG_IBM_NEW_EMAC_RGMII is not set
@@ -466,6 +478,7 @@ CONFIG_NET_ETHERNET=y
466478
# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
467479
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
468480
# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
481+
# CONFIG_B44 is not set
469482
# CONFIG_KS8842 is not set
470483
# CONFIG_KS8851_MLL is not set
471484
# CONFIG_XILINX_EMACLITE is not set
@@ -516,6 +529,7 @@ CONFIG_SERIAL_UARTLITE=y
516529
CONFIG_SERIAL_UARTLITE_CONSOLE=y
517530
CONFIG_SERIAL_CORE=y
518531
CONFIG_SERIAL_CORE_CONSOLE=y
532+
# CONFIG_SERIAL_TIMBERDALE is not set
519533
# CONFIG_SERIAL_GRLIB_GAISLER_APBUART is not set
520534
CONFIG_UNIX98_PTYS=y
521535
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
@@ -544,6 +558,12 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
544558
# CONFIG_HWMON is not set
545559
# CONFIG_THERMAL is not set
546560
# CONFIG_WATCHDOG is not set
561+
CONFIG_SSB_POSSIBLE=y
562+
563+
#
564+
# Sonics Silicon Backplane
565+
#
566+
# CONFIG_SSB is not set
547567

548568
#
549569
# Multifunction device drivers
@@ -593,6 +613,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
593613
# CONFIG_NEW_LEDS is not set
594614
# CONFIG_ACCESSIBILITY is not set
595615
# CONFIG_RTC_CLASS is not set
616+
# CONFIG_DMADEVICES is not set
596617
# CONFIG_AUXDISPLAY is not set
597618
# CONFIG_UIO is not set
598619

@@ -661,6 +682,7 @@ CONFIG_MISC_FILESYSTEMS=y
661682
# CONFIG_BFS_FS is not set
662683
# CONFIG_EFS_FS is not set
663684
# CONFIG_JFFS2_FS is not set
685+
# CONFIG_LOGFS is not set
664686
CONFIG_CRAMFS=y
665687
# CONFIG_SQUASHFS is not set
666688
# CONFIG_VXFS_FS is not set
@@ -689,6 +711,7 @@ CONFIG_SUNRPC=y
689711
# CONFIG_RPCSEC_GSS_KRB5 is not set
690712
# CONFIG_RPCSEC_GSS_SPKM3 is not set
691713
# CONFIG_SMB_FS is not set
714+
# CONFIG_CEPH_FS is not set
692715
# CONFIG_CIFS is not set
693716
# CONFIG_NCP_FS is not set
694717
# CONFIG_CODA_FS is not set
@@ -733,6 +756,7 @@ CONFIG_DEBUG_OBJECTS_TIMERS=y
733756
# CONFIG_DEBUG_OBJECTS_WORK is not set
734757
CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1
735758
# CONFIG_DEBUG_SLAB is not set
759+
# CONFIG_DEBUG_KMEMLEAK is not set
736760
# CONFIG_DEBUG_RT_MUTEXES is not set
737761
# CONFIG_RT_MUTEX_TESTER is not set
738762
# CONFIG_DEBUG_SPINLOCK is not set
@@ -758,6 +782,7 @@ CONFIG_DEBUG_SG=y
758782
# CONFIG_BACKTRACE_SELF_TEST is not set
759783
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
760784
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
785+
# CONFIG_LKDTM is not set
761786
# CONFIG_FAULT_INJECTION is not set
762787
# CONFIG_LATENCYTOP is not set
763788
CONFIG_SYSCTL_SYSCALL_CHECK=y
@@ -782,6 +807,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
782807
# CONFIG_WORKQUEUE_TRACER is not set
783808
# CONFIG_BLK_DEV_IO_TRACE is not set
784809
# CONFIG_DYNAMIC_DEBUG is not set
810+
# CONFIG_DMA_API_DEBUG is not set
785811
# CONFIG_SAMPLES is not set
786812
CONFIG_EARLY_PRINTK=y
787813
# CONFIG_HEART_BEAT is not set
@@ -901,5 +927,6 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
901927
CONFIG_ZLIB_INFLATE=y
902928
CONFIG_HAS_IOMEM=y
903929
CONFIG_HAS_IOPORT=y
930+
CONFIG_HAS_DMA=y
904931
CONFIG_HAVE_LMB=y
905932
CONFIG_NLATTR=y

‎arch/microblaze/include/asm/cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include <asm/registers.h>
1717

18-
#define L1_CACHE_SHIFT 2
18+
#define L1_CACHE_SHIFT 5
1919
/* word-granular cache in microblaze */
2020
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2121

‎arch/microblaze/include/asm/dma.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,10 @@
1818
#define MAX_DMA_ADDRESS (CONFIG_KERNEL_START + memory_size - 1)
1919
#endif
2020

21+
#ifdef CONFIG_PCI
22+
extern int isa_dma_bridge_buggy;
23+
#else
24+
#define isa_dma_bridge_buggy (0)
25+
#endif
26+
2127
#endif /* _ASM_MICROBLAZE_DMA_H */

‎arch/microblaze/include/asm/exceptions.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,6 @@ asmlinkage void full_exception(struct pt_regs *regs, unsigned int type,
6464
void die(const char *str, struct pt_regs *fp, long err);
6565
void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr);
6666

67-
#ifdef CONFIG_MMU
68-
void __bug(const char *file, int line, void *data);
69-
int bad_trap(int trap_num, struct pt_regs *regs);
70-
int debug_trap(struct pt_regs *regs);
71-
#endif /* CONFIG_MMU */
72-
7367
#if defined(CONFIG_KGDB)
7468
void (*debugger)(struct pt_regs *regs);
7569
int (*debugger_bpt)(struct pt_regs *regs);

0 commit comments

Comments
 (0)