mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[generic-2.6] Remove files now present upstream in files-2.6.25
(This is mostly just drivers/ssb and include/linux/ssb)
[brcm47xx] Regenerate patches against 2.6.25.1 kernel+files set
Default is still to build against 2.6.23.16
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11155 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
noz
252
target/linux/brcm47xx/config-2.6.25
Normal file
252
target/linux/brcm47xx/config-2.6.25
Normal file
@@ -0,0 +1,252 @@
|
||||
CONFIG_32BIT=y
|
||||
# CONFIG_64BIT is not set
|
||||
# CONFIG_8139TOO is not set
|
||||
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
|
||||
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
# CONFIG_ARPD is not set
|
||||
# CONFIG_ATMEL is not set
|
||||
CONFIG_B44=y
|
||||
CONFIG_BASE_SMALL=0
|
||||
# CONFIG_BCM43XX is not set
|
||||
CONFIG_BCM47XX=y
|
||||
CONFIG_BITREVERSE=y
|
||||
# CONFIG_BONDING is not set
|
||||
# CONFIG_BSD_DISKLABEL is not set
|
||||
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||
# CONFIG_BT_HCIBCM203X is not set
|
||||
# CONFIG_BT_HCIBFUSB is not set
|
||||
# CONFIG_BT_HCIBPA10X is not set
|
||||
# CONFIG_BT_HCIVHCI is not set
|
||||
CONFIG_CFE=y
|
||||
# CONFIG_CIFS_STATS is not set
|
||||
# CONFIG_CLS_U32_MARK is not set
|
||||
# CONFIG_CLS_U32_PERF is not set
|
||||
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
|
||||
# CONFIG_CONFIGFS_FS is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_CPU_BIG_ENDIAN is not set
|
||||
CONFIG_CPU_HAS_LLSC=y
|
||||
CONFIG_CPU_HAS_PREFETCH=y
|
||||
CONFIG_CPU_HAS_SYNC=y
|
||||
CONFIG_CPU_LITTLE_ENDIAN=y
|
||||
# CONFIG_CPU_LOONGSON2 is not set
|
||||
CONFIG_CPU_MIPS32=y
|
||||
CONFIG_CPU_MIPS32_R1=y
|
||||
# CONFIG_CPU_MIPS32_R2 is not set
|
||||
# CONFIG_CPU_MIPS64_R1 is not set
|
||||
# CONFIG_CPU_MIPS64_R2 is not set
|
||||
CONFIG_CPU_MIPSR1=y
|
||||
# CONFIG_CPU_NEVADA is not set
|
||||
# CONFIG_CPU_R10000 is not set
|
||||
# CONFIG_CPU_R3000 is not set
|
||||
# CONFIG_CPU_R4300 is not set
|
||||
# CONFIG_CPU_R4X00 is not set
|
||||
# CONFIG_CPU_R5000 is not set
|
||||
# CONFIG_CPU_R5432 is not set
|
||||
# CONFIG_CPU_R6000 is not set
|
||||
# CONFIG_CPU_R8000 is not set
|
||||
# CONFIG_CPU_RM7000 is not set
|
||||
# CONFIG_CPU_RM9000 is not set
|
||||
# CONFIG_CPU_SB1 is not set
|
||||
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
|
||||
CONFIG_CPU_SUPPORTS_HIGHMEM=y
|
||||
# CONFIG_CPU_TX39XX is not set
|
||||
# CONFIG_CPU_TX49XX is not set
|
||||
# CONFIG_CPU_VR41XX is not set
|
||||
# CONFIG_CRYPTO_HW is not set
|
||||
CONFIG_DEVPORT=y
|
||||
# CONFIG_DM9000 is not set
|
||||
CONFIG_DMA_NEED_PCI_MAP_STATE=y
|
||||
CONFIG_DMA_NONCOHERENT=y
|
||||
# CONFIG_E100 is not set
|
||||
CONFIG_FS_POSIX_ACL=y
|
||||
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
||||
CONFIG_GENERIC_GPIO=y
|
||||
# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
|
||||
# CONFIG_HAMRADIO is not set
|
||||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT=y
|
||||
CONFIG_HID=m
|
||||
# CONFIG_HID_SUPPORT is not set
|
||||
CONFIG_HW_HAS_PCI=y
|
||||
CONFIG_HW_RANDOM=y
|
||||
CONFIG_HZ=250
|
||||
# CONFIG_HZ_100 is not set
|
||||
CONFIG_HZ_250=y
|
||||
# CONFIG_I2C is not set
|
||||
# CONFIG_IDE is not set
|
||||
# CONFIG_IKCONFIG is not set
|
||||
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_INPUT=y
|
||||
CONFIG_INPUT_EVDEV=y
|
||||
CONFIG_INPUT_POLLDEV=y
|
||||
# CONFIG_IP6_NF_MATCH_FRAG is not set
|
||||
# CONFIG_IP6_NF_MATCH_HL is not set
|
||||
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
|
||||
# CONFIG_IP6_NF_MATCH_OPTS is not set
|
||||
# CONFIG_IP6_NF_MATCH_RT is not set
|
||||
# CONFIG_IP6_NF_TARGET_HL is not set
|
||||
CONFIG_IPW2200_QOS=y
|
||||
# CONFIG_IP_ROUTE_VERBOSE is not set
|
||||
CONFIG_IRQ_CPU=y
|
||||
# CONFIG_LEDS_ALIX is not set
|
||||
CONFIG_LEDS_GPIO=y
|
||||
# CONFIG_LEMOTE_FULONG is not set
|
||||
# CONFIG_LLC2 is not set
|
||||
# CONFIG_MACH_ALCHEMY is not set
|
||||
# CONFIG_MACH_DECSTATION is not set
|
||||
# CONFIG_MACH_JAZZ is not set
|
||||
# CONFIG_MACH_VR41XX is not set
|
||||
CONFIG_MIPS=y
|
||||
# CONFIG_MIPS_ATLAS is not set
|
||||
# CONFIG_MIPS_COBALT is not set
|
||||
CONFIG_MIPS_L1_CACHE_SHIFT=5
|
||||
# CONFIG_MIPS_MALTA is not set
|
||||
CONFIG_MIPS_MT_DISABLED=y
|
||||
# CONFIG_MIPS_MT_SMP is not set
|
||||
# CONFIG_MIPS_MT_SMTC is not set
|
||||
# CONFIG_MIPS_SEAD is not set
|
||||
# CONFIG_MIPS_SIM is not set
|
||||
CONFIG_MTD=y
|
||||
# CONFIG_MTD_ABSENT is not set
|
||||
CONFIG_MTD_BCM47XX=y
|
||||
CONFIG_MTD_BLKDEVS=y
|
||||
CONFIG_MTD_BLOCK=y
|
||||
# CONFIG_MTD_BLOCK2MTD is not set
|
||||
CONFIG_MTD_CFI=y
|
||||
# CONFIG_MTD_CFI_ADV_OPTIONS is not set
|
||||
CONFIG_MTD_CFI_AMDSTD=y
|
||||
CONFIG_MTD_CFI_I1=y
|
||||
CONFIG_MTD_CFI_I2=y
|
||||
# CONFIG_MTD_CFI_I4 is not set
|
||||
# CONFIG_MTD_CFI_I8 is not set
|
||||
CONFIG_MTD_CFI_INTELEXT=y
|
||||
# CONFIG_MTD_CFI_STAA is not set
|
||||
CONFIG_MTD_CFI_UTIL=y
|
||||
CONFIG_MTD_CHAR=y
|
||||
# CONFIG_MTD_CMDLINE_PARTS is not set
|
||||
CONFIG_MTD_COMPLEX_MAPPINGS=y
|
||||
# CONFIG_MTD_CONCAT is not set
|
||||
# CONFIG_MTD_DEBUG is not set
|
||||
# CONFIG_MTD_DOC2000 is not set
|
||||
# CONFIG_MTD_DOC2001 is not set
|
||||
# CONFIG_MTD_DOC2001PLUS is not set
|
||||
CONFIG_MTD_GEN_PROBE=y
|
||||
# CONFIG_MTD_JEDECPROBE is not set
|
||||
CONFIG_MTD_MAP_BANK_WIDTH_1=y
|
||||
# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
|
||||
CONFIG_MTD_MAP_BANK_WIDTH_2=y
|
||||
# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
|
||||
CONFIG_MTD_MAP_BANK_WIDTH_4=y
|
||||
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
|
||||
# CONFIG_MTD_MTDRAM is not set
|
||||
# CONFIG_MTD_ONENAND is not set
|
||||
CONFIG_MTD_PARTITIONS=y
|
||||
# CONFIG_MTD_PCI is not set
|
||||
# CONFIG_MTD_PHRAM is not set
|
||||
# CONFIG_MTD_PHYSMAP is not set
|
||||
# CONFIG_MTD_PLATRAM is not set
|
||||
# CONFIG_MTD_PMC551 is not set
|
||||
# CONFIG_MTD_RAM is not set
|
||||
# CONFIG_MTD_REDBOOT_PARTS is not set
|
||||
# CONFIG_MTD_ROM is not set
|
||||
# CONFIG_MTD_SLRAM is not set
|
||||
# CONFIG_NATSEMI is not set
|
||||
# CONFIG_NE2K_PCI is not set
|
||||
CONFIG_NETDEV_1000=y
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_IPGRE_BROADCAST is not set
|
||||
# CONFIG_NET_PKTGEN is not set
|
||||
# CONFIG_NET_SCH_NETEM is not set
|
||||
# CONFIG_NET_VENDOR_3COM is not set
|
||||
# CONFIG_NO_IOPORT is not set
|
||||
# CONFIG_PAGE_SIZE_16KB is not set
|
||||
CONFIG_PAGE_SIZE_4KB=y
|
||||
# CONFIG_PAGE_SIZE_64KB is not set
|
||||
# CONFIG_PAGE_SIZE_8KB is not set
|
||||
# CONFIG_PMC_MSP is not set
|
||||
# CONFIG_PMC_YOSEMITE is not set
|
||||
# CONFIG_PNX8550_JBS is not set
|
||||
# CONFIG_PNX8550_STB810 is not set
|
||||
# CONFIG_PPP_MULTILINK is not set
|
||||
# CONFIG_PPP_SYNC_TTY is not set
|
||||
# CONFIG_PROC_KCORE is not set
|
||||
CONFIG_RFKILL=y
|
||||
CONFIG_RFKILL_INPUT=y
|
||||
CONFIG_RFKILL_LEDS=y
|
||||
# CONFIG_RTC is not set
|
||||
CONFIG_RWSEM_GENERIC_SPINLOCK=y
|
||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||
# CONFIG_SCSI_MULTI_LUN is not set
|
||||
CONFIG_SCSI_WAIT_SCAN=m
|
||||
# CONFIG_SERIAL_8250_DETECT_IRQ is not set
|
||||
CONFIG_SERIAL_8250_EXTENDED=y
|
||||
# CONFIG_SERIAL_8250_MANY_PORTS is not set
|
||||
# CONFIG_SERIAL_8250_RSA is not set
|
||||
CONFIG_SERIAL_8250_SHARE_IRQ=y
|
||||
# CONFIG_SGI_IP22 is not set
|
||||
# CONFIG_SGI_IP27 is not set
|
||||
# CONFIG_SGI_IP32 is not set
|
||||
# CONFIG_SIBYTE_BIGSUR is not set
|
||||
# CONFIG_SIBYTE_CARMEL is not set
|
||||
# CONFIG_SIBYTE_CRHINE is not set
|
||||
# CONFIG_SIBYTE_CRHONE is not set
|
||||
# CONFIG_SIBYTE_LITTLESUR is not set
|
||||
# CONFIG_SIBYTE_PTSWARM is not set
|
||||
# CONFIG_SIBYTE_RHONE is not set
|
||||
# CONFIG_SIBYTE_SENTOSA is not set
|
||||
# CONFIG_SIBYTE_SWARM is not set
|
||||
# CONFIG_SPARSEMEM_STATIC is not set
|
||||
CONFIG_SSB=y
|
||||
CONFIG_SSB_DEBUG=y
|
||||
CONFIG_SSB_DRIVER_EXTIF=y
|
||||
# CONFIG_SSB_DRIVER_GIGE is not set
|
||||
CONFIG_SSB_DRIVER_MIPS=y
|
||||
CONFIG_SSB_DRIVER_PCICORE=y
|
||||
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
|
||||
CONFIG_SSB_EMBEDDED=y
|
||||
CONFIG_SSB_PCICORE_HOSTMODE=y
|
||||
CONFIG_SSB_PCIHOST=y
|
||||
CONFIG_SSB_PCIHOST_POSSIBLE=y
|
||||
CONFIG_SSB_POSSIBLE=y
|
||||
CONFIG_SSB_SERIAL=y
|
||||
# CONFIG_SSB_SILENT is not set
|
||||
CONFIG_SYSVIPC_SYSCTL=y
|
||||
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
|
||||
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
|
||||
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
|
||||
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
|
||||
# CONFIG_TC35815 is not set
|
||||
# CONFIG_TOSHIBA_JMR3927 is not set
|
||||
# CONFIG_TOSHIBA_RBTX4927 is not set
|
||||
# CONFIG_TOSHIBA_RBTX4938 is not set
|
||||
CONFIG_TRAD_SIGNALS=y
|
||||
# CONFIG_USB_CATC is not set
|
||||
CONFIG_USB_EHCI_HCD=m
|
||||
CONFIG_USB_EHCI_SPLIT_ISO=y
|
||||
# CONFIG_USB_KAWETH is not set
|
||||
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
|
||||
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
|
||||
CONFIG_USB_OHCI_HCD=m
|
||||
CONFIG_USB_OHCI_HCD_SSB=y
|
||||
# CONFIG_USB_PEGASUS is not set
|
||||
# CONFIG_USB_R8A66597_HCD is not set
|
||||
# CONFIG_USB_SERIAL_OTI6858 is not set
|
||||
# CONFIG_USB_STORAGE_ALAUDA is not set
|
||||
# CONFIG_USB_STORAGE_DATAFAB is not set
|
||||
# CONFIG_USB_STORAGE_DPCM is not set
|
||||
# CONFIG_USB_STORAGE_FREECOM is not set
|
||||
# CONFIG_USB_STORAGE_JUMPSHOT is not set
|
||||
# CONFIG_USB_STORAGE_KARMA is not set
|
||||
# CONFIG_USB_STORAGE_SDDR09 is not set
|
||||
# CONFIG_USB_STORAGE_SDDR55 is not set
|
||||
# CONFIG_USB_STORAGE_USBAT is not set
|
||||
CONFIG_USB_UHCI_HCD=m
|
||||
# CONFIG_USER_NS is not set
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIA_RHINE is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
CONFIG_ZONE_DMA_FLAG=0
|
||||
@@ -1,7 +0,0 @@
|
||||
#
|
||||
# Makefile for the BCM47xx specific kernel interface routines
|
||||
# under Linux.
|
||||
#
|
||||
|
||||
obj-y := irq.o prom.o setup.o time.o
|
||||
obj-y += nvram.o cfe_env.o
|
||||
@@ -1,86 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
||||
* Copyright (C) 2008 Michael Buesch <mb@bu3sch.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
||||
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
||||
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <linux/errno.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/smp.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/ssb/ssb.h>
|
||||
|
||||
#include <asm/cpu.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/irq_cpu.h>
|
||||
|
||||
|
||||
extern struct ssb_bus ssb;
|
||||
|
||||
|
||||
void plat_irq_dispatch(void)
|
||||
{
|
||||
u32 cause;
|
||||
|
||||
cause = read_c0_cause() & read_c0_status() & CAUSEF_IP;
|
||||
|
||||
clear_c0_status(cause);
|
||||
|
||||
if (cause & CAUSEF_IP7)
|
||||
do_IRQ(7);
|
||||
if (cause & CAUSEF_IP2)
|
||||
do_IRQ(2);
|
||||
if (cause & CAUSEF_IP3)
|
||||
do_IRQ(3);
|
||||
if (cause & CAUSEF_IP4)
|
||||
do_IRQ(4);
|
||||
if (cause & CAUSEF_IP5)
|
||||
do_IRQ(5);
|
||||
if (cause & CAUSEF_IP6)
|
||||
do_IRQ(6);
|
||||
}
|
||||
|
||||
void __init arch_init_irq(void)
|
||||
{
|
||||
mips_cpu_irq_init();
|
||||
}
|
||||
|
||||
int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
{
|
||||
int res;
|
||||
|
||||
res = ssb_pcibios_map_irq(dev, slot, pin);
|
||||
if (res < 0) {
|
||||
printk(KERN_ALERT "PCI: Failed to map IRQ of device %s\n",
|
||||
dev->dev.bus_id);
|
||||
return 0;
|
||||
}
|
||||
/* IRQ-0 and IRQ-1 are software interrupts. */
|
||||
WARN_ON((res == 0) || (res == 1));
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -1,61 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
||||
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
||||
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/bootmem.h>
|
||||
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/pmon.h>
|
||||
#include "../cfe/cfe_private.h"
|
||||
|
||||
const char *get_system_type(void)
|
||||
{
|
||||
return "Broadcom BCM47xx";
|
||||
}
|
||||
|
||||
void __init prom_init(void)
|
||||
{
|
||||
unsigned long mem;
|
||||
|
||||
mips_machgroup = MACH_GROUP_BRCM;
|
||||
mips_machtype = MACH_BCM47XX;
|
||||
|
||||
cfe_setup(fw_arg0, fw_arg1, fw_arg2, fw_arg3);
|
||||
|
||||
/* Figure out memory size by finding aliases */
|
||||
for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) {
|
||||
if (*(unsigned long *)((unsigned long)(prom_init) + mem) ==
|
||||
*(unsigned long *)(prom_init))
|
||||
break;
|
||||
}
|
||||
|
||||
add_memory_region(0, mem, BOOT_MEM_RAM);
|
||||
}
|
||||
|
||||
void __init prom_free_prom_memory(void)
|
||||
{
|
||||
}
|
||||
@@ -1,246 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
||||
* Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
|
||||
* Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
|
||||
* Copyright (C) 2006-2008 Michael Buesch <mb@bu3sch.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
||||
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
||||
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/tty.h>
|
||||
#include <linux/serial.h>
|
||||
#include <linux/serial_core.h>
|
||||
#include <linux/serial_reg.h>
|
||||
#include <linux/serial_8250.h>
|
||||
#include <asm/bootinfo.h>
|
||||
#include <asm/time.h>
|
||||
#include <asm/reboot.h>
|
||||
#include <asm/cfe.h>
|
||||
#include <linux/pm.h>
|
||||
#include <linux/ssb/ssb.h>
|
||||
#include <linux/ssb/ssb_embedded.h>
|
||||
|
||||
#include <nvram.h>
|
||||
|
||||
extern void bcm47xx_pci_init(void);
|
||||
extern void bcm47xx_time_init(void);
|
||||
|
||||
struct ssb_bus ssb;
|
||||
|
||||
|
||||
int pcibios_plat_dev_init(struct pci_dev *dev)
|
||||
{
|
||||
int err;
|
||||
|
||||
err = ssb_pcibios_plat_dev_init(dev);
|
||||
if (err) {
|
||||
printk(KERN_ALERT "PCI: Failed to init device %s\n",
|
||||
pci_name(dev));
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static void bcm47xx_machine_restart(char *command)
|
||||
{
|
||||
printk(KERN_ALERT "Please stand by while rebooting the system...\n");
|
||||
local_irq_disable();
|
||||
/* CFE has a reboot callback, but that does not work.
|
||||
* Oopses with: Reserved instruction in kernel code.
|
||||
*/
|
||||
|
||||
/* Set the watchdog timer to reset immediately */
|
||||
if (ssb_watchdog_timer_set(&ssb, 1))
|
||||
printk(KERN_EMERG "SSB watchdog-triggered reboot failed!\n");
|
||||
while (1)
|
||||
cpu_relax();
|
||||
}
|
||||
|
||||
static void bcm47xx_machine_halt(void)
|
||||
{
|
||||
/* Disable interrupts and watchdog and spin forever */
|
||||
local_irq_disable();
|
||||
if (ssb_watchdog_timer_set(&ssb, 0))
|
||||
printk(KERN_EMERG "Failed to disable SSB watchdog!\n");
|
||||
while (1)
|
||||
cpu_relax();
|
||||
}
|
||||
|
||||
static void e_aton(char *str, char *dest)
|
||||
{
|
||||
int i = 0;
|
||||
|
||||
if (str == NULL) {
|
||||
memset(dest, 0, 6);
|
||||
return;
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
dest[i++] = (char) simple_strtoul(str, NULL, 16);
|
||||
str += 2;
|
||||
if (!*str++ || i == 6)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
|
||||
{
|
||||
char *s;
|
||||
|
||||
memset(sprom, 0xFF, sizeof(struct ssb_sprom));
|
||||
|
||||
sprom->revision = 1;
|
||||
if ((s = nvram_get("il0macaddr")))
|
||||
e_aton(s, sprom->il0mac);
|
||||
if ((s = nvram_get("et0macaddr")))
|
||||
e_aton(s, sprom->et0mac);
|
||||
if ((s = nvram_get("et1macaddr")))
|
||||
e_aton(s, sprom->et1mac);
|
||||
if ((s = nvram_get("et0phyaddr")))
|
||||
sprom->et0phyaddr = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("et1phyaddr")))
|
||||
sprom->et1phyaddr = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("et0mdcport")))
|
||||
sprom->et0mdcport = !!simple_strtoul(s, NULL, 10);
|
||||
if ((s = nvram_get("et1mdcport")))
|
||||
sprom->et1mdcport = !!simple_strtoul(s, NULL, 10);
|
||||
if ((s = nvram_get("pa0b0")))
|
||||
sprom->pa0b0 = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("pa0b1")))
|
||||
sprom->pa0b1 = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("pa0b2")))
|
||||
sprom->pa0b2 = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("pa1b0")))
|
||||
sprom->pa1b0 = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("pa1b1")))
|
||||
sprom->pa1b1 = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("pa1b2")))
|
||||
sprom->pa1b2 = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("wl0gpio0")))
|
||||
sprom->gpio0 = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("wl0gpio1")))
|
||||
sprom->gpio1 = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("wl0gpio2")))
|
||||
sprom->gpio2 = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("wl0gpio3")))
|
||||
sprom->gpio3 = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("pa0maxpwr")))
|
||||
sprom->maxpwr_bg = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("pa1maxpwr")))
|
||||
sprom->maxpwr_a = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("pa0itssit")))
|
||||
sprom->itssi_bg = simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("pa1itssit")))
|
||||
sprom->itssi_a = simple_strtoul(s, NULL, 0);
|
||||
sprom->boardflags_lo = 0;
|
||||
if ((s = nvram_get("boardflags")))
|
||||
sprom->boardflags_lo = simple_strtoul(s, NULL, 0);
|
||||
sprom->boardflags_hi = 0;
|
||||
if ((s = nvram_get("boardflags2")))
|
||||
sprom->boardflags_hi = simple_strtoul(s, NULL, 0);
|
||||
}
|
||||
|
||||
static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariants *iv)
|
||||
{
|
||||
char *s;
|
||||
|
||||
iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;
|
||||
if ((s = nvram_get("boardtype")))
|
||||
iv->boardinfo.type = (u16)simple_strtoul(s, NULL, 0);
|
||||
if ((s = nvram_get("boardrev")))
|
||||
iv->boardinfo.rev = (u16)simple_strtoul(s, NULL, 0);
|
||||
|
||||
bcm47xx_fill_sprom(&iv->sprom);
|
||||
|
||||
if ((s = nvram_get("cardbus")))
|
||||
iv->has_cardbus_slot = !!simple_strtoul(s, NULL, 10);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void __init plat_mem_setup(void)
|
||||
{
|
||||
int i, err;
|
||||
char *s;
|
||||
struct ssb_mipscore *mcore;
|
||||
|
||||
err = ssb_bus_ssbbus_register(&ssb, SSB_ENUM_BASE, bcm47xx_get_invariants);
|
||||
if (err) {
|
||||
const char *msg = "Failed to initialize SSB bus (err %d)\n";
|
||||
cfe_printk(msg, err); /* Make sure the message gets out of the box. */
|
||||
panic(msg, err);
|
||||
}
|
||||
mcore = &ssb.mipscore;
|
||||
|
||||
s = nvram_get("kernel_args");
|
||||
if (s && !strncmp(s, "console=ttyS1", 13)) {
|
||||
struct ssb_serial_port port;
|
||||
|
||||
cfe_printk("Swapping serial ports!\n");
|
||||
/* swap serial ports */
|
||||
memcpy(&port, &mcore->serial_ports[0], sizeof(port));
|
||||
memcpy(&mcore->serial_ports[0], &mcore->serial_ports[1], sizeof(port));
|
||||
memcpy(&mcore->serial_ports[1], &port, sizeof(port));
|
||||
}
|
||||
|
||||
for (i = 0; i < mcore->nr_serial_ports; i++) {
|
||||
struct ssb_serial_port *port = &(mcore->serial_ports[i]);
|
||||
struct uart_port s;
|
||||
|
||||
memset(&s, 0, sizeof(s));
|
||||
s.line = i;
|
||||
s.membase = port->regs;
|
||||
s.irq = port->irq + 2;
|
||||
s.uartclk = port->baud_base;
|
||||
s.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
|
||||
s.iotype = SERIAL_IO_MEM;
|
||||
s.regshift = port->reg_shift;
|
||||
|
||||
early_serial_setup(&s);
|
||||
}
|
||||
cfe_printk("Serial init done.\n");
|
||||
|
||||
_machine_restart = bcm47xx_machine_restart;
|
||||
_machine_halt = bcm47xx_machine_halt;
|
||||
pm_power_off = bcm47xx_machine_halt;
|
||||
board_time_init = bcm47xx_time_init;
|
||||
}
|
||||
|
||||
static int __init bcm47xx_register_gpiodev(void)
|
||||
{
|
||||
static struct resource res = {
|
||||
.start = 0xFFFFFFFF,
|
||||
};
|
||||
struct platform_device *pdev;
|
||||
|
||||
pdev = platform_device_register_simple("GPIODEV", 0, &res, 1);
|
||||
if (!pdev) {
|
||||
printk(KERN_ERR "bcm47xx: GPIODEV init failed\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
device_initcall(bcm47xx_register_gpiodev);
|
||||
|
||||
EXPORT_SYMBOL(ssb);
|
||||
@@ -1,62 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
|
||||
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
||||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
||||
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
||||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/serial_reg.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/ssb/ssb.h>
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/time.h>
|
||||
|
||||
extern struct ssb_bus ssb;
|
||||
|
||||
void __init
|
||||
bcm47xx_time_init(void)
|
||||
{
|
||||
unsigned long hz;
|
||||
|
||||
/*
|
||||
* Use deterministic values for initial counter interrupt
|
||||
* so that calibrate delay avoids encountering a counter wrap.
|
||||
*/
|
||||
write_c0_count(0);
|
||||
write_c0_compare(0xffff);
|
||||
|
||||
hz = ssb_cpu_clock(&ssb.mipscore) / 2;
|
||||
if (!hz)
|
||||
hz = 100000000;
|
||||
|
||||
/* Set MIPS counter frequency for fixed_rate_gettimeoffset() */
|
||||
mips_hpt_frequency = hz;
|
||||
}
|
||||
|
||||
void __init
|
||||
plat_timer_setup(struct irqaction *irq)
|
||||
{
|
||||
/* Enable the timer interrupt */
|
||||
setup_irq(7, irq);
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
#
|
||||
# Makefile for the Broadcom Common Firmware Environment support
|
||||
#
|
||||
|
||||
obj-y += cfe.o
|
||||
@@ -1,533 +0,0 @@
|
||||
/*
|
||||
* Broadcom Common Firmware Environment (CFE) support
|
||||
*
|
||||
* Copyright 2000, 2001, 2002
|
||||
* Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Copyright (C) 2006 Michael Buesch
|
||||
*
|
||||
* Original Authors: Mitch Lichtenberg, Chris Demetriou
|
||||
*
|
||||
* This software is furnished under license and may be used and copied only
|
||||
* in accordance with the following terms and conditions. Subject to these
|
||||
* conditions, you may download, copy, install, use, modify and distribute
|
||||
* modified or unmodified copies of this software in source and/or binary
|
||||
* form. No title or ownership is transferred hereby.
|
||||
*
|
||||
* 1) Any source code used, modified or distributed must reproduce and
|
||||
* retain this copyright notice and list of conditions as they appear in
|
||||
* the source file.
|
||||
*
|
||||
* 2) No right is granted to use any trade name, trademark, or logo of
|
||||
* Broadcom Corporation. The "Broadcom Corporation" name may not be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without the prior written permission of Broadcom Corporation.
|
||||
*
|
||||
* 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
|
||||
* NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
|
||||
* FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
|
||||
* LIABLE FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||
* OR OTHERWISE), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#include <linux/init.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <asm/cfe.h>
|
||||
|
||||
#include "cfe_private.h"
|
||||
|
||||
|
||||
static cfe_uint_t cfe_handle;
|
||||
static int (*cfe_trampoline)(long handle, long iocb);
|
||||
|
||||
|
||||
#include <linux/kernel.h>
|
||||
|
||||
void __init cfe_setup(unsigned long fwarg0, unsigned long fwarg1,
|
||||
unsigned long fwarg2, unsigned long fwarg3)
|
||||
{
|
||||
if (fwarg3 == 0x80300000) {
|
||||
/* WRT54G workaround */
|
||||
fwarg3 = CFE_EPTSEAL;
|
||||
fwarg2 = 0xBFC00500;
|
||||
}
|
||||
if (fwarg3 != CFE_EPTSEAL) {
|
||||
/* We are not booted from CFE */
|
||||
return;
|
||||
}
|
||||
if (fwarg1 == 0) {
|
||||
/* We are on the boot CPU */
|
||||
cfe_handle = (cfe_uint_t)fwarg0;
|
||||
cfe_trampoline = CFE_TO_PTR(fwarg2);
|
||||
}
|
||||
}
|
||||
|
||||
int cfe_vprintk(const char *fmt, va_list args)
|
||||
{
|
||||
static char buffer[1024];
|
||||
static DEFINE_SPINLOCK(lock);
|
||||
static const char pfx[] = "CFE-console: ";
|
||||
static const size_t pfx_len = sizeof(pfx) - 1;
|
||||
unsigned long flags;
|
||||
int len, cnt, pos;
|
||||
int handle;
|
||||
int res;
|
||||
|
||||
if (!cfe_present())
|
||||
return -ENODEV;
|
||||
|
||||
spin_lock_irqsave(&lock, flags);
|
||||
handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
|
||||
if (CFE_ISERR(handle)) {
|
||||
len = -EIO;
|
||||
goto out;
|
||||
}
|
||||
strcpy(buffer, pfx);
|
||||
len = vscnprintf(buffer + pfx_len,
|
||||
sizeof(buffer) - pfx_len - 2,
|
||||
fmt, args);
|
||||
len += pfx_len;
|
||||
/* The CFE console requires CR-LF line-ends.
|
||||
* Add a CR, if we only terminate lines with a LF.
|
||||
* This does only fix CR-LF at the end of the string.
|
||||
* So for multiple lines, use multiple cfe_vprintk calls.
|
||||
*/
|
||||
if (len > 1 &&
|
||||
buffer[len - 1] == '\n' && buffer[len - 2] != '\r') {
|
||||
buffer[len - 1] = '\r';
|
||||
buffer[len] = '\n';
|
||||
len += 1;
|
||||
}
|
||||
cnt = len;
|
||||
pos = 0;
|
||||
while (cnt > 0) {
|
||||
res = cfe_write(handle, buffer + pos, len - pos);
|
||||
if (CFE_ISERR(res)) {
|
||||
len = -EIO;
|
||||
goto out;
|
||||
}
|
||||
cnt -= res;
|
||||
pos += res;
|
||||
}
|
||||
out:
|
||||
spin_unlock_irqrestore(&lock, flags);
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
int cfe_printk(const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
int res;
|
||||
|
||||
va_start(args, fmt);
|
||||
res = cfe_vprintk(fmt, args);
|
||||
va_end(args);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
static int cfe_iocb_dispatch(struct cfe_iocb *iocb)
|
||||
{
|
||||
if (!cfe_present())
|
||||
return CFE_ERR_UNSUPPORTED;
|
||||
return cfe_trampoline((long)cfe_handle, (long)iocb);
|
||||
}
|
||||
|
||||
int cfe_present(void)
|
||||
{
|
||||
return (cfe_trampoline != NULL);
|
||||
}
|
||||
|
||||
int cfe_close(int handle)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_DEV_CLOSE;
|
||||
iocb.handle = handle;
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
|
||||
return (CFE_ISERR(err)) ? err : iocb.status;
|
||||
}
|
||||
|
||||
int cfe_cpu_start(int cpu, void (*fn)(void), long sp, long gp, long a1)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_FW_CPUCTL;
|
||||
iocb.psize = sizeof(struct cfe_iocb_cpuctl);
|
||||
iocb.cpuctl.number = cpu;
|
||||
iocb.cpuctl.command = CFE_CPU_CMD_START;
|
||||
iocb.cpuctl.gp = gp;
|
||||
iocb.cpuctl.sp = sp;
|
||||
iocb.cpuctl.a1 = a1;
|
||||
iocb.cpuctl.start_addr = (long)fn;
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
|
||||
return (CFE_ISERR(err)) ? err : iocb.status;
|
||||
}
|
||||
|
||||
int cfe_cpu_stop(int cpu)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_FW_CPUCTL;
|
||||
iocb.psize = sizeof(struct cfe_iocb_cpuctl);
|
||||
iocb.cpuctl.number = cpu;
|
||||
iocb.cpuctl.command = CFE_CPU_CMD_STOP;
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
|
||||
return (CFE_ISERR(err)) ? err : iocb.status;
|
||||
}
|
||||
|
||||
int cfe_enumenv(int idx, char *name, int namelen, char *val, int vallen)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_ENV_ENUM;
|
||||
iocb.psize = sizeof(struct cfe_iocb_envbuf);
|
||||
iocb.envbuf.index = idx;
|
||||
iocb.envbuf.name = PTR_TO_CFE(name);
|
||||
iocb.envbuf.name_len = namelen;
|
||||
iocb.envbuf.val = PTR_TO_CFE(val);
|
||||
iocb.envbuf.val_len = vallen;
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
|
||||
return (CFE_ISERR(err)) ? err : iocb.status;
|
||||
}
|
||||
|
||||
int cfe_enumdev(int idx, char *name, int namelen)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
|
||||
iocb.fcode = CFE_CMD_DEV_ENUM;
|
||||
iocb.psize = sizeof(struct cfe_iocb_envbuf);
|
||||
iocb.envbuf.index = idx;
|
||||
iocb.envbuf.name = PTR_TO_CFE(name);
|
||||
iocb.envbuf.name_len = namelen;
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
|
||||
return (CFE_ISERR(err)) ? err : iocb.status;
|
||||
}
|
||||
|
||||
int cfe_enummem(int idx, int flags, u64 *start, u64 *length,
|
||||
u64 *type)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
|
||||
iocb.fcode = CFE_CMD_FW_MEMENUM;
|
||||
iocb.flags = flags;
|
||||
iocb.psize = sizeof(struct cfe_iocb_meminfo);
|
||||
iocb.meminfo.index = idx;
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
if (CFE_ISERR(err))
|
||||
return err;
|
||||
if (!CFE_ISERR(iocb.status)) {
|
||||
*start = iocb.meminfo.addr;
|
||||
*length = iocb.meminfo.size;
|
||||
*type = iocb.meminfo.type;
|
||||
}
|
||||
|
||||
return iocb.status;
|
||||
}
|
||||
|
||||
int cfe_exit(int warm, int status)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
printk("CFE REBOOT\n");
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_FW_RESTART;
|
||||
if (warm)
|
||||
iocb.flags = CFE_FLG_WARMSTART;
|
||||
iocb.psize = sizeof(struct cfe_iocb_exitstat);
|
||||
iocb.exitstat.status = status;
|
||||
|
||||
printk("CALL\n");
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
printk("DONE\n");
|
||||
|
||||
return (CFE_ISERR(err)) ? err : iocb.status;
|
||||
}
|
||||
|
||||
int cfe_flushcache(int flags)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_FW_FLUSHCACHE;
|
||||
iocb.flags = flags;
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
|
||||
return (CFE_ISERR(err)) ? err : iocb.status;
|
||||
}
|
||||
|
||||
int cfe_getdevinfo(char *name)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_DEV_GETINFO;
|
||||
iocb.psize = sizeof(struct cfe_iocb_buf);
|
||||
iocb.buffer.ptr = PTR_TO_CFE(name);
|
||||
iocb.buffer.length = strlen(name);
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
if (CFE_ISERR(err))
|
||||
return err;
|
||||
if (CFE_ISERR(iocb.status))
|
||||
return iocb.status;
|
||||
|
||||
return iocb.buffer.devflags;
|
||||
}
|
||||
|
||||
int cfe_getenv(char *name, char *dest, int destlen)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
dest[0] = '\0';
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_ENV_GET;
|
||||
iocb.psize = sizeof(struct cfe_iocb_envbuf);
|
||||
iocb.envbuf.name = PTR_TO_CFE(name);
|
||||
iocb.envbuf.name_len = strlen(name);
|
||||
iocb.envbuf.val = PTR_TO_CFE(dest);
|
||||
iocb.envbuf.val_len = destlen;
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
|
||||
return (CFE_ISERR(err)) ? err : iocb.status;
|
||||
}
|
||||
|
||||
int cfe_getfwinfo(struct cfe_fwinfo *info)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_FW_GETINFO;
|
||||
iocb.psize = sizeof(struct cfe_iocb_fwinfo);
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
if (CFE_ISERR(err))
|
||||
return err;
|
||||
if (CFE_ISERR(iocb.status))
|
||||
return err;
|
||||
|
||||
info->version = iocb.fwinfo.version;
|
||||
info->totalmem = iocb.fwinfo.totalmem;
|
||||
info->flags = iocb.fwinfo.flags;
|
||||
info->boardid = iocb.fwinfo.boardid;
|
||||
info->bootarea_va = iocb.fwinfo.bootarea_va;
|
||||
info->bootarea_pa = iocb.fwinfo.bootarea_pa;
|
||||
info->bootarea_size = iocb.fwinfo.bootarea_size;
|
||||
|
||||
return iocb.status;
|
||||
}
|
||||
|
||||
int cfe_getstdhandle(int handletype)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_DEV_GETHANDLE;
|
||||
iocb.flags = handletype;
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
if (CFE_ISERR(err))
|
||||
return err;
|
||||
if (CFE_ISERR(iocb.status))
|
||||
return iocb.status;
|
||||
|
||||
return iocb.handle;
|
||||
}
|
||||
|
||||
int cfe_getticks(s64 *ticks)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_FW_GETTIME;
|
||||
iocb.psize = sizeof(struct cfe_iocb_time);
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
if (CFE_ISERR(err))
|
||||
return err;
|
||||
if (!CFE_ISERR(iocb.status))
|
||||
*ticks = iocb.time.ticks;
|
||||
|
||||
return iocb.status;
|
||||
}
|
||||
|
||||
int cfe_inpstat(int handle)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_DEV_INPSTAT;
|
||||
iocb.handle = handle;
|
||||
iocb.psize = sizeof(struct cfe_iocb_inpstat);
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
if (CFE_ISERR(err))
|
||||
return err;
|
||||
if (CFE_ISERR(iocb.status))
|
||||
return iocb.status;
|
||||
|
||||
return iocb.inpstat.status;
|
||||
}
|
||||
|
||||
int cfe_ioctl(int handle, unsigned int ioctlnum,
|
||||
unsigned char *buffer, int length,
|
||||
int *retlen, u64 offset)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_DEV_IOCTL;
|
||||
iocb.handle = handle;
|
||||
iocb.psize = sizeof(struct cfe_iocb_buf);
|
||||
iocb.buffer.offset = offset;
|
||||
iocb.buffer.ioctlcmd = ioctlnum;
|
||||
iocb.buffer.ptr = PTR_TO_CFE(buffer);
|
||||
iocb.buffer.length = length;
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
if (CFE_ISERR(err))
|
||||
return err;
|
||||
if (CFE_ISERR(iocb.status))
|
||||
return iocb.status;
|
||||
if (retlen)
|
||||
*retlen = iocb.buffer.retlen;
|
||||
|
||||
return iocb.status;
|
||||
}
|
||||
|
||||
int cfe_open(char *name)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_DEV_OPEN;
|
||||
iocb.psize = sizeof(struct cfe_iocb_buf);
|
||||
iocb.buffer.ptr = PTR_TO_CFE(name);
|
||||
iocb.buffer.length = strlen(name);
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
if (CFE_ISERR(err))
|
||||
return err;
|
||||
if (CFE_ISERR(iocb.status))
|
||||
return iocb.status;
|
||||
|
||||
return iocb.handle;
|
||||
}
|
||||
|
||||
int cfe_read(int handle, unsigned char *buffer, int length)
|
||||
{
|
||||
return cfe_readblk(handle, 0, buffer, length);
|
||||
}
|
||||
|
||||
int cfe_readblk(int handle, s64 offset, unsigned char *buffer, int length)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_DEV_READ;
|
||||
iocb.handle = handle;
|
||||
iocb.psize = sizeof(struct cfe_iocb_buf);
|
||||
iocb.buffer.offset = offset;
|
||||
iocb.buffer.ptr = PTR_TO_CFE(buffer);
|
||||
iocb.buffer.length = length;
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
if (CFE_ISERR(err))
|
||||
return err;
|
||||
if (CFE_ISERR(iocb.status))
|
||||
return iocb.status;
|
||||
|
||||
return iocb.buffer.retlen;
|
||||
}
|
||||
|
||||
int cfe_setenv(char *name, char *val)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_ENV_SET;
|
||||
iocb.psize = sizeof(struct cfe_iocb_envbuf);
|
||||
iocb.envbuf.name = PTR_TO_CFE(name);
|
||||
iocb.envbuf.name_len = strlen(name);
|
||||
iocb.envbuf.val = PTR_TO_CFE(val);
|
||||
iocb.envbuf.val_len = strlen(val);
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
|
||||
return (CFE_ISERR(err)) ? err : iocb.status;
|
||||
}
|
||||
|
||||
int cfe_write(int handle, unsigned char *buffer, int length)
|
||||
{
|
||||
return cfe_writeblk(handle, 0, buffer, length);
|
||||
}
|
||||
|
||||
int cfe_writeblk(int handle, s64 offset, unsigned char *buffer, int length)
|
||||
{
|
||||
struct cfe_iocb iocb;
|
||||
int err;
|
||||
|
||||
memset(&iocb, 0, sizeof(iocb));
|
||||
iocb.fcode = CFE_CMD_DEV_WRITE;
|
||||
iocb.handle = handle;
|
||||
iocb.psize = sizeof(struct cfe_iocb_buf);
|
||||
iocb.buffer.offset = offset;
|
||||
iocb.buffer.ptr = PTR_TO_CFE(buffer);
|
||||
iocb.buffer.length = length;
|
||||
|
||||
err = cfe_iocb_dispatch(&iocb);
|
||||
if (CFE_ISERR(err))
|
||||
return err;
|
||||
if (CFE_ISERR(iocb.status))
|
||||
return iocb.status;
|
||||
|
||||
return iocb.buffer.retlen;
|
||||
}
|
||||
@@ -1,176 +0,0 @@
|
||||
/*
|
||||
* Broadcom Common Firmware Environment (CFE) support
|
||||
*
|
||||
* Copyright 2000, 2001, 2002
|
||||
* Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Copyright (C) 2006 Michael Buesch
|
||||
*
|
||||
* Original Authors: Mitch Lichtenberg, Chris Demetriou
|
||||
*
|
||||
* This software is furnished under license and may be used and copied only
|
||||
* in accordance with the following terms and conditions. Subject to these
|
||||
* conditions, you may download, copy, install, use, modify and distribute
|
||||
* modified or unmodified copies of this software in source and/or binary
|
||||
* form. No title or ownership is transferred hereby.
|
||||
*
|
||||
* 1) Any source code used, modified or distributed must reproduce and
|
||||
* retain this copyright notice and list of conditions as they appear in
|
||||
* the source file.
|
||||
*
|
||||
* 2) No right is granted to use any trade name, trademark, or logo of
|
||||
* Broadcom Corporation. The "Broadcom Corporation" name may not be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without the prior written permission of Broadcom Corporation.
|
||||
*
|
||||
* 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
|
||||
* NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
|
||||
* FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
|
||||
* LIABLE FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||
* OR OTHERWISE), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef LINUX_CFE_PRIVATE_H_
|
||||
#define LINUX_CFE_PRIVATE_H_
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
/* Seal indicating CFE's presence, passed to the kernel. */
|
||||
#define CFE_EPTSEAL 0x43464531
|
||||
|
||||
#define CFE_CMD_FW_GETINFO 0
|
||||
#define CFE_CMD_FW_RESTART 1
|
||||
#define CFE_CMD_FW_BOOT 2
|
||||
#define CFE_CMD_FW_CPUCTL 3
|
||||
#define CFE_CMD_FW_GETTIME 4
|
||||
#define CFE_CMD_FW_MEMENUM 5
|
||||
#define CFE_CMD_FW_FLUSHCACHE 6
|
||||
|
||||
#define CFE_CMD_DEV_GETHANDLE 9
|
||||
#define CFE_CMD_DEV_ENUM 10
|
||||
#define CFE_CMD_DEV_OPEN 11
|
||||
#define CFE_CMD_DEV_INPSTAT 12
|
||||
#define CFE_CMD_DEV_READ 13
|
||||
#define CFE_CMD_DEV_WRITE 14
|
||||
#define CFE_CMD_DEV_IOCTL 15
|
||||
#define CFE_CMD_DEV_CLOSE 16
|
||||
#define CFE_CMD_DEV_GETINFO 17
|
||||
|
||||
#define CFE_CMD_ENV_ENUM 20
|
||||
#define CFE_CMD_ENV_GET 22
|
||||
#define CFE_CMD_ENV_SET 23
|
||||
#define CFE_CMD_ENV_DEL 24
|
||||
|
||||
#define CFE_CMD_MAX 32
|
||||
|
||||
#define CFE_CMD_VENDOR_USE 0x8000 /* codes above this are for customer use */
|
||||
|
||||
typedef u64 cfe_uint_t;
|
||||
typedef s64 cfe_int_t;
|
||||
typedef s64 cfe_ptr_t;
|
||||
|
||||
/* Cast a pointer from native to CFE-API pointer and back */
|
||||
#define CFE_TO_PTR(p) ((void *)(unsigned long)(p))
|
||||
#define PTR_TO_CFE(p) ((cfe_ptr_t)(unsigned long)(p))
|
||||
|
||||
struct cfe_iocb_buf {
|
||||
cfe_uint_t offset; /* offset on device (bytes) */
|
||||
cfe_ptr_t ptr; /* pointer to a buffer */
|
||||
cfe_uint_t length; /* length of this buffer */
|
||||
cfe_uint_t retlen; /* returned length (for read ops) */
|
||||
union {
|
||||
cfe_uint_t ioctlcmd; /* IOCTL command (used only for IOCTLs) */
|
||||
cfe_uint_t devflags; /* Returned device info flags */
|
||||
};
|
||||
};
|
||||
|
||||
struct cfe_iocb_inpstat {
|
||||
cfe_uint_t status; /* 1 means input available */
|
||||
};
|
||||
|
||||
struct cfe_iocb_envbuf {
|
||||
cfe_int_t index; /* 0-based enumeration index */
|
||||
cfe_ptr_t name; /* name string buffer */
|
||||
cfe_int_t name_len; /* size of name buffer */
|
||||
cfe_ptr_t val; /* value string buffer */
|
||||
cfe_int_t val_len; /* size of value string buffer */
|
||||
};
|
||||
|
||||
struct cfe_iocb_cpuctl {
|
||||
cfe_uint_t number; /* cpu number to control */
|
||||
cfe_uint_t command; /* command to issue to CPU */
|
||||
cfe_uint_t start_addr; /* CPU start address */
|
||||
cfe_uint_t gp; /* starting GP value */
|
||||
cfe_uint_t sp; /* starting SP value */
|
||||
cfe_uint_t a1; /* starting A1 value */
|
||||
};
|
||||
|
||||
struct cfe_iocb_time {
|
||||
cfe_int_t ticks; /* current time in ticks */
|
||||
};
|
||||
|
||||
struct cfe_iocb_exitstat {
|
||||
cfe_int_t status;
|
||||
};
|
||||
|
||||
struct cfe_iocb_meminfo {
|
||||
cfe_int_t index; /* 0-based enumeration index */
|
||||
cfe_int_t type; /* type of memory block */
|
||||
cfe_uint_t addr; /* physical start address */
|
||||
cfe_uint_t size; /* block size */
|
||||
};
|
||||
|
||||
struct cfe_iocb_fwinfo {
|
||||
cfe_int_t version; /* major, minor, eco version */
|
||||
cfe_int_t totalmem; /* total installed mem */
|
||||
cfe_int_t flags; /* various flags */
|
||||
cfe_int_t boardid; /* board ID */
|
||||
cfe_int_t bootarea_va; /* VA of boot area */
|
||||
cfe_int_t bootarea_pa; /* PA of boot area */
|
||||
cfe_int_t bootarea_size; /* size of boot area */
|
||||
cfe_int_t reserved1;
|
||||
cfe_int_t reserved2;
|
||||
cfe_int_t reserved3;
|
||||
};
|
||||
|
||||
/* CFE I/O Control Block */
|
||||
struct cfe_iocb {
|
||||
cfe_uint_t fcode; /* IOCB function code */
|
||||
cfe_int_t status; /* return status */
|
||||
cfe_int_t handle; /* file/device handle */
|
||||
cfe_uint_t flags; /* flags for this IOCB */
|
||||
cfe_uint_t psize; /* size of parameter list */
|
||||
union {
|
||||
struct cfe_iocb_buf buffer; /* buffer parameters */
|
||||
struct cfe_iocb_inpstat inpstat; /* input status parameters */
|
||||
struct cfe_iocb_envbuf envbuf; /* environment function parameters */
|
||||
struct cfe_iocb_cpuctl cpuctl; /* CPU control parameters */
|
||||
struct cfe_iocb_time time; /* timer parameters */
|
||||
struct cfe_iocb_meminfo meminfo; /* memory arena info parameters */
|
||||
struct cfe_iocb_fwinfo fwinfo; /* firmware information */
|
||||
struct cfe_iocb_exitstat exitstat; /* Exit Status */
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
#include <linux/init.h>
|
||||
|
||||
void __init cfe_setup(unsigned long fwarg0, unsigned long fwarg1,
|
||||
unsigned long fwarg2, unsigned long fwarg3);
|
||||
|
||||
#else /* __ASSEMBLY__ */
|
||||
|
||||
.macro cfe_early_init
|
||||
#ifdef CONFIG_CFE
|
||||
jal cfe_setup
|
||||
#endif
|
||||
.endm
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
#endif /* LINUX_CFE_PRIVATE_H_ */
|
||||
@@ -76,11 +76,11 @@ struct trx_header {
|
||||
#define BUSWIDTH 2
|
||||
|
||||
#ifdef CONFIG_SSB
|
||||
extern struct ssb_bus ssb;
|
||||
extern struct ssb_bus ssb_bcm47xx;
|
||||
#endif
|
||||
static struct mtd_info *bcm947xx_mtd;
|
||||
static struct mtd_info *bcm47xx_mtd;
|
||||
|
||||
static void bcm947xx_map_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
|
||||
static void bcm47xx_map_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
|
||||
{
|
||||
if (len==1) {
|
||||
memcpy_fromio(to, map->virt + from, len);
|
||||
@@ -96,7 +96,7 @@ static void bcm947xx_map_copy_from(struct map_info *map, void *to, unsigned long
|
||||
}
|
||||
}
|
||||
|
||||
static struct map_info bcm947xx_map = {
|
||||
static struct map_info bcm47xx_map = {
|
||||
name: "Physically mapped flash",
|
||||
size: WINDOW_SIZE,
|
||||
bankwidth: BUSWIDTH,
|
||||
@@ -105,7 +105,7 @@ static struct map_info bcm947xx_map = {
|
||||
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
|
||||
static struct mtd_partition bcm947xx_parts[] = {
|
||||
static struct mtd_partition bcm47xx_parts[] = {
|
||||
{ name: "cfe", offset: 0, size: 0, mask_flags: MTD_WRITEABLE, },
|
||||
{ name: "linux", offset: 0, size: 0, },
|
||||
{ name: "rootfs", offset: 0, size: 0, },
|
||||
@@ -323,46 +323,46 @@ init_mtd_partitions(struct mtd_info *mtd, size_t size)
|
||||
return NULL;
|
||||
|
||||
/* boot loader */
|
||||
bcm947xx_parts[0].offset = 0;
|
||||
bcm947xx_parts[0].size = cfe_size;
|
||||
bcm47xx_parts[0].offset = 0;
|
||||
bcm47xx_parts[0].size = cfe_size;
|
||||
|
||||
/* nvram */
|
||||
if (cfe_size != 384 * 1024) {
|
||||
bcm947xx_parts[3].offset = size - ROUNDUP(NVRAM_SPACE, mtd->erasesize);
|
||||
bcm947xx_parts[3].size = ROUNDUP(NVRAM_SPACE, mtd->erasesize);
|
||||
bcm47xx_parts[3].offset = size - ROUNDUP(NVRAM_SPACE, mtd->erasesize);
|
||||
bcm47xx_parts[3].size = ROUNDUP(NVRAM_SPACE, mtd->erasesize);
|
||||
} else {
|
||||
/* nvram (old 128kb config partition on netgear wgt634u) */
|
||||
bcm947xx_parts[3].offset = bcm947xx_parts[0].size;
|
||||
bcm947xx_parts[3].size = ROUNDUP(NVRAM_SPACE, mtd->erasesize);
|
||||
bcm47xx_parts[3].offset = bcm47xx_parts[0].size;
|
||||
bcm47xx_parts[3].size = ROUNDUP(NVRAM_SPACE, mtd->erasesize);
|
||||
}
|
||||
|
||||
/* linux (kernel and rootfs) */
|
||||
if (cfe_size != 384 * 1024) {
|
||||
bcm947xx_parts[1].offset = bcm947xx_parts[0].size;
|
||||
bcm947xx_parts[1].size = bcm947xx_parts[3].offset -
|
||||
bcm947xx_parts[1].offset;
|
||||
bcm47xx_parts[1].offset = bcm47xx_parts[0].size;
|
||||
bcm47xx_parts[1].size = bcm47xx_parts[3].offset -
|
||||
bcm47xx_parts[1].offset;
|
||||
} else {
|
||||
/* do not count the elf loader, which is on one block */
|
||||
bcm947xx_parts[1].offset = bcm947xx_parts[0].size +
|
||||
bcm947xx_parts[3].size + mtd->erasesize;
|
||||
bcm947xx_parts[1].size = size -
|
||||
bcm947xx_parts[0].size -
|
||||
(2*bcm947xx_parts[3].size) -
|
||||
bcm47xx_parts[1].offset = bcm47xx_parts[0].size +
|
||||
bcm47xx_parts[3].size + mtd->erasesize;
|
||||
bcm47xx_parts[1].size = size -
|
||||
bcm47xx_parts[0].size -
|
||||
(2*bcm47xx_parts[3].size) -
|
||||
mtd->erasesize;
|
||||
}
|
||||
|
||||
/* find and size rootfs */
|
||||
find_root(mtd,size,&bcm947xx_parts[2]);
|
||||
bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset - bcm947xx_parts[3].size;
|
||||
find_root(mtd,size,&bcm47xx_parts[2]);
|
||||
bcm47xx_parts[2].size = size - bcm47xx_parts[2].offset - bcm47xx_parts[3].size;
|
||||
|
||||
return bcm947xx_parts;
|
||||
return bcm47xx_parts;
|
||||
}
|
||||
#endif
|
||||
|
||||
int __init init_bcm947xx_map(void)
|
||||
int __init init_bcm47xx_map(void)
|
||||
{
|
||||
#ifdef CONFIG_SSB
|
||||
struct ssb_mipscore *mcore = &ssb.mipscore;
|
||||
struct ssb_mipscore *mcore = &ssb_bcm47xx.mipscore;
|
||||
#endif
|
||||
size_t size;
|
||||
int ret = 0;
|
||||
@@ -376,40 +376,40 @@ int __init init_bcm947xx_map(void)
|
||||
u32 window_size = mcore->flash_window_size;
|
||||
|
||||
printk("flash init: 0x%08x 0x%08x\n", window, window_size);
|
||||
bcm947xx_map.phys = window;
|
||||
bcm947xx_map.size = window_size;
|
||||
bcm947xx_map.virt = ioremap_nocache(window, window_size);
|
||||
bcm47xx_map.phys = window;
|
||||
bcm47xx_map.size = window_size;
|
||||
bcm47xx_map.virt = ioremap_nocache(window, window_size);
|
||||
#else
|
||||
printk("flash init: 0x%08x 0x%08x\n", WINDOW_ADDR, WINDOW_SIZE);
|
||||
bcm947xx_map.virt = ioremap_nocache(WINDOW_ADDR, WINDOW_SIZE);
|
||||
bcm47xx_map.virt = ioremap_nocache(WINDOW_ADDR, WINDOW_SIZE);
|
||||
#endif
|
||||
|
||||
if (!bcm947xx_map.virt) {
|
||||
if (!bcm47xx_map.virt) {
|
||||
printk("Failed to ioremap\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
simple_map_init(&bcm947xx_map);
|
||||
simple_map_init(&bcm47xx_map);
|
||||
|
||||
if (!(bcm947xx_mtd = do_map_probe("cfi_probe", &bcm947xx_map))) {
|
||||
if (!(bcm47xx_mtd = do_map_probe("cfi_probe", &bcm47xx_map))) {
|
||||
printk("Failed to do_map_probe\n");
|
||||
iounmap((void *)bcm947xx_map.virt);
|
||||
iounmap((void *)bcm47xx_map.virt);
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
/* override copy_from routine */
|
||||
bcm947xx_map.copy_from = bcm947xx_map_copy_from;
|
||||
bcm47xx_map.copy_from = bcm47xx_map_copy_from;
|
||||
|
||||
bcm947xx_mtd->owner = THIS_MODULE;
|
||||
bcm47xx_mtd->owner = THIS_MODULE;
|
||||
|
||||
size = bcm947xx_mtd->size;
|
||||
size = bcm47xx_mtd->size;
|
||||
|
||||
printk(KERN_NOTICE "Flash device: 0x%x at 0x%x\n", size, WINDOW_ADDR);
|
||||
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
parts = init_mtd_partitions(bcm947xx_mtd, size);
|
||||
parts = init_mtd_partitions(bcm47xx_mtd, size);
|
||||
for (i = 0; parts[i].name; i++);
|
||||
ret = add_mtd_partitions(bcm947xx_mtd, parts, i);
|
||||
ret = add_mtd_partitions(bcm47xx_mtd, parts, i);
|
||||
if (ret) {
|
||||
printk(KERN_ERR "Flash: add_mtd_partitions failed\n");
|
||||
goto fail;
|
||||
@@ -418,22 +418,22 @@ int __init init_bcm947xx_map(void)
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
if (bcm947xx_mtd)
|
||||
map_destroy(bcm947xx_mtd);
|
||||
if (bcm947xx_map.virt)
|
||||
iounmap((void *)bcm947xx_map.virt);
|
||||
bcm947xx_map.virt = 0;
|
||||
if (bcm47xx_mtd)
|
||||
map_destroy(bcm47xx_mtd);
|
||||
if (bcm47xx_map.virt)
|
||||
iounmap((void *)bcm47xx_map.virt);
|
||||
bcm47xx_map.virt = 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
void __exit cleanup_bcm947xx_map(void)
|
||||
void __exit cleanup_bcm47xx_map(void)
|
||||
{
|
||||
#ifdef CONFIG_MTD_PARTITIONS
|
||||
del_mtd_partitions(bcm947xx_mtd);
|
||||
del_mtd_partitions(bcm47xx_mtd);
|
||||
#endif
|
||||
map_destroy(bcm947xx_mtd);
|
||||
iounmap((void *)bcm947xx_map.virt);
|
||||
map_destroy(bcm47xx_mtd);
|
||||
iounmap((void *)bcm47xx_map.virt);
|
||||
}
|
||||
|
||||
module_init(init_bcm947xx_map);
|
||||
module_exit(cleanup_bcm947xx_map);
|
||||
module_init(init_bcm47xx_map);
|
||||
module_exit(cleanup_bcm47xx_map);
|
||||
|
||||
@@ -1,189 +0,0 @@
|
||||
/*
|
||||
* Broadcom Common Firmware Environment (CFE) support
|
||||
*
|
||||
* Copyright 2000, 2001, 2002
|
||||
* Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Copyright (C) 2006 Michael Buesch
|
||||
*
|
||||
* Original Authors: Mitch Lichtenberg, Chris Demetriou
|
||||
*
|
||||
* This software is furnished under license and may be used and copied only
|
||||
* in accordance with the following terms and conditions. Subject to these
|
||||
* conditions, you may download, copy, install, use, modify and distribute
|
||||
* modified or unmodified copies of this software in source and/or binary
|
||||
* form. No title or ownership is transferred hereby.
|
||||
*
|
||||
* 1) Any source code used, modified or distributed must reproduce and
|
||||
* retain this copyright notice and list of conditions as they appear in
|
||||
* the source file.
|
||||
*
|
||||
* 2) No right is granted to use any trade name, trademark, or logo of
|
||||
* Broadcom Corporation. The "Broadcom Corporation" name may not be
|
||||
* used to endorse or promote products derived from this software
|
||||
* without the prior written permission of Broadcom Corporation.
|
||||
*
|
||||
* 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
|
||||
* NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
|
||||
* FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
|
||||
* LIABLE FOR DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
|
||||
* OR OTHERWISE), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef LINUX_CFE_API_H_
|
||||
#define LINUX_CFE_API_H_
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
|
||||
#define CFE_MI_RESERVED 0 /* memory is reserved, do not use */
|
||||
#define CFE_MI_AVAILABLE 1 /* memory is available */
|
||||
|
||||
#define CFE_FLG_WARMSTART 0x00000001
|
||||
#define CFE_FLG_FULL_ARENA 0x00000001
|
||||
#define CFE_FLG_ENV_PERMANENT 0x00000001
|
||||
|
||||
#define CFE_CPU_CMD_START 1
|
||||
#define CFE_CPU_CMD_STOP 0
|
||||
|
||||
#define CFE_STDHANDLE_CONSOLE 0
|
||||
|
||||
#define CFE_DEV_NETWORK 1
|
||||
#define CFE_DEV_DISK 2
|
||||
#define CFE_DEV_FLASH 3
|
||||
#define CFE_DEV_SERIAL 4
|
||||
#define CFE_DEV_CPU 5
|
||||
#define CFE_DEV_NVRAM 6
|
||||
#define CFE_DEV_CLOCK 7
|
||||
#define CFE_DEV_OTHER 8
|
||||
#define CFE_DEV_MASK 0x0F
|
||||
|
||||
#define CFE_CACHE_FLUSH_D 1
|
||||
#define CFE_CACHE_INVAL_I 2
|
||||
#define CFE_CACHE_INVAL_D 4
|
||||
#define CFE_CACHE_INVAL_L2 8
|
||||
|
||||
#define CFE_FWI_64BIT 0x00000001
|
||||
#define CFE_FWI_32BIT 0x00000002
|
||||
#define CFE_FWI_RELOC 0x00000004
|
||||
#define CFE_FWI_UNCACHED 0x00000008
|
||||
#define CFE_FWI_MULTICPU 0x00000010
|
||||
#define CFE_FWI_FUNCSIM 0x00000020
|
||||
#define CFE_FWI_RTLSIM 0x00000040
|
||||
|
||||
struct cfe_fwinfo {
|
||||
s64 version; /* major, minor, eco version */
|
||||
s64 totalmem; /* total installed mem */
|
||||
s64 flags; /* various flags */
|
||||
s64 boardid; /* board ID */
|
||||
s64 bootarea_va; /* VA of boot area */
|
||||
s64 bootarea_pa; /* PA of boot area */
|
||||
s64 bootarea_size; /* size of boot area */
|
||||
};
|
||||
|
||||
|
||||
/* The public CFE API */
|
||||
|
||||
int cfe_present(void); /* Check if we booted from CFE. Returns bool */
|
||||
|
||||
int cfe_getticks(s64 *ticks);
|
||||
int cfe_close(int handle);
|
||||
int cfe_cpu_start(int cpu, void (*fn)(void), long sp, long gp, long a1);
|
||||
int cfe_cpu_stop(int cpu);
|
||||
int cfe_enumenv(int idx, char *name, int namelen, char *val, int vallen);
|
||||
int cfe_enumdev(int idx, char *name, int namelen);
|
||||
int cfe_enummem(int idx, int flags, u64 *start, u64 *length,
|
||||
u64 *type);
|
||||
int cfe_exit(int warm, int status);
|
||||
int cfe_flushcache(int flags);
|
||||
int cfe_getdevinfo(char *name);
|
||||
int cfe_getenv(char *name, char *dest, int destlen);
|
||||
int cfe_getfwinfo(struct cfe_fwinfo *info);
|
||||
int cfe_getstdhandle(int handletype);
|
||||
int cfe_inpstat(int handle);
|
||||
int cfe_ioctl(int handle, unsigned int ioctlnum, unsigned char *buffer,
|
||||
int length, int *retlen, u64 offset);
|
||||
int cfe_open(char *name);
|
||||
int cfe_read(int handle, unsigned char *buffer, int length);
|
||||
int cfe_readblk(int handle, s64 offset, unsigned char *buffer, int length);
|
||||
int cfe_setenv(char *name, char *val);
|
||||
int cfe_write(int handle, unsigned char *buffer, int length);
|
||||
int cfe_writeblk(int handle, s64 offset, unsigned char *buffer,
|
||||
int length);
|
||||
|
||||
|
||||
/* High level API */
|
||||
|
||||
/* Print some information to CFE's console (most likely serial line) */
|
||||
int cfe_printk(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
|
||||
int cfe_vprintk(const char *fmt, va_list args);
|
||||
|
||||
|
||||
|
||||
/* Error codes returned by the low API functions */
|
||||
|
||||
#define CFE_ISERR(errcode) (errcode < 0)
|
||||
|
||||
#define CFE_OK 0
|
||||
#define CFE_ERR -1 /* generic error */
|
||||
#define CFE_ERR_INV_COMMAND -2
|
||||
#define CFE_ERR_EOF -3
|
||||
#define CFE_ERR_IOERR -4
|
||||
#define CFE_ERR_NOMEM -5
|
||||
#define CFE_ERR_DEVNOTFOUND -6
|
||||
#define CFE_ERR_DEVOPEN -7
|
||||
#define CFE_ERR_INV_PARAM -8
|
||||
#define CFE_ERR_ENVNOTFOUND -9
|
||||
#define CFE_ERR_ENVREADONLY -10
|
||||
|
||||
#define CFE_ERR_NOTELF -11
|
||||
#define CFE_ERR_NOT32BIT -12
|
||||
#define CFE_ERR_WRONGENDIAN -13
|
||||
#define CFE_ERR_BADELFVERS -14
|
||||
#define CFE_ERR_NOTMIPS -15
|
||||
#define CFE_ERR_BADELFFMT -16
|
||||
#define CFE_ERR_BADADDR -17
|
||||
|
||||
#define CFE_ERR_FILENOTFOUND -18
|
||||
#define CFE_ERR_UNSUPPORTED -19
|
||||
|
||||
#define CFE_ERR_HOSTUNKNOWN -20
|
||||
|
||||
#define CFE_ERR_TIMEOUT -21
|
||||
|
||||
#define CFE_ERR_PROTOCOLERR -22
|
||||
|
||||
#define CFE_ERR_NETDOWN -23
|
||||
#define CFE_ERR_NONAMESERVER -24
|
||||
|
||||
#define CFE_ERR_NOHANDLES -25
|
||||
#define CFE_ERR_ALREADYBOUND -26
|
||||
|
||||
#define CFE_ERR_CANNOTSET -27
|
||||
#define CFE_ERR_NOMORE -28
|
||||
#define CFE_ERR_BADFILESYS -29
|
||||
#define CFE_ERR_FSNOTAVAIL -30
|
||||
|
||||
#define CFE_ERR_INVBOOTBLOCK -31
|
||||
#define CFE_ERR_WRONGDEVTYPE -32
|
||||
#define CFE_ERR_BBCHECKSUM -33
|
||||
#define CFE_ERR_BOOTPROGCHKSUM -34
|
||||
|
||||
#define CFE_ERR_LDRNOTAVAIL -35
|
||||
|
||||
#define CFE_ERR_NOTREADY -36
|
||||
|
||||
#define CFE_ERR_GETMEM -37
|
||||
#define CFE_ERR_SETMEM -38
|
||||
|
||||
#define CFE_ERR_NOTCONN -39
|
||||
#define CFE_ERR_ADDRINUSE -40
|
||||
|
||||
|
||||
#endif /* LINUX_CFE_API_H_ */
|
||||
@@ -1,67 +0,0 @@
|
||||
#ifndef __BCM947XX_GPIO_H
|
||||
#define __BCM947XX_GPIO_H
|
||||
|
||||
#include <linux/ssb/ssb_embedded.h>
|
||||
|
||||
extern struct ssb_bus ssb;
|
||||
|
||||
static inline int gpio_request(unsigned gpio, const char *label)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void gpio_free(unsigned gpio)
|
||||
{
|
||||
}
|
||||
|
||||
static inline int gpio_direction_input(unsigned gpio)
|
||||
{
|
||||
ssb_gpio_outen(&ssb, 1 << gpio, 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int gpio_direction_output(unsigned gpio, int value)
|
||||
{
|
||||
ssb_gpio_out(&ssb, 1 << gpio, (value ? 1 << gpio : 0));
|
||||
ssb_gpio_outen(&ssb, 1 << gpio, 1 << gpio);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static inline int gpio_to_irq(unsigned gpio)
|
||||
{
|
||||
struct ssb_device *dev;
|
||||
|
||||
dev = ssb.chipco.dev;
|
||||
if (!dev)
|
||||
dev = ssb.extif.dev;
|
||||
if (!dev)
|
||||
return -EINVAL;
|
||||
|
||||
return ssb_mips_irq(dev) + 2;
|
||||
}
|
||||
|
||||
static inline int irq_to_gpio(unsigned gpio)
|
||||
{
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
||||
static inline int gpio_get_value(unsigned gpio)
|
||||
{
|
||||
return !!ssb_gpio_in(&ssb, 1 << gpio);
|
||||
}
|
||||
|
||||
static inline int gpio_set_value(unsigned gpio, int value)
|
||||
{
|
||||
ssb_gpio_out(&ssb, 1 << gpio, (value ? 1 << gpio : 0));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* cansleep wrappers */
|
||||
#include <asm-generic/gpio.h>
|
||||
|
||||
|
||||
#endif /* __BCM947XX_GPIO_H */
|
||||
|
||||
@@ -1,160 +0,0 @@
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/driver_chipcommon.c 2008-02-19 14:37:06.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_chipcommon.c 2008-02-19 14:37:08.000000000 +0100
|
||||
@@ -39,12 +39,14 @@ static inline void chipco_write32(struct
|
||||
ssb_write32(cc->dev, offset, value);
|
||||
}
|
||||
|
||||
-static inline void chipco_write32_masked(struct ssb_chipcommon *cc, u16 offset,
|
||||
- u32 mask, u32 value)
|
||||
+static inline u32 chipco_write32_masked(struct ssb_chipcommon *cc, u16 offset,
|
||||
+ u32 mask, u32 value)
|
||||
{
|
||||
value &= mask;
|
||||
value |= chipco_read32(cc, offset) & ~mask;
|
||||
chipco_write32(cc, offset, value);
|
||||
+
|
||||
+ return value;
|
||||
}
|
||||
|
||||
void ssb_chipco_set_clockmode(struct ssb_chipcommon *cc,
|
||||
@@ -355,16 +357,37 @@ u32 ssb_chipco_gpio_in(struct ssb_chipco
|
||||
{
|
||||
return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask;
|
||||
}
|
||||
+EXPORT_SYMBOL(ssb_chipco_gpio_in);
|
||||
+
|
||||
+u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
||||
+{
|
||||
+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value);
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_chipco_gpio_out);
|
||||
+
|
||||
+u32 ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
||||
+{
|
||||
+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value);
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_chipco_gpio_outen);
|
||||
+
|
||||
+u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
||||
+{
|
||||
+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_chipco_gpio_control);
|
||||
|
||||
-void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
||||
+u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
||||
{
|
||||
- chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value);
|
||||
+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOIRQ, mask, value);
|
||||
}
|
||||
+EXPORT_SYMBOL(ssb_chipco_gpio_intmask);
|
||||
|
||||
-void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
||||
+u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
||||
{
|
||||
- chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value);
|
||||
+ return chipco_write32_masked(cc, SSB_CHIPCO_GPIOPOL, mask, value);
|
||||
}
|
||||
+EXPORT_SYMBOL(ssb_chipco_gpio_polarity);
|
||||
|
||||
#ifdef CONFIG_SSB_SERIAL
|
||||
int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_extif.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/driver_extif.c 2008-02-19 14:37:06.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_extif.c 2008-02-19 14:37:08.000000000 +0100
|
||||
@@ -27,12 +27,14 @@ static inline void extif_write32(struct
|
||||
ssb_write32(extif->dev, offset, value);
|
||||
}
|
||||
|
||||
-static inline void extif_write32_masked(struct ssb_extif *extif, u16 offset,
|
||||
- u32 mask, u32 value)
|
||||
+static inline u32 extif_write32_masked(struct ssb_extif *extif, u16 offset,
|
||||
+ u32 mask, u32 value)
|
||||
{
|
||||
value &= mask;
|
||||
value |= extif_read32(extif, offset) & ~mask;
|
||||
extif_write32(extif, offset, value);
|
||||
+
|
||||
+ return value;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SSB_SERIAL
|
||||
@@ -114,16 +116,30 @@ u32 ssb_extif_gpio_in(struct ssb_extif *
|
||||
{
|
||||
return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask;
|
||||
}
|
||||
+EXPORT_SYMBOL(ssb_extif_gpio_in);
|
||||
|
||||
-void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value)
|
||||
+u32 ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value)
|
||||
{
|
||||
return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUT(0),
|
||||
mask, value);
|
||||
}
|
||||
+EXPORT_SYMBOL(ssb_extif_gpio_out);
|
||||
|
||||
-void ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value)
|
||||
+u32 ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value)
|
||||
{
|
||||
return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUTEN(0),
|
||||
mask, value);
|
||||
}
|
||||
+EXPORT_SYMBOL(ssb_extif_gpio_outen);
|
||||
+
|
||||
+u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value)
|
||||
+{
|
||||
+ return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTPOL, mask, value);
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_extif_gpio_polarity);
|
||||
|
||||
+u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value)
|
||||
+{
|
||||
+ return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value);
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_extif_gpio_intmask);
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 14:37:06.000000000 +0100
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 14:37:08.000000000 +0100
|
||||
@@ -382,11 +382,13 @@ extern void ssb_chipco_set_clockmode(str
|
||||
extern void ssb_chipco_watchdog_timer_set(struct ssb_chipcommon *cc,
|
||||
u32 ticks);
|
||||
|
||||
+/* Chipcommon GPIO pin access. */
|
||||
u32 ssb_chipco_gpio_in(struct ssb_chipcommon *cc, u32 mask);
|
||||
-
|
||||
-void ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
||||
-
|
||||
-void ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
||||
+u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
||||
+u32 ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
||||
+u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
||||
+u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
||||
+u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc, u32 mask, u32 value);
|
||||
|
||||
#ifdef CONFIG_SSB_SERIAL
|
||||
extern int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_extif.h 2008-02-19 14:37:06.000000000 +0100
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h 2008-02-19 14:37:08.000000000 +0100
|
||||
@@ -171,11 +171,12 @@ extern void ssb_extif_get_clockcontrol(s
|
||||
extern void ssb_extif_timing_init(struct ssb_extif *extif,
|
||||
unsigned long ns);
|
||||
|
||||
+/* Extif GPIO pin access */
|
||||
u32 ssb_extif_gpio_in(struct ssb_extif *extif, u32 mask);
|
||||
-
|
||||
-void ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value);
|
||||
-
|
||||
-void ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value);
|
||||
+u32 ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value);
|
||||
+u32 ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value);
|
||||
+u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value);
|
||||
+u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value);
|
||||
|
||||
#ifdef CONFIG_SSB_SERIAL
|
||||
extern int ssb_extif_serial_init(struct ssb_extif *extif,
|
||||
@@ -1,154 +1,33 @@
|
||||
Index: linux-2.6.23/arch/mips/Kconfig
|
||||
Index: linux-2.6.25/arch/mips/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/Kconfig 2007-10-13 02:23:06.662507926 +0200
|
||||
+++ linux-2.6.23/arch/mips/Kconfig 2007-10-13 02:23:41.484492317 +0200
|
||||
@@ -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"
|
||||
@@ -44,6 +48,23 @@
|
||||
note that a kernel built with this option selected will not be
|
||||
able to run on normal units.
|
||||
|
||||
+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
|
||||
--- linux-2.6.25.orig/arch/mips/Kconfig 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/arch/mips/Kconfig 2008-04-26 22:08:17.000000000 +0100
|
||||
@@ -50,8 +50,10 @@ config BCM47XX
|
||||
select SYS_SUPPORTS_32BIT_KERNEL
|
||||
select SYS_SUPPORTS_LITTLE_ENDIAN
|
||||
select SSB
|
||||
+ select SSB_SERIAL
|
||||
select SSB_DRIVER_MIPS
|
||||
select SSB_DRIVER_EXTIF
|
||||
+ select SSB_DRIVER_PCICORE
|
||||
+ select SSB_PCICORE_HOSTMODE
|
||||
+ select CFE
|
||||
+ select GENERIC_GPIO
|
||||
+ help
|
||||
+ Support for BCM947xx based boards
|
||||
+
|
||||
config MIPS_COBALT
|
||||
bool "Cobalt Server"
|
||||
select DMA_NONCOHERENT
|
||||
Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/kernel/cpu-probe.c 2007-10-13 02:23:06.666508151 +0200
|
||||
+++ linux-2.6.23/arch/mips/kernel/cpu-probe.c 2007-10-13 02:23:11.210767122 +0200
|
||||
@@ -793,6 +793,28 @@
|
||||
}
|
||||
select SSB_PCICORE_HOSTMODE if PCI
|
||||
select GENERIC_GPIO
|
||||
select SYS_HAS_EARLY_PRINTK
|
||||
@@ -790,6 +792,7 @@ config CSRC_SB1250
|
||||
|
||||
config CFE
|
||||
bool
|
||||
+ # Common Firmware Environment
|
||||
|
||||
+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;
|
||||
@@ -815,6 +837,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;
|
||||
Index: linux-2.6.23/arch/mips/kernel/proc.c
|
||||
config DMA_COHERENT
|
||||
bool
|
||||
Index: linux-2.6.25/include/asm-mips/bootinfo.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/kernel/proc.c 2007-10-13 02:23:06.678508839 +0200
|
||||
+++ linux-2.6.23/arch/mips/kernel/proc.c 2007-10-13 02:23:11.210767122 +0200
|
||||
@@ -82,6 +82,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",
|
||||
[CPU_LOONGSON2] = "ICT Loongson-2",
|
||||
};
|
||||
Index: linux-2.6.23/arch/mips/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/Makefile 2007-10-13 02:23:06.682509066 +0200
|
||||
+++ linux-2.6.23/arch/mips/Makefile 2007-10-13 02:23:11.210767122 +0200
|
||||
@@ -533,6 +533,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/
|
||||
Index: linux-2.6.23/arch/mips/mm/tlbex.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/mm/tlbex.c 2007-10-13 02:23:06.694509748 +0200
|
||||
+++ linux-2.6.23/arch/mips/mm/tlbex.c 2007-10-13 02:26:00.272401391 +0200
|
||||
@@ -895,6 +895,8 @@
|
||||
case CPU_AU1550:
|
||||
case CPU_AU1200:
|
||||
case CPU_PR4450:
|
||||
+ case CPU_BCM3302:
|
||||
+ case CPU_BCM4710:
|
||||
i_nop(p);
|
||||
tlbw(p);
|
||||
break;
|
||||
Index: linux-2.6.23/drivers/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/drivers/Kconfig 2007-10-13 02:23:06.702510206 +0200
|
||||
+++ linux-2.6.23/drivers/Kconfig 2007-10-13 02:23:11.214767346 +0200
|
||||
@@ -58,6 +58,8 @@
|
||||
|
||||
source "drivers/hwmon/Kconfig"
|
||||
|
||||
+source "drivers/ssb/Kconfig"
|
||||
+
|
||||
source "drivers/mfd/Kconfig"
|
||||
|
||||
source "drivers/media/Kconfig"
|
||||
Index: linux-2.6.23/include/asm-mips/bootinfo.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/include/asm-mips/bootinfo.h 2007-10-13 02:23:06.718511119 +0200
|
||||
+++ linux-2.6.23/include/asm-mips/bootinfo.h 2007-10-13 02:23:11.214767346 +0200
|
||||
@@ -208,6 +208,12 @@
|
||||
#define MACH_GROUP_WINDRIVER 28 /* Windriver boards */
|
||||
#define MACH_WRPPMC 1
|
||||
--- linux-2.6.25.orig/include/asm-mips/bootinfo.h 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/include/asm-mips/bootinfo.h 2008-04-26 21:57:10.000000000 +0100
|
||||
@@ -94,6 +94,12 @@
|
||||
#define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */
|
||||
#define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */
|
||||
|
||||
+/*
|
||||
+ * Valid machtype for group Broadcom
|
||||
@@ -158,51 +37,12 @@ Index: linux-2.6.23/include/asm-mips/bootinfo.h
|
||||
+
|
||||
#define CL_SIZE COMMAND_LINE_SIZE
|
||||
|
||||
const char *get_system_type(void);
|
||||
Index: linux-2.6.23/include/asm-mips/cpu.h
|
||||
extern char *system_type;
|
||||
Index: linux-2.6.25/include/linux/pci_ids.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/include/asm-mips/cpu.h 2007-10-13 02:23:06.726511570 +0200
|
||||
+++ linux-2.6.23/include/asm-mips/cpu.h 2007-10-13 02:27:43.994312161 +0200
|
||||
@@ -106,6 +106,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
|
||||
*/
|
||||
|
||||
@@ -217,8 +224,10 @@
|
||||
#define CPU_R14000 64
|
||||
#define CPU_LOONGSON1 65
|
||||
#define CPU_LOONGSON2 66
|
||||
+#define CPU_BCM3302 67
|
||||
+#define CPU_BCM4710 68
|
||||
|
||||
-#define CPU_LAST 66
|
||||
+#define CPU_LAST 68
|
||||
|
||||
/*
|
||||
* ISA Level encodings
|
||||
Index: linux-2.6.23.1/drivers/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.23.1.orig/drivers/Makefile 2008-01-27 04:34:31.000000000 +0100
|
||||
+++ linux-2.6.23.1/drivers/Makefile 2008-01-27 04:39:57.000000000 +0100
|
||||
@@ -89,3 +89,4 @@
|
||||
obj-$(CONFIG_PPC_PS3) += ps3/
|
||||
obj-$(CONFIG_OF) += of/
|
||||
obj-$(CONFIG_GPIO_DEVICE) += gpio/
|
||||
+obj-$(CONFIG_SSB) += ssb/
|
||||
Index: linux-2.6.23.1/include/linux/pci_ids.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.1.orig/include/linux/pci_ids.h 2008-01-27 04:55:18.000000000 +0100
|
||||
+++ linux-2.6.23.1/include/linux/pci_ids.h 2008-01-27 04:55:22.000000000 +0100
|
||||
@@ -1972,6 +1972,7 @@
|
||||
--- linux-2.6.25.orig/include/linux/pci_ids.h 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/include/linux/pci_ids.h 2008-04-26 21:57:10.000000000 +0100
|
||||
@@ -2000,6 +2000,7 @@
|
||||
#define PCI_DEVICE_ID_TIGON3_5906M 0x1713
|
||||
#define PCI_DEVICE_ID_BCM4401 0x4401
|
||||
#define PCI_DEVICE_ID_BCM4401B0 0x4402
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
Index: linux-2.6.23/drivers/mtd/maps/Kconfig
|
||||
Index: linux-2.6.25/drivers/mtd/maps/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/drivers/mtd/maps/Kconfig 2007-10-09 22:31:38.000000000 +0200
|
||||
+++ linux-2.6.23/drivers/mtd/maps/Kconfig 2007-10-13 02:28:13.644001805 +0200
|
||||
@@ -352,6 +352,12 @@
|
||||
--- linux-2.6.25.orig/drivers/mtd/maps/Kconfig 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/drivers/mtd/maps/Kconfig 2008-04-26 21:57:12.000000000 +0100
|
||||
@@ -337,6 +337,12 @@ config MTD_CFI_FLAGADM
|
||||
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
|
||||
+ depends on MIPS && MTD_CFI && BCM47XX
|
||||
+ help
|
||||
+ Support for the flash chips on the BCM947xx board.
|
||||
+
|
||||
config MTD_WALNUT
|
||||
tristate "Flash device mapped on IBM 405GP Walnut"
|
||||
depends on MTD_JEDECPROBE && WALNUT
|
||||
Index: linux-2.6.23/drivers/mtd/maps/Makefile
|
||||
depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE
|
||||
Index: linux-2.6.25/drivers/mtd/maps/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/drivers/mtd/maps/Makefile 2007-10-09 22:31:38.000000000 +0200
|
||||
+++ linux-2.6.23/drivers/mtd/maps/Makefile 2007-10-13 02:27:56.727037761 +0200
|
||||
@@ -33,6 +33,7 @@
|
||||
--- linux-2.6.25.orig/drivers/mtd/maps/Makefile 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/drivers/mtd/maps/Makefile 2008-04-26 21:57:12.000000000 +0100
|
||||
@@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcm
|
||||
obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o
|
||||
obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o
|
||||
obj-$(CONFIG_MTD_TQM8XXL) += tqm8xxl.o
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,15 +0,0 @@
|
||||
Index: linux-2.6.23.16/drivers/net/b44.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/net/b44.c 2008-03-22 19:52:40.000000000 -0700
|
||||
+++ linux-2.6.23.16/drivers/net/b44.c 2008-03-22 19:52:41.000000000 -0700
|
||||
@@ -2273,6 +2273,10 @@
|
||||
bp->phy_addr = sdev->bus->sprom.et1phyaddr;
|
||||
break;
|
||||
}
|
||||
+ /* Some ROMs have buggy PHY addresses with the high
|
||||
+ * bits set (sign extension?). Truncate them to a
|
||||
+ * valid PHY address. */
|
||||
+ bp->phy_addr &= 0x1F;
|
||||
|
||||
memcpy(bp->dev->dev_addr, addr, 6);
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: linux-2.6.23/arch/mips/Kconfig
|
||||
Index: linux-2.6.25/arch/mips/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/Kconfig 2007-10-13 02:23:41.484492317 +0200
|
||||
+++ linux-2.6.23/arch/mips/Kconfig 2007-10-13 02:47:02.784347843 +0200
|
||||
@@ -192,7 +192,6 @@
|
||||
--- linux-2.6.25.orig/arch/mips/Kconfig 2008-04-26 21:57:10.000000000 +0100
|
||||
+++ linux-2.6.25/arch/mips/Kconfig 2008-04-26 21:57:13.000000000 +0100
|
||||
@@ -228,7 +228,6 @@ config MIPS_MALTA
|
||||
select I8259
|
||||
select MIPS_BOARDS_GEN
|
||||
select MIPS_BONITO64
|
||||
@@ -10,7 +10,7 @@ Index: linux-2.6.23/arch/mips/Kconfig
|
||||
select PCI_GT64XXX_PCI0
|
||||
select MIPS_MSC
|
||||
select SWAP_IO_SPACE
|
||||
@@ -1281,13 +1280,6 @@
|
||||
@@ -1421,13 +1420,6 @@ config IP22_CPU_SCACHE
|
||||
bool
|
||||
select BOARD_SCACHE
|
||||
|
||||
@@ -24,11 +24,11 @@ Index: linux-2.6.23/arch/mips/Kconfig
|
||||
config R5000_CPU_SCACHE
|
||||
bool
|
||||
select BOARD_SCACHE
|
||||
Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c
|
||||
Index: linux-2.6.25/arch/mips/kernel/cpu-probe.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/kernel/cpu-probe.c 2007-10-13 02:23:11.210767122 +0200
|
||||
+++ linux-2.6.23/arch/mips/kernel/cpu-probe.c 2007-10-13 02:47:02.788348072 +0200
|
||||
@@ -701,6 +701,8 @@
|
||||
--- linux-2.6.25.orig/arch/mips/kernel/cpu-probe.c 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/arch/mips/kernel/cpu-probe.c 2008-04-26 21:57:13.000000000 +0100
|
||||
@@ -704,6 +704,8 @@ static inline void cpu_probe_mips(struct
|
||||
break;
|
||||
case PRID_IMP_25KF:
|
||||
c->cputype = CPU_25KF;
|
||||
@@ -37,19 +37,19 @@ Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c
|
||||
break;
|
||||
case PRID_IMP_34K:
|
||||
c->cputype = CPU_34K;
|
||||
Index: linux-2.6.23/arch/mips/mm/c-r4k.c
|
||||
Index: linux-2.6.25/arch/mips/mm/c-r4k.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/mm/c-r4k.c 2007-10-09 22:31:38.000000000 +0200
|
||||
+++ linux-2.6.23/arch/mips/mm/c-r4k.c 2007-10-13 02:47:02.792348301 +0200
|
||||
@@ -1086,7 +1086,6 @@
|
||||
--- linux-2.6.25.orig/arch/mips/mm/c-r4k.c 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/arch/mips/mm/c-r4k.c 2008-04-26 22:08:15.000000000 +0100
|
||||
@@ -1103,7 +1103,6 @@ static void __init loongson2_sc_init(voi
|
||||
|
||||
extern int r5k_sc_init(void);
|
||||
extern int rm7k_sc_init(void);
|
||||
-extern int mips_sc_init(void);
|
||||
|
||||
static void __init setup_scache(void)
|
||||
static void __cpuinit setup_scache(void)
|
||||
{
|
||||
@@ -1140,29 +1139,17 @@
|
||||
@@ -1157,29 +1156,17 @@ static void __cpuinit setup_scache(void)
|
||||
#endif
|
||||
|
||||
default:
|
||||
@@ -84,11 +84,11 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c
|
||||
/* compute a couple of other cache variables */
|
||||
c->scache.waysize = scache_size / c->scache.ways;
|
||||
|
||||
Index: linux-2.6.23/arch/mips/mm/Makefile
|
||||
Index: linux-2.6.25/arch/mips/mm/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/mm/Makefile 2007-10-09 22:31:38.000000000 +0200
|
||||
+++ linux-2.6.23/arch/mips/mm/Makefile 2007-10-13 02:47:23.393522295 +0200
|
||||
@@ -31,6 +31,5 @@
|
||||
--- linux-2.6.25.orig/arch/mips/mm/Makefile 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/arch/mips/mm/Makefile 2008-04-26 21:57:13.000000000 +0100
|
||||
@@ -32,6 +32,5 @@ obj-$(CONFIG_CPU_VR41XX) += c-r4k.o cex-
|
||||
obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
|
||||
obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o
|
||||
obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
Index: linux-2.6.23/arch/mips/kernel/genex.S
|
||||
Index: linux-2.6.25/arch/mips/kernel/genex.S
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/kernel/genex.S 2007-10-13 11:29:46.219648163 +0200
|
||||
+++ linux-2.6.23/arch/mips/kernel/genex.S 2007-10-13 11:29:49.619841933 +0200
|
||||
@@ -51,6 +51,10 @@
|
||||
--- linux-2.6.25.orig/arch/mips/kernel/genex.S 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/arch/mips/kernel/genex.S 2008-04-26 21:57:14.000000000 +0100
|
||||
@@ -51,6 +51,10 @@ NESTED(except_vec1_generic, 0, sp)
|
||||
NESTED(except_vec3_generic, 0, sp)
|
||||
.set push
|
||||
.set noat
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+#ifdef CONFIG_BCM47XX
|
||||
+ nop
|
||||
+ nop
|
||||
+#endif
|
||||
#if R5432_CP0_INTERRUPT_WAR
|
||||
mfc0 k0, CP0_INDEX
|
||||
#endif
|
||||
Index: linux-2.6.23/arch/mips/mm/c-r4k.c
|
||||
Index: linux-2.6.25/arch/mips/mm/c-r4k.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/mm/c-r4k.c 2007-10-13 11:29:46.227648623 +0200
|
||||
+++ linux-2.6.23/arch/mips/mm/c-r4k.c 2007-10-13 11:29:49.619841933 +0200
|
||||
@@ -30,6 +30,9 @@
|
||||
--- linux-2.6.25.orig/arch/mips/mm/c-r4k.c 2008-04-26 21:57:13.000000000 +0100
|
||||
+++ linux-2.6.25/arch/mips/mm/c-r4k.c 2008-04-26 21:57:14.000000000 +0100
|
||||
@@ -33,6 +33,9 @@
|
||||
#include <asm/cacheflush.h> /* for run_uncached() */
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c
|
||||
/*
|
||||
* Special Variant of smp_call_function for use by cache functions:
|
||||
*
|
||||
@@ -94,6 +97,9 @@
|
||||
@@ -97,6 +100,9 @@ static void __cpuinit r4k_blast_dcache_p
|
||||
{
|
||||
unsigned long dc_lsize = cpu_dcache_line_size();
|
||||
|
||||
@@ -37,7 +37,7 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c
|
||||
if (dc_lsize == 0)
|
||||
r4k_blast_dcache_page = (void *)cache_noop;
|
||||
else if (dc_lsize == 16)
|
||||
@@ -108,6 +114,9 @@
|
||||
@@ -111,6 +117,9 @@ static void __cpuinit r4k_blast_dcache_p
|
||||
{
|
||||
unsigned long dc_lsize = cpu_dcache_line_size();
|
||||
|
||||
@@ -47,7 +47,7 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c
|
||||
if (dc_lsize == 0)
|
||||
r4k_blast_dcache_page_indexed = (void *)cache_noop;
|
||||
else if (dc_lsize == 16)
|
||||
@@ -122,6 +131,9 @@
|
||||
@@ -125,6 +134,9 @@ static void __cpuinit r4k_blast_dcache_s
|
||||
{
|
||||
unsigned long dc_lsize = cpu_dcache_line_size();
|
||||
|
||||
@@ -57,7 +57,7 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c
|
||||
if (dc_lsize == 0)
|
||||
r4k_blast_dcache = (void *)cache_noop;
|
||||
else if (dc_lsize == 16)
|
||||
@@ -623,6 +635,8 @@
|
||||
@@ -630,6 +642,8 @@ static void local_r4k_flush_cache_sigtra
|
||||
unsigned long addr = (unsigned long) arg;
|
||||
|
||||
R4600_HIT_CACHEOP_WAR_IMPL;
|
||||
@@ -66,10 +66,10 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c
|
||||
if (dc_lsize)
|
||||
protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
|
||||
if (!cpu_icache_snoops_remote_store && scache_size)
|
||||
@@ -1198,6 +1212,17 @@
|
||||
@@ -1215,6 +1229,17 @@ static void __cpuinit coherency_setup(vo
|
||||
* silly idea of putting something else there ...
|
||||
*/
|
||||
switch (current_cpu_data.cputype) {
|
||||
switch (current_cpu_type()) {
|
||||
+ case CPU_BCM3302:
|
||||
+ {
|
||||
+ u32 cm;
|
||||
@@ -84,12 +84,12 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c
|
||||
case CPU_R4000PC:
|
||||
case CPU_R4000SC:
|
||||
case CPU_R4000MC:
|
||||
@@ -1228,6 +1253,15 @@
|
||||
/* Default cache error handler for R4000 and R5000 family */
|
||||
set_uncached_handler (0x100, &except_vec2_generic, 0x80);
|
||||
@@ -1254,6 +1279,15 @@ void __cpuinit r4k_cache_init(void)
|
||||
break;
|
||||
}
|
||||
|
||||
+ /* Check if special workarounds are required */
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+#ifdef CONFIG_BCM47XX
|
||||
+ if (current_cpu_data.cputype == CPU_BCM4710 && (current_cpu_data.processor_id & 0xff) == 0) {
|
||||
+ printk("Enabling BCM4710A0 cache workarounds.\n");
|
||||
+ bcm4710 = 1;
|
||||
@@ -100,11 +100,11 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c
|
||||
probe_pcache();
|
||||
setup_scache();
|
||||
|
||||
@@ -1273,5 +1307,13 @@
|
||||
@@ -1303,5 +1337,13 @@ void __cpuinit r4k_cache_init(void)
|
||||
build_clear_page();
|
||||
build_copy_page();
|
||||
local_r4k___flush_cache_all(NULL);
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+#ifdef CONFIG_BCM47XX
|
||||
+ {
|
||||
+ static void (*_coherency_setup)(void);
|
||||
+ _coherency_setup = (void (*)(void)) KSEG1ADDR(coherency_setup);
|
||||
@@ -114,39 +114,39 @@ Index: linux-2.6.23/arch/mips/mm/c-r4k.c
|
||||
coherency_setup();
|
||||
+#endif
|
||||
}
|
||||
Index: linux-2.6.23/arch/mips/mm/tlbex.c
|
||||
Index: linux-2.6.25/arch/mips/mm/tlbex.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/mm/tlbex.c 2007-10-13 11:29:46.235649074 +0200
|
||||
+++ linux-2.6.23/arch/mips/mm/tlbex.c 2007-10-13 11:35:46.076155216 +0200
|
||||
@@ -1273,6 +1273,9 @@
|
||||
/* No need for i_nop */
|
||||
--- linux-2.6.25.orig/arch/mips/mm/tlbex.c 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/arch/mips/mm/tlbex.c 2008-04-26 21:57:14.000000000 +0100
|
||||
@@ -677,6 +677,9 @@ static void __cpuinit build_r4000_tlb_re
|
||||
/* No need for uasm_i_nop */
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+ i_nop(&p);
|
||||
+#ifdef CONFIG_BCM47XX
|
||||
+ uasm_i_nop(&p);
|
||||
+#endif
|
||||
#ifdef CONFIG_64BIT
|
||||
build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
|
||||
#else
|
||||
@@ -1708,6 +1711,9 @@
|
||||
struct reloc **r, unsigned int pte,
|
||||
@@ -1084,6 +1087,9 @@ build_r4000_tlbchange_handler_head(u32 *
|
||||
struct uasm_reloc **r, unsigned int pte,
|
||||
unsigned int ptr)
|
||||
{
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+ i_nop(p);
|
||||
+#ifdef CONFIG_BCM47XX
|
||||
+ uasm_i_nop(p);
|
||||
+#endif
|
||||
#ifdef CONFIG_64BIT
|
||||
build_get_pmde64(p, l, r, pte, ptr); /* get pmd in ptr */
|
||||
#else
|
||||
Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
Index: linux-2.6.25/include/asm-mips/r4kcache.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/include/asm-mips/r4kcache.h 2007-10-13 11:29:46.255650214 +0200
|
||||
+++ linux-2.6.23/include/asm-mips/r4kcache.h 2007-10-13 11:29:49.631842613 +0200
|
||||
--- linux-2.6.25.orig/include/asm-mips/r4kcache.h 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/include/asm-mips/r4kcache.h 2008-04-26 21:57:14.000000000 +0100
|
||||
@@ -17,6 +17,20 @@
|
||||
#include <asm/cpu-features.h>
|
||||
#include <asm/mipsmtregs.h>
|
||||
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+#ifdef CONFIG_BCM47XX
|
||||
+#include <asm/paccess.h>
|
||||
+#include <linux/ssb/ssb.h>
|
||||
+#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE + SSB_IMSTATE)))
|
||||
@@ -163,7 +163,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
/*
|
||||
* This macro return a properly sign-extended address suitable as base address
|
||||
* for indexed cache operations. Two issues here:
|
||||
@@ -150,6 +164,7 @@
|
||||
@@ -150,6 +164,7 @@ static inline void flush_icache_line_ind
|
||||
static inline void flush_dcache_line_indexed(unsigned long addr)
|
||||
{
|
||||
__dflush_prologue
|
||||
@@ -171,7 +171,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
cache_op(Index_Writeback_Inv_D, addr);
|
||||
__dflush_epilogue
|
||||
}
|
||||
@@ -169,6 +184,7 @@
|
||||
@@ -169,6 +184,7 @@ static inline void flush_icache_line(uns
|
||||
static inline void flush_dcache_line(unsigned long addr)
|
||||
{
|
||||
__dflush_prologue
|
||||
@@ -179,7 +179,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
cache_op(Hit_Writeback_Inv_D, addr);
|
||||
__dflush_epilogue
|
||||
}
|
||||
@@ -176,6 +192,7 @@
|
||||
@@ -176,6 +192,7 @@ static inline void flush_dcache_line(uns
|
||||
static inline void invalidate_dcache_line(unsigned long addr)
|
||||
{
|
||||
__dflush_prologue
|
||||
@@ -187,7 +187,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
cache_op(Hit_Invalidate_D, addr);
|
||||
__dflush_epilogue
|
||||
}
|
||||
@@ -208,6 +225,7 @@
|
||||
@@ -208,6 +225,7 @@ static inline void flush_scache_line(uns
|
||||
*/
|
||||
static inline void protected_flush_icache_line(unsigned long addr)
|
||||
{
|
||||
@@ -195,7 +195,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
protected_cache_op(Hit_Invalidate_I, addr);
|
||||
}
|
||||
|
||||
@@ -219,6 +237,7 @@
|
||||
@@ -219,6 +237,7 @@ static inline void protected_flush_icach
|
||||
*/
|
||||
static inline void protected_writeback_dcache_line(unsigned long addr)
|
||||
{
|
||||
@@ -203,7 +203,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
protected_cache_op(Hit_Writeback_Inv_D, addr);
|
||||
}
|
||||
|
||||
@@ -339,8 +358,52 @@
|
||||
@@ -339,8 +358,52 @@ static inline void invalidate_tcache_pag
|
||||
: "r" (base), \
|
||||
"i" (op));
|
||||
|
||||
@@ -257,23 +257,23 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
static inline void blast_##pfx##cache##lsize(void) \
|
||||
{ \
|
||||
unsigned long start = INDEX_BASE; \
|
||||
@@ -352,6 +415,7 @@
|
||||
@@ -352,6 +415,7 @@ static inline void blast_##pfx##cache##l
|
||||
\
|
||||
__##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 @@
|
||||
cache##lsize##_unroll32(addr|ws, indexop); \
|
||||
@@ -366,6 +430,7 @@ static inline void blast_##pfx##cache##l
|
||||
\
|
||||
__##pfx##flush_prologue \
|
||||
\
|
||||
+ war \
|
||||
do { \
|
||||
cache##lsize##_unroll32(start,hitop); \
|
||||
cache##lsize##_unroll32(start, hitop); \
|
||||
start += lsize * 32; \
|
||||
@@ -384,6 +449,8 @@
|
||||
@@ -384,6 +449,8 @@ static inline void blast_##pfx##cache##l
|
||||
current_cpu_data.desc.waybit; \
|
||||
unsigned long ws, addr; \
|
||||
\
|
||||
@@ -282,7 +282,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
__##pfx##flush_prologue \
|
||||
\
|
||||
for (ws = 0; ws < ws_end; ws += ws_inc) \
|
||||
@@ -393,28 +460,30 @@
|
||||
@@ -393,35 +460,37 @@ static inline void blast_##pfx##cache##l
|
||||
__##pfx##flush_epilogue \
|
||||
}
|
||||
|
||||
@@ -295,6 +295,13 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
-__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(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 16)
|
||||
-__BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 32)
|
||||
-__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 16)
|
||||
-__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 32)
|
||||
-__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 64)
|
||||
-__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_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, )
|
||||
@@ -304,6 +311,13 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
+__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_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 16, )
|
||||
+__BUILD_BLAST_CACHE(inv_d, dcache, Index_Writeback_Inv_D, Hit_Invalidate_D, 32, )
|
||||
+__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 16, )
|
||||
+__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 32, )
|
||||
+__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 64, )
|
||||
+__BUILD_BLAST_CACHE(inv_s, scache, Index_Writeback_Inv_SD, Hit_Invalidate_SD, 128, )
|
||||
|
||||
/* build blast_xxx_range, protected_blast_xxx_range */
|
||||
-#define __BUILD_BLAST_CACHE_RANGE(pfx, desc, hitop, prot) \
|
||||
@@ -323,7 +337,7 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
prot##cache_op(hitop, addr); \
|
||||
if (addr == aend) \
|
||||
break; \
|
||||
@@ -424,13 +493,13 @@
|
||||
@@ -431,13 +500,13 @@ static inline void prot##blast_##pfx##ca
|
||||
__##pfx##flush_epilogue \
|
||||
}
|
||||
|
||||
@@ -344,15 +358,15 @@ Index: linux-2.6.23/include/asm-mips/r4kcache.h
|
||||
+__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD,,, )
|
||||
|
||||
#endif /* _ASM_R4KCACHE_H */
|
||||
Index: linux-2.6.23/include/asm-mips/stackframe.h
|
||||
Index: linux-2.6.25/include/asm-mips/stackframe.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/include/asm-mips/stackframe.h 2007-10-13 11:29:46.263650671 +0200
|
||||
+++ linux-2.6.23/include/asm-mips/stackframe.h 2007-10-13 11:33:38.504885346 +0200
|
||||
@@ -350,6 +350,10 @@
|
||||
--- linux-2.6.25.orig/include/asm-mips/stackframe.h 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/include/asm-mips/stackframe.h 2008-04-26 21:57:14.000000000 +0100
|
||||
@@ -359,6 +359,10 @@
|
||||
.macro RESTORE_SP_AND_RET
|
||||
LONG_L sp, PT_R29(sp)
|
||||
.set mips3
|
||||
+#ifdef CONFIG_BCM947XX
|
||||
+#ifdef CONFIG_BCM47XX
|
||||
+ nop
|
||||
+ nop
|
||||
+#endif
|
||||
|
||||
@@ -1,38 +1,38 @@
|
||||
Index: linux-2.6.23/arch/mips/mm/init.c
|
||||
Index: linux-2.6.25/arch/mips/mm/init.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/mm/init.c 2007-10-09 22:31:38.000000000 +0200
|
||||
+++ linux-2.6.23/arch/mips/mm/init.c 2007-10-13 02:57:18.483434538 +0200
|
||||
@@ -211,7 +211,7 @@
|
||||
--- linux-2.6.25.orig/arch/mips/mm/init.c 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/arch/mips/mm/init.c 2008-04-26 22:07:48.000000000 +0100
|
||||
@@ -211,7 +211,7 @@ void copy_user_highpage(struct page *to,
|
||||
void *vfrom, *vto;
|
||||
|
||||
vto = kmap_atomic(to, KM_USER1);
|
||||
- if (cpu_has_dc_aliases && !Page_dcache_dirty(from)) {
|
||||
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent && !Page_dcache_dirty(from)) {
|
||||
- if (cpu_has_dc_aliases &&
|
||||
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
|
||||
page_mapped(from) && !Page_dcache_dirty(from)) {
|
||||
vfrom = kmap_coherent(from, vaddr);
|
||||
copy_page(vto, vfrom);
|
||||
kunmap_coherent();
|
||||
@@ -234,7 +234,7 @@
|
||||
@@ -235,7 +235,7 @@ void copy_to_user_page(struct vm_area_st
|
||||
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) {
|
||||
- if (cpu_has_dc_aliases &&
|
||||
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
|
||||
page_mapped(page) && !Page_dcache_dirty(page)) {
|
||||
void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
|
||||
memcpy(vto, src, len);
|
||||
kunmap_coherent();
|
||||
@@ -250,7 +250,7 @@
|
||||
@@ -255,7 +255,7 @@ void copy_from_user_page(struct vm_area_
|
||||
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);
|
||||
- if (cpu_has_dc_aliases &&
|
||||
+ if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
|
||||
page_mapped(page) && !Page_dcache_dirty(page)) {
|
||||
void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
|
||||
memcpy(dst, vfrom, len);
|
||||
Index: linux-2.6.23/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h
|
||||
Index: linux-2.6.25/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.23/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h 2007-10-13 02:56:22.020216880 +0200
|
||||
+++ linux-2.6.25/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h 2008-04-26 21:57:15.000000000 +0100
|
||||
@@ -0,0 +1,13 @@
|
||||
+/*
|
||||
+ * This file is subject to the terms and conditions of the GNU General Public
|
||||
@@ -41,16 +41,16 @@ Index: linux-2.6.23/include/asm-mips/mach-bcm947xx/cpu-feature-overrides.h
|
||||
+ *
|
||||
+ * 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
|
||||
+#ifndef __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H
|
||||
+#define __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H
|
||||
+
|
||||
+#define cpu_use_kmap_coherent 0
|
||||
+
|
||||
+#endif /* __ASM_MACH_BCM947XX_CPU_FEATURE_OVERRIDES_H */
|
||||
Index: linux-2.6.23/include/asm-mips/cpu-features.h
|
||||
+#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
|
||||
Index: linux-2.6.25/include/asm-mips/cpu-features.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/include/asm-mips/cpu-features.h 2007-10-09 22:31:38.000000000 +0200
|
||||
+++ linux-2.6.23/include/asm-mips/cpu-features.h 2007-10-13 02:56:22.028217337 +0200
|
||||
--- linux-2.6.25.orig/include/asm-mips/cpu-features.h 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/include/asm-mips/cpu-features.h 2008-04-26 21:57:15.000000000 +0100
|
||||
@@ -101,6 +101,9 @@
|
||||
#ifndef cpu_has_pindexed_dcache
|
||||
#define cpu_has_pindexed_dcache (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/kernel/cpu-probe.c 2007-10-13 02:47:02.788348072 +0200
|
||||
+++ linux-2.6.23/arch/mips/kernel/cpu-probe.c 2007-10-13 02:57:46.293019312 +0200
|
||||
@@ -159,6 +159,7 @@
|
||||
case CPU_5KC:
|
||||
case CPU_25KF:
|
||||
case CPU_PR4450:
|
||||
+ case CPU_BCM3302:
|
||||
cpu_wait = r4k_wait;
|
||||
break;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c
|
||||
Index: linux-2.6.25/drivers/ssb/driver_chipcommon.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/driver_chipcommon.c 2008-02-19 13:46:08.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_chipcommon.c 2008-02-19 13:46:17.000000000 +0100
|
||||
--- linux-2.6.25.orig/drivers/ssb/driver_chipcommon.c 2008-04-27 21:36:52.000000000 +0100
|
||||
+++ linux-2.6.25/drivers/ssb/driver_chipcommon.c 2008-04-27 21:43:50.000000000 +0100
|
||||
@@ -270,6 +270,8 @@ void ssb_chipco_resume(struct ssb_chipco
|
||||
void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
|
||||
u32 *plltype, u32 *n, u32 *m)
|
||||
@@ -20,11 +20,11 @@ Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c
|
||||
*n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
|
||||
*plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
|
||||
switch (*plltype) {
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_mipscore.c
|
||||
Index: linux-2.6.25/drivers/ssb/driver_mipscore.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/driver_mipscore.c 2008-02-19 13:46:08.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_mipscore.c 2008-02-19 13:46:17.000000000 +0100
|
||||
@@ -160,6 +160,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
|
||||
--- linux-2.6.25.orig/drivers/ssb/driver_mipscore.c 2008-04-17 03:49:44.000000000 +0100
|
||||
+++ linux-2.6.25/drivers/ssb/driver_mipscore.c 2008-04-27 21:43:50.000000000 +0100
|
||||
@@ -161,6 +161,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
|
||||
|
||||
if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) {
|
||||
rate = 200000000;
|
||||
@@ -33,11 +33,11 @@ Index: linux-2.6.23.16/drivers/ssb/driver_mipscore.c
|
||||
} else {
|
||||
rate = ssb_calc_clock_rate(pll_type, n, m);
|
||||
}
|
||||
Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
Index: linux-2.6.25/drivers/ssb/main.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 13:46:08.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 13:46:17.000000000 +0100
|
||||
@@ -862,6 +862,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
|
||||
--- linux-2.6.25.orig/drivers/ssb/main.c 2008-04-17 03:49:44.000000000 +0100
|
||||
+++ linux-2.6.25/drivers/ssb/main.c 2008-04-27 21:43:50.000000000 +0100
|
||||
@@ -867,6 +867,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
|
||||
|
||||
if (bus->chip_id == 0x5365) {
|
||||
rate = 100000000;
|
||||
|
||||
@@ -1,345 +0,0 @@
|
||||
From: Michael Buesch <mb@bu3sch.de>
|
||||
Date: Wed, 10 Oct 2007 06:47:17 +0000 (-0700)
|
||||
Subject: USB: ohci SSB bus glue
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fralf%2Flinux.git;a=commitdiff_plain;h=c604e851486eabcbeb73e984279d436ce121fd5d
|
||||
|
||||
USB: ohci SSB bus glue
|
||||
|
||||
This adds SSB bus glue for the USB OHCI HCD.
|
||||
|
||||
Signed-off-by: Michael Buesch <mb@bu3sch.de>
|
||||
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
||||
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
||||
---
|
||||
|
||||
Index: linux-2.6.23.16/drivers/usb/host/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/usb/host/Kconfig 2008-02-19 00:47:29.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/usb/host/Kconfig 2008-02-19 00:47:51.000000000 +0100
|
||||
@@ -154,6 +154,19 @@ config USB_OHCI_HCD_PCI
|
||||
Enables support for PCI-bus plug-in USB controller cards.
|
||||
If unsure, say Y.
|
||||
|
||||
+config USB_OHCI_HCD_SSB
|
||||
+ bool "OHCI support for Broadcom SSB OHCI core"
|
||||
+ depends on USB_OHCI_HCD && SSB && EXPERIMENTAL
|
||||
+ default n
|
||||
+ ---help---
|
||||
+ Support for the Sonics Silicon Backplane (SSB) attached
|
||||
+ Broadcom USB OHCI core.
|
||||
+
|
||||
+ This device is 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.23.16/drivers/usb/host/ohci-hcd.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/usb/host/ohci-hcd.c 2008-02-19 00:47:29.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/usb/host/ohci-hcd.c 2008-02-19 00:47:51.000000000 +0100
|
||||
@@ -926,11 +926,17 @@ MODULE_LICENSE ("GPL");
|
||||
#define PS3_SYSTEM_BUS_DRIVER ps3_ohci_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
|
||||
|
||||
@@ -975,10 +981,20 @@ static int __init ohci_hcd_mod_init(void
|
||||
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
|
||||
@@ -1003,6 +1019,9 @@ module_init(ohci_hcd_mod_init);
|
||||
|
||||
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
|
||||
Index: linux-2.6.23.16/drivers/usb/host/ohci-ssb.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.23.16/drivers/usb/host/ohci-ssb.c 2008-02-19 00:47:51.000000000 +0100
|
||||
@@ -0,0 +1,247 @@
|
||||
+/*
|
||||
+ * Sonics Silicon Backplane
|
||||
+ * Broadcom USB-core OHCI driver
|
||||
+ *
|
||||
+ * Copyright 2007 Michael Buesch <mb@bu3sch.de>
|
||||
+ *
|
||||
+ * Derived from the OHCI-PCI driver
|
||||
+ * Copyright 1999 Roman Weissgaerber
|
||||
+ * Copyright 2000-2002 David Brownell
|
||||
+ * Copyright 1999 Linus Torvalds
|
||||
+ * Copyright 1999 Gregory P. Smith
|
||||
+ *
|
||||
+ * Derived from the USBcore related parts of Broadcom-SB
|
||||
+ * Copyright 2005 Broadcom Corporation
|
||||
+ *
|
||||
+ * Licensed under the GNU/GPL. See COPYING for details.
|
||||
+ */
|
||||
+#include <linux/ssb/ssb.h>
|
||||
+
|
||||
+
|
||||
+#define SSB_OHCI_TMSLOW_HOSTMODE (1 << 29)
|
||||
+
|
||||
+struct ssb_ohci_device {
|
||||
+ struct ohci_hcd ohci; /* _must_ be at the beginning. */
|
||||
+
|
||||
+ u32 enable_flags;
|
||||
+};
|
||||
+
|
||||
+static inline
|
||||
+struct ssb_ohci_device *hcd_to_ssb_ohci(struct usb_hcd *hcd)
|
||||
+{
|
||||
+ return (struct ssb_ohci_device *)(hcd->hcd_priv);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static int ssb_ohci_reset(struct usb_hcd *hcd)
|
||||
+{
|
||||
+ struct ssb_ohci_device *ohcidev = hcd_to_ssb_ohci(hcd);
|
||||
+ struct ohci_hcd *ohci = &ohcidev->ohci;
|
||||
+ int err;
|
||||
+
|
||||
+ ohci_hcd_init(ohci);
|
||||
+ err = ohci_init(ohci);
|
||||
+
|
||||
+ return err;
|
||||
+}
|
||||
+
|
||||
+static int ssb_ohci_start(struct usb_hcd *hcd)
|
||||
+{
|
||||
+ struct ssb_ohci_device *ohcidev = hcd_to_ssb_ohci(hcd);
|
||||
+ struct ohci_hcd *ohci = &ohcidev->ohci;
|
||||
+ int err;
|
||||
+
|
||||
+ err = ohci_run(ohci);
|
||||
+ if (err < 0) {
|
||||
+ ohci_err(ohci, "can't start\n");
|
||||
+ ohci_stop(hcd);
|
||||
+ }
|
||||
+
|
||||
+ return err;
|
||||
+}
|
||||
+
|
||||
+#ifdef CONFIG_PM
|
||||
+static int ssb_ohci_hcd_suspend(struct usb_hcd *hcd, pm_message_t message)
|
||||
+{
|
||||
+ struct ssb_ohci_device *ohcidev = hcd_to_ssb_ohci(hcd);
|
||||
+ struct ohci_hcd *ohci = &ohcidev->ohci;
|
||||
+ unsigned long flags;
|
||||
+
|
||||
+ spin_lock_irqsave(&ohci->lock, flags);
|
||||
+
|
||||
+ ohci_writel(ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
|
||||
+ ohci_readl(ohci, &ohci->regs->intrdisable); /* commit write */
|
||||
+
|
||||
+ /* make sure snapshot being resumed re-enumerates everything */
|
||||
+ if (message.event == PM_EVENT_PRETHAW)
|
||||
+ ohci_usb_reset(ohci);
|
||||
+
|
||||
+ clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
|
||||
+
|
||||
+ spin_unlock_irqrestore(&ohci->lock, flags);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int ssb_ohci_hcd_resume(struct usb_hcd *hcd)
|
||||
+{
|
||||
+ set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
|
||||
+ usb_hcd_resume_root_hub(hcd);
|
||||
+ return 0;
|
||||
+}
|
||||
+#endif /* CONFIG_PM */
|
||||
+
|
||||
+static const struct hc_driver ssb_ohci_hc_driver = {
|
||||
+ .description = "ssb-usb-ohci",
|
||||
+ .product_desc = "SSB OHCI Controller",
|
||||
+ .hcd_priv_size = sizeof(struct ssb_ohci_device),
|
||||
+
|
||||
+ .irq = ohci_irq,
|
||||
+ .flags = HCD_MEMORY | HCD_USB11,
|
||||
+
|
||||
+ .reset = ssb_ohci_reset,
|
||||
+ .start = ssb_ohci_start,
|
||||
+ .stop = ohci_stop,
|
||||
+ .shutdown = ohci_shutdown,
|
||||
+
|
||||
+#ifdef CONFIG_PM
|
||||
+ .suspend = ssb_ohci_hcd_suspend,
|
||||
+ .resume = ssb_ohci_hcd_resume,
|
||||
+#endif
|
||||
+
|
||||
+ .urb_enqueue = ohci_urb_enqueue,
|
||||
+ .urb_dequeue = ohci_urb_dequeue,
|
||||
+ .endpoint_disable = ohci_endpoint_disable,
|
||||
+
|
||||
+ .get_frame_number = ohci_get_frame,
|
||||
+
|
||||
+ .hub_status_data = ohci_hub_status_data,
|
||||
+ .hub_control = ohci_hub_control,
|
||||
+ .hub_irq_enable = ohci_rhsc_enable,
|
||||
+ .bus_suspend = ohci_bus_suspend,
|
||||
+ .bus_resume = ohci_bus_resume,
|
||||
+
|
||||
+ .start_port_reset = ohci_start_port_reset,
|
||||
+};
|
||||
+
|
||||
+static void ssb_ohci_detach(struct ssb_device *dev)
|
||||
+{
|
||||
+ struct usb_hcd *hcd = ssb_get_drvdata(dev);
|
||||
+
|
||||
+ usb_remove_hcd(hcd);
|
||||
+ iounmap(hcd->regs);
|
||||
+ usb_put_hcd(hcd);
|
||||
+ ssb_device_disable(dev, 0);
|
||||
+}
|
||||
+
|
||||
+static int ssb_ohci_attach(struct ssb_device *dev)
|
||||
+{
|
||||
+ struct ssb_ohci_device *ohcidev;
|
||||
+ struct usb_hcd *hcd;
|
||||
+ int err = -ENOMEM;
|
||||
+ u32 tmp, flags = 0;
|
||||
+
|
||||
+ if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV)
|
||||
+ flags |= SSB_OHCI_TMSLOW_HOSTMODE;
|
||||
+
|
||||
+ ssb_device_enable(dev, flags);
|
||||
+
|
||||
+ hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
|
||||
+ dev->dev->bus_id);
|
||||
+ if (!hcd)
|
||||
+ goto err_dev_disable;
|
||||
+ ohcidev = hcd_to_ssb_ohci(hcd);
|
||||
+ ohcidev->enable_flags = flags;
|
||||
+
|
||||
+ tmp = ssb_read32(dev, SSB_ADMATCH0);
|
||||
+ hcd->rsrc_start = ssb_admatch_base(tmp);
|
||||
+ hcd->rsrc_len = ssb_admatch_size(tmp);
|
||||
+ hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
|
||||
+ if (!hcd->regs)
|
||||
+ goto err_put_hcd;
|
||||
+ err = usb_add_hcd(hcd, dev->irq, IRQF_SHARED);
|
||||
+ if (err)
|
||||
+ goto err_iounmap;
|
||||
+
|
||||
+ ssb_set_drvdata(dev, hcd);
|
||||
+
|
||||
+ return err;
|
||||
+
|
||||
+err_iounmap:
|
||||
+ iounmap(hcd->regs);
|
||||
+err_put_hcd:
|
||||
+ usb_put_hcd(hcd);
|
||||
+err_dev_disable:
|
||||
+ ssb_device_disable(dev, flags);
|
||||
+ return err;
|
||||
+}
|
||||
+
|
||||
+static int ssb_ohci_probe(struct ssb_device *dev,
|
||||
+ const struct ssb_device_id *id)
|
||||
+{
|
||||
+ int err;
|
||||
+ u16 chipid_top;
|
||||
+
|
||||
+ /* USBcores are only connected on embedded devices. */
|
||||
+ chipid_top = (dev->bus->chip_id & 0xFF00);
|
||||
+ if (chipid_top != 0x4700 && chipid_top != 0x5300)
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ /* TODO: Probably need checks here; is the core connected? */
|
||||
+
|
||||
+ if (usb_disabled())
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ /* We currently always attach SSB_DEV_USB11_HOSTDEV
|
||||
+ * as HOST OHCI. If we want to attach it as Client device,
|
||||
+ * we must branch here and call into the (yet to
|
||||
+ * be written) Client mode driver. Same for remove(). */
|
||||
+
|
||||
+ err = ssb_ohci_attach(dev);
|
||||
+
|
||||
+ return err;
|
||||
+}
|
||||
+
|
||||
+static void ssb_ohci_remove(struct ssb_device *dev)
|
||||
+{
|
||||
+ ssb_ohci_detach(dev);
|
||||
+}
|
||||
+
|
||||
+#ifdef CONFIG_PM
|
||||
+
|
||||
+static int ssb_ohci_suspend(struct ssb_device *dev, pm_message_t state)
|
||||
+{
|
||||
+ ssb_device_disable(dev, 0);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int ssb_ohci_resume(struct ssb_device *dev)
|
||||
+{
|
||||
+ struct usb_hcd *hcd = ssb_get_drvdata(dev);
|
||||
+ struct ssb_ohci_device *ohcidev = hcd_to_ssb_ohci(hcd);
|
||||
+
|
||||
+ ssb_device_enable(dev, ohcidev->enable_flags);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+#else /* !CONFIG_PM */
|
||||
+#define ssb_ohci_suspend NULL
|
||||
+#define ssb_ohci_resume NULL
|
||||
+#endif /* CONFIG_PM */
|
||||
+
|
||||
+static const struct ssb_device_id ssb_ohci_table[] = {
|
||||
+ SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
|
||||
+ SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),
|
||||
+ SSB_DEVTABLE_END
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(ssb, ssb_ohci_table);
|
||||
+
|
||||
+static struct ssb_driver ssb_ohci_driver = {
|
||||
+ .name = KBUILD_MODNAME,
|
||||
+ .id_table = ssb_ohci_table,
|
||||
+ .probe = ssb_ohci_probe,
|
||||
+ .remove = ssb_ohci_remove,
|
||||
+ .suspend = ssb_ohci_suspend,
|
||||
+ .resume = ssb_ohci_resume,
|
||||
+};
|
||||
@@ -1,30 +0,0 @@
|
||||
From: Al Viro <viro@ftp.linux.org.uk>
|
||||
Date: Sat, 13 Oct 2007 21:29:47 +0000 (+0100)
|
||||
Subject: Fix ohci-ssb with !CONFIG_PM
|
||||
X-Git-Tag: linux-2.6.24-rc1~57^2~38
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fralf%2Flinux.git;a=commitdiff_plain;h=4735b37cf434175c2b7b36b3b68f1e60e8ec8527;hp=d773b33972a663cfaf066e966f87922a74088a1e
|
||||
|
||||
Fix ohci-ssb with !CONFIG_PM
|
||||
|
||||
ohci_bus_{suspend,resume} exists only if we have CONFIG_PM; do the same
|
||||
thing as other subdrivers...
|
||||
|
||||
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
|
||||
diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
|
||||
index bc3e785..fe70e72 100644
|
||||
--- a/drivers/usb/host/ohci-ssb.c
|
||||
+++ b/drivers/usb/host/ohci-ssb.c
|
||||
@@ -117,8 +117,10 @@ static const struct hc_driver ssb_ohci_hc_driver = {
|
||||
.hub_status_data = ohci_hub_status_data,
|
||||
.hub_control = ohci_hub_control,
|
||||
.hub_irq_enable = ohci_rhsc_enable,
|
||||
+#ifdef CONFIG_PM
|
||||
.bus_suspend = ohci_bus_suspend,
|
||||
.bus_resume = ohci_bus_resume,
|
||||
+#endif
|
||||
|
||||
.start_port_reset = ohci_start_port_reset,
|
||||
};
|
||||
@@ -1,6 +1,8 @@
|
||||
--- a/drivers/usb/host/ohci-ssb.c 2007-11-05 07:56:56.000000000 -0800
|
||||
+++ b/drivers/usb/host/ohci-ssb.c 2007-11-05 08:26:15.000000000 -0800
|
||||
@@ -142,10 +142,59 @@
|
||||
Index: linux-2.6.25/drivers/usb/host/ohci-ssb.c
|
||||
===================================================================
|
||||
--- linux-2.6.25.orig/drivers/usb/host/ohci-ssb.c 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/drivers/usb/host/ohci-ssb.c 2008-04-26 22:07:53.000000000 +0100
|
||||
@@ -142,10 +142,59 @@ static int ssb_ohci_attach(struct ssb_de
|
||||
int err = -ENOMEM;
|
||||
u32 tmp, flags = 0;
|
||||
|
||||
@@ -62,7 +64,7 @@
|
||||
|
||||
hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
|
||||
dev->dev->bus_id);
|
||||
@@ -235,6 +284,7 @@
|
||||
@@ -235,6 +284,7 @@ static int ssb_ohci_resume(struct ssb_de
|
||||
static const struct ssb_device_id ssb_ohci_table[] = {
|
||||
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
|
||||
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
--- linux-2.6.23.1/drivers/usb/host/ohci-ssb.c 2007-11-26 14:01:22.000000000 -0500
|
||||
+++ linux-2.6.23.1.new/drivers/usb/host/ohci-ssb.c 2007-11-26 14:16:08.000000000 -0500
|
||||
@@ -195,6 +195,11 @@
|
||||
Index: linux-2.6.25/drivers/usb/host/ohci-ssb.c
|
||||
===================================================================
|
||||
--- linux-2.6.25.orig/drivers/usb/host/ohci-ssb.c 2008-04-26 21:57:17.000000000 +0100
|
||||
+++ linux-2.6.25/drivers/usb/host/ohci-ssb.c 2008-04-26 21:57:17.000000000 +0100
|
||||
@@ -195,6 +195,11 @@ static int ssb_ohci_attach(struct ssb_de
|
||||
else
|
||||
ssb_device_enable(dev, 0);
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Index: linux-2.6.23/include/asm-mips/cacheflush.h
|
||||
Index: linux-2.6.25/include/asm-mips/cacheflush.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/include/asm-mips/cacheflush.h 2007-10-13 11:01:52.780284289 +0200
|
||||
+++ linux-2.6.23/include/asm-mips/cacheflush.h 2007-10-13 11:02:16.289624011 +0200
|
||||
--- linux-2.6.25.orig/include/asm-mips/cacheflush.h 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/include/asm-mips/cacheflush.h 2008-04-26 21:57:18.000000000 +0100
|
||||
@@ -32,7 +32,7 @@
|
||||
extern void (*flush_cache_all)(void);
|
||||
extern void (*__flush_cache_all)(void);
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: linux-2.6.23/arch/mips/mm/init.c
|
||||
Index: linux-2.6.25/arch/mips/mm/init.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/arch/mips/mm/init.c 2007-10-13 11:46:58.762489429 +0200
|
||||
+++ linux-2.6.23/arch/mips/mm/init.c 2007-10-13 11:47:36.092616749 +0200
|
||||
@@ -205,31 +205,6 @@
|
||||
--- linux-2.6.25.orig/arch/mips/mm/init.c 2008-04-26 21:57:15.000000000 +0100
|
||||
+++ linux-2.6.25/arch/mips/mm/init.c 2008-04-26 21:57:19.000000000 +0100
|
||||
@@ -205,32 +205,6 @@ void kunmap_coherent(void)
|
||||
preempt_check_resched();
|
||||
}
|
||||
|
||||
@@ -12,7 +12,8 @@ Index: linux-2.6.23/arch/mips/mm/init.c
|
||||
- void *vfrom, *vto;
|
||||
-
|
||||
- vto = kmap_atomic(to, KM_USER1);
|
||||
- if (cpu_has_dc_aliases && cpu_use_kmap_coherent && !Page_dcache_dirty(from)) {
|
||||
- if (cpu_has_dc_aliases && cpu_use_kmap_coherent &&
|
||||
- page_mapped(from) && !Page_dcache_dirty(from)) {
|
||||
- vfrom = kmap_coherent(from, vaddr);
|
||||
- copy_page(vto, vfrom);
|
||||
- kunmap_coherent();
|
||||
@@ -34,11 +35,11 @@ Index: linux-2.6.23/arch/mips/mm/init.c
|
||||
void copy_to_user_page(struct vm_area_struct *vma,
|
||||
struct page *page, unsigned long vaddr, void *dst, const void *src,
|
||||
unsigned long len)
|
||||
Index: linux-2.6.23/include/asm-mips/page.h
|
||||
Index: linux-2.6.25/include/asm-mips/page.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.orig/include/asm-mips/page.h 2007-10-13 11:45:50.518600430 +0200
|
||||
+++ linux-2.6.23/include/asm-mips/page.h 2007-10-13 11:47:26.472068504 +0200
|
||||
@@ -35,6 +35,7 @@
|
||||
--- linux-2.6.25.orig/include/asm-mips/page.h 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/include/asm-mips/page.h 2008-04-26 21:57:19.000000000 +0100
|
||||
@@ -32,6 +32,7 @@
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
#include <linux/pfn.h>
|
||||
@@ -46,7 +47,7 @@ Index: linux-2.6.23/include/asm-mips/page.h
|
||||
#include <asm/io.h>
|
||||
|
||||
/*
|
||||
@@ -67,13 +68,16 @@
|
||||
@@ -64,13 +65,16 @@ static inline void clear_user_page(void
|
||||
flush_data_cache_page((unsigned long)addr);
|
||||
}
|
||||
|
||||
|
||||
384
target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch
Normal file
384
target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch
Normal file
@@ -0,0 +1,384 @@
|
||||
Index: linux-2.6.25.1/arch/mips/bcm47xx/irq.c
|
||||
===================================================================
|
||||
--- linux-2.6.25.1.orig/arch/mips/bcm47xx/irq.c 2008-05-14 14:36:58.000000000 +0100
|
||||
+++ linux-2.6.25.1/arch/mips/bcm47xx/irq.c 2008-05-14 14:37:06.000000000 +0100
|
||||
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
|
||||
+ * Copyright (C) 2008 Michael Buesch <mb@bu3sch.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
@@ -23,10 +24,19 @@
|
||||
*/
|
||||
|
||||
#include <linux/types.h>
|
||||
+#include <linux/errno.h>
|
||||
+#include <linux/init.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/irq.h>
|
||||
+#include <linux/pci.h>
|
||||
+#include <linux/ssb/ssb.h>
|
||||
+
|
||||
#include <asm/irq_cpu.h>
|
||||
|
||||
+
|
||||
+extern struct ssb_bus ssb_bcm47xx;
|
||||
+
|
||||
+
|
||||
void plat_irq_dispatch(void)
|
||||
{
|
||||
u32 cause;
|
||||
@@ -53,3 +63,19 @@ void __init arch_init_irq(void)
|
||||
{
|
||||
mips_cpu_irq_init();
|
||||
}
|
||||
+
|
||||
+int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
||||
+{
|
||||
+ int res;
|
||||
+
|
||||
+ res = ssb_pcibios_map_irq(dev, slot, pin);
|
||||
+ if (res < 0) {
|
||||
+ printk(KERN_ALERT "PCI: Failed to map IRQ of device %s\n",
|
||||
+ dev->dev.bus_id);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ /* IRQ-0 and IRQ-1 are software interrupts. */
|
||||
+ WARN_ON((res == 0) || (res == 1));
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
Index: linux-2.6.25.1/arch/mips/bcm47xx/setup.c
|
||||
===================================================================
|
||||
--- linux-2.6.25.1.orig/arch/mips/bcm47xx/setup.c 2008-05-14 14:36:58.000000000 +0100
|
||||
+++ linux-2.6.25.1/arch/mips/bcm47xx/setup.c 2008-05-14 14:37:06.000000000 +0100
|
||||
@@ -2,7 +2,7 @@
|
||||
* Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
|
||||
* Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
|
||||
* Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
|
||||
- * Copyright (C) 2006 Michael Buesch <mb@bu3sch.de>
|
||||
+ * Copyright (C) 2006-2008 Michael Buesch <mb@bu3sch.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
@@ -25,23 +25,52 @@
|
||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
+#include <linux/init.h>
|
||||
#include <linux/types.h>
|
||||
-#include <linux/ssb/ssb.h>
|
||||
+#include <linux/tty.h>
|
||||
+#include <linux/serial.h>
|
||||
+#include <linux/serial_core.h>
|
||||
+#include <linux/serial_reg.h>
|
||||
+#include <linux/serial_8250.h>
|
||||
#include <asm/bootinfo.h>
|
||||
-#include <asm/reboot.h>
|
||||
#include <asm/time.h>
|
||||
-#include <bcm47xx.h>
|
||||
+#include <asm/reboot.h>
|
||||
#include <asm/fw/cfe/cfe_api.h>
|
||||
+#include <linux/pm.h>
|
||||
+#include <linux/ssb/ssb.h>
|
||||
+#include <linux/ssb/ssb_embedded.h>
|
||||
+
|
||||
+#include "include/nvram.h"
|
||||
|
||||
struct ssb_bus ssb_bcm47xx;
|
||||
EXPORT_SYMBOL(ssb_bcm47xx);
|
||||
|
||||
+extern void bcm47xx_pci_init(void);
|
||||
+
|
||||
+int pcibios_plat_dev_init(struct pci_dev *dev)
|
||||
+{
|
||||
+ int err;
|
||||
+
|
||||
+ err = ssb_pcibios_plat_dev_init(dev);
|
||||
+ if (err) {
|
||||
+ printk(KERN_ALERT "PCI: Failed to init device %s\n",
|
||||
+ pci_name(dev));
|
||||
+ }
|
||||
+
|
||||
+ return err;
|
||||
+}
|
||||
+
|
||||
static void bcm47xx_machine_restart(char *command)
|
||||
{
|
||||
printk(KERN_ALERT "Please stand by while rebooting the system...\n");
|
||||
local_irq_disable();
|
||||
+ /* CFE has a reboot callback, but that does not work.
|
||||
+ * Oopses with: Reserved instruction in kernel code.
|
||||
+ */
|
||||
+
|
||||
/* Set the watchdog timer to reset immediately */
|
||||
- ssb_chipco_watchdog_timer_set(&ssb_bcm47xx.chipco, 1);
|
||||
+ if (ssb_watchdog_timer_set(&ssb_bcm47xx, 1))
|
||||
+ printk(KERN_EMERG "SSB watchdog-triggered reboot failed!\n");
|
||||
while (1)
|
||||
cpu_relax();
|
||||
}
|
||||
@@ -50,12 +79,13 @@ static void bcm47xx_machine_halt(void)
|
||||
{
|
||||
/* Disable interrupts and watchdog and spin forever */
|
||||
local_irq_disable();
|
||||
- ssb_chipco_watchdog_timer_set(&ssb_bcm47xx.chipco, 0);
|
||||
+ if (ssb_watchdog_timer_set(&ssb_bcm47xx, 0))
|
||||
+ printk(KERN_EMERG "Failed to disable SSB watchdog!\n");
|
||||
while (1)
|
||||
cpu_relax();
|
||||
}
|
||||
|
||||
-static void str2eaddr(char *str, char *dest)
|
||||
+static void e_aton(char *str, char *dest)
|
||||
{
|
||||
int i = 0;
|
||||
|
||||
@@ -72,52 +102,141 @@ static void str2eaddr(char *str, char *d
|
||||
}
|
||||
}
|
||||
|
||||
-static int bcm47xx_get_invariants(struct ssb_bus *bus,
|
||||
- struct ssb_init_invariants *iv)
|
||||
+static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
|
||||
{
|
||||
- char buf[100];
|
||||
+ char *s;
|
||||
|
||||
- /* Fill boardinfo structure */
|
||||
- memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));
|
||||
+ memset(sprom, 0xFF, sizeof(struct ssb_sprom));
|
||||
|
||||
- if (cfe_getenv("boardvendor", buf, sizeof(buf)) >= 0)
|
||||
- iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
|
||||
- if (cfe_getenv("boardtype", buf, sizeof(buf)) >= 0)
|
||||
- iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
|
||||
- if (cfe_getenv("boardrev", buf, sizeof(buf)) >= 0)
|
||||
- iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
|
||||
-
|
||||
- /* Fill sprom structure */
|
||||
- memset(&(iv->sprom), 0, sizeof(struct ssb_sprom));
|
||||
- iv->sprom.revision = 3;
|
||||
-
|
||||
- if (cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
|
||||
- str2eaddr(buf, iv->sprom.et0mac);
|
||||
- if (cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
|
||||
- str2eaddr(buf, iv->sprom.et1mac);
|
||||
- if (cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
|
||||
- iv->sprom.et0phyaddr = simple_strtoul(buf, NULL, 10);
|
||||
- if (cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
|
||||
- iv->sprom.et1phyaddr = simple_strtoul(buf, NULL, 10);
|
||||
- if (cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
|
||||
- iv->sprom.et0mdcport = simple_strtoul(buf, NULL, 10);
|
||||
- if (cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
|
||||
- iv->sprom.et1mdcport = simple_strtoul(buf, NULL, 10);
|
||||
+ sprom->revision = 1;
|
||||
+ if ((s = nvram_get("il0macaddr")))
|
||||
+ e_aton(s, sprom->il0mac);
|
||||
+ if ((s = nvram_get("et0macaddr")))
|
||||
+ e_aton(s, sprom->et0mac);
|
||||
+ if ((s = nvram_get("et1macaddr")))
|
||||
+ e_aton(s, sprom->et1mac);
|
||||
+ if ((s = nvram_get("et0phyaddr")))
|
||||
+ sprom->et0phyaddr = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("et1phyaddr")))
|
||||
+ sprom->et1phyaddr = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("et0mdcport")))
|
||||
+ sprom->et0mdcport = !!simple_strtoul(s, NULL, 10);
|
||||
+ if ((s = nvram_get("et1mdcport")))
|
||||
+ sprom->et1mdcport = !!simple_strtoul(s, NULL, 10);
|
||||
+ if ((s = nvram_get("pa0b0")))
|
||||
+ sprom->pa0b0 = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("pa0b1")))
|
||||
+ sprom->pa0b1 = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("pa0b2")))
|
||||
+ sprom->pa0b2 = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("pa1b0")))
|
||||
+ sprom->pa1b0 = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("pa1b1")))
|
||||
+ sprom->pa1b1 = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("pa1b2")))
|
||||
+ sprom->pa1b2 = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("wl0gpio0")))
|
||||
+ sprom->gpio0 = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("wl0gpio1")))
|
||||
+ sprom->gpio1 = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("wl0gpio2")))
|
||||
+ sprom->gpio2 = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("wl0gpio3")))
|
||||
+ sprom->gpio3 = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("pa0maxpwr")))
|
||||
+ sprom->maxpwr_bg = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("pa1maxpwr")))
|
||||
+ sprom->maxpwr_a = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("pa0itssit")))
|
||||
+ sprom->itssi_bg = simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("pa1itssit")))
|
||||
+ sprom->itssi_a = simple_strtoul(s, NULL, 0);
|
||||
+ sprom->boardflags_lo = 0;
|
||||
+ if ((s = nvram_get("boardflags")))
|
||||
+ sprom->boardflags_lo = simple_strtoul(s, NULL, 0);
|
||||
+ sprom->boardflags_hi = 0;
|
||||
+ if ((s = nvram_get("boardflags2")))
|
||||
+ sprom->boardflags_hi = simple_strtoul(s, NULL, 0);
|
||||
+}
|
||||
+
|
||||
+static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariants *iv)
|
||||
+{
|
||||
+ char *s;
|
||||
+
|
||||
+ iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;
|
||||
+ if ((s = nvram_get("boardtype")))
|
||||
+ iv->boardinfo.type = (u16)simple_strtoul(s, NULL, 0);
|
||||
+ if ((s = nvram_get("boardrev")))
|
||||
+ iv->boardinfo.rev = (u16)simple_strtoul(s, NULL, 0);
|
||||
+
|
||||
+ bcm47xx_fill_sprom(&iv->sprom);
|
||||
+
|
||||
+ if ((s = nvram_get("cardbus")))
|
||||
+ iv->has_cardbus_slot = !!simple_strtoul(s, NULL, 10);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void __init plat_mem_setup(void)
|
||||
{
|
||||
- int err;
|
||||
+ int i, err;
|
||||
+ char *s;
|
||||
+ struct ssb_mipscore *mcore;
|
||||
+
|
||||
+ err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE, bcm47xx_get_invariants);
|
||||
+ if (err) {
|
||||
+ const char *msg = "Failed to initialize SSB bus (err %d)\n";
|
||||
+ printk(msg, err); /* Make sure the message gets out of the box. */
|
||||
+ panic(msg, err);
|
||||
+ }
|
||||
+ mcore = &ssb_bcm47xx.mipscore;
|
||||
+
|
||||
+ s = nvram_get("kernel_args");
|
||||
+ if (s && !strncmp(s, "console=ttyS1", 13)) {
|
||||
+ struct ssb_serial_port port;
|
||||
+
|
||||
+ printk("Swapping serial ports!\n");
|
||||
+ /* swap serial ports */
|
||||
+ memcpy(&port, &mcore->serial_ports[0], sizeof(port));
|
||||
+ memcpy(&mcore->serial_ports[0], &mcore->serial_ports[1], sizeof(port));
|
||||
+ memcpy(&mcore->serial_ports[1], &port, sizeof(port));
|
||||
+ }
|
||||
|
||||
- err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE,
|
||||
- bcm47xx_get_invariants);
|
||||
- if (err)
|
||||
- panic("Failed to initialize SSB bus (err %d)\n", err);
|
||||
+ for (i = 0; i < mcore->nr_serial_ports; i++) {
|
||||
+ struct ssb_serial_port *port = &(mcore->serial_ports[i]);
|
||||
+ struct uart_port s;
|
||||
+
|
||||
+ memset(&s, 0, sizeof(s));
|
||||
+ s.line = i;
|
||||
+ s.membase = port->regs;
|
||||
+ s.irq = port->irq + 2;
|
||||
+ s.uartclk = port->baud_base;
|
||||
+ s.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
|
||||
+ s.iotype = SERIAL_IO_MEM;
|
||||
+ s.regshift = port->reg_shift;
|
||||
+
|
||||
+ early_serial_setup(&s);
|
||||
+ }
|
||||
+ printk("Serial init done.\n");
|
||||
|
||||
_machine_restart = bcm47xx_machine_restart;
|
||||
_machine_halt = bcm47xx_machine_halt;
|
||||
pm_power_off = bcm47xx_machine_halt;
|
||||
}
|
||||
|
||||
+static int __init bcm47xx_register_gpiodev(void)
|
||||
+{
|
||||
+ static struct resource res = {
|
||||
+ .start = 0xFFFFFFFF,
|
||||
+ };
|
||||
+ struct platform_device *pdev;
|
||||
+
|
||||
+ pdev = platform_device_register_simple("GPIODEV", 0, &res, 1);
|
||||
+ if (!pdev) {
|
||||
+ printk(KERN_ERR "bcm47xx: GPIODEV init failed\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+device_initcall(bcm47xx_register_gpiodev);
|
||||
Index: linux-2.6.25.1/arch/mips/bcm47xx/time.c
|
||||
===================================================================
|
||||
--- linux-2.6.25.1.orig/arch/mips/bcm47xx/time.c 2008-05-14 14:36:58.000000000 +0100
|
||||
+++ linux-2.6.25.1/arch/mips/bcm47xx/time.c 2008-05-14 14:37:06.000000000 +0100
|
||||
@@ -22,11 +22,17 @@
|
||||
* 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
-
|
||||
#include <linux/init.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/sched.h>
|
||||
+#include <linux/serial_reg.h>
|
||||
+#include <linux/interrupt.h>
|
||||
#include <linux/ssb/ssb.h>
|
||||
+#include <asm/addrspace.h>
|
||||
+#include <asm/io.h>
|
||||
#include <asm/time.h>
|
||||
-#include <bcm47xx.h>
|
||||
+
|
||||
+extern struct ssb_bus ssb_bcm47xx;
|
||||
|
||||
void __init plat_time_init(void)
|
||||
{
|
||||
Index: linux-2.6.25.1/arch/mips/bcm47xx/nvram.c
|
||||
===================================================================
|
||||
--- linux-2.6.25.1.orig/arch/mips/bcm47xx/nvram.c 2008-05-14 14:36:58.000000000 +0100
|
||||
+++ linux-2.6.25.1/arch/mips/bcm47xx/nvram.c 2008-05-14 14:37:06.000000000 +0100
|
||||
@@ -24,10 +24,10 @@
|
||||
#include <asm/io.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
-#include <nvram.h>
|
||||
+#include "include/nvram.h"
|
||||
|
||||
#define MB * 1048576
|
||||
-extern struct ssb_bus ssb;
|
||||
+extern struct ssb_bus ssb_bcm47xx;
|
||||
|
||||
static char nvram_buf[NVRAM_SPACE];
|
||||
static int cfe_env;
|
||||
@@ -36,7 +36,7 @@ extern char *cfe_env_get(char *nv_buf, c
|
||||
/* Probe for NVRAM header */
|
||||
static void __init early_nvram_init(void)
|
||||
{
|
||||
- struct ssb_mipscore *mcore = &ssb.mipscore;
|
||||
+ struct ssb_mipscore *mcore = &ssb_bcm47xx.mipscore;
|
||||
struct nvram_header *header;
|
||||
int i;
|
||||
u32 base, lim, off;
|
||||
Index: linux-2.6.25.1/arch/mips/bcm47xx/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.25.1.orig/arch/mips/bcm47xx/Makefile 2008-05-14 14:36:58.000000000 +0100
|
||||
+++ linux-2.6.25.1/arch/mips/bcm47xx/Makefile 2008-05-14 14:37:06.000000000 +0100
|
||||
@@ -3,4 +3,4 @@
|
||||
# under Linux.
|
||||
#
|
||||
|
||||
-obj-y := gpio.o irq.o prom.o serial.o setup.o time.o wgt634u.o
|
||||
+obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o
|
||||
Index: linux-2.6.25.1/arch/mips/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.25.1.orig/arch/mips/Kconfig 2008-05-14 14:47:43.000000000 +0100
|
||||
+++ linux-2.6.25.1/arch/mips/Kconfig 2008-05-14 14:48:15.000000000 +0100
|
||||
@@ -54,6 +54,7 @@ config BCM47XX
|
||||
select SSB_DRIVER_MIPS
|
||||
select SSB_DRIVER_EXTIF
|
||||
select SSB_DRIVER_PCICORE
|
||||
+ select SSB_B43_PCI_BRIDGE
|
||||
select SSB_PCICORE_HOSTMODE if PCI
|
||||
select GENERIC_GPIO
|
||||
select SYS_HAS_EARLY_PRINTK
|
||||
@@ -1,32 +0,0 @@
|
||||
diff -Naur a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
|
||||
--- a/drivers/ide/pci/aec62xx.c 2007-10-12 18:43:44.000000000 +0200
|
||||
+++ b/drivers/ide/pci/aec62xx.c 2007-11-14 14:12:51.000000000 +0100
|
||||
@@ -248,7 +248,14 @@
|
||||
|
||||
static int __devinit init_setup_aec6x80(struct pci_dev *dev, ide_pci_device_t *d)
|
||||
{
|
||||
- unsigned long dma_base = pci_resource_start(dev, 4);
|
||||
+ unsigned long dma_base;
|
||||
+ int err;
|
||||
+
|
||||
+ err = pci_enable_device(dev);
|
||||
+ if (err)
|
||||
+ return err;
|
||||
+
|
||||
+ dma_base = pci_resource_start(dev, 4);
|
||||
|
||||
if (inb(dma_base + 2) & 0x10) {
|
||||
d->name = (dev->device == PCI_DEVICE_ID_ARTOP_ATP865R) ?
|
||||
@@ -256,7 +263,11 @@
|
||||
d->udma_mask = 0x7f; /* udma0-6 */
|
||||
}
|
||||
|
||||
- return ide_setup_pci_device(dev, d);
|
||||
+ err = ide_setup_pci_device(dev, d);
|
||||
+ if(err)
|
||||
+ pci_disable_device(dev);
|
||||
+
|
||||
+ return err;
|
||||
}
|
||||
|
||||
static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: linux-2.6.23.1/scripts/gen_initramfs_list.sh
|
||||
Index: linux-2.6.25/scripts/gen_initramfs_list.sh
|
||||
===================================================================
|
||||
--- linux-2.6.23.1.orig/scripts/gen_initramfs_list.sh 2007-11-16 02:26:47.821227881 +0100
|
||||
+++ linux-2.6.23.1/scripts/gen_initramfs_list.sh 2007-11-16 02:45:42.753904007 +0100
|
||||
@@ -287,7 +287,7 @@
|
||||
--- linux-2.6.25.orig/scripts/gen_initramfs_list.sh 2008-04-26 21:57:00.000000000 +0100
|
||||
+++ linux-2.6.25/scripts/gen_initramfs_list.sh 2008-04-26 21:57:20.000000000 +0100
|
||||
@@ -287,7 +287,7 @@ if [ ! -z ${output_file} ]; then
|
||||
if [ "${is_cpio_compressed}" = "compressed" ]; then
|
||||
cat ${cpio_tfile} > ${output_file}
|
||||
else
|
||||
@@ -11,11 +11,11 @@ Index: linux-2.6.23.1/scripts/gen_initramfs_list.sh
|
||||
fi
|
||||
[ -z ${cpio_file} ] && rm ${cpio_tfile}
|
||||
fi
|
||||
Index: linux-2.6.23.1/init/initramfs.c
|
||||
Index: linux-2.6.25/init/initramfs.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.1.orig/init/initramfs.c 2007-11-16 02:26:47.829228332 +0100
|
||||
+++ linux-2.6.23.1/init/initramfs.c 2007-11-16 03:03:09.661563882 +0100
|
||||
@@ -441,6 +441,69 @@
|
||||
--- linux-2.6.25.orig/init/initramfs.c 2008-04-26 21:56:21.000000000 +0100
|
||||
+++ linux-2.6.25/init/initramfs.c 2008-04-26 21:57:20.000000000 +0100
|
||||
@@ -441,6 +441,69 @@ static void __init flush_window(void)
|
||||
outcnt = 0;
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ Index: linux-2.6.23.1/init/initramfs.c
|
||||
static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
|
||||
{
|
||||
int written;
|
||||
@@ -475,12 +538,28 @@
|
||||
@@ -475,12 +538,28 @@ static char * __init unpack_to_rootfs(ch
|
||||
inptr = 0;
|
||||
outcnt = 0; /* bytes in output buffer */
|
||||
bytes_out = 0;
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/driver_pcicore.c 2008-02-16 17:55:20.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_pcicore.c 2008-02-16 17:55:35.000000000 +0100
|
||||
@@ -66,6 +66,7 @@ int pcibios_plat_dev_init(struct pci_dev
|
||||
base = &ssb_pcicore_pcibus_iobase;
|
||||
else
|
||||
base = &ssb_pcicore_pcibus_membase;
|
||||
+ res->flags |= IORESOURCE_PCI_FIXED;
|
||||
if (res->end) {
|
||||
size = res->end - res->start + 1;
|
||||
if (*base & (size - 1))
|
||||
@@ -88,10 +89,12 @@ int pcibios_plat_dev_init(struct pci_dev
|
||||
|
||||
static void __init ssb_fixup_pcibridge(struct pci_dev *dev)
|
||||
{
|
||||
+ u8 lat;
|
||||
+
|
||||
if (dev->bus->number != 0 || PCI_SLOT(dev->devfn) != 0)
|
||||
return;
|
||||
|
||||
- ssb_printk(KERN_INFO "PCI: fixing up bridge\n");
|
||||
+ ssb_printk(KERN_INFO "PCI: Fixing up bridge %s\n", pci_name(dev));
|
||||
|
||||
/* Enable PCI bridge bus mastering and memory space */
|
||||
pci_set_master(dev);
|
||||
@@ -101,7 +104,10 @@ static void __init ssb_fixup_pcibridge(s
|
||||
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);
|
||||
+ lat = 168;
|
||||
+ ssb_printk(KERN_INFO "PCI: Fixing latency timer of device %s to %u\n",
|
||||
+ pci_name(dev), lat);
|
||||
+ pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
|
||||
}
|
||||
DECLARE_PCI_FIXUP_EARLY(PCI_ANY_ID, PCI_ANY_ID, ssb_fixup_pcibridge);
|
||||
|
||||
@@ -279,14 +285,14 @@ static struct resource ssb_pcicore_mem_r
|
||||
.name = "SSB PCIcore external memory",
|
||||
.start = SSB_PCI_DMA,
|
||||
.end = SSB_PCI_DMA + SSB_PCI_DMA_SZ - 1,
|
||||
- .flags = IORESOURCE_MEM,
|
||||
+ .flags = IORESOURCE_MEM | IORESOURCE_PCI_FIXED,
|
||||
};
|
||||
|
||||
static struct resource ssb_pcicore_io_resource = {
|
||||
.name = "SSB PCIcore external I/O",
|
||||
.start = 0x100,
|
||||
.end = 0x7FF,
|
||||
- .flags = IORESOURCE_IO,
|
||||
+ .flags = IORESOURCE_IO | IORESOURCE_PCI_FIXED,
|
||||
};
|
||||
|
||||
static struct pci_controller ssb_pcicore_controller = {
|
||||
@@ -344,7 +350,8 @@ static void ssb_pcicore_init_hostmode(st
|
||||
/* Ok, ready to run, register it to the system.
|
||||
* 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));
|
||||
+ ssb_pcicore_controller.io_map_base = (unsigned long)ioremap_nocache(SSB_PCI_MEM, 0x04000000);
|
||||
+ set_io_port_base(ssb_pcicore_controller.io_map_base);
|
||||
/* Give some time to the PCI controller to configure itself with the new
|
||||
* values. Not waiting at this point causes crashes of the machine. */
|
||||
mdelay(10);
|
||||
@@ -2,20 +2,23 @@ The SSB pcicore driver does create some MMIO resource collisions.
|
||||
However, the pcicore PCI-fixup routine fixes these collisions afterwards.
|
||||
Remove this sanity check for now until we find a better solution.
|
||||
--mb
|
||||
Index: linux-2.6.23.16/arch/mips/pci/pci.c
|
||||
Index: linux-2.6.25.1/arch/mips/pci/pci.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/arch/mips/pci/pci.c 2008-02-16 17:55:20.000000000 +0100
|
||||
+++ linux-2.6.23.16/arch/mips/pci/pci.c 2008-02-16 17:57:39.000000000 +0100
|
||||
@@ -177,10 +177,8 @@ static int pcibios_enable_resources(stru
|
||||
--- linux-2.6.25.1.orig/arch/mips/pci/pci.c 2008-05-08 22:37:55.000000000 +0100
|
||||
+++ linux-2.6.25.1/arch/mips/pci/pci.c 2008-05-09 07:39:55.000000000 +0100
|
||||
@@ -182,12 +182,10 @@ static int pcibios_enable_resources(stru
|
||||
if ((idx == PCI_ROM_RESOURCE) &&
|
||||
(!(r->flags & IORESOURCE_ROM_ENABLE)))
|
||||
continue;
|
||||
|
||||
r = &dev->resource[idx];
|
||||
- if (!r->start && r->end) {
|
||||
- printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
|
||||
- printk(KERN_ERR "PCI: Device %s not available "
|
||||
- "because of resource collisions\n",
|
||||
+ if (!r->start && r->end)
|
||||
+ printk(KERN_WARNING "PCI: Device %s resource"
|
||||
+ "collisions detected. Ignoring...\n",
|
||||
pci_name(dev));
|
||||
- return -EINVAL;
|
||||
- }
|
||||
+ if (!r->start && r->end)
|
||||
+ printk(KERN_WARNING "PCI: Device %s resource collisions detected. Ignoring...\n", pci_name(dev));
|
||||
if (r->flags & IORESOURCE_IO)
|
||||
cmd |= PCI_COMMAND_IO;
|
||||
if (r->flags & IORESOURCE_MEM)
|
||||
|
||||
@@ -1,90 +0,0 @@
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/driver_chipcommon.c 2008-02-19 14:37:26.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_chipcommon.c 2008-02-19 14:37:27.000000000 +0100
|
||||
@@ -403,6 +403,7 @@ int ssb_chipco_serial_init(struct ssb_ch
|
||||
unsigned int irq;
|
||||
u32 baud_base, div;
|
||||
u32 i, n;
|
||||
+ unsigned int ccrev = cc->dev->id.revision;
|
||||
|
||||
plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
|
||||
irq = ssb_mips_irq(cc->dev);
|
||||
@@ -414,14 +415,39 @@ int ssb_chipco_serial_init(struct ssb_ch
|
||||
chipco_read32(cc, SSB_CHIPCO_CLOCK_M2));
|
||||
div = 1;
|
||||
} else {
|
||||
- if (cc->dev->id.revision >= 11) {
|
||||
+ if (ccrev == 20) {
|
||||
+ /* BCM5354 uses constant 25MHz clock */
|
||||
+ baud_base = 25000000;
|
||||
+ div = 48;
|
||||
+ /* Set the override bit so we don't divide it */
|
||||
+ chipco_write32(cc, SSB_CHIPCO_CORECTL,
|
||||
+ chipco_read32(cc, SSB_CHIPCO_CORECTL)
|
||||
+ | SSB_CHIPCO_CORECTL_UARTCLK0);
|
||||
+ } else if ((ccrev >= 11) && (ccrev != 15)) {
|
||||
/* Fixed ALP clock */
|
||||
baud_base = 20000000;
|
||||
+ if (cc->capabilities & SSB_CHIPCO_CAP_PMU) {
|
||||
+ /* FIXME: baud_base is different for devices with a PMU */
|
||||
+ SSB_WARN_ON(1);
|
||||
+ }
|
||||
div = 1;
|
||||
+ if (ccrev >= 21) {
|
||||
+ /* Turn off UART clock before switching clocksource. */
|
||||
+ chipco_write32(cc, SSB_CHIPCO_CORECTL,
|
||||
+ chipco_read32(cc, SSB_CHIPCO_CORECTL)
|
||||
+ & ~SSB_CHIPCO_CORECTL_UARTCLKEN);
|
||||
+ }
|
||||
/* Set the override bit so we don't divide it */
|
||||
chipco_write32(cc, SSB_CHIPCO_CORECTL,
|
||||
- SSB_CHIPCO_CORECTL_UARTCLK0);
|
||||
- } else if (cc->dev->id.revision >= 3) {
|
||||
+ chipco_read32(cc, SSB_CHIPCO_CORECTL)
|
||||
+ | SSB_CHIPCO_CORECTL_UARTCLK0);
|
||||
+ if (ccrev >= 21) {
|
||||
+ /* Re-enable the UART clock. */
|
||||
+ chipco_write32(cc, SSB_CHIPCO_CORECTL,
|
||||
+ chipco_read32(cc, SSB_CHIPCO_CORECTL)
|
||||
+ | SSB_CHIPCO_CORECTL_UARTCLKEN);
|
||||
+ }
|
||||
+ } else if (ccrev >= 3) {
|
||||
/* Internal backplane clock */
|
||||
baud_base = ssb_clockspeed(bus);
|
||||
div = chipco_read32(cc, SSB_CHIPCO_CLKDIV)
|
||||
@@ -433,7 +459,7 @@ int ssb_chipco_serial_init(struct ssb_ch
|
||||
}
|
||||
|
||||
/* Clock source depends on strapping if UartClkOverride is unset */
|
||||
- if ((cc->dev->id.revision > 0) &&
|
||||
+ if ((ccrev > 0) &&
|
||||
!(chipco_read32(cc, SSB_CHIPCO_CORECTL) & SSB_CHIPCO_CORECTL_UARTCLK0)) {
|
||||
if ((cc->capabilities & SSB_CHIPCO_CAP_UARTCLK) ==
|
||||
SSB_CHIPCO_CAP_UARTCLK_INT) {
|
||||
@@ -455,7 +481,7 @@ int ssb_chipco_serial_init(struct ssb_ch
|
||||
cc_mmio = cc->dev->bus->mmio + (cc->dev->core_index * SSB_CORE_SIZE);
|
||||
uart_regs = cc_mmio + SSB_CHIPCO_UART0_DATA;
|
||||
/* Offset changed at after rev 0 */
|
||||
- if (cc->dev->id.revision == 0)
|
||||
+ if (ccrev == 0)
|
||||
uart_regs += (i * 8);
|
||||
else
|
||||
uart_regs += (i * 256);
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 14:37:26.000000000 +0100
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 14:37:27.000000000 +0100
|
||||
@@ -51,9 +51,12 @@
|
||||
#define SSB_CHIPCO_CAP_JTAGM 0x00400000 /* JTAG master present */
|
||||
#define SSB_CHIPCO_CAP_BROM 0x00800000 /* Internal boot ROM active */
|
||||
#define SSB_CHIPCO_CAP_64BIT 0x08000000 /* 64-bit Backplane */
|
||||
+#define SSB_CHIPCO_CAP_PMU 0x10000000 /* PMU available (rev >= 20) */
|
||||
+#define SSB_CHIPCO_CAP_ECI 0x20000000 /* ECI available (rev >= 20) */
|
||||
#define SSB_CHIPCO_CORECTL 0x0008
|
||||
#define SSB_CHIPCO_CORECTL_UARTCLK0 0x00000001 /* Drive UART with internal clock */
|
||||
#define SSB_CHIPCO_CORECTL_SE 0x00000002 /* sync clk out enable (corerev >= 3) */
|
||||
+#define SSB_CHIPCO_CORECTL_UARTCLKEN 0x00000008 /* UART clock enable (rev >= 21) */
|
||||
#define SSB_CHIPCO_BIST 0x000C
|
||||
#define SSB_CHIPCO_OTPS 0x0010 /* OTP status */
|
||||
#define SSB_CHIPCO_OTPS_PROGFAIL 0x80000000
|
||||
@@ -1,133 +0,0 @@
|
||||
Index: linux-2.6.23.16/drivers/ssb/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/Kconfig 2008-02-19 13:46:05.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/Kconfig 2008-02-19 13:46:33.000000000 +0100
|
||||
@@ -105,6 +105,12 @@ config SSB_DRIVER_MIPS
|
||||
|
||||
If unsure, say N
|
||||
|
||||
+# Assumption: We are on embedded, if we compile the MIPS core.
|
||||
+config SSB_EMBEDDED
|
||||
+ bool
|
||||
+ depends on SSB_DRIVER_MIPS
|
||||
+ default y
|
||||
+
|
||||
config SSB_DRIVER_EXTIF
|
||||
bool "SSB Broadcom EXTIF core driver (EXPERIMENTAL)"
|
||||
depends on SSB_DRIVER_MIPS && EXPERIMENTAL
|
||||
Index: linux-2.6.23.16/drivers/ssb/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/Makefile 2008-02-19 13:46:05.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/Makefile 2008-02-19 13:46:33.000000000 +0100
|
||||
@@ -1,5 +1,6 @@
|
||||
# core
|
||||
ssb-y += main.o scan.o
|
||||
+ssb-$(CONFIG_SSB_EMBEDDED) += embedded.o
|
||||
|
||||
# host support
|
||||
ssb-$(CONFIG_SSB_PCIHOST) += pci.o pcihost_wrapper.o
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_extif.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/driver_extif.c 2008-02-19 13:46:05.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_extif.c 2008-02-19 13:46:33.000000000 +0100
|
||||
@@ -37,6 +37,12 @@ static inline u32 extif_write32_masked(s
|
||||
return value;
|
||||
}
|
||||
|
||||
+void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
|
||||
+ u32 ticks)
|
||||
+{
|
||||
+ extif_write32(extif, SSB_EXTIF_WATCHDOG, ticks);
|
||||
+}
|
||||
+
|
||||
#ifdef CONFIG_SSB_SERIAL
|
||||
static bool serial_exists(u8 *regs)
|
||||
{
|
||||
Index: linux-2.6.23.16/drivers/ssb/embedded.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.23.16/drivers/ssb/embedded.c 2008-02-19 13:46:33.000000000 +0100
|
||||
@@ -0,0 +1,26 @@
|
||||
+/*
|
||||
+ * Sonics Silicon Backplane
|
||||
+ * Embedded systems support code
|
||||
+ *
|
||||
+ * Copyright 2005-2008, Broadcom Corporation
|
||||
+ * Copyright 2006-2008, Michael Buesch <mb@bu3sch.de>
|
||||
+ *
|
||||
+ * Licensed under the GNU/GPL. See COPYING for details.
|
||||
+ */
|
||||
+
|
||||
+#include <linux/ssb/ssb.h>
|
||||
+#include <linux/ssb/ssb_embedded.h>
|
||||
+
|
||||
+
|
||||
+int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks)
|
||||
+{
|
||||
+ if (ssb_chipco_available(&bus->chipco)) {
|
||||
+ ssb_chipco_watchdog_timer_set(&bus->chipco, ticks);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ if (ssb_extif_available(&bus->extif)) {
|
||||
+ ssb_extif_watchdog_timer_set(&bus->extif, ticks);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ return -ENODEV;
|
||||
+}
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 13:46:29.000000000 +0100
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_chipcommon.h 2008-02-19 13:46:33.000000000 +0100
|
||||
@@ -360,6 +360,11 @@ struct ssb_chipcommon {
|
||||
u16 fast_pwrup_delay;
|
||||
};
|
||||
|
||||
+static inline bool ssb_chipco_available(struct ssb_chipcommon *cc)
|
||||
+{
|
||||
+ return (cc->dev != NULL);
|
||||
+}
|
||||
+
|
||||
extern void ssb_chipcommon_init(struct ssb_chipcommon *cc);
|
||||
|
||||
#include <linux/pm.h>
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_extif.h 2008-02-19 13:46:05.000000000 +0100
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_extif.h 2008-02-19 13:46:33.000000000 +0100
|
||||
@@ -178,6 +178,9 @@ u32 ssb_extif_gpio_outen(struct ssb_exti
|
||||
u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value);
|
||||
u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value);
|
||||
|
||||
+extern void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
|
||||
+ u32 ticks);
|
||||
+
|
||||
#ifdef CONFIG_SSB_SERIAL
|
||||
extern int ssb_extif_serial_init(struct ssb_extif *extif,
|
||||
struct ssb_serial_port *ports);
|
||||
@@ -201,5 +204,11 @@ void ssb_extif_get_clockcontrol(struct s
|
||||
{
|
||||
}
|
||||
|
||||
+static inline
|
||||
+void ssb_extif_watchdog_timer_set(struct ssb_extif *extif,
|
||||
+ u32 ticks)
|
||||
+{
|
||||
+}
|
||||
+
|
||||
#endif /* CONFIG_SSB_DRIVER_EXTIF */
|
||||
#endif /* LINUX_SSB_EXTIFCORE_H_ */
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb_embedded.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb_embedded.h 2008-02-19 13:46:33.000000000 +0100
|
||||
@@ -0,0 +1,10 @@
|
||||
+#ifndef LINUX_SSB_EMBEDDED_H_
|
||||
+#define LINUX_SSB_EMBEDDED_H_
|
||||
+
|
||||
+#include <linux/types.h>
|
||||
+#include <linux/ssb/ssb.h>
|
||||
+
|
||||
+
|
||||
+extern int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks);
|
||||
+
|
||||
+#endif /* LINUX_SSB_EMBEDDED_H_ */
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
Index: linux-2.6.25.1/drivers/ssb/main.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 12:38:34.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 12:48:25.000000000 +0100
|
||||
@@ -1163,7 +1163,9 @@ static int __init ssb_modinit(void)
|
||||
--- linux-2.6.25.1.orig/drivers/ssb/main.c 2008-05-10 08:35:23.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/ssb/main.c 2008-05-10 09:04:53.000000000 +0100
|
||||
@@ -1173,7 +1173,9 @@ static int __init ssb_modinit(void)
|
||||
/* ssb must be initialized after PCI but before the ssb drivers.
|
||||
* That means we must use some initcall between subsys_initcall
|
||||
* and device_initcall. */
|
||||
|
||||
@@ -1,245 +0,0 @@
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_chipcommon.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/driver_chipcommon.c 2008-02-19 15:50:42.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_chipcommon.c 2008-02-19 15:50:44.000000000 +0100
|
||||
@@ -361,37 +361,31 @@ u32 ssb_chipco_gpio_in(struct ssb_chipco
|
||||
{
|
||||
return chipco_read32(cc, SSB_CHIPCO_GPIOIN) & mask;
|
||||
}
|
||||
-EXPORT_SYMBOL(ssb_chipco_gpio_in);
|
||||
|
||||
u32 ssb_chipco_gpio_out(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
||||
{
|
||||
return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUT, mask, value);
|
||||
}
|
||||
-EXPORT_SYMBOL(ssb_chipco_gpio_out);
|
||||
|
||||
u32 ssb_chipco_gpio_outen(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
||||
{
|
||||
return chipco_write32_masked(cc, SSB_CHIPCO_GPIOOUTEN, mask, value);
|
||||
}
|
||||
-EXPORT_SYMBOL(ssb_chipco_gpio_outen);
|
||||
|
||||
u32 ssb_chipco_gpio_control(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
||||
{
|
||||
return chipco_write32_masked(cc, SSB_CHIPCO_GPIOCTL, mask, value);
|
||||
}
|
||||
-EXPORT_SYMBOL(ssb_chipco_gpio_control);
|
||||
|
||||
u32 ssb_chipco_gpio_intmask(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
||||
{
|
||||
return chipco_write32_masked(cc, SSB_CHIPCO_GPIOIRQ, mask, value);
|
||||
}
|
||||
-EXPORT_SYMBOL(ssb_chipco_gpio_intmask);
|
||||
|
||||
u32 ssb_chipco_gpio_polarity(struct ssb_chipcommon *cc, u32 mask, u32 value)
|
||||
{
|
||||
return chipco_write32_masked(cc, SSB_CHIPCO_GPIOPOL, mask, value);
|
||||
}
|
||||
-EXPORT_SYMBOL(ssb_chipco_gpio_polarity);
|
||||
|
||||
#ifdef CONFIG_SSB_SERIAL
|
||||
int ssb_chipco_serial_init(struct ssb_chipcommon *cc,
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_extif.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/driver_extif.c 2008-02-19 15:50:42.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_extif.c 2008-02-19 15:50:44.000000000 +0100
|
||||
@@ -122,30 +122,25 @@ u32 ssb_extif_gpio_in(struct ssb_extif *
|
||||
{
|
||||
return extif_read32(extif, SSB_EXTIF_GPIO_IN) & mask;
|
||||
}
|
||||
-EXPORT_SYMBOL(ssb_extif_gpio_in);
|
||||
|
||||
u32 ssb_extif_gpio_out(struct ssb_extif *extif, u32 mask, u32 value)
|
||||
{
|
||||
return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUT(0),
|
||||
mask, value);
|
||||
}
|
||||
-EXPORT_SYMBOL(ssb_extif_gpio_out);
|
||||
|
||||
u32 ssb_extif_gpio_outen(struct ssb_extif *extif, u32 mask, u32 value)
|
||||
{
|
||||
return extif_write32_masked(extif, SSB_EXTIF_GPIO_OUTEN(0),
|
||||
mask, value);
|
||||
}
|
||||
-EXPORT_SYMBOL(ssb_extif_gpio_outen);
|
||||
|
||||
u32 ssb_extif_gpio_polarity(struct ssb_extif *extif, u32 mask, u32 value)
|
||||
{
|
||||
return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTPOL, mask, value);
|
||||
}
|
||||
-EXPORT_SYMBOL(ssb_extif_gpio_polarity);
|
||||
|
||||
u32 ssb_extif_gpio_intmask(struct ssb_extif *extif, u32 mask, u32 value)
|
||||
{
|
||||
return extif_write32_masked(extif, SSB_EXTIF_GPIO_INTMASK, mask, value);
|
||||
}
|
||||
-EXPORT_SYMBOL(ssb_extif_gpio_intmask);
|
||||
Index: linux-2.6.23.16/drivers/ssb/embedded.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/embedded.c 2008-02-19 15:50:42.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/embedded.c 2008-02-19 15:51:01.000000000 +0100
|
||||
@@ -11,6 +11,8 @@
|
||||
#include <linux/ssb/ssb.h>
|
||||
#include <linux/ssb/ssb_embedded.h>
|
||||
|
||||
+#include "ssb_private.h"
|
||||
+
|
||||
|
||||
int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks)
|
||||
{
|
||||
@@ -24,3 +26,107 @@ int ssb_watchdog_timer_set(struct ssb_bu
|
||||
}
|
||||
return -ENODEV;
|
||||
}
|
||||
+
|
||||
+u32 ssb_gpio_in(struct ssb_bus *bus, u32 mask)
|
||||
+{
|
||||
+ unsigned long flags;
|
||||
+ u32 res = 0;
|
||||
+
|
||||
+ spin_lock_irqsave(&bus->gpio_lock, flags);
|
||||
+ if (ssb_chipco_available(&bus->chipco))
|
||||
+ res = ssb_chipco_gpio_in(&bus->chipco, mask);
|
||||
+ else if (ssb_extif_available(&bus->extif))
|
||||
+ res = ssb_extif_gpio_in(&bus->extif, mask);
|
||||
+ else
|
||||
+ SSB_WARN_ON(1);
|
||||
+ spin_unlock_irqrestore(&bus->gpio_lock, flags);
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_gpio_in);
|
||||
+
|
||||
+u32 ssb_gpio_out(struct ssb_bus *bus, u32 mask, u32 value)
|
||||
+{
|
||||
+ unsigned long flags;
|
||||
+ u32 res = 0;
|
||||
+
|
||||
+ spin_lock_irqsave(&bus->gpio_lock, flags);
|
||||
+ if (ssb_chipco_available(&bus->chipco))
|
||||
+ res = ssb_chipco_gpio_out(&bus->chipco, mask, value);
|
||||
+ else if (ssb_extif_available(&bus->extif))
|
||||
+ res = ssb_extif_gpio_out(&bus->extif, mask, value);
|
||||
+ else
|
||||
+ SSB_WARN_ON(1);
|
||||
+ spin_unlock_irqrestore(&bus->gpio_lock, flags);
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_gpio_out);
|
||||
+
|
||||
+u32 ssb_gpio_outen(struct ssb_bus *bus, u32 mask, u32 value)
|
||||
+{
|
||||
+ unsigned long flags;
|
||||
+ u32 res = 0;
|
||||
+
|
||||
+ spin_lock_irqsave(&bus->gpio_lock, flags);
|
||||
+ if (ssb_chipco_available(&bus->chipco))
|
||||
+ res = ssb_chipco_gpio_outen(&bus->chipco, mask, value);
|
||||
+ else if (ssb_extif_available(&bus->extif))
|
||||
+ res = ssb_extif_gpio_outen(&bus->extif, mask, value);
|
||||
+ else
|
||||
+ SSB_WARN_ON(1);
|
||||
+ spin_unlock_irqrestore(&bus->gpio_lock, flags);
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_gpio_outen);
|
||||
+
|
||||
+u32 ssb_gpio_control(struct ssb_bus *bus, u32 mask, u32 value)
|
||||
+{
|
||||
+ unsigned long flags;
|
||||
+ u32 res = 0;
|
||||
+
|
||||
+ spin_lock_irqsave(&bus->gpio_lock, flags);
|
||||
+ if (ssb_chipco_available(&bus->chipco))
|
||||
+ res = ssb_chipco_gpio_control(&bus->chipco, mask, value);
|
||||
+ spin_unlock_irqrestore(&bus->gpio_lock, flags);
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_gpio_control);
|
||||
+
|
||||
+u32 ssb_gpio_intmask(struct ssb_bus *bus, u32 mask, u32 value)
|
||||
+{
|
||||
+ unsigned long flags;
|
||||
+ u32 res = 0;
|
||||
+
|
||||
+ spin_lock_irqsave(&bus->gpio_lock, flags);
|
||||
+ if (ssb_chipco_available(&bus->chipco))
|
||||
+ res = ssb_chipco_gpio_intmask(&bus->chipco, mask, value);
|
||||
+ else if (ssb_extif_available(&bus->extif))
|
||||
+ res = ssb_extif_gpio_intmask(&bus->extif, mask, value);
|
||||
+ else
|
||||
+ SSB_WARN_ON(1);
|
||||
+ spin_unlock_irqrestore(&bus->gpio_lock, flags);
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_gpio_intmask);
|
||||
+
|
||||
+u32 ssb_gpio_polarity(struct ssb_bus *bus, u32 mask, u32 value)
|
||||
+{
|
||||
+ unsigned long flags;
|
||||
+ u32 res = 0;
|
||||
+
|
||||
+ spin_lock_irqsave(&bus->gpio_lock, flags);
|
||||
+ if (ssb_chipco_available(&bus->chipco))
|
||||
+ res = ssb_chipco_gpio_polarity(&bus->chipco, mask, value);
|
||||
+ else if (ssb_extif_available(&bus->extif))
|
||||
+ res = ssb_extif_gpio_polarity(&bus->extif, mask, value);
|
||||
+ else
|
||||
+ SSB_WARN_ON(1);
|
||||
+ spin_unlock_irqrestore(&bus->gpio_lock, flags);
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_gpio_polarity);
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/include/linux/ssb/ssb.h 2008-02-19 15:50:42.000000000 +0100
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb.h 2008-02-19 15:50:44.000000000 +0100
|
||||
@@ -283,6 +283,11 @@ struct ssb_bus {
|
||||
/* Contents of the SPROM. */
|
||||
struct ssb_sprom sprom;
|
||||
|
||||
+#ifdef CONFIG_SSB_EMBEDDED
|
||||
+ /* Lock for GPIO register access. */
|
||||
+ spinlock_t gpio_lock;
|
||||
+#endif /* EMBEDDED */
|
||||
+
|
||||
/* Internal-only stuff follows. Do not touch. */
|
||||
struct list_head list;
|
||||
#ifdef CONFIG_SSB_DEBUG
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb_embedded.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/include/linux/ssb/ssb_embedded.h 2008-02-19 15:50:42.000000000 +0100
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb_embedded.h 2008-02-19 15:50:44.000000000 +0100
|
||||
@@ -7,4 +7,12 @@
|
||||
|
||||
extern int ssb_watchdog_timer_set(struct ssb_bus *bus, u32 ticks);
|
||||
|
||||
+/* Generic GPIO API */
|
||||
+u32 ssb_gpio_in(struct ssb_bus *bus, u32 mask);
|
||||
+u32 ssb_gpio_out(struct ssb_bus *bus, u32 mask, u32 value);
|
||||
+u32 ssb_gpio_outen(struct ssb_bus *bus, u32 mask, u32 value);
|
||||
+u32 ssb_gpio_control(struct ssb_bus *bus, u32 mask, u32 value);
|
||||
+u32 ssb_gpio_intmask(struct ssb_bus *bus, u32 mask, u32 value);
|
||||
+u32 ssb_gpio_polarity(struct ssb_bus *bus, u32 mask, u32 value);
|
||||
+
|
||||
#endif /* LINUX_SSB_EMBEDDED_H_ */
|
||||
Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 15:50:42.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 15:50:44.000000000 +0100
|
||||
@@ -571,6 +571,9 @@ static int ssb_bus_register(struct ssb_b
|
||||
|
||||
spin_lock_init(&bus->bar_lock);
|
||||
INIT_LIST_HEAD(&bus->list);
|
||||
+#ifdef CONFIG_SSB_EMBEDDED
|
||||
+ spin_lock_init(&bus->gpio_lock);
|
||||
+#endif
|
||||
|
||||
/* Powerup the bus */
|
||||
err = ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 1);
|
||||
@@ -1,116 +0,0 @@
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/driver_pcicore.c 2008-02-19 16:37:14.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_pcicore.c 2008-02-19 17:25:26.000000000 +0100
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <linux/ssb/ssb.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/delay.h>
|
||||
+#include <linux/ssb/ssb_embedded.h>
|
||||
|
||||
#include "ssb_private.h"
|
||||
|
||||
@@ -27,6 +28,18 @@ void pcicore_write32(struct ssb_pcicore
|
||||
ssb_write32(pc->dev, offset, value);
|
||||
}
|
||||
|
||||
+static inline
|
||||
+u16 pcicore_read16(struct ssb_pcicore *pc, u16 offset)
|
||||
+{
|
||||
+ return ssb_read16(pc->dev, offset);
|
||||
+}
|
||||
+
|
||||
+static inline
|
||||
+void pcicore_write16(struct ssb_pcicore *pc, u16 offset, u16 value)
|
||||
+{
|
||||
+ ssb_write16(pc->dev, offset, value);
|
||||
+}
|
||||
+
|
||||
/**************************************************
|
||||
* Code for hostmode operation.
|
||||
**************************************************/
|
||||
@@ -123,8 +136,10 @@ static u32 get_cfgspace_addr(struct ssb_
|
||||
u32 addr = 0;
|
||||
u32 tmp;
|
||||
|
||||
- if (unlikely(pc->cardbusmode && dev > 1))
|
||||
+ /* We do only have one cardbus device behind the bridge. */
|
||||
+ if (pc->cardbusmode && (dev >= 1))
|
||||
goto out;
|
||||
+
|
||||
if (bus == 0) {
|
||||
/* Type 0 transaction */
|
||||
if (unlikely(dev >= SSB_PCI_SLOT_MAX))
|
||||
@@ -324,7 +339,16 @@ static void ssb_pcicore_init_hostmode(st
|
||||
pcicore_write32(pc, SSB_PCICORE_ARBCTL, val);
|
||||
udelay(1); /* Assertion time demanded by the PCI standard */
|
||||
|
||||
- /*TODO cardbus mode */
|
||||
+ if (pc->dev->bus->has_cardbus_slot) {
|
||||
+ ssb_dprintk(KERN_INFO PFX "CardBus slot detected\n");
|
||||
+ pc->cardbusmode = 1;
|
||||
+ /* GPIO 1 resets the bridge */
|
||||
+ ssb_gpio_out(pc->dev->bus, 1, 1);
|
||||
+ ssb_gpio_outen(pc->dev->bus, 1, 1);
|
||||
+ pcicore_write16(pc, SSB_PCICORE_SPROM(0),
|
||||
+ pcicore_read16(pc, SSB_PCICORE_SPROM(0))
|
||||
+ | 0x0400);
|
||||
+ }
|
||||
|
||||
/* 64MB I/O window */
|
||||
pcicore_write32(pc, SSB_PCICORE_SBTOPCI0,
|
||||
Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 15:50:44.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 16:38:31.000000000 +0100
|
||||
@@ -559,6 +559,7 @@ static int ssb_fetch_invariants(struct s
|
||||
goto out;
|
||||
memcpy(&bus->boardinfo, &iv.boardinfo, sizeof(iv.boardinfo));
|
||||
memcpy(&bus->sprom, &iv.sprom, sizeof(iv.sprom));
|
||||
+ bus->has_cardbus_slot = iv.has_cardbus_slot;
|
||||
out:
|
||||
return err;
|
||||
}
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/include/linux/ssb/ssb.h 2008-02-19 15:50:44.000000000 +0100
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb.h 2008-02-19 16:38:31.000000000 +0100
|
||||
@@ -282,6 +282,8 @@ struct ssb_bus {
|
||||
struct ssb_boardinfo boardinfo;
|
||||
/* Contents of the SPROM. */
|
||||
struct ssb_sprom sprom;
|
||||
+ /* If the board has a cardbus slot, this is set to true. */
|
||||
+ bool has_cardbus_slot;
|
||||
|
||||
#ifdef CONFIG_SSB_EMBEDDED
|
||||
/* Lock for GPIO register access. */
|
||||
@@ -299,8 +301,13 @@ struct ssb_bus {
|
||||
|
||||
/* The initialization-invariants. */
|
||||
struct ssb_init_invariants {
|
||||
+ /* Versioning information about the PCB. */
|
||||
struct ssb_boardinfo boardinfo;
|
||||
+ /* The SPROM information. That's either stored in an
|
||||
+ * EEPROM or NVRAM on the board. */
|
||||
struct ssb_sprom sprom;
|
||||
+ /* If the board has a cardbus slot, this is set to true. */
|
||||
+ bool has_cardbus_slot;
|
||||
};
|
||||
/* Type of function to fetch the invariants. */
|
||||
typedef int (*ssb_invariants_func_t)(struct ssb_bus *bus,
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_pci.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_pci.h 2008-02-13 20:27:17.000000000 +0100
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_pci.h 2008-02-19 17:31:47.000000000 +0100
|
||||
@@ -51,6 +51,11 @@
|
||||
#define SSB_PCICORE_SBTOPCI1_MASK 0xFC000000
|
||||
#define SSB_PCICORE_SBTOPCI2 0x0108 /* Backplane to PCI translation 2 (sbtopci2) */
|
||||
#define SSB_PCICORE_SBTOPCI2_MASK 0xC0000000
|
||||
+#define SSB_PCICORE_PCICFG0 0x0400 /* PCI config space 0 (rev >= 8) */
|
||||
+#define SSB_PCICORE_PCICFG1 0x0500 /* PCI config space 1 (rev >= 8) */
|
||||
+#define SSB_PCICORE_PCICFG2 0x0600 /* PCI config space 2 (rev >= 8) */
|
||||
+#define SSB_PCICORE_PCICFG3 0x0700 /* PCI config space 3 (rev >= 8) */
|
||||
+#define SSB_PCICORE_SPROM(wordoffset) (0x0800 + ((wordoffset) * 2)) /* SPROM shadow area (72 bytes) */
|
||||
|
||||
/* SBtoPCIx */
|
||||
#define SSB_PCICORE_SBTOPCI_MEM 0x00000000
|
||||
@@ -1,9 +1,9 @@
|
||||
Add support for 8bit reads/writes to SSB.
|
||||
Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
Index: linux-2.6.25.1/drivers/ssb/main.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-20 14:10:07.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-20 18:34:48.000000000 +0100
|
||||
@@ -507,6 +507,14 @@ error:
|
||||
--- linux-2.6.25.1.orig/drivers/ssb/main.c 2008-05-10 09:04:53.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/ssb/main.c 2008-05-10 09:05:38.000000000 +0100
|
||||
@@ -508,6 +508,14 @@ error:
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
static u16 ssb_ssb_read16(struct ssb_device *dev, u16 offset)
|
||||
{
|
||||
struct ssb_bus *bus = dev->bus;
|
||||
@@ -523,6 +531,14 @@ static u32 ssb_ssb_read32(struct ssb_dev
|
||||
@@ -524,6 +532,14 @@ static u32 ssb_ssb_read32(struct ssb_dev
|
||||
return readl(bus->mmio + offset);
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
static void ssb_ssb_write16(struct ssb_device *dev, u16 offset, u16 value)
|
||||
{
|
||||
struct ssb_bus *bus = dev->bus;
|
||||
@@ -541,8 +557,10 @@ static void ssb_ssb_write32(struct ssb_d
|
||||
@@ -542,8 +558,10 @@ static void ssb_ssb_write32(struct ssb_d
|
||||
|
||||
/* Ops for the plain SSB bus without a host-device (no PCI or PCMCIA). */
|
||||
static const struct ssb_bus_ops ssb_ssb_ops = {
|
||||
@@ -44,11 +44,11 @@ Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
.write16 = ssb_ssb_write16,
|
||||
.write32 = ssb_ssb_write32,
|
||||
};
|
||||
Index: linux-2.6.23.16/drivers/ssb/pci.c
|
||||
Index: linux-2.6.25.1/drivers/ssb/pci.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/pci.c 2008-02-20 14:10:03.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/pci.c 2008-02-20 14:10:07.000000000 +0100
|
||||
@@ -572,6 +572,19 @@ static inline int ssb_pci_assert_buspowe
|
||||
--- linux-2.6.25.1.orig/drivers/ssb/pci.c 2008-05-10 09:04:53.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/ssb/pci.c 2008-05-10 09:05:38.000000000 +0100
|
||||
@@ -577,6 +577,19 @@ static inline int ssb_pci_assert_buspowe
|
||||
}
|
||||
#endif /* DEBUG */
|
||||
|
||||
@@ -68,7 +68,7 @@ Index: linux-2.6.23.16/drivers/ssb/pci.c
|
||||
static u16 ssb_pci_read16(struct ssb_device *dev, u16 offset)
|
||||
{
|
||||
struct ssb_bus *bus = dev->bus;
|
||||
@@ -598,6 +611,19 @@ static u32 ssb_pci_read32(struct ssb_dev
|
||||
@@ -603,6 +616,19 @@ static u32 ssb_pci_read32(struct ssb_dev
|
||||
return ioread32(bus->mmio + offset);
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ Index: linux-2.6.23.16/drivers/ssb/pci.c
|
||||
static void ssb_pci_write16(struct ssb_device *dev, u16 offset, u16 value)
|
||||
{
|
||||
struct ssb_bus *bus = dev->bus;
|
||||
@@ -626,8 +652,10 @@ static void ssb_pci_write32(struct ssb_d
|
||||
@@ -631,8 +657,10 @@ static void ssb_pci_write32(struct ssb_d
|
||||
|
||||
/* Not "static", as it's used in main.c */
|
||||
const struct ssb_bus_ops ssb_pci_ops = {
|
||||
@@ -99,10 +99,10 @@ Index: linux-2.6.23.16/drivers/ssb/pci.c
|
||||
.write16 = ssb_pci_write16,
|
||||
.write32 = ssb_pci_write32,
|
||||
};
|
||||
Index: linux-2.6.23.16/drivers/ssb/pcmcia.c
|
||||
Index: linux-2.6.25.1/drivers/ssb/pcmcia.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/pcmcia.c 2008-02-20 14:10:03.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/pcmcia.c 2008-02-20 14:10:07.000000000 +0100
|
||||
--- linux-2.6.25.1.orig/drivers/ssb/pcmcia.c 2008-05-10 09:04:53.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/ssb/pcmcia.c 2008-05-10 09:05:38.000000000 +0100
|
||||
@@ -172,6 +172,22 @@ static int select_core_and_segment(struc
|
||||
return 0;
|
||||
}
|
||||
@@ -158,10 +158,10 @@ Index: linux-2.6.23.16/drivers/ssb/pcmcia.c
|
||||
.write16 = ssb_pcmcia_write16,
|
||||
.write32 = ssb_pcmcia_write32,
|
||||
};
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb.h
|
||||
Index: linux-2.6.25.1/include/linux/ssb/ssb.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/include/linux/ssb/ssb.h 2008-02-20 14:10:07.000000000 +0100
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb.h 2008-02-20 18:33:21.000000000 +0100
|
||||
--- linux-2.6.25.1.orig/include/linux/ssb/ssb.h 2008-05-10 09:04:53.000000000 +0100
|
||||
+++ linux-2.6.25.1/include/linux/ssb/ssb.h 2008-05-10 09:05:38.000000000 +0100
|
||||
@@ -72,8 +72,10 @@ struct ssb_device;
|
||||
/* Lowlevel read/write operations on the device MMIO.
|
||||
* Internal, don't use that outside of ssb. */
|
||||
@@ -173,7 +173,7 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb.h
|
||||
void (*write16)(struct ssb_device *dev, u16 offset, u16 value);
|
||||
void (*write32)(struct ssb_device *dev, u16 offset, u32 value);
|
||||
};
|
||||
@@ -344,6 +346,10 @@ void ssb_device_disable(struct ssb_devic
|
||||
@@ -348,6 +350,10 @@ void ssb_device_disable(struct ssb_devic
|
||||
|
||||
|
||||
/* Device MMIO register read/write functions. */
|
||||
@@ -184,7 +184,7 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb.h
|
||||
static inline u16 ssb_read16(struct ssb_device *dev, u16 offset)
|
||||
{
|
||||
return dev->ops->read16(dev, offset);
|
||||
@@ -352,6 +358,10 @@ static inline u32 ssb_read32(struct ssb_
|
||||
@@ -356,6 +362,10 @@ static inline u32 ssb_read32(struct ssb_
|
||||
{
|
||||
return dev->ops->read32(dev, offset);
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
Allow registering PCI devices after early boot.
|
||||
|
||||
This is an ugly hack and needs to be rewritten before going upstream.
|
||||
Index: linux-2.6.23.16/arch/mips/pci/pci.c
|
||||
Index: linux-2.6.25/arch/mips/pci/pci.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/arch/mips/pci/pci.c 2008-02-20 16:06:36.000000000 +0100
|
||||
+++ linux-2.6.23.16/arch/mips/pci/pci.c 2008-02-20 16:09:33.000000000 +0100
|
||||
--- linux-2.6.25.orig/arch/mips/pci/pci.c 2008-04-27 21:49:19.000000000 +0100
|
||||
+++ linux-2.6.25/arch/mips/pci/pci.c 2008-04-27 21:58:31.000000000 +0100
|
||||
@@ -21,6 +21,17 @@
|
||||
*/
|
||||
int pci_probe_only;
|
||||
@@ -146,11 +146,11 @@ Index: linux-2.6.23.16/arch/mips/pci/pci.c
|
||||
|
||||
return 0;
|
||||
}
|
||||
Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
Index: linux-2.6.25/drivers/ssb/main.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-20 16:06:36.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-20 18:33:21.000000000 +0100
|
||||
@@ -1185,9 +1185,7 @@ static int __init ssb_modinit(void)
|
||||
--- linux-2.6.25.orig/drivers/ssb/main.c 2008-04-27 21:55:32.000000000 +0100
|
||||
+++ linux-2.6.25/drivers/ssb/main.c 2008-04-27 21:58:31.000000000 +0100
|
||||
@@ -1191,9 +1191,7 @@ static int __init ssb_modinit(void)
|
||||
/* ssb must be initialized after PCI but before the ssb drivers.
|
||||
* That means we must use some initcall between subsys_initcall
|
||||
* and device_initcall. */
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: linux-2.6.23.16/drivers/ssb/Kconfig
|
||||
Index: linux-2.6.25.1/drivers/ssb/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/Kconfig 2008-03-19 11:16:18.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/Kconfig 2008-03-19 11:16:18.000000000 +0100
|
||||
@@ -120,4 +120,13 @@ config SSB_DRIVER_EXTIF
|
||||
--- linux-2.6.25.1.orig/drivers/ssb/Kconfig 2008-05-07 22:45:24.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/ssb/Kconfig 2008-05-07 22:57:40.000000000 +0100
|
||||
@@ -125,4 +125,13 @@ config SSB_DRIVER_EXTIF
|
||||
|
||||
If unsure, say N
|
||||
|
||||
@@ -16,10 +16,10 @@ Index: linux-2.6.23.16/drivers/ssb/Kconfig
|
||||
+ If unsure, say N
|
||||
+
|
||||
endmenu
|
||||
Index: linux-2.6.23.16/drivers/ssb/Makefile
|
||||
Index: linux-2.6.25.1/drivers/ssb/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/Makefile 2008-03-19 11:16:18.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/Makefile 2008-03-19 11:16:18.000000000 +0100
|
||||
--- linux-2.6.25.1.orig/drivers/ssb/Makefile 2008-05-07 22:45:24.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/ssb/Makefile 2008-05-07 22:57:40.000000000 +0100
|
||||
@@ -11,6 +11,7 @@ ssb-y += driver_chipcommon.o
|
||||
ssb-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o
|
||||
ssb-$(CONFIG_SSB_DRIVER_EXTIF) += driver_extif.o
|
||||
@@ -28,10 +28,10 @@ Index: linux-2.6.23.16/drivers/ssb/Makefile
|
||||
|
||||
# b43 pci-ssb-bridge driver
|
||||
# Not strictly a part of SSB, but kept here for convenience
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_gige.c
|
||||
Index: linux-2.6.25.1/drivers/ssb/driver_gige.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_gige.c 2008-03-19 11:16:18.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/ssb/driver_gige.c 2008-05-07 22:57:40.000000000 +0100
|
||||
@@ -0,0 +1,294 @@
|
||||
+/*
|
||||
+ * Sonics Silicon Backplane
|
||||
@@ -327,10 +327,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_gige.c
|
||||
+{
|
||||
+ return ssb_driver_register(&ssb_gige_driver);
|
||||
+}
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_gige.h
|
||||
Index: linux-2.6.25.1/include/linux/ssb/ssb_driver_gige.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_gige.h 2008-03-19 11:16:18.000000000 +0100
|
||||
+++ linux-2.6.25.1/include/linux/ssb/ssb_driver_gige.h 2008-05-07 22:57:40.000000000 +0100
|
||||
@@ -0,0 +1,174 @@
|
||||
+#ifndef LINUX_SSB_DRIVER_GIGE_H_
|
||||
+#define LINUX_SSB_DRIVER_GIGE_H_
|
||||
@@ -506,11 +506,11 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_gige.h
|
||||
+
|
||||
+#endif /* CONFIG_SSB_DRIVER_GIGE */
|
||||
+#endif /* LINUX_SSB_DRIVER_GIGE_H_ */
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c
|
||||
Index: linux-2.6.25.1/drivers/ssb/driver_pcicore.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/driver_pcicore.c 2008-03-19 11:16:18.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_pcicore.c 2008-03-19 11:16:18.000000000 +0100
|
||||
@@ -60,74 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
|
||||
--- linux-2.6.25.1.orig/drivers/ssb/driver_pcicore.c 2008-05-07 22:45:24.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/ssb/driver_pcicore.c 2008-05-07 22:57:40.000000000 +0100
|
||||
@@ -60,78 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
|
||||
/* Core to access the external PCI config space. Can only have one. */
|
||||
static struct ssb_pcicore *extpci_core;
|
||||
|
||||
@@ -565,7 +565,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c
|
||||
-
|
||||
- /* Enable PCI bridge bus mastering and memory space */
|
||||
- pci_set_master(dev);
|
||||
- pcibios_enable_device(dev, ~0);
|
||||
- if (pcibios_enable_device(dev, ~0) < 0) {
|
||||
- ssb_printk(KERN_ERR "PCI: SSB bridge enable failed\n");
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- /* Enable PCI bridge BAR1 prefetch and burst */
|
||||
- pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3);
|
||||
@@ -582,10 +585,11 @@ Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c
|
||||
-{
|
||||
- return ssb_mips_irq(extpci_core->dev) + 2;
|
||||
-}
|
||||
|
||||
-
|
||||
static u32 get_cfgspace_addr(struct ssb_pcicore *pc,
|
||||
unsigned int bus, unsigned int dev,
|
||||
@@ -317,6 +249,92 @@ static struct pci_controller ssb_pcicore
|
||||
unsigned int func, unsigned int off)
|
||||
@@ -320,6 +248,95 @@ static struct pci_controller ssb_pcicore
|
||||
.mem_offset = 0x24000000,
|
||||
};
|
||||
|
||||
@@ -652,7 +656,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c
|
||||
+
|
||||
+ /* Enable PCI bridge bus mastering and memory space */
|
||||
+ pci_set_master(dev);
|
||||
+ pcibios_enable_device(dev, ~0);
|
||||
+ if (pcibios_enable_device(dev, ~0) < 0) {
|
||||
+ ssb_printk(KERN_ERR "PCI: SSB bridge enable failed\n");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ /* Enable PCI bridge BAR1 prefetch and burst */
|
||||
+ pci_write_config_dword(dev, SSB_BAR1_CONTROL, 3);
|
||||
@@ -678,10 +685,10 @@ Index: linux-2.6.23.16/drivers/ssb/driver_pcicore.c
|
||||
static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
|
||||
{
|
||||
u32 val;
|
||||
Index: linux-2.6.23.16/drivers/ssb/embedded.c
|
||||
Index: linux-2.6.25.1/drivers/ssb/embedded.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/embedded.c 2008-03-19 11:16:18.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/embedded.c 2008-03-19 11:16:18.000000000 +0100
|
||||
--- linux-2.6.25.1.orig/drivers/ssb/embedded.c 2008-05-07 22:45:24.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/ssb/embedded.c 2008-05-07 22:57:40.000000000 +0100
|
||||
@@ -10,6 +10,9 @@
|
||||
|
||||
#include <linux/ssb/ssb.h>
|
||||
@@ -783,11 +790,11 @@ Index: linux-2.6.23.16/drivers/ssb/embedded.c
|
||||
+
|
||||
+ return -ENODEV;
|
||||
+}
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb.h
|
||||
Index: linux-2.6.25.1/include/linux/ssb/ssb.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/include/linux/ssb/ssb.h 2008-03-19 11:16:18.000000000 +0100
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb.h 2008-03-19 11:16:18.000000000 +0100
|
||||
@@ -422,5 +422,12 @@ extern int ssb_bus_powerup(struct ssb_bu
|
||||
--- linux-2.6.25.1.orig/include/linux/ssb/ssb.h 2008-05-07 22:45:33.000000000 +0100
|
||||
+++ linux-2.6.25.1/include/linux/ssb/ssb.h 2008-05-07 22:57:40.000000000 +0100
|
||||
@@ -426,5 +426,12 @@ extern int ssb_bus_powerup(struct ssb_bu
|
||||
extern u32 ssb_admatch_base(u32 adm);
|
||||
extern u32 ssb_admatch_size(u32 adm);
|
||||
|
||||
@@ -800,10 +807,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb.h
|
||||
+#endif /* CONFIG_SSB_EMBEDDED */
|
||||
|
||||
#endif /* LINUX_SSB_H_ */
|
||||
Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_pci.h
|
||||
Index: linux-2.6.25.1/include/linux/ssb/ssb_driver_pci.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/include/linux/ssb/ssb_driver_pci.h 2008-03-19 11:16:18.000000000 +0100
|
||||
+++ linux-2.6.23.16/include/linux/ssb/ssb_driver_pci.h 2008-03-19 11:16:18.000000000 +0100
|
||||
--- linux-2.6.25.1.orig/include/linux/ssb/ssb_driver_pci.h 2008-05-07 22:45:24.000000000 +0100
|
||||
+++ linux-2.6.25.1/include/linux/ssb/ssb_driver_pci.h 2008-05-07 22:57:40.000000000 +0100
|
||||
@@ -1,6 +1,11 @@
|
||||
#ifndef LINUX_SSB_PCICORE_H_
|
||||
#define LINUX_SSB_PCICORE_H_
|
||||
@@ -843,10 +850,10 @@ Index: linux-2.6.23.16/include/linux/ssb/ssb_driver_pci.h
|
||||
+
|
||||
#endif /* CONFIG_SSB_DRIVER_PCICORE */
|
||||
#endif /* LINUX_SSB_PCICORE_H_ */
|
||||
Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
Index: linux-2.6.25.1/drivers/ssb/main.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-03-19 11:16:18.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/main.c 2008-03-19 11:16:18.000000000 +0100
|
||||
--- linux-2.6.25.1.orig/drivers/ssb/main.c 2008-05-07 22:45:33.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/ssb/main.c 2008-05-07 22:57:40.000000000 +0100
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/ssb/ssb.h>
|
||||
@@ -881,7 +888,7 @@ Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
static struct ssb_device *ssb_device_get(struct ssb_device *dev)
|
||||
{
|
||||
if (dev)
|
||||
@@ -1175,7 +1195,14 @@ static int __init ssb_modinit(void)
|
||||
@@ -1181,7 +1201,14 @@ static int __init ssb_modinit(void)
|
||||
err = b43_pci_ssb_bridge_init();
|
||||
if (err) {
|
||||
ssb_printk(KERN_ERR "Broadcom 43xx PCI-SSB-bridge "
|
||||
@@ -897,7 +904,7 @@ Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
/* don't fail SSB init because of this */
|
||||
err = 0;
|
||||
}
|
||||
@@ -1189,6 +1216,7 @@ fs_initcall(ssb_modinit);
|
||||
@@ -1195,6 +1222,7 @@ fs_initcall(ssb_modinit);
|
||||
|
||||
static void __exit ssb_modexit(void)
|
||||
{
|
||||
@@ -905,10 +912,10 @@ Index: linux-2.6.23.16/drivers/ssb/main.c
|
||||
b43_pci_ssb_bridge_exit();
|
||||
bus_unregister(&ssb_bustype);
|
||||
}
|
||||
Index: linux-2.6.23.16/drivers/ssb/ssb_private.h
|
||||
Index: linux-2.6.25.1/drivers/ssb/ssb_private.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/ssb_private.h 2008-03-19 11:16:15.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/ssb_private.h 2008-03-19 11:16:18.000000000 +0100
|
||||
--- linux-2.6.25.1.orig/drivers/ssb/ssb_private.h 2008-05-07 22:45:24.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/ssb/ssb_private.h 2008-05-07 22:57:40.000000000 +0100
|
||||
@@ -118,6 +118,8 @@ extern u32 ssb_calc_clock_rate(u32 pllty
|
||||
extern int ssb_devices_freeze(struct ssb_bus *bus);
|
||||
extern int ssb_devices_thaw(struct ssb_bus *bus);
|
||||
@@ -917,11 +924,11 @@ Index: linux-2.6.23.16/drivers/ssb/ssb_private.h
|
||||
+ int (*func)(struct ssb_bus *bus, unsigned long data));
|
||||
|
||||
/* b43_pci_bridge.c */
|
||||
#ifdef CONFIG_SSB_PCIHOST
|
||||
Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
#ifdef CONFIG_SSB_B43_PCI_BRIDGE
|
||||
Index: linux-2.6.25.1/drivers/net/tg3.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/net/tg3.c 2008-03-19 11:16:15.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/net/tg3.c 2008-03-19 11:16:18.000000000 +0100
|
||||
--- linux-2.6.25.1.orig/drivers/net/tg3.c 2008-05-07 22:45:24.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/net/tg3.c 2008-05-07 22:57:40.000000000 +0100
|
||||
@@ -38,6 +38,7 @@
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/prefetch.h>
|
||||
@@ -930,7 +937,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
|
||||
#include <net/checksum.h>
|
||||
#include <net/ip.h>
|
||||
@@ -410,8 +411,9 @@ static void _tw32_flush(struct tg3 *tp,
|
||||
@@ -425,8 +426,9 @@ static void _tw32_flush(struct tg3 *tp,
|
||||
static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val)
|
||||
{
|
||||
tp->write32_mbox(tp, off, val);
|
||||
@@ -942,7 +949,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
tp->read32_mbox(tp, off);
|
||||
}
|
||||
|
||||
@@ -623,7 +625,7 @@ static void tg3_switch_clocks(struct tg3
|
||||
@@ -706,7 +708,7 @@ static void tg3_switch_clocks(struct tg3
|
||||
|
||||
#define PHY_BUSY_LOOPS 5000
|
||||
|
||||
@@ -951,7 +958,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
{
|
||||
u32 frame_val;
|
||||
unsigned int loops;
|
||||
@@ -637,7 +639,7 @@ static int tg3_readphy(struct tg3 *tp, i
|
||||
@@ -720,7 +722,7 @@ static int tg3_readphy(struct tg3 *tp, i
|
||||
|
||||
*val = 0x0;
|
||||
|
||||
@@ -960,7 +967,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
MI_COM_PHY_ADDR_MASK);
|
||||
frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
|
||||
MI_COM_REG_ADDR_MASK);
|
||||
@@ -672,7 +674,12 @@ static int tg3_readphy(struct tg3 *tp, i
|
||||
@@ -755,7 +757,12 @@ static int tg3_readphy(struct tg3 *tp, i
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -974,7 +981,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
{
|
||||
u32 frame_val;
|
||||
unsigned int loops;
|
||||
@@ -688,7 +695,7 @@ static int tg3_writephy(struct tg3 *tp,
|
||||
@@ -771,7 +778,7 @@ static int tg3_writephy(struct tg3 *tp,
|
||||
udelay(80);
|
||||
}
|
||||
|
||||
@@ -983,8 +990,8 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
MI_COM_PHY_ADDR_MASK);
|
||||
frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
|
||||
MI_COM_REG_ADDR_MASK);
|
||||
@@ -721,6 +728,11 @@ static int tg3_writephy(struct tg3 *tp,
|
||||
return ret;
|
||||
@@ -810,6 +817,11 @@ static void tg3_phydsp_write(struct tg3
|
||||
tg3_writephy(tp, MII_TG3_DSP_RW_PORT, val);
|
||||
}
|
||||
|
||||
+static int tg3_writephy(struct tg3 *tp, int reg, u32 val)
|
||||
@@ -995,22 +1002,22 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
static void tg3_phy_toggle_automdix(struct tg3 *tp, int enable)
|
||||
{
|
||||
u32 phy;
|
||||
@@ -1988,6 +2000,14 @@ static int tg3_setup_copper_phy(struct t
|
||||
tp->link_config.active_duplex = current_duplex;
|
||||
}
|
||||
@@ -2250,6 +2262,14 @@ static int tg3_setup_copper_phy(struct t
|
||||
}
|
||||
}
|
||||
|
||||
+ if (tp->tg3_flags3 & TG3_FLG3_ROBOSWITCH) {
|
||||
+ current_link_up = 1;
|
||||
+ current_speed = SPEED_1000; //FIXME
|
||||
+ current_duplex = DUPLEX_FULL;
|
||||
+ tp->link_config.active_speed = current_speed;
|
||||
+ tp->link_config.active_duplex = current_duplex;
|
||||
+ }
|
||||
+ if (tp->tg3_flags & TG3_FLG3_ROBOSWITCH) {
|
||||
+ current_link_up = 1;
|
||||
+ current_speed = SPEED_1000; //FIXME
|
||||
+ current_duplex = DUPLEX_FULL;
|
||||
+ tp->link_config.active_speed = current_speed;
|
||||
+ tp->link_config.active_duplex = current_duplex;
|
||||
+ }
|
||||
+
|
||||
if (current_link_up == 1 &&
|
||||
(tp->link_config.active_duplex == DUPLEX_FULL) &&
|
||||
(tp->link_config.autoneg == AUTONEG_ENABLE)) {
|
||||
@@ -4813,6 +4833,11 @@ static int tg3_poll_fw(struct tg3 *tp)
|
||||
if (current_link_up == 1 &&
|
||||
tp->link_config.active_duplex == DUPLEX_FULL)
|
||||
tg3_setup_flow_control(tp, lcl_adv, rmt_adv);
|
||||
@@ -5197,6 +5217,11 @@ static int tg3_poll_fw(struct tg3 *tp)
|
||||
int i;
|
||||
u32 val;
|
||||
|
||||
@@ -1022,7 +1029,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
|
||||
/* Wait up to 20ms for init done. */
|
||||
for (i = 0; i < 200; i++) {
|
||||
@@ -5040,6 +5065,14 @@ static int tg3_chip_reset(struct tg3 *tp
|
||||
@@ -5435,6 +5460,14 @@ static int tg3_chip_reset(struct tg3 *tp
|
||||
tw32(0x5000, 0x400);
|
||||
}
|
||||
|
||||
@@ -1037,7 +1044,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
tw32(GRC_MODE, tp->grc_mode);
|
||||
|
||||
if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
|
||||
@@ -5308,9 +5341,12 @@ static int tg3_halt_cpu(struct tg3 *tp,
|
||||
@@ -5704,9 +5737,12 @@ static int tg3_halt_cpu(struct tg3 *tp,
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@@ -1053,7 +1060,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -5391,6 +5427,11 @@ static int tg3_load_5701_a0_firmware_fix
|
||||
@@ -5787,6 +5823,11 @@ static int tg3_load_5701_a0_firmware_fix
|
||||
struct fw_info info;
|
||||
int err, i;
|
||||
|
||||
@@ -1065,7 +1072,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
info.text_base = TG3_FW_TEXT_ADDR;
|
||||
info.text_len = TG3_FW_TEXT_LEN;
|
||||
info.text_data = &tg3FwText[0];
|
||||
@@ -5949,6 +5990,11 @@ static int tg3_load_tso_firmware(struct
|
||||
@@ -6345,6 +6386,11 @@ static int tg3_load_tso_firmware(struct
|
||||
unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
|
||||
int err, i;
|
||||
|
||||
@@ -1077,7 +1084,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
|
||||
return 0;
|
||||
|
||||
@@ -6850,6 +6896,11 @@ static void tg3_timer(unsigned long __op
|
||||
@@ -7306,6 +7352,11 @@ static void tg3_timer(unsigned long __op
|
||||
|
||||
spin_lock(&tp->lock);
|
||||
|
||||
@@ -1089,9 +1096,9 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
|
||||
/* All of this garbage is because when using non-tagged
|
||||
* IRQ status the mailbox/status_block protocol the chip
|
||||
@@ -8432,6 +8483,11 @@ static int tg3_test_nvram(struct tg3 *tp
|
||||
u32 *buf, csum, magic;
|
||||
int i, j, err = 0, size;
|
||||
@@ -8906,6 +8957,11 @@ static int tg3_test_nvram(struct tg3 *tp
|
||||
__le32 *buf;
|
||||
int i, j, k, err = 0, size;
|
||||
|
||||
+ if (tp->tg3_flags3 & TG3_FLG3_IS_SSB_CORE) {
|
||||
+ /* We don't have NVRAM. */
|
||||
@@ -1101,7 +1108,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
if (tg3_nvram_read_swab(tp, 0, &magic) != 0)
|
||||
return -EIO;
|
||||
|
||||
@@ -9154,7 +9210,7 @@ static int tg3_ioctl(struct net_device *
|
||||
@@ -9689,7 +9745,7 @@ static int tg3_ioctl(struct net_device *
|
||||
return -EAGAIN;
|
||||
|
||||
spin_lock_bh(&tp->lock);
|
||||
@@ -1110,7 +1117,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
spin_unlock_bh(&tp->lock);
|
||||
|
||||
data->val_out = mii_regval;
|
||||
@@ -9173,7 +9229,7 @@ static int tg3_ioctl(struct net_device *
|
||||
@@ -9708,7 +9764,7 @@ static int tg3_ioctl(struct net_device *
|
||||
return -EAGAIN;
|
||||
|
||||
spin_lock_bh(&tp->lock);
|
||||
@@ -1119,7 +1126,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
spin_unlock_bh(&tp->lock);
|
||||
|
||||
return err;
|
||||
@@ -9571,6 +9627,12 @@ static void __devinit tg3_get_5906_nvram
|
||||
@@ -10177,6 +10233,12 @@ static void __devinit tg3_get_5906_nvram
|
||||
/* Chips other than 5700/5701 use the NVRAM for fetching info. */
|
||||
static void __devinit tg3_nvram_init(struct tg3 *tp)
|
||||
{
|
||||
@@ -1132,7 +1139,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
tw32_f(GRC_EEPROM_ADDR,
|
||||
(EEPROM_ADDR_FSM_RESET |
|
||||
(EEPROM_DEFAULT_CLOCK_PERIOD <<
|
||||
@@ -9706,6 +9768,9 @@ static int tg3_nvram_read(struct tg3 *tp
|
||||
@@ -10317,6 +10379,9 @@ static int tg3_nvram_read(struct tg3 *tp
|
||||
{
|
||||
int ret;
|
||||
|
||||
@@ -1142,7 +1149,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
if (!(tp->tg3_flags & TG3_FLAG_NVRAM))
|
||||
return tg3_nvram_read_using_eeprom(tp, offset, val);
|
||||
|
||||
@@ -9938,6 +10003,9 @@ static int tg3_nvram_write_block(struct
|
||||
@@ -10563,6 +10628,9 @@ static int tg3_nvram_write_block(struct
|
||||
{
|
||||
int ret;
|
||||
|
||||
@@ -1152,7 +1159,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
|
||||
tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
|
||||
~GRC_LCLCTRL_GPIO_OUTPUT1);
|
||||
@@ -10804,7 +10872,6 @@ static int __devinit tg3_get_invariants(
|
||||
@@ -11610,7 +11678,6 @@ static int __devinit tg3_get_invariants(
|
||||
tp->write32 = tg3_write_flush_reg32;
|
||||
}
|
||||
|
||||
@@ -1160,7 +1167,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
if ((tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) ||
|
||||
(tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)) {
|
||||
tp->write32_tx_mbox = tg3_write32_tx_mbox;
|
||||
@@ -10840,6 +10907,11 @@ static int __devinit tg3_get_invariants(
|
||||
@@ -11646,6 +11713,11 @@ static int __devinit tg3_get_invariants(
|
||||
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
|
||||
tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
|
||||
|
||||
@@ -1172,7 +1179,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
/* Get eeprom hw config before calling tg3_set_power_state().
|
||||
* In particular, the TG3_FLG2_IS_NIC flag must be
|
||||
* determined before calling tg3_set_power_state() so that
|
||||
@@ -11184,6 +11256,10 @@ static int __devinit tg3_get_device_addr
|
||||
@@ -12017,6 +12089,10 @@ static int __devinit tg3_get_device_addr
|
||||
}
|
||||
|
||||
if (!is_valid_ether_addr(&dev->dev_addr[0])) {
|
||||
@@ -1180,10 +1187,10 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
+ ssb_gige_get_macaddr(tp->pdev, &dev->dev_addr[0]);
|
||||
+ }
|
||||
+ if (!is_valid_ether_addr(&dev->dev_addr[0])) {
|
||||
#ifdef CONFIG_SPARC64
|
||||
#ifdef CONFIG_SPARC
|
||||
if (!tg3_get_default_macaddr_sparc(tp))
|
||||
return 0;
|
||||
@@ -11675,6 +11751,7 @@ static char * __devinit tg3_phy_string(s
|
||||
@@ -12508,6 +12584,7 @@ static char * __devinit tg3_phy_string(s
|
||||
case PHY_ID_BCM5704: return "5704";
|
||||
case PHY_ID_BCM5705: return "5705";
|
||||
case PHY_ID_BCM5750: return "5750";
|
||||
@@ -1191,7 +1198,7 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
case PHY_ID_BCM5752: return "5752";
|
||||
case PHY_ID_BCM5714: return "5714";
|
||||
case PHY_ID_BCM5780: return "5780";
|
||||
@@ -11859,6 +11936,13 @@ static int __devinit tg3_init_one(struct
|
||||
@@ -12695,6 +12772,13 @@ static int __devinit tg3_init_one(struct
|
||||
tp->msg_enable = tg3_debug;
|
||||
else
|
||||
tp->msg_enable = TG3_DEF_MSG_ENABLE;
|
||||
@@ -1205,44 +1212,42 @@ Index: linux-2.6.23.16/drivers/net/tg3.c
|
||||
|
||||
/* The word/byte swap controls here control register access byte
|
||||
* swapping. DMA data byte swapping is controlled in the GRC_MODE
|
||||
Index: linux-2.6.23.16/drivers/net/tg3.h
|
||||
Index: linux-2.6.25.1/drivers/net/tg3.h
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/net/tg3.h 2008-03-19 11:16:15.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/net/tg3.h 2008-03-19 11:16:18.000000000 +0100
|
||||
@@ -2279,6 +2279,10 @@ struct tg3 {
|
||||
#define TG3_FLG2_PHY_JITTER_BUG 0x20000000
|
||||
#define TG3_FLG2_NO_FWARE_REPORTED 0x40000000
|
||||
#define TG3_FLG2_PHY_ADJUST_TRIM 0x80000000
|
||||
+ u32 tg3_flags3;
|
||||
+#define TG3_FLG3_IS_SSB_CORE 0x00000001
|
||||
+#define TG3_FLG3_FLUSH_POSTED_WRITES 0x00000002
|
||||
+#define TG3_FLG3_ROBOSWITCH 0x00000004
|
||||
--- linux-2.6.25.1.orig/drivers/net/tg3.h 2008-05-07 22:45:24.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/net/tg3.h 2008-05-07 23:02:12.000000000 +0100
|
||||
@@ -2477,6 +2477,9 @@ struct tg3 {
|
||||
#define TG3_FLG3_ENABLE_APE 0x00000002
|
||||
#define TG3_FLG3_5761_5784_AX_FIXES 0x00000004
|
||||
#define TG3_FLG3_5701_DMA_BUG 0x00000008
|
||||
+#define TG3_FLG3_IS_SSB_CORE 0x00000010
|
||||
+#define TG3_FLG3_FLUSH_POSTED_WRITES 0x00000020
|
||||
+#define TG3_FLG3_ROBOSWITCH 0x00000040
|
||||
|
||||
struct timer_list timer;
|
||||
u16 timer_counter;
|
||||
@@ -2333,6 +2337,7 @@ struct tg3 {
|
||||
@@ -2532,6 +2535,7 @@ struct tg3 {
|
||||
#define PHY_ID_BCM5714 0x60008340
|
||||
#define PHY_ID_BCM5780 0x60008350
|
||||
#define PHY_ID_BCM5755 0xbc050cc0
|
||||
+#define PHY_ID_BCM5750_2 0xbc050cd0
|
||||
#define PHY_ID_BCM5787 0xbc050ce0
|
||||
#define PHY_ID_BCM5756 0xbc050ed0
|
||||
#define PHY_ID_BCM5906 0xdc00ac40
|
||||
@@ -2364,7 +2369,8 @@ struct tg3 {
|
||||
(X) == PHY_ID_BCM5752 || (X) == PHY_ID_BCM5714 || \
|
||||
#define PHY_ID_BCM5784 0xbc050fa0
|
||||
@@ -2568,7 +2572,7 @@ struct tg3 {
|
||||
(X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \
|
||||
(X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \
|
||||
- (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM8002)
|
||||
+ (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM8002 || \
|
||||
+ (X) == PHY_ID_BCM5750_2)
|
||||
(X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \
|
||||
- (X) == PHY_ID_BCM8002)
|
||||
+ (X) == PHY_ID_BCM8002 || (X) == PHY_ID_BCM5750_2)
|
||||
|
||||
struct tg3_hw_stats *hw_stats;
|
||||
dma_addr_t stats_mapping;
|
||||
Index: linux-2.6.23.16/drivers/ssb/driver_mipscore.c
|
||||
Index: linux-2.6.25.1/drivers/ssb/driver_mipscore.c
|
||||
===================================================================
|
||||
--- linux-2.6.23.16.orig/drivers/ssb/driver_mipscore.c 2008-03-19 11:16:18.000000000 +0100
|
||||
+++ linux-2.6.23.16/drivers/ssb/driver_mipscore.c 2008-03-19 11:16:18.000000000 +0100
|
||||
@@ -211,6 +211,7 @@ void ssb_mipscore_init(struct ssb_mipsco
|
||||
--- linux-2.6.25.1.orig/drivers/ssb/driver_mipscore.c 2008-05-07 22:45:33.000000000 +0100
|
||||
+++ linux-2.6.25.1/drivers/ssb/driver_mipscore.c 2008-05-07 22:57:40.000000000 +0100
|
||||
@@ -212,6 +212,7 @@ void ssb_mipscore_init(struct ssb_mipsco
|
||||
/* fallthrough */
|
||||
case SSB_DEV_PCI:
|
||||
case SSB_DEV_ETHERNET:
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
Index: linux-2.6.25.1/arch/mips/bcm47xx/prom.c
|
||||
===================================================================
|
||||
--- linux-2.6.25.1.orig/arch/mips/bcm47xx/prom.c 2008-05-14 14:46:44.000000000 +0100
|
||||
+++ linux-2.6.25.1/arch/mips/bcm47xx/prom.c 2008-05-14 17:05:43.000000000 +0100
|
||||
@@ -83,9 +83,18 @@ static __init void prom_init_cfe(void)
|
||||
}
|
||||
}
|
||||
|
||||
+ if (((unsigned int)prom_vec == 0x80300000) ||
|
||||
+ ((unsigned int)prom_vec == 0x80400000)) {
|
||||
+ /* WRT54G series workaround */
|
||||
+ cfe_eptseal = CFE_EPTSEAL;
|
||||
+ cfe_ept = 0xBFC00500;
|
||||
+ cfe_handle = (uint32_t)argc;
|
||||
+ }
|
||||
+
|
||||
if (cfe_eptseal != CFE_EPTSEAL) {
|
||||
/* too early for panic to do any good */
|
||||
printk(KERN_ERR "CFE's entrypoint seal doesn't match.");
|
||||
+ *(unsigned int*)0xb8000064 = 0x1;
|
||||
while (1) ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user