mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-12 07:31:30 +03:00
nuke broadcom 2.6.21 patches - 2.6.22-rc6 is more stable and more up to date
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7836 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
6b70f7ae81
commit
91c8022bf8
@ -1,202 +0,0 @@
|
||||
diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig
|
||||
--- linux.old/arch/mips/Kconfig 2007-01-26 00:51:33.000000000 +0100
|
||||
+++ linux.dev/arch/mips/Kconfig 2007-01-26 00:51:18.000000000 +0100
|
||||
@@ -4,6 +4,10 @@
|
||||
# Horrible source of confusion. Die, die, die ...
|
||||
select EMBEDDED
|
||||
|
||||
+config CFE
|
||||
+ bool
|
||||
+ # Common Firmware Environment
|
||||
+
|
||||
mainmenu "Linux/MIPS Kernel Configuration"
|
||||
|
||||
menu "Machine selection"
|
||||
@@ -240,6 +240,23 @@
|
||||
Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
|
||||
Olivetti M700-10 workstations.
|
||||
|
||||
+config BCM947XX
|
||||
+ bool "Support for BCM947xx based boards"
|
||||
+ select DMA_NONCOHERENT
|
||||
+ select HW_HAS_PCI
|
||||
+ select IRQ_CPU
|
||||
+ select SYS_HAS_CPU_MIPS32_R1
|
||||
+ select SYS_SUPPORTS_32BIT_KERNEL
|
||||
+ select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||
+ select SSB
|
||||
+ select SSB_SERIAL
|
||||
+ select SSB_DRIVER_PCICORE
|
||||
+ select SSB_PCICORE_HOSTMODE
|
||||
+ select CFE
|
||||
+ select GENERIC_GPIO
|
||||
+ help
|
||||
+ Support for BCM947xx based boards
|
||||
+
|
||||
config LASAT
|
||||
bool "LASAT Networks platforms"
|
||||
select DMA_NONCOHERENT
|
||||
diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-probe.c
|
||||
--- linux.old/arch/mips/kernel/cpu-probe.c 2007-01-26 00:51:33.000000000 +0100
|
||||
+++ linux.dev/arch/mips/kernel/cpu-probe.c 2007-01-25 23:34:01.000000000 +0100
|
||||
@@ -711,6 +711,28 @@
|
||||
}
|
||||
|
||||
|
||||
+static inline void cpu_probe_broadcom(struct cpuinfo_mips *c)
|
||||
+{
|
||||
+ decode_config1(c);
|
||||
+ switch (c->processor_id & 0xff00) {
|
||||
+ case PRID_IMP_BCM3302:
|
||||
+ c->cputype = CPU_BCM3302;
|
||||
+ c->isa_level = MIPS_CPU_ISA_M32R1;
|
||||
+ c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
|
||||
+ MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER;
|
||||
+ break;
|
||||
+ case PRID_IMP_BCM4710:
|
||||
+ c->cputype = CPU_BCM4710;
|
||||
+ c->isa_level = MIPS_CPU_ISA_M32R1;
|
||||
+ c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
|
||||
+ MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER;
|
||||
+ break;
|
||||
+ default:
|
||||
+ c->cputype = CPU_UNKNOWN;
|
||||
+ break;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
__init void cpu_probe(void)
|
||||
{
|
||||
struct cpuinfo_mips *c = ¤t_cpu_data;
|
||||
@@ -733,6 +755,9 @@
|
||||
case PRID_COMP_SIBYTE:
|
||||
cpu_probe_sibyte(c);
|
||||
break;
|
||||
+ case PRID_COMP_BROADCOM:
|
||||
+ cpu_probe_broadcom(c);
|
||||
+ break;
|
||||
case PRID_COMP_SANDCRAFT:
|
||||
cpu_probe_sandcraft(c);
|
||||
break;
|
||||
diff -urN linux.old/arch/mips/kernel/proc.c linux.dev/arch/mips/kernel/proc.c
|
||||
--- linux.old/arch/mips/kernel/proc.c 2007-01-26 00:51:33.000000000 +0100
|
||||
+++ linux.dev/arch/mips/kernel/proc.c 2007-01-25 23:34:01.000000000 +0100
|
||||
@@ -83,6 +83,8 @@
|
||||
[CPU_VR4181] = "NEC VR4181",
|
||||
[CPU_VR4181A] = "NEC VR4181A",
|
||||
[CPU_SR71000] = "Sandcraft SR71000",
|
||||
+ [CPU_BCM3302] = "Broadcom BCM3302",
|
||||
+ [CPU_BCM4710] = "Broadcom BCM4710",
|
||||
[CPU_PR4450] = "Philips PR4450",
|
||||
};
|
||||
|
||||
diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile
|
||||
--- linux.old/arch/mips/Makefile 2007-01-26 00:51:33.000000000 +0100
|
||||
+++ linux.dev/arch/mips/Makefile 2007-01-25 23:34:01.000000000 +0100
|
||||
@@ -576,6 +576,18 @@
|
||||
load-$(CONFIG_SIBYTE_BIGSUR) := 0xffffffff80100000
|
||||
|
||||
#
|
||||
+# Broadcom BCM47XX boards
|
||||
+#
|
||||
+core-$(CONFIG_BCM947XX) += arch/mips/bcm947xx/
|
||||
+cflags-$(CONFIG_BCM947XX) += -Iarch/mips/bcm947xx/include -Iinclude/asm-mips/mach-bcm947xx
|
||||
+load-$(CONFIG_BCM947XX) := 0xffffffff80001000
|
||||
+
|
||||
+#
|
||||
+# Common Firmware Environment
|
||||
+#
|
||||
+core-$(CONFIG_CFE) += arch/mips/cfe/
|
||||
+
|
||||
+#
|
||||
# SNI RM
|
||||
#
|
||||
core-$(CONFIG_SNI_RM) += arch/mips/sni/
|
||||
diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
|
||||
--- linux.old/arch/mips/mm/tlbex.c 2007-01-26 00:51:33.000000000 +0100
|
||||
+++ linux.dev/arch/mips/mm/tlbex.c 2007-01-25 23:34:01.000000000 +0100
|
||||
@@ -892,6 +892,8 @@
|
||||
case CPU_4KSC:
|
||||
case CPU_20KC:
|
||||
case CPU_25KF:
|
||||
+ case CPU_BCM3302:
|
||||
+ case CPU_BCM4710:
|
||||
tlbw(p);
|
||||
break;
|
||||
|
||||
diff -urN linux.old/drivers/Kconfig linux.dev/drivers/Kconfig
|
||||
--- linux.old/drivers/Kconfig 2007-01-26 00:51:33.000000000 +0100
|
||||
+++ linux.dev/drivers/Kconfig 2007-01-25 23:34:01.000000000 +0100
|
||||
@@ -56,6 +56,8 @@
|
||||
|
||||
source "drivers/hwmon/Kconfig"
|
||||
|
||||
+source "drivers/ssb/Kconfig"
|
||||
+
|
||||
source "drivers/mfd/Kconfig"
|
||||
|
||||
source "drivers/media/Kconfig"
|
||||
diff -urN linux.old/drivers/Makefile linux.dev/drivers/Makefile
|
||||
--- linux.old/drivers/Makefile 2007-01-26 00:51:33.000000000 +0100
|
||||
+++ linux.dev/drivers/Makefile 2007-01-25 23:34:01.000000000 +0100
|
||||
@@ -81,3 +81,4 @@
|
||||
obj-$(CONFIG_DMA_ENGINE) += dma/
|
||||
obj-$(CONFIG_HID) += hid/
|
||||
obj-$(CONFIG_PPC_PS3) += ps3/
|
||||
+obj-$(CONFIG_SSB) += ssb/
|
||||
diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h
|
||||
--- linux.old/include/asm-mips/bootinfo.h 2007-01-26 00:51:33.000000000 +0100
|
||||
+++ linux.dev/include/asm-mips/bootinfo.h 2007-01-25 23:34:01.000000000 +0100
|
||||
@@ -213,6 +213,12 @@
|
||||
#define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */
|
||||
#define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */
|
||||
|
||||
+/*
|
||||
+ * Valid machtype for group Broadcom
|
||||
+ */
|
||||
+#define MACH_GROUP_BRCM 23 /* Broadcom */
|
||||
+#define MACH_BCM47XX 1 /* Broadcom BCM47xx */
|
||||
+
|
||||
#define CL_SIZE COMMAND_LINE_SIZE
|
||||
|
||||
const char *get_system_type(void);
|
||||
diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h
|
||||
--- linux.old/include/asm-mips/cpu.h 2007-01-26 00:51:33.000000000 +0100
|
||||
+++ linux.dev/include/asm-mips/cpu.h 2007-01-25 23:34:01.000000000 +0100
|
||||
@@ -104,6 +104,13 @@
|
||||
#define PRID_IMP_SR71000 0x0400
|
||||
|
||||
/*
|
||||
+ * These are the PRID's for when 23:16 == PRID_COMP_BROADCOM
|
||||
+ */
|
||||
+
|
||||
+#define PRID_IMP_BCM4710 0x4000
|
||||
+#define PRID_IMP_BCM3302 0x9000
|
||||
+
|
||||
+/*
|
||||
* Definitions for 7:0 on legacy processors
|
||||
*/
|
||||
|
||||
@@ -200,7 +207,9 @@
|
||||
#define CPU_SB1A 62
|
||||
#define CPU_74K 63
|
||||
#define CPU_R14000 64
|
||||
-#define CPU_LAST 64
|
||||
+#define CPU_BCM3302 65
|
||||
+#define CPU_BCM4710 66
|
||||
+#define CPU_LAST 66
|
||||
|
||||
/*
|
||||
* ISA Level encodings
|
||||
diff -urN linux.old/include/linux/pci_ids.h linux.dev/include/linux/pci_ids.h
|
||||
--- linux.old/include/linux/pci_ids.h 2007-01-26 00:51:33.000000000 +0100
|
||||
+++ linux.dev/include/linux/pci_ids.h 2007-01-25 23:34:01.000000000 +0100
|
||||
@@ -1981,6 +1981,7 @@
|
||||
#define PCI_DEVICE_ID_TIGON3_5906M 0x1713
|
||||
#define PCI_DEVICE_ID_BCM4401 0x4401
|
||||
#define PCI_DEVICE_ID_BCM4401B0 0x4402
|
||||
+#define PCI_DEVICE_ID_BCM4713 0x4713
|
||||
|
||||
#define PCI_VENDOR_ID_TOPIC 0x151f
|
||||
#define PCI_DEVICE_ID_TOPIC_TP560 0x0000
|
||||
|
@ -1,28 +0,0 @@
|
||||
diff -urN linux.old/drivers/mtd/maps/Kconfig linux.dev/drivers/mtd/maps/Kconfig
|
||||
--- linux.old/drivers/mtd/maps/Kconfig 2006-12-11 20:32:53.000000000 +0100
|
||||
+++ linux.dev/drivers/mtd/maps/Kconfig 2007-01-03 02:26:02.000000000 +0100
|
||||
@@ -326,6 +326,12 @@
|
||||
Mapping for the Flaga digital module. If you don't have one, ignore
|
||||
this setting.
|
||||
|
||||
+config MTD_BCM47XX
|
||||
+ tristate "BCM47xx flash device"
|
||||
+ depends on MIPS && MTD_CFI && BCM947XX
|
||||
+ help
|
||||
+ Support for the flash chips on the BCM947xx board.
|
||||
+
|
||||
config MTD_BEECH
|
||||
tristate "CFI Flash device mapped on IBM 405LP Beech"
|
||||
depends on MTD_CFI && BEECH
|
||||
diff -urN linux.old/drivers/mtd/maps/Makefile linux.dev/drivers/mtd/maps/Makefile
|
||||
--- linux.old/drivers/mtd/maps/Makefile 2006-12-11 20:32:53.000000000 +0100
|
||||
+++ linux.dev/drivers/mtd/maps/Makefile 2007-01-03 02:26:02.000000000 +0100
|
||||
@@ -31,6 +31,7 @@
|
||||
obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o
|
||||
obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o
|
||||
obj-$(CONFIG_MTD_TQM8XXL) += tqm8xxl.o
|
||||
+obj-$(CONFIG_MTD_BCM47XX) += bcm47xx-flash.o
|
||||
obj-$(CONFIG_MTD_SA1100) += sa1100-flash.o
|
||||
obj-$(CONFIG_MTD_IPAQ) += ipaq-flash.o
|
||||
obj-$(CONFIG_MTD_SBC_GXX) += sbc_gxx.o
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,91 +0,0 @@
|
||||
diff -urN linux-2.6.19.ref/arch/mips/Kconfig linux-2.6.19/arch/mips/Kconfig
|
||||
--- linux-2.6.19.ref/arch/mips/Kconfig 2006-12-04 21:33:48.000000000 +0100
|
||||
+++ linux-2.6.19/arch/mips/Kconfig 2006-12-04 21:34:04.000000000 +0100
|
||||
@@ -315,7 +315,6 @@
|
||||
select I8259
|
||||
select MIPS_BOARDS_GEN
|
||||
select MIPS_BONITO64
|
||||
- select MIPS_CPU_SCACHE
|
||||
select MIPS_GT64120
|
||||
select MIPS_MSC
|
||||
select SWAP_IO_SPACE
|
||||
@@ -1538,13 +1537,6 @@
|
||||
bool
|
||||
select BOARD_SCACHE
|
||||
|
||||
-#
|
||||
-# Support for a MIPS32 / MIPS64 style S-caches
|
||||
-#
|
||||
-config MIPS_CPU_SCACHE
|
||||
- bool
|
||||
- select BOARD_SCACHE
|
||||
-
|
||||
config R5000_CPU_SCACHE
|
||||
bool
|
||||
select BOARD_SCACHE
|
||||
diff -urN linux-2.6.19.ref/arch/mips/kernel/cpu-probe.c linux-2.6.19/arch/mips/kernel/cpu-probe.c
|
||||
--- linux-2.6.19.ref/arch/mips/kernel/cpu-probe.c 2006-12-04 21:33:48.000000000 +0100
|
||||
+++ linux-2.6.19/arch/mips/kernel/cpu-probe.c 2006-12-04 21:34:04.000000000 +0100
|
||||
@@ -619,6 +619,8 @@
|
||||
break;
|
||||
case PRID_IMP_25KF:
|
||||
c->cputype = CPU_25KF;
|
||||
+ /* Probe for L2 cache */
|
||||
+ c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT;
|
||||
break;
|
||||
case PRID_IMP_34K:
|
||||
c->cputype = CPU_34K;
|
||||
diff -urN linux-2.6.19.ref/arch/mips/mm/c-r4k.c linux-2.6.19/arch/mips/mm/c-r4k.c
|
||||
--- linux-2.6.19.ref/arch/mips/mm/c-r4k.c 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19/arch/mips/mm/c-r4k.c 2006-12-04 21:34:04.000000000 +0100
|
||||
@@ -1038,7 +1038,6 @@
|
||||
|
||||
extern int r5k_sc_init(void);
|
||||
extern int rm7k_sc_init(void);
|
||||
-extern int mips_sc_init(void);
|
||||
|
||||
static void __init setup_scache(void)
|
||||
{
|
||||
@@ -1086,29 +1085,17 @@
|
||||
return;
|
||||
|
||||
default:
|
||||
- if (c->isa_level == MIPS_CPU_ISA_M32R1 ||
|
||||
- c->isa_level == MIPS_CPU_ISA_M32R2 ||
|
||||
- c->isa_level == MIPS_CPU_ISA_M64R1 ||
|
||||
- c->isa_level == MIPS_CPU_ISA_M64R2) {
|
||||
-#ifdef CONFIG_MIPS_CPU_SCACHE
|
||||
- if (mips_sc_init ()) {
|
||||
- scache_size = c->scache.ways * c->scache.sets * c->scache.linesz;
|
||||
- printk("MIPS secondary cache %ldkB, %s, linesize %d bytes.\n",
|
||||
- scache_size >> 10,
|
||||
- way_string[c->scache.ways], c->scache.linesz);
|
||||
- }
|
||||
-#else
|
||||
- if (!(c->scache.flags & MIPS_CACHE_NOT_PRESENT))
|
||||
- panic("Dunno how to handle MIPS32 / MIPS64 second level cache");
|
||||
-#endif
|
||||
- return;
|
||||
- }
|
||||
sc_present = 0;
|
||||
}
|
||||
|
||||
if (!sc_present)
|
||||
return;
|
||||
|
||||
+ if ((c->isa_level == MIPS_CPU_ISA_M32R1 ||
|
||||
+ c->isa_level == MIPS_CPU_ISA_M64R1) &&
|
||||
+ !(c->scache.flags & MIPS_CACHE_NOT_PRESENT))
|
||||
+ panic("Dunno how to handle MIPS32 / MIPS64 second level cache");
|
||||
+
|
||||
/* compute a couple of other cache variables */
|
||||
c->scache.waysize = scache_size / c->scache.ways;
|
||||
|
||||
diff -urN linux-2.6.19.ref/arch/mips/mm/Makefile linux-2.6.19/arch/mips/mm/Makefile
|
||||
--- linux-2.6.19.ref/arch/mips/mm/Makefile 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19/arch/mips/mm/Makefile 2006-12-04 21:34:04.000000000 +0100
|
||||
@@ -30,4 +30,3 @@
|
||||
obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
|
||||
obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o
|
||||
obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o
|
||||
-obj-$(CONFIG_MIPS_CPU_SCACHE) += sc-mips.o
|
@ -1,338 +0,0 @@
|
||||
diff -ur linux.old/arch/mips/kernel/genex.S linux.dev/arch/mips/kernel/genex.S
|
||||
--- linux.old/arch/mips/kernel/genex.S 2007-03-23 16:10:35.572499592 +0100
|
||||
+++ linux.dev/arch/mips/kernel/genex.S 2007-03-16 11:54:34.901251992 +0100
|
||||
@@ -51,6 +51,10 @@
|
||||
NESTED(except_vec3_generic, 0, sp)
|
||||
.set push
|
||||
.set noat
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+ nop
|
||||
+ nop
|
||||
+#endif
|
||||
#if R5432_CP0_INTERRUPT_WAR
|
||||
mfc0 k0, CP0_INDEX
|
||||
#endif
|
||||
diff -ur linux.old/arch/mips/mm/c-r4k.c linux.dev/arch/mips/mm/c-r4k.c
|
||||
--- linux.old/arch/mips/mm/c-r4k.c 2007-03-16 12:11:00.344441000 +0100
|
||||
+++ linux.dev/arch/mips/mm/c-r4k.c 2007-03-23 16:03:23.596169976 +0100
|
||||
@@ -29,6 +29,9 @@
|
||||
#include <asm/cacheflush.h> /* for run_uncached() */
|
||||
|
||||
|
||||
+/* For enabling BCM4710 cache workarounds */
|
||||
+int bcm4710 = 0;
|
||||
+
|
||||
/*
|
||||
* Special Variant of smp_call_function for use by cache functions:
|
||||
*
|
||||
@@ -93,6 +96,9 @@
|
||||
{
|
||||
unsigned long dc_lsize = cpu_dcache_line_size();
|
||||
|
||||
+ if (bcm4710)
|
||||
+ r4k_blast_dcache_page = blast_dcache_page;
|
||||
+ else
|
||||
if (dc_lsize == 0)
|
||||
r4k_blast_dcache_page = (void *)cache_noop;
|
||||
else if (dc_lsize == 16)
|
||||
@@ -107,6 +113,9 @@
|
||||
{
|
||||
unsigned long dc_lsize = cpu_dcache_line_size();
|
||||
|
||||
+ if (bcm4710)
|
||||
+ r4k_blast_dcache_page_indexed = blast_dcache_page_indexed;
|
||||
+ else
|
||||
if (dc_lsize == 0)
|
||||
r4k_blast_dcache_page_indexed = (void *)cache_noop;
|
||||
else if (dc_lsize == 16)
|
||||
@@ -121,6 +130,9 @@
|
||||
{
|
||||
unsigned long dc_lsize = cpu_dcache_line_size();
|
||||
|
||||
+ if (bcm4710)
|
||||
+ r4k_blast_dcache = blast_dcache;
|
||||
+ else
|
||||
if (dc_lsize == 0)
|
||||
r4k_blast_dcache = (void *)cache_noop;
|
||||
else if (dc_lsize == 16)
|
||||
@@ -538,6 +550,9 @@
|
||||
r4k_blast_icache();
|
||||
else
|
||||
protected_blast_icache_range(start, end);
|
||||
+
|
||||
+ if (bcm4710)
|
||||
+ r4k_flush_cache_all();
|
||||
}
|
||||
|
||||
static void r4k_flush_icache_range(unsigned long start, unsigned long end)
|
||||
@@ -618,6 +633,8 @@
|
||||
unsigned long addr = (unsigned long) arg;
|
||||
|
||||
R4600_HIT_CACHEOP_WAR_IMPL;
|
||||
+ BCM4710_PROTECTED_FILL_TLB(addr);
|
||||
+ BCM4710_PROTECTED_FILL_TLB(addr + 4);
|
||||
if (dc_lsize)
|
||||
protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
|
||||
if (!cpu_icache_snoops_remote_store && scache_size)
|
||||
@@ -1173,6 +1190,15 @@
|
||||
|
||||
/* Default cache error handler for R4000 and R5000 family */
|
||||
set_uncached_handler (0x100, &except_vec2_generic, 0x80);
|
||||
+
|
||||
+ /* Check if special workarounds are required */
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+ if (current_cpu_data.cputype == CPU_BCM4710 && (current_cpu_data.processor_id & 0xff) == 0) {
|
||||
+ printk("Enabling BCM4710A0 cache workarounds.\n");
|
||||
+ bcm4710 = 1;
|
||||
+ } else
|
||||
+#endif
|
||||
+ bcm4710 = 0;
|
||||
|
||||
probe_pcache();
|
||||
setup_scache();
|
||||
diff -ur linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c
|
||||
--- linux.old/arch/mips/mm/tlbex.c 2007-03-16 11:54:34.826263000 +0100
|
||||
+++ linux.dev/arch/mips/mm/tlbex.c 2007-03-23 16:03:23.608168152 +0100
|
||||
@@ -1229,6 +1229,10 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+extern int bcm4710;
|
||||
+#endif
|
||||
+
|
||||
static void __init build_r4000_tlb_refill_handler(void)
|
||||
{
|
||||
u32 *p = tlb_handler;
|
||||
@@ -1243,6 +1247,12 @@
|
||||
memset(relocs, 0, sizeof(relocs));
|
||||
memset(final_handler, 0, sizeof(final_handler));
|
||||
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+ if (bcm4710) {
|
||||
+ i_nop(&p);
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* create the plain linear handler
|
||||
*/
|
||||
diff -ur linux.old/include/asm-mips/r4kcache.h linux.dev/include/asm-mips/r4kcache.h
|
||||
--- linux.old/include/asm-mips/r4kcache.h 2007-01-10 20:10:37.000000000 +0100
|
||||
+++ linux.dev/include/asm-mips/r4kcache.h 2007-03-23 16:38:44.603727816 +0100
|
||||
@@ -17,6 +17,20 @@
|
||||
#include <asm/cpu-features.h>
|
||||
#include <asm/mipsmtregs.h>
|
||||
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+#include <asm/paccess.h>
|
||||
+#include <linux/ssb/ssb.h>
|
||||
+#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE + SSB_IMSTATE)))
|
||||
+
|
||||
+#define BCM4710_FILL_TLB(addr) (*(volatile unsigned long *)(addr))
|
||||
+#define BCM4710_PROTECTED_FILL_TLB(addr) ({ unsigned long x; get_dbe(x, (volatile unsigned long *)(addr)); })
|
||||
+#else
|
||||
+#define BCM4710_DUMMY_RREG()
|
||||
+
|
||||
+#define BCM4710_FILL_TLB(addr)
|
||||
+#define BCM4710_PROTECTED_FILL_TLB(addr)
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* This macro return a properly sign-extended address suitable as base address
|
||||
* for indexed cache operations. Two issues here:
|
||||
@@ -150,6 +164,7 @@
|
||||
static inline void flush_dcache_line_indexed(unsigned long addr)
|
||||
{
|
||||
__dflush_prologue
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
cache_op(Index_Writeback_Inv_D, addr);
|
||||
__dflush_epilogue
|
||||
}
|
||||
@@ -169,6 +184,7 @@
|
||||
static inline void flush_dcache_line(unsigned long addr)
|
||||
{
|
||||
__dflush_prologue
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
cache_op(Hit_Writeback_Inv_D, addr);
|
||||
__dflush_epilogue
|
||||
}
|
||||
@@ -176,6 +192,7 @@
|
||||
static inline void invalidate_dcache_line(unsigned long addr)
|
||||
{
|
||||
__dflush_prologue
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
cache_op(Hit_Invalidate_D, addr);
|
||||
__dflush_epilogue
|
||||
}
|
||||
@@ -208,6 +225,7 @@
|
||||
*/
|
||||
static inline void protected_flush_icache_line(unsigned long addr)
|
||||
{
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
protected_cache_op(Hit_Invalidate_I, addr);
|
||||
}
|
||||
|
||||
@@ -219,6 +237,7 @@
|
||||
*/
|
||||
static inline void protected_writeback_dcache_line(unsigned long addr)
|
||||
{
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
protected_cache_op(Hit_Writeback_Inv_D, addr);
|
||||
}
|
||||
|
||||
@@ -339,8 +358,52 @@
|
||||
: "r" (base), \
|
||||
"i" (op));
|
||||
|
||||
+static inline void blast_dcache(void)
|
||||
+{
|
||||
+ unsigned long start = KSEG0;
|
||||
+ unsigned long dcache_size = current_cpu_data.dcache.waysize * current_cpu_data.dcache.ways;
|
||||
+ unsigned long end = (start + dcache_size);
|
||||
+
|
||||
+ do {
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
+ cache_op(Index_Writeback_Inv_D, start);
|
||||
+ start += current_cpu_data.dcache.linesz;
|
||||
+ } while(start < end);
|
||||
+}
|
||||
+
|
||||
+static inline void blast_dcache_page(unsigned long page)
|
||||
+{
|
||||
+ unsigned long start = page;
|
||||
+ unsigned long end = start + PAGE_SIZE;
|
||||
+
|
||||
+ BCM4710_FILL_TLB(start);
|
||||
+ do {
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
+ cache_op(Hit_Writeback_Inv_D, start);
|
||||
+ start += current_cpu_data.dcache.linesz;
|
||||
+ } while(start < end);
|
||||
+}
|
||||
+
|
||||
+static inline void blast_dcache_page_indexed(unsigned long page)
|
||||
+{
|
||||
+ unsigned long start = page;
|
||||
+ unsigned long end = start + PAGE_SIZE;
|
||||
+ unsigned long ws_inc = 1UL << current_cpu_data.dcache.waybit;
|
||||
+ unsigned long ws_end = current_cpu_data.dcache.ways <<
|
||||
+ current_cpu_data.dcache.waybit;
|
||||
+ unsigned long ws, addr;
|
||||
+ for (ws = 0; ws < ws_end; ws += ws_inc) {
|
||||
+ start = page + ws;
|
||||
+ for (addr = start; addr < end; addr += current_cpu_data.dcache.linesz) {
|
||||
+ BCM4710_DUMMY_RREG();
|
||||
+ cache_op(Index_Writeback_Inv_D, addr);
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
/* build blast_xxx, blast_xxx_page, blast_xxx_page_indexed */
|
||||
-#define __BUILD_BLAST_CACHE(pfx, desc, indexop, hitop, lsize) \
|
||||
+#define __BUILD_BLAST_CACHE(pfx, desc, indexop, hitop, lsize, war) \
|
||||
static inline void blast_##pfx##cache##lsize(void) \
|
||||
{ \
|
||||
unsigned long start = INDEX_BASE; \
|
||||
@@ -352,6 +415,7 @@
|
||||
\
|
||||
__##pfx##flush_prologue \
|
||||
\
|
||||
+ war \
|
||||
for (ws = 0; ws < ws_end; ws += ws_inc) \
|
||||
for (addr = start; addr < end; addr += lsize * 32) \
|
||||
cache##lsize##_unroll32(addr|ws,indexop); \
|
||||
@@ -366,6 +430,7 @@
|
||||
\
|
||||
__##pfx##flush_prologue \
|
||||
\
|
||||
+ war \
|
||||
do { \
|
||||
cache##lsize##_unroll32(start,hitop); \
|
||||
start += lsize * 32; \
|
||||
@@ -384,6 +449,8 @@
|
||||
current_cpu_data.desc.waybit; \
|
||||
unsigned long ws, addr; \
|
||||
\
|
||||
+ war \
|
||||
+ \
|
||||
__##pfx##flush_prologue \
|
||||
\
|
||||
for (ws = 0; ws < ws_end; ws += ws_inc) \
|
||||
@@ -393,28 +460,30 @@
|
||||
__##pfx##flush_epilogue \
|
||||
}
|
||||
|
||||
-__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 16)
|
||||
-__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 16)
|
||||
-__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 16)
|
||||
-__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 32)
|
||||
-__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 32)
|
||||
-__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 32)
|
||||
-__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 64)
|
||||
-__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 64)
|
||||
-__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 128)
|
||||
+__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 16, )
|
||||
+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 16, BCM4710_FILL_TLB(start);)
|
||||
+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 16, )
|
||||
+__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 32, )
|
||||
+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 32, BCM4710_FILL_TLB(start);)
|
||||
+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 32, )
|
||||
+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 64, BCM4710_FILL_TLB(start);)
|
||||
+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 64, )
|
||||
+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 128, )
|
||||
|
||||
/* build blast_xxx_range, protected_blast_xxx_range */
|
||||
-#define __BUILD_BLAST_CACHE_RANGE(pfx, desc, hitop, prot) \
|
||||
+#define __BUILD_BLAST_CACHE_RANGE(pfx, desc, hitop, prot, war, war2) \
|
||||
static inline void prot##blast_##pfx##cache##_range(unsigned long start, \
|
||||
unsigned long end) \
|
||||
{ \
|
||||
unsigned long lsize = cpu_##desc##_line_size(); \
|
||||
unsigned long addr = start & ~(lsize - 1); \
|
||||
unsigned long aend = (end - 1) & ~(lsize - 1); \
|
||||
+ war \
|
||||
\
|
||||
__##pfx##flush_prologue \
|
||||
\
|
||||
while (1) { \
|
||||
+ war2 \
|
||||
prot##cache_op(hitop, addr); \
|
||||
if (addr == aend) \
|
||||
break; \
|
||||
@@ -424,13 +493,13 @@
|
||||
__##pfx##flush_epilogue \
|
||||
}
|
||||
|
||||
-__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, protected_)
|
||||
-__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, protected_)
|
||||
-__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I, protected_)
|
||||
-__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, )
|
||||
-__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, )
|
||||
+__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, protected_, BCM4710_PROTECTED_FILL_TLB(addr); BCM4710_PROTECTED_FILL_TLB(aend);, BCM4710_DUMMY_RREG();)
|
||||
+__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, protected_,, )
|
||||
+__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I, protected_,, )
|
||||
+__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D,, BCM4710_FILL_TLB(addr); BCM4710_FILL_TLB(aend);, BCM4710_DUMMY_RREG();)
|
||||
+__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD,,, )
|
||||
/* blast_inv_dcache_range */
|
||||
-__BUILD_BLAST_CACHE_RANGE(inv_d, dcache, Hit_Invalidate_D, )
|
||||
-__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD, )
|
||||
+__BUILD_BLAST_CACHE_RANGE(inv_d, dcache, Hit_Invalidate_D,,,BCM4710_DUMMY_RREG();)
|
||||
+__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD,,, )
|
||||
|
||||
#endif /* _ASM_R4KCACHE_H */
|
||||
diff -ur linux.old/include/asm-mips/stackframe.h linux.dev/include/asm-mips/stackframe.h
|
||||
--- linux.old/include/asm-mips/stackframe.h 2007-03-23 16:10:35.573499440 +0100
|
||||
+++ linux.dev/include/asm-mips/stackframe.h 2007-03-16 11:54:34.903251688 +0100
|
||||
@@ -352,6 +352,10 @@
|
||||
.macro RESTORE_SP_AND_RET
|
||||
LONG_L sp, PT_R29(sp)
|
||||
.set mips3
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+ nop
|
||||
+ nop
|
||||
+#endif
|
||||
eret
|
||||
.set mips0
|
||||
.endm
|
@ -1,57 +0,0 @@
|
||||
--- ./arch/mips/mm/init.c.orig 2007-03-22 08:08:34.000000000 -0600
|
||||
+++ ./arch/mips/mm/init.c 2007-03-22 08:09:04.000000000 -0600
|
||||
@@ -207,7 +207,7 @@
|
||||
void *vfrom, *vto;
|
||||
|
||||
vto = kmap_atomic(to, KM_USER1);
|
||||
- if (cpu_has_dc_aliases) {
|
||||
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent) {
|
||||
vfrom = kmap_coherent(from, vaddr);
|
||||
copy_page(vto, vfrom);
|
||||
kunmap_coherent(from);
|
||||
@@ -230,7 +230,7 @@
|
||||
struct page *page, unsigned long vaddr, void *dst, const void *src,
|
||||
unsigned long len)
|
||||
{
|
||||
- if (cpu_has_dc_aliases) {
|
||||
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent) {
|
||||
void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
|
||||
memcpy(vto, src, len);
|
||||
kunmap_coherent(page);
|
||||
@@ -246,7 +246,7 @@
|
||||
struct page *page, unsigned long vaddr, void *dst, const void *src,
|
||||
unsigned long len)
|
||||
{
|
||||
- if (cpu_has_dc_aliases) {
|
||||
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent) {
|
||||
void *vfrom =
|
||||
kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
|
||||
memcpy(dst, vfrom, len);
|
||||
--- ./include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h.orig 2007-03-22 08:10:54.000000000 -0600
|
||||
+++ ./include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h 2007-03-22 08:10:50.000000000 -0600
|
||||
@@ -0,0 +1,13 @@
|
||||
+/*
|
||||
+ * This file is subject to the terms and conditions of the GNU General Public
|
||||
+ * License. See the file "COPYING" in the main directory of this archive
|
||||
+ * for more details.
|
||||
+ *
|
||||
+ * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
|
||||
+ */
|
||||
+#ifndef __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H
|
||||
+#define __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H
|
||||
+
|
||||
+#define cpu_use_kmap_coherent 0
|
||||
+
|
||||
+#endif /* __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H */
|
||||
--- ./include/asm-mips/cpu-features.h.orig 2007-03-22 08:09:16.000000000 -0600
|
||||
+++ ./include/asm-mips/cpu-features.h 2007-03-22 08:09:52.000000000 -0600
|
||||
@@ -101,6 +101,9 @@
|
||||
#ifndef cpu_has_pindexed_dcache
|
||||
#define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
|
||||
#endif
|
||||
+#ifndef cpu_use_kmap_coherent
|
||||
+#define cpu_use_kmap_coherent 1
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* I-Cache snoops remote store. This only matters on SMP. Some multiprocessors
|
@ -1,12 +0,0 @@
|
||||
diff -urN linux-2.6.19.2.old/arch/mips/kernel/cpu-probe.c linux-2.6.19.2/arch/mips/kernel/cpu-probe.c
|
||||
--- linux-2.6.19.2.old/arch/mips/kernel/cpu-probe.c 2007-05-01 19:28:06.937756121 +0100
|
||||
+++ linux-2.6.19.2/arch/mips/kernel/cpu-probe.c 2007-05-01 19:31:46.867756121 +0100
|
||||
@@ -143,6 +143,8 @@
|
||||
case CPU_34K:
|
||||
case CPU_74K:
|
||||
case CPU_PR4450:
|
||||
+ case CPU_BCM3302:
|
||||
+ case CPU_BCM4710:
|
||||
cpu_wait = r4k_wait;
|
||||
break;
|
||||
case CPU_TX49XX:
|
@ -1,256 +0,0 @@
|
||||
Index: linux-2.6.22-rc4/drivers/net/b44.c
|
||||
===================================================================
|
||||
--- linux-2.6.22-rc4.orig/drivers/net/b44.c 2007-06-10 21:33:15.000000000 +0100
|
||||
+++ linux-2.6.22-rc4/drivers/net/b44.c 2007-06-10 21:33:23.000000000 +0100
|
||||
@@ -128,7 +128,7 @@
|
||||
unsigned long offset,
|
||||
enum dma_data_direction dir)
|
||||
{
|
||||
- dma_sync_single_range_for_device(&sdev->dev, dma_base,
|
||||
+ dma_sync_single_range_for_device(sdev->dev, dma_base,
|
||||
offset & dma_desc_align_mask,
|
||||
dma_desc_sync_size, dir);
|
||||
}
|
||||
@@ -138,7 +138,7 @@
|
||||
unsigned long offset,
|
||||
enum dma_data_direction dir)
|
||||
{
|
||||
- dma_sync_single_range_for_cpu(&sdev->dev, dma_base,
|
||||
+ dma_sync_single_range_for_cpu(sdev->dev, dma_base,
|
||||
offset & dma_desc_align_mask,
|
||||
dma_desc_sync_size, dir);
|
||||
}
|
||||
@@ -563,7 +563,7 @@
|
||||
|
||||
BUG_ON(skb == NULL);
|
||||
|
||||
- dma_unmap_single(&bp->sdev->dev,
|
||||
+ dma_unmap_single(bp->sdev->dev,
|
||||
pci_unmap_addr(rp, mapping),
|
||||
skb->len,
|
||||
DMA_TO_DEVICE);
|
||||
@@ -603,7 +603,7 @@
|
||||
if (skb == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
- mapping = dma_map_single(&bp->sdev->dev, skb->data,
|
||||
+ mapping = dma_map_single(bp->sdev->dev, skb->data,
|
||||
RX_PKT_BUF_SZ,
|
||||
DMA_FROM_DEVICE);
|
||||
|
||||
@@ -613,18 +613,18 @@
|
||||
mapping + RX_PKT_BUF_SZ > DMA_30BIT_MASK) {
|
||||
/* Sigh... */
|
||||
if (!dma_mapping_error(mapping))
|
||||
- dma_unmap_single(&bp->sdev->dev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
|
||||
+ dma_unmap_single(bp->sdev->dev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
|
||||
dev_kfree_skb_any(skb);
|
||||
skb = __dev_alloc_skb(RX_PKT_BUF_SZ,GFP_DMA);
|
||||
if (skb == NULL)
|
||||
return -ENOMEM;
|
||||
- mapping = dma_map_single(&bp->sdev->dev, skb->data,
|
||||
+ mapping = dma_map_single(bp->sdev->dev, skb->data,
|
||||
RX_PKT_BUF_SZ,
|
||||
DMA_FROM_DEVICE);
|
||||
if (dma_mapping_error(mapping) ||
|
||||
mapping + RX_PKT_BUF_SZ > DMA_30BIT_MASK) {
|
||||
if (!dma_mapping_error(mapping))
|
||||
- dma_unmap_single(&bp->sdev->dev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
|
||||
+ dma_unmap_single(bp->sdev->dev, mapping, RX_PKT_BUF_SZ,DMA_FROM_DEVICE);
|
||||
dev_kfree_skb_any(skb);
|
||||
return -ENOMEM;
|
||||
}
|
||||
@@ -702,7 +702,7 @@
|
||||
dest_idx * sizeof(dest_desc),
|
||||
DMA_BIDIRECTIONAL);
|
||||
|
||||
- dma_sync_single_for_device(&bp->sdev->dev, le32_to_cpu(src_desc->addr),
|
||||
+ dma_sync_single_for_device(bp->sdev->dev, le32_to_cpu(src_desc->addr),
|
||||
RX_PKT_BUF_SZ,
|
||||
DMA_FROM_DEVICE);
|
||||
}
|
||||
@@ -724,7 +724,7 @@
|
||||
struct rx_header *rh;
|
||||
u16 len;
|
||||
|
||||
- dma_sync_single_for_cpu(&bp->sdev->dev, map,
|
||||
+ dma_sync_single_for_cpu(bp->sdev->dev, map,
|
||||
RX_PKT_BUF_SZ,
|
||||
DMA_FROM_DEVICE);
|
||||
rh = (struct rx_header *) skb->data;
|
||||
@@ -758,7 +758,7 @@
|
||||
skb_size = b44_alloc_rx_skb(bp, cons, bp->rx_prod);
|
||||
if (skb_size < 0)
|
||||
goto drop_it;
|
||||
- dma_unmap_single(&bp->sdev->dev, map,
|
||||
+ dma_unmap_single(bp->sdev->dev, map,
|
||||
skb_size, DMA_FROM_DEVICE);
|
||||
/* Leave out rx_header */
|
||||
skb_put(skb, len+bp->rx_offset);
|
||||
@@ -931,22 +931,22 @@
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
- mapping = dma_map_single(&bp->sdev->dev, skb->data, len, DMA_TO_DEVICE);
|
||||
+ mapping = dma_map_single(bp->sdev->dev, skb->data, len, DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(mapping) || mapping + len > DMA_30BIT_MASK) {
|
||||
/* Chip can't handle DMA to/from >1GB, use bounce buffer */
|
||||
if (!dma_mapping_error(mapping))
|
||||
- dma_unmap_single(&bp->sdev->dev, mapping, len, DMA_TO_DEVICE);
|
||||
+ dma_unmap_single(bp->sdev->dev, mapping, len, DMA_TO_DEVICE);
|
||||
|
||||
bounce_skb = __dev_alloc_skb(TX_PKT_BUF_SZ,
|
||||
GFP_ATOMIC|GFP_DMA);
|
||||
if (!bounce_skb)
|
||||
goto err_out;
|
||||
|
||||
- mapping = dma_map_single(&bp->sdev->dev, bounce_skb->data,
|
||||
+ mapping = dma_map_single(bp->sdev->dev, bounce_skb->data,
|
||||
len, DMA_TO_DEVICE);
|
||||
if (dma_mapping_error(mapping) || mapping + len > DMA_30BIT_MASK) {
|
||||
if (!dma_mapping_error(mapping))
|
||||
- dma_unmap_single(&bp->sdev->dev, mapping,
|
||||
+ dma_unmap_single(bp->sdev->dev, mapping,
|
||||
len, DMA_TO_DEVICE);
|
||||
dev_kfree_skb_any(bounce_skb);
|
||||
goto err_out;
|
||||
@@ -1046,7 +1046,7 @@
|
||||
|
||||
if (rp->skb == NULL)
|
||||
continue;
|
||||
- dma_unmap_single(&bp->sdev->dev,
|
||||
+ dma_unmap_single(bp->sdev->dev,
|
||||
pci_unmap_addr(rp, mapping),
|
||||
RX_PKT_BUF_SZ,
|
||||
DMA_FROM_DEVICE);
|
||||
@@ -1060,7 +1060,7 @@
|
||||
|
||||
if (rp->skb == NULL)
|
||||
continue;
|
||||
- dma_unmap_single(&bp->sdev->dev,
|
||||
+ dma_unmap_single(bp->sdev->dev,
|
||||
pci_unmap_addr(rp, mapping),
|
||||
rp->skb->len,
|
||||
DMA_TO_DEVICE);
|
||||
@@ -1085,12 +1085,12 @@
|
||||
memset(bp->tx_ring, 0, B44_TX_RING_BYTES);
|
||||
|
||||
if (bp->flags & B44_FLAG_RX_RING_HACK)
|
||||
- dma_sync_single_for_device(&bp->sdev->dev, bp->rx_ring_dma,
|
||||
+ dma_sync_single_for_device(bp->sdev->dev, bp->rx_ring_dma,
|
||||
DMA_TABLE_BYTES,
|
||||
DMA_BIDIRECTIONAL);
|
||||
|
||||
if (bp->flags & B44_FLAG_TX_RING_HACK)
|
||||
- dma_sync_single_for_device(&bp->sdev->dev, bp->tx_ring_dma,
|
||||
+ dma_sync_single_for_device(bp->sdev->dev, bp->tx_ring_dma,
|
||||
DMA_TABLE_BYTES,
|
||||
DMA_TO_DEVICE);
|
||||
|
||||
@@ -1112,24 +1112,24 @@
|
||||
bp->tx_buffers = NULL;
|
||||
if (bp->rx_ring) {
|
||||
if (bp->flags & B44_FLAG_RX_RING_HACK) {
|
||||
- dma_unmap_single(&bp->sdev->dev, bp->rx_ring_dma,
|
||||
+ dma_unmap_single(bp->sdev->dev, bp->rx_ring_dma,
|
||||
DMA_TABLE_BYTES,
|
||||
DMA_BIDIRECTIONAL);
|
||||
kfree(bp->rx_ring);
|
||||
} else
|
||||
- dma_free_coherent(&bp->sdev->dev, DMA_TABLE_BYTES,
|
||||
+ dma_free_coherent(bp->sdev->dev, DMA_TABLE_BYTES,
|
||||
bp->rx_ring, bp->rx_ring_dma);
|
||||
bp->rx_ring = NULL;
|
||||
bp->flags &= ~B44_FLAG_RX_RING_HACK;
|
||||
}
|
||||
if (bp->tx_ring) {
|
||||
if (bp->flags & B44_FLAG_TX_RING_HACK) {
|
||||
- dma_unmap_single(&bp->sdev->dev, bp->tx_ring_dma,
|
||||
+ dma_unmap_single(bp->sdev->dev, bp->tx_ring_dma,
|
||||
DMA_TABLE_BYTES,
|
||||
DMA_TO_DEVICE);
|
||||
kfree(bp->tx_ring);
|
||||
} else
|
||||
- dma_free_coherent(&bp->sdev->dev, DMA_TABLE_BYTES,
|
||||
+ dma_free_coherent(bp->sdev->dev, DMA_TABLE_BYTES,
|
||||
bp->tx_ring, bp->tx_ring_dma);
|
||||
bp->tx_ring = NULL;
|
||||
bp->flags &= ~B44_FLAG_TX_RING_HACK;
|
||||
@@ -1155,7 +1155,7 @@
|
||||
goto out_err;
|
||||
|
||||
size = DMA_TABLE_BYTES;
|
||||
- bp->rx_ring = dma_alloc_coherent(&bp->sdev->dev, size, &bp->rx_ring_dma, GFP_ATOMIC);
|
||||
+ bp->rx_ring = dma_alloc_coherent(bp->sdev->dev, size, &bp->rx_ring_dma, GFP_ATOMIC);
|
||||
if (!bp->rx_ring) {
|
||||
/* Allocation may have failed due to pci_alloc_consistent
|
||||
insisting on use of GFP_DMA, which is more restrictive
|
||||
@@ -1167,7 +1167,7 @@
|
||||
if (!rx_ring)
|
||||
goto out_err;
|
||||
|
||||
- rx_ring_dma = dma_map_single(&bp->sdev->dev, rx_ring,
|
||||
+ rx_ring_dma = dma_map_single(bp->sdev->dev, rx_ring,
|
||||
DMA_TABLE_BYTES,
|
||||
DMA_BIDIRECTIONAL);
|
||||
|
||||
@@ -1182,7 +1182,7 @@
|
||||
bp->flags |= B44_FLAG_RX_RING_HACK;
|
||||
}
|
||||
|
||||
- bp->tx_ring = dma_alloc_coherent(&bp->sdev->dev, size, &bp->tx_ring_dma, GFP_ATOMIC);
|
||||
+ bp->tx_ring = dma_alloc_coherent(bp->sdev->dev, size, &bp->tx_ring_dma, GFP_ATOMIC);
|
||||
if (!bp->tx_ring) {
|
||||
/* Allocation may have failed due to dma_alloc_coherent
|
||||
insisting on use of GFP_DMA, which is more restrictive
|
||||
@@ -1194,7 +1194,7 @@
|
||||
if (!tx_ring)
|
||||
goto out_err;
|
||||
|
||||
- tx_ring_dma = dma_map_single(&bp->sdev->dev, tx_ring,
|
||||
+ tx_ring_dma = dma_map_single(bp->sdev->dev, tx_ring,
|
||||
DMA_TABLE_BYTES,
|
||||
DMA_TO_DEVICE);
|
||||
|
||||
@@ -2314,13 +2314,13 @@
|
||||
|
||||
dev = alloc_etherdev(sizeof(*bp));
|
||||
if (!dev) {
|
||||
- dev_err(&sdev->dev, "Etherdev alloc failed, aborting.\n");
|
||||
+ dev_err(sdev->dev, "Etherdev alloc failed, aborting.\n");
|
||||
err = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
SET_MODULE_OWNER(dev);
|
||||
- SET_NETDEV_DEV(dev,&sdev->dev);
|
||||
+ SET_NETDEV_DEV(dev,sdev->dev);
|
||||
|
||||
/* No interesting netdevice features in this card... */
|
||||
dev->features |= 0;
|
||||
@@ -2358,7 +2358,7 @@
|
||||
|
||||
err = b44_get_invariants(bp);
|
||||
if (err) {
|
||||
- dev_err(&sdev->dev,
|
||||
+ dev_err(sdev->dev,
|
||||
"Problem fetching invariants of chip, aborting.\n");
|
||||
goto err_out_free_dev;
|
||||
}
|
||||
@@ -2379,7 +2379,7 @@
|
||||
|
||||
err = register_netdev(dev);
|
||||
if (err) {
|
||||
- dev_err(&sdev->dev, "Cannot register net device, aborting.\n");
|
||||
+ dev_err(sdev->dev, "Cannot register net device, aborting.\n");
|
||||
goto out;
|
||||
}
|
||||
|
||||
@@ -2458,7 +2458,6 @@
|
||||
rc = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev);
|
||||
if (rc) {
|
||||
printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name);
|
||||
- pci_disable_device(pdev);
|
||||
return rc;
|
||||
}
|
||||
|
@ -1,78 +0,0 @@
|
||||
Index: linux-2.6.22-rc4/drivers/usb/host/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.22-rc4.orig/drivers/usb/host/Kconfig 2007-06-10 21:32:11.000000000 +0100
|
||||
+++ linux-2.6.22-rc4/drivers/usb/host/Kconfig 2007-06-10 21:33:24.000000000 +0100
|
||||
@@ -142,6 +142,19 @@
|
||||
Enables support for PCI-bus plug-in USB controller cards.
|
||||
If unsure, say Y.
|
||||
|
||||
+config USB_OHCI_HCD_SSB
|
||||
+ bool "OHCI support for the Broadcom SSB OHCI core (embedded systems only)"
|
||||
+ depends on USB_OHCI_HCD && ((USB_OHCI_HCD=m && SSB) || (USB_OHCI_HCD=y && SSB=y)) && EXPERIMENTAL
|
||||
+ default n
|
||||
+ ---help---
|
||||
+ Support for the Sonics Silicon Backplane (SSB) attached
|
||||
+ Broadcom USB OHCI core.
|
||||
+
|
||||
+ This device is only present in some embedded devices with
|
||||
+ Broadcom based SSB bus.
|
||||
+
|
||||
+ If unsure, say N.
|
||||
+
|
||||
config USB_OHCI_BIG_ENDIAN_DESC
|
||||
bool
|
||||
depends on USB_OHCI_HCD
|
||||
Index: linux-2.6.22-rc4/drivers/usb/host/ohci-hcd.c
|
||||
===================================================================
|
||||
--- linux-2.6.22-rc4.orig/drivers/usb/host/ohci-hcd.c 2007-06-10 21:32:11.000000000 +0100
|
||||
+++ linux-2.6.22-rc4/drivers/usb/host/ohci-hcd.c 2007-06-10 21:33:24.000000000 +0100
|
||||
@@ -920,11 +920,17 @@
|
||||
#define PS3_SYSTEM_BUS_DRIVER ps3_ohci_sb_driver
|
||||
#endif
|
||||
|
||||
+#ifdef CONFIG_USB_OHCI_HCD_SSB
|
||||
+#include "ohci-ssb.c"
|
||||
+#define SSB_OHCI_DRIVER ssb_ohci_driver
|
||||
+#endif
|
||||
+
|
||||
#if !defined(PCI_DRIVER) && \
|
||||
!defined(PLATFORM_DRIVER) && \
|
||||
!defined(OF_PLATFORM_DRIVER) && \
|
||||
!defined(SA1111_DRIVER) && \
|
||||
- !defined(PS3_SYSTEM_BUS_DRIVER)
|
||||
+ !defined(PS3_SYSTEM_BUS_DRIVER) && \
|
||||
+ !defined(SSB_OHCI_DRIVER)
|
||||
#error "missing bus glue for ohci-hcd"
|
||||
#endif
|
||||
|
||||
@@ -972,10 +978,20 @@
|
||||
goto error_pci;
|
||||
#endif
|
||||
|
||||
+#ifdef SSB_OHCI_DRIVER
|
||||
+ retval = ssb_driver_register(&SSB_OHCI_DRIVER);
|
||||
+ if (retval)
|
||||
+ goto error_ssb;
|
||||
+#endif
|
||||
+
|
||||
return retval;
|
||||
|
||||
/* Error path */
|
||||
+#ifdef SSB_OHCI_DRIVER
|
||||
+ error_ssb:
|
||||
+#endif
|
||||
#ifdef PCI_DRIVER
|
||||
+ pci_unregister_driver(&PCI_DRIVER);
|
||||
error_pci:
|
||||
#endif
|
||||
#ifdef SA1111_DRIVER
|
||||
@@ -1001,6 +1017,9 @@
|
||||
|
||||
static void __exit ohci_hcd_mod_exit(void)
|
||||
{
|
||||
+#ifdef SSB_OHCI_DRIVER
|
||||
+ ssb_driver_unregister(&SSB_OHCI_DRIVER);
|
||||
+#endif
|
||||
#ifdef PCI_DRIVER
|
||||
pci_unregister_driver(&PCI_DRIVER);
|
||||
#endif
|
@ -1,421 +0,0 @@
|
||||
Index: linux-2.6.22-rc4/drivers/ssb/driver_chipcommon.c
|
||||
===================================================================
|
||||
--- linux-2.6.22-rc4.orig/drivers/ssb/driver_chipcommon.c 2007-06-10 21:32:11.000000000 +0100
|
||||
+++ linux-2.6.22-rc4/drivers/ssb/driver_chipcommon.c 2007-06-10 21:33:25.000000000 +0100
|
||||
@@ -264,6 +264,31 @@
|
||||
ssb_chipco_set_clockmode(cc, SSB_CLKMODE_FAST);
|
||||
}
|
||||
|
||||
+/* TODO: These two functions are a clear candidate for merging, but one gets
|
||||
+ * the processor clock, and the other gets the bus clock.
|
||||
+ */
|
||||
+void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
|
||||
+ u32 *plltype, u32 *n, u32 *m)
|
||||
+{
|
||||
+ *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
|
||||
+ *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
|
||||
+ switch (*plltype) {
|
||||
+ case SSB_PLLTYPE_2:
|
||||
+ case SSB_PLLTYPE_4:
|
||||
+ case SSB_PLLTYPE_6:
|
||||
+ case SSB_PLLTYPE_7:
|
||||
+ *m = chipco_read32(cc, SSB_CHIPCO_CLOCK_MIPS);
|
||||
+ break;
|
||||
+ case SSB_PLLTYPE_3:
|
||||
+ /* 5350 uses m2 to control mips */
|
||||
+ *m = chipco_read32(cc, SSB_CHIPCO_CLOCK_M2);
|
||||
+ break;
|
||||
+ default:
|
||||
+ *m = chipco_read32(cc, SSB_CHIPCO_CLOCK_SB);
|
||||
+ break;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
|
||||
u32 *plltype, u32 *n, u32 *m)
|
||||
{
|
||||
@@ -400,3 +425,13 @@
|
||||
return nr_ports;
|
||||
}
|
||||
#endif /* CONFIG_SSB_SERIAL */
|
||||
+
|
||||
+/* Set chip watchdog reset timer to fire in 'ticks' backplane cycles */
|
||||
+int
|
||||
+ssb_chipco_watchdog(struct ssb_chipcommon *cc, uint ticks)
|
||||
+{
|
||||
+ /* instant NMI */
|
||||
+ chipco_write32(cc, SSB_CHIPCO_WATCHDOG, ticks);
|
||||
+ return 0;
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_chipco_watchdog);
|
||||
Index: linux-2.6.22-rc4/drivers/ssb/driver_mipscore.c
|
||||
===================================================================
|
||||
--- linux-2.6.22-rc4.orig/drivers/ssb/driver_mipscore.c 2007-06-10 21:32:11.000000000 +0100
|
||||
+++ linux-2.6.22-rc4/drivers/ssb/driver_mipscore.c 2007-06-10 21:33:25.000000000 +0100
|
||||
@@ -4,6 +4,7 @@
|
||||
*
|
||||
* Copyright 2005, Broadcom Corporation
|
||||
* Copyright 2006, 2007, Michael Buesch <mb@bu3sch.de>
|
||||
+ * Copyright 2006, 2007, Felix Fietkau <nbd@openwrt.org>
|
||||
*
|
||||
* Licensed under the GNU/GPL. See COPYING for details.
|
||||
*/
|
||||
@@ -31,6 +32,16 @@
|
||||
ssb_write32(mcore->dev, offset, value);
|
||||
}
|
||||
|
||||
+static inline u32 extif_read32(struct ssb_extif *extif, u16 offset)
|
||||
+{
|
||||
+ return ssb_read32(extif->dev, offset);
|
||||
+}
|
||||
+
|
||||
+static inline void extif_write32(struct ssb_extif *extif, u16 offset, u32 value)
|
||||
+{
|
||||
+ ssb_write32(extif->dev, offset, value);
|
||||
+}
|
||||
+
|
||||
static const u32 ipsflag_irq_mask[] = {
|
||||
0,
|
||||
SSB_IPSFLAG_IRQ1,
|
||||
@@ -118,9 +129,9 @@
|
||||
}
|
||||
|
||||
/* XXX: leave here or move into separate extif driver? */
|
||||
-static int ssb_extif_serial_init(struct ssb_device *dev, struct ssb_serial_ports *ports)
|
||||
+static int ssb_extif_serial_init(struct ssb_extif *dev, struct ssb_serial_port *ports)
|
||||
{
|
||||
-
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -174,23 +185,76 @@
|
||||
{
|
||||
struct ssb_bus *bus = mcore->dev->bus;
|
||||
|
||||
+ mcore->flash_buswidth = 2;
|
||||
if (bus->chipco.dev) {
|
||||
mcore->flash_window = 0x1c000000;
|
||||
- mcore->flash_window_size = 0x800000;
|
||||
+ mcore->flash_window_size = 0x02000000;
|
||||
+ if ((ssb_read32(bus->chipco.dev, SSB_CHIPCO_FLASH_CFG)
|
||||
+ & SSB_CHIPCO_CFG_DS16) == 0)
|
||||
+ mcore->flash_buswidth = 1;
|
||||
} else {
|
||||
mcore->flash_window = 0x1fc00000;
|
||||
- mcore->flash_window_size = 0x400000;
|
||||
+ mcore->flash_window_size = 0x00400000;
|
||||
}
|
||||
}
|
||||
|
||||
+static void ssb_extif_timing_init(struct ssb_extif *extif, u32 ns)
|
||||
+{
|
||||
+ u32 tmp;
|
||||
+
|
||||
+ /* Initialize extif so we can get to the LEDs and external UART */
|
||||
+ extif_write32(extif, SSB_EXTIF_PROG_CFG, SSB_EXTCFG_EN);
|
||||
+
|
||||
+ /* Set timing for the flash */
|
||||
+ tmp = ceildiv(10, ns) << SSB_PROG_WCNT_3_SHIFT;
|
||||
+ tmp |= ceildiv(40, ns) << SSB_PROG_WCNT_1_SHIFT;
|
||||
+ tmp |= ceildiv(120, ns);
|
||||
+ extif_write32(extif, SSB_EXTIF_PROG_WAITCNT, tmp);
|
||||
+
|
||||
+ /* Set programmable interface timing for external uart */
|
||||
+ tmp = ceildiv(10, ns) << SSB_PROG_WCNT_3_SHIFT;
|
||||
+ tmp |= ceildiv(20, ns) << SSB_PROG_WCNT_2_SHIFT;
|
||||
+ tmp |= ceildiv(100, ns) << SSB_PROG_WCNT_1_SHIFT;
|
||||
+ tmp |= ceildiv(120, ns);
|
||||
+ extif_write32(extif, SSB_EXTIF_PROG_WAITCNT, tmp);
|
||||
+}
|
||||
|
||||
-static void ssb_cpu_clock(struct ssb_mipscore *mcore)
|
||||
+static inline void ssb_extif_get_clockcontrol(struct ssb_extif *extif,
|
||||
+ u32 *pll_type, u32 *n, u32 *m)
|
||||
{
|
||||
+ *pll_type = SSB_PLLTYPE_1;
|
||||
+ *n = extif_read32(extif, SSB_EXTIF_CLOCK_N);
|
||||
+ *m = extif_read32(extif, SSB_EXTIF_CLOCK_SB);
|
||||
}
|
||||
|
||||
-void ssb_mipscore_init(struct ssb_mipscore *mcore)
|
||||
+u32 ssb_cpu_clock(struct ssb_mipscore *mcore)
|
||||
{
|
||||
struct ssb_bus *bus = mcore->dev->bus;
|
||||
+ u32 pll_type, n, m, rate = 0;
|
||||
+
|
||||
+ if (bus->extif.dev) {
|
||||
+ ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
|
||||
+ } else if (bus->chipco.dev) {
|
||||
+ ssb_chipco_get_clockcpu(&bus->chipco, &pll_type, &n, &m);
|
||||
+ } else
|
||||
+ return 0;
|
||||
+
|
||||
+ if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) {
|
||||
+ rate = 200000000;
|
||||
+ } else {
|
||||
+ rate = ssb_calc_clock_rate(pll_type, n, m);
|
||||
+ }
|
||||
+
|
||||
+ if (pll_type == SSB_PLLTYPE_6) {
|
||||
+ rate *= 2;
|
||||
+ }
|
||||
+
|
||||
+ return rate;
|
||||
+}
|
||||
+
|
||||
+void ssb_mipscore_init(struct ssb_mipscore *mcore)
|
||||
+{
|
||||
+ struct ssb_bus *bus;
|
||||
struct ssb_device *dev;
|
||||
unsigned long hz, ns;
|
||||
unsigned int irq, i;
|
||||
@@ -198,6 +262,8 @@
|
||||
if (!mcore->dev)
|
||||
return; /* We don't have a MIPS core */
|
||||
|
||||
+ bus = mcore->dev->bus;
|
||||
+
|
||||
ssb_dprintk(KERN_INFO PFX "Initializing MIPS core...\n");
|
||||
|
||||
hz = ssb_clockspeed(bus);
|
||||
@@ -205,28 +271,9 @@
|
||||
hz = 100000000;
|
||||
ns = 1000000000 / hz;
|
||||
|
||||
-//TODO
|
||||
-#if 0
|
||||
- if (have EXTIF) {
|
||||
- /* Initialize extif so we can get to the LEDs and external UART */
|
||||
- W_REG(&eir->prog_config, CF_EN);
|
||||
-
|
||||
- /* Set timing for the flash */
|
||||
- tmp = CEIL(10, ns) << FW_W3_SHIFT; /* W3 = 10nS */
|
||||
- tmp = tmp | (CEIL(40, ns) << FW_W1_SHIFT); /* W1 = 40nS */
|
||||
- tmp = tmp | CEIL(120, ns); /* W0 = 120nS */
|
||||
- W_REG(&eir->prog_waitcount, tmp); /* 0x01020a0c for a 100Mhz clock */
|
||||
-
|
||||
- /* Set programmable interface timing for external uart */
|
||||
- tmp = CEIL(10, ns) << FW_W3_SHIFT; /* W3 = 10nS */
|
||||
- tmp = tmp | (CEIL(20, ns) << FW_W2_SHIFT); /* W2 = 20nS */
|
||||
- tmp = tmp | (CEIL(100, ns) << FW_W1_SHIFT); /* W1 = 100nS */
|
||||
- tmp = tmp | CEIL(120, ns); /* W0 = 120nS */
|
||||
- W_REG(&eir->prog_waitcount, tmp);
|
||||
- }
|
||||
- else... chipcommon
|
||||
-#endif
|
||||
- if (bus->chipco.dev)
|
||||
+ if (bus->extif.dev)
|
||||
+ ssb_extif_timing_init(&bus->extif, ns);
|
||||
+ else if (bus->chipco.dev)
|
||||
ssb_chipco_timing_init(&bus->chipco, ns);
|
||||
|
||||
/* Assign IRQs to all cores on the bus, start with irq line 2, because serial usually takes 1 */
|
||||
@@ -256,3 +303,5 @@
|
||||
ssb_mips_serial_init(mcore);
|
||||
ssb_mips_flash_detect(mcore);
|
||||
}
|
||||
+
|
||||
+EXPORT_SYMBOL(ssb_mips_irq);
|
||||
Index: linux-2.6.22-rc4/drivers/ssb/driver_pcicore.c
|
||||
===================================================================
|
||||
--- linux-2.6.22-rc4.orig/drivers/ssb/driver_pcicore.c 2007-06-10 21:32:11.000000000 +0100
|
||||
+++ linux-2.6.22-rc4/drivers/ssb/driver_pcicore.c 2007-06-10 21:33:25.000000000 +0100
|
||||
@@ -93,6 +93,9 @@
|
||||
|
||||
/* Enable PCI bridge BAR1 prefetch and burst */
|
||||
pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3);
|
||||
+
|
||||
+ /* Make sure our latency is high enough to handle the devices behind us */
|
||||
+ pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0xa8);
|
||||
}
|
||||
DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_fixup_pcibridge);
|
||||
|
||||
@@ -110,7 +113,7 @@
|
||||
|
||||
if (unlikely(pc->cardbusmode && dev > 1))
|
||||
goto out;
|
||||
- if (bus == 0) {
|
||||
+ if (bus == 0) {//FIXME busnumber ok?
|
||||
/* Type 0 transaction */
|
||||
if (unlikely(dev >= SSB_PCI_SLOT_MAX))
|
||||
goto out;
|
||||
@@ -224,7 +227,7 @@
|
||||
val = *((const u32 *)buf);
|
||||
break;
|
||||
}
|
||||
- writel(*((const u32 *)buf), mmio);
|
||||
+ writel(val, mmio);
|
||||
|
||||
err = 0;
|
||||
unmap:
|
||||
@@ -307,6 +310,8 @@
|
||||
udelay(150);
|
||||
val |= SSB_PCICORE_CTL_RST; /* Deassert RST# */
|
||||
pcicore_write32(pc, SSB_PCICORE_CTL, val);
|
||||
+ val = SSB_PCICORE_ARBCTL_INTERN;
|
||||
+ pcicore_write32(pc, SSB_PCICORE_ARBCTL, val);
|
||||
udelay(1);
|
||||
|
||||
//TODO cardbus mode
|
||||
@@ -336,6 +341,7 @@
|
||||
* The following needs change, if we want to port hostmode
|
||||
* to non-MIPS platform. */
|
||||
set_io_port_base((unsigned long)ioremap_nocache(SSB_PCI_MEM, 0x04000000));
|
||||
+ mdelay(300);
|
||||
register_pci_controller(&ssb_pcicore_controller);
|
||||
}
|
||||
|
||||
Index: linux-2.6.22-rc4/include/linux/ssb/ssb_driver_chipcommon.h
|
||||
===================================================================
|
||||
--- linux-2.6.22-rc4.orig/include/linux/ssb/ssb_driver_chipcommon.h 2007-06-10 21:32:11.000000000 +0100
|
||||
+++ linux-2.6.22-rc4/include/linux/ssb/ssb_driver_chipcommon.h 2007-06-10 21:33:25.000000000 +0100
|
||||
@@ -364,6 +364,8 @@
|
||||
extern void ssb_chipco_suspend(struct ssb_chipcommon *cc, pm_message_t state);
|
||||
extern void ssb_chipco_resume(struct ssb_chipcommon *cc);
|
||||
|
||||
+extern void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
|
||||
+ u32 *plltype, u32 *n, u32 *m);
|
||||
extern void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
|
||||
u32 *plltype, u32 *n, u32 *m);
|
||||
extern void ssb_chipco_timing_init(struct ssb_chipcommon *cc,
|
||||
@@ -378,6 +380,46 @@
|
||||
extern void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
|
||||
enum ssb_clkmode mode);
|
||||
|
||||
+/* GPIO functions */
|
||||
+static inline u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc,
|
||||
+ u32 mask)
|
||||
+{
|
||||
+ return ssb_read32(cc->dev, SSB_CHIPCO_GPIOIN) & mask;
|
||||
+}
|
||||
+
|
||||
+static inline u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc,
|
||||
+ u32 mask, u32 value)
|
||||
+{
|
||||
+ return ssb_write32_masked(cc->dev, SSB_CHIPCO_GPIOOUT, mask, value);
|
||||
+}
|
||||
+
|
||||
+static inline u32 ssb_chipco_gpio_outen(struct ssb_chipcommon *cc,
|
||||
+ u32 mask, u32 value)
|
||||
+{
|
||||
+ return ssb_write32_masked(cc->dev, SSB_CHIPCO_GPIOOUTEN, mask, value);
|
||||
+}
|
||||
+
|
||||
+static inline u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc,
|
||||
+ u32 mask, u32 value)
|
||||
+{
|
||||
+ return ssb_write32_masked(cc->dev, SSB_CHIPCO_GPIOCTL, mask, value);
|
||||
+}
|
||||
+
|
||||
+static inline u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc,
|
||||
+ u32 mask, u32 value)
|
||||
+{
|
||||
+ return ssb_write32_masked(cc->dev, SSB_CHIPCO_GPIOIRQ, mask, value);
|
||||
+}
|
||||
+
|
||||
+static inline u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc,
|
||||
+ u32 mask, u32 value)
|
||||
+{
|
||||
+ return ssb_write32_masked(cc->dev, SSB_CHIPCO_GPIOPOL, mask, value);
|
||||
+}
|
||||
+/* TODO: GPIO reservation */
|
||||
+
|
||||
+extern int ssb_chipco_watchdog(struct ssb_chipcommon *cc, uint ticks);
|
||||
+
|
||||
#ifdef CONFIG_SSB_SERIAL
|
||||
extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
|
||||
struct ssb_serial_port *ports);
|
||||
Index: linux-2.6.22-rc4/include/linux/ssb/ssb_driver_extif.h
|
||||
===================================================================
|
||||
--- linux-2.6.22-rc4.orig/include/linux/ssb/ssb_driver_extif.h 2007-06-10 21:32:11.000000000 +0100
|
||||
+++ linux-2.6.22-rc4/include/linux/ssb/ssb_driver_extif.h 2007-06-10 21:33:25.000000000 +0100
|
||||
@@ -158,6 +158,36 @@
|
||||
/* watchdog */
|
||||
#define SSB_EXTIF_WATCHDOG_CLK 48000000 /* Hz */
|
||||
|
||||
+/* GPIO functions */
|
||||
+static inline u32 ssb_extif_gpio_in(struct ssb_extif *extif,
|
||||
+ u32 mask)
|
||||
+{
|
||||
+ return ssb_read32(extif->dev, SSB_EXTIF_GPIO_IN) & mask;
|
||||
+}
|
||||
+
|
||||
+static inline u32 ssb_extif_gpio_out(struct ssb_extif *extif,
|
||||
+ u32 mask, u32 value)
|
||||
+{
|
||||
+ return ssb_write32_masked(extif->dev, SSB_EXTIF_GPIO_OUT(0), mask, value);
|
||||
+}
|
||||
+
|
||||
+static inline u32 ssb_extif_gpio_outen(struct ssb_extif *extif,
|
||||
+ u32 mask, u32 value)
|
||||
+{
|
||||
+ return ssb_write32_masked(extif->dev, SSB_EXTIF_GPIO_OUTEN(0), mask, value);
|
||||
+}
|
||||
+
|
||||
+static inline u32 ssb_extif_gpio_polarity(struct ssb_extif *extif,
|
||||
+ u32 mask, u32 value)
|
||||
+{
|
||||
+ return ssb_write32_masked(extif->dev, SSB_EXTIF_GPIO_INTPOL, mask, value);
|
||||
+}
|
||||
+
|
||||
+static inline u32 ssb_extif_gpio_intmask(struct ssb_extif *extif,
|
||||
+ u32 mask, u32 value)
|
||||
+{
|
||||
+ return ssb_write32_masked(extif->dev, SSB_EXTIF_GPIO_INTMASK, mask, value);
|
||||
+}
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
#endif /* LINUX_SSB_EXTIFCORE_H_ */
|
||||
Index: linux-2.6.22-rc4/include/linux/ssb/ssb_driver_mips.h
|
||||
===================================================================
|
||||
--- linux-2.6.22-rc4.orig/include/linux/ssb/ssb_driver_mips.h 2007-06-10 21:32:11.000000000 +0100
|
||||
+++ linux-2.6.22-rc4/include/linux/ssb/ssb_driver_mips.h 2007-06-10 21:33:25.000000000 +0100
|
||||
@@ -22,11 +22,13 @@
|
||||
int nr_serial_ports;
|
||||
struct ssb_serial_port serial_ports[4];
|
||||
|
||||
+ int flash_buswidth;
|
||||
u32 flash_window;
|
||||
u32 flash_window_size;
|
||||
};
|
||||
|
||||
extern void ssb_mipscore_init(struct ssb_mipscore *mcore);
|
||||
+extern u32 ssb_cpu_clock(struct ssb_mipscore *mcore);
|
||||
|
||||
extern unsigned int ssb_mips_irq(struct ssb_device *dev);
|
||||
|
||||
Index: linux-2.6.22-rc4/include/linux/ssb/ssb.h
|
||||
===================================================================
|
||||
--- linux-2.6.22-rc4.orig/include/linux/ssb/ssb.h 2007-06-10 21:32:11.000000000 +0100
|
||||
+++ linux-2.6.22-rc4/include/linux/ssb/ssb.h 2007-06-10 21:33:25.000000000 +0100
|
||||
@@ -263,6 +263,12 @@
|
||||
#define SSB_CHIPPACK_BCM4712M 2 /* Medium 225pin 4712 */
|
||||
#define SSB_CHIPPACK_BCM4712L 0 /* Large 340pin 4712 */
|
||||
|
||||
+static inline u16 ssb_read16(struct ssb_device *dev, u16 offset);
|
||||
+static inline u32 ssb_read32(struct ssb_device *dev, u16 offset);
|
||||
+static inline void ssb_write16(struct ssb_device *dev, u16 offset, u16 value);
|
||||
+static inline void ssb_write32(struct ssb_device *dev, u16 offset, u32 value);
|
||||
+static inline u32 ssb_write32_masked(struct ssb_device *dev, u16 offset, u32 mask, u32 value);
|
||||
+
|
||||
#include <linux/ssb/ssb_driver_chipcommon.h>
|
||||
#include <linux/ssb/ssb_driver_mips.h>
|
||||
#include <linux/ssb/ssb_driver_extif.h>
|
||||
@@ -369,6 +375,16 @@
|
||||
dev->ops->write32(dev, offset, value);
|
||||
}
|
||||
|
||||
+static inline u32 ssb_write32_masked(struct ssb_device *dev,
|
||||
+ u16 offset,
|
||||
+ u32 mask,
|
||||
+ u32 value)
|
||||
+{
|
||||
+ value &= mask;
|
||||
+ value |= ssb_read32(dev, offset) & ~mask;
|
||||
+ ssb_write32(dev, offset, value);
|
||||
+ return value;
|
||||
+}
|
||||
|
||||
/* Translation (routing) bits that need to be ORed to DMA
|
||||
* addresses before they are given to a device. */
|
Loading…
Reference in New Issue
Block a user