brcm47xx: remove kernel 4.1 support
Kernel 4.1 is not supported by LEDE for some time now. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens
parent
e3b339e2ea
commit
250d305455
36 changed files with 0 additions and 3487 deletions
|
|
@ -1,185 +0,0 @@
|
||||||
CONFIG_ADM6996_PHY=y
|
|
||||||
CONFIG_ARCH_BINFMT_ELF_STATE=y
|
|
||||||
CONFIG_ARCH_DISCARD_MEMBLOCK=y
|
|
||||||
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
|
|
||||||
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
|
|
||||||
# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set
|
|
||||||
# CONFIG_ARCH_HAS_SG_CHAIN is not set
|
|
||||||
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
|
|
||||||
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
|
|
||||||
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
|
|
||||||
CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
|
|
||||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
|
||||||
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
|
|
||||||
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
|
|
||||||
CONFIG_SWCONFIG_B53=y
|
|
||||||
# CONFIG_SWCONFIG_B53_MMAP_DRIVER is not set
|
|
||||||
CONFIG_SWCONFIG_B53_PHY_DRIVER=y
|
|
||||||
CONFIG_SWCONFIG_B53_PHY_FIXUP=y
|
|
||||||
# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set
|
|
||||||
CONFIG_BCM47XX=y
|
|
||||||
CONFIG_BCM47XX_BCMA=y
|
|
||||||
CONFIG_BCM47XX_SSB=y
|
|
||||||
CONFIG_BCM47XX_WDT=y
|
|
||||||
CONFIG_BCMA=y
|
|
||||||
CONFIG_BCMA_BLOCKIO=y
|
|
||||||
CONFIG_BCMA_DEBUG=y
|
|
||||||
CONFIG_BCMA_DRIVER_GMAC_CMN=y
|
|
||||||
CONFIG_BCMA_DRIVER_GPIO=y
|
|
||||||
CONFIG_BCMA_DRIVER_MIPS=y
|
|
||||||
CONFIG_BCMA_DRIVER_PCI=y
|
|
||||||
CONFIG_BCMA_DRIVER_PCI_HOSTMODE=y
|
|
||||||
CONFIG_BCMA_HOST_PCI=y
|
|
||||||
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
|
|
||||||
CONFIG_BCMA_HOST_SOC=y
|
|
||||||
CONFIG_BCMA_NFLASH=y
|
|
||||||
CONFIG_BCMA_SFLASH=y
|
|
||||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
|
||||||
CONFIG_CEVT_R4K=y
|
|
||||||
CONFIG_CLONE_BACKWARDS=y
|
|
||||||
CONFIG_CMDLINE="noinitrd console=ttyS0,115200"
|
|
||||||
CONFIG_CMDLINE_BOOL=y
|
|
||||||
# CONFIG_CMDLINE_OVERRIDE is not set
|
|
||||||
# CONFIG_CPU_BMIPS is not set
|
|
||||||
CONFIG_CPU_GENERIC_DUMP_TLB=y
|
|
||||||
CONFIG_CPU_HAS_PREFETCH=y
|
|
||||||
CONFIG_CPU_HAS_SYNC=y
|
|
||||||
CONFIG_CPU_LITTLE_ENDIAN=y
|
|
||||||
CONFIG_CPU_MIPS32=y
|
|
||||||
CONFIG_CPU_MIPS32_R1=y
|
|
||||||
# CONFIG_CPU_MIPS32_R2 is not set
|
|
||||||
CONFIG_CPU_MIPSR1=y
|
|
||||||
CONFIG_CPU_MIPSR2_IRQ_VI=y
|
|
||||||
CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y
|
|
||||||
CONFIG_CPU_R4K_CACHE_TLB=y
|
|
||||||
CONFIG_CPU_R4K_FPU=y
|
|
||||||
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
|
|
||||||
CONFIG_CPU_SUPPORTS_HIGHMEM=y
|
|
||||||
CONFIG_CSRC_R4K=y
|
|
||||||
CONFIG_DMA_NONCOHERENT=y
|
|
||||||
# CONFIG_EARLY_PRINTK is not set
|
|
||||||
CONFIG_FIXED_PHY=y
|
|
||||||
CONFIG_GENERIC_ATOMIC64=y
|
|
||||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
|
||||||
CONFIG_GENERIC_CMOS_UPDATE=y
|
|
||||||
CONFIG_GENERIC_IO=y
|
|
||||||
CONFIG_GENERIC_IRQ_SHOW=y
|
|
||||||
CONFIG_GENERIC_PCI_IOMAP=y
|
|
||||||
CONFIG_GENERIC_SCHED_CLOCK=y
|
|
||||||
CONFIG_GENERIC_SMP_IDLE_THREAD=y
|
|
||||||
CONFIG_GPIOLIB=y
|
|
||||||
CONFIG_GPIO_DEVRES=y
|
|
||||||
CONFIG_GPIO_SYSFS=y
|
|
||||||
CONFIG_GPIO_WDT=y
|
|
||||||
CONFIG_HARDWARE_WATCHPOINTS=y
|
|
||||||
CONFIG_HAS_DMA=y
|
|
||||||
CONFIG_HAS_IOMEM=y
|
|
||||||
CONFIG_HAS_IOPORT_MAP=y
|
|
||||||
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
|
|
||||||
# CONFIG_HAVE_ARCH_BITREVERSE is not set
|
|
||||||
CONFIG_HAVE_ARCH_JUMP_LABEL=y
|
|
||||||
CONFIG_HAVE_ARCH_KGDB=y
|
|
||||||
CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
|
|
||||||
CONFIG_HAVE_ARCH_TRACEHOOK=y
|
|
||||||
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
|
|
||||||
CONFIG_HAVE_BPF_JIT=y
|
|
||||||
CONFIG_HAVE_CC_STACKPROTECTOR=y
|
|
||||||
CONFIG_HAVE_CONTEXT_TRACKING=y
|
|
||||||
CONFIG_HAVE_C_RECORDMCOUNT=y
|
|
||||||
CONFIG_HAVE_DEBUG_KMEMLEAK=y
|
|
||||||
CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
|
|
||||||
CONFIG_HAVE_DMA_API_DEBUG=y
|
|
||||||
CONFIG_HAVE_DMA_ATTRS=y
|
|
||||||
CONFIG_HAVE_DMA_CONTIGUOUS=y
|
|
||||||
CONFIG_HAVE_DYNAMIC_FTRACE=y
|
|
||||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
|
|
||||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
|
|
||||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
|
||||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
|
|
||||||
CONFIG_HAVE_IDE=y
|
|
||||||
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
|
|
||||||
CONFIG_HAVE_MEMBLOCK=y
|
|
||||||
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
|
|
||||||
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
|
|
||||||
CONFIG_HAVE_NET_DSA=y
|
|
||||||
CONFIG_HAVE_OPROFILE=y
|
|
||||||
CONFIG_HAVE_PERF_EVENTS=y
|
|
||||||
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
|
|
||||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
|
|
||||||
CONFIG_HW_HAS_PCI=y
|
|
||||||
CONFIG_HW_RANDOM=y
|
|
||||||
CONFIG_HZ_PERIODIC=y
|
|
||||||
CONFIG_INITRAMFS_SOURCE=""
|
|
||||||
CONFIG_IRQ_CPU=y
|
|
||||||
CONFIG_IRQ_DOMAIN=y
|
|
||||||
CONFIG_IRQ_FORCED_THREADING=y
|
|
||||||
CONFIG_IRQ_WORK=y
|
|
||||||
CONFIG_LEDS_GPIO_REGISTER=y
|
|
||||||
# CONFIG_LZ4_COMPRESS is not set
|
|
||||||
# CONFIG_LZ4_DECOMPRESS is not set
|
|
||||||
CONFIG_MDIO_BOARDINFO=y
|
|
||||||
CONFIG_MIPS=y
|
|
||||||
# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
|
|
||||||
CONFIG_MIPS_L1_CACHE_SHIFT=5
|
|
||||||
# CONFIG_MIPS_MACHINE is not set
|
|
||||||
CONFIG_MODULES_USE_ELF_REL=y
|
|
||||||
CONFIG_MTD_BCM47XXSFLASH=y
|
|
||||||
CONFIG_MTD_BCM47XX_PARTS=y
|
|
||||||
CONFIG_MTD_NAND=y
|
|
||||||
CONFIG_MTD_NAND_BCM47XXNFLASH=y
|
|
||||||
CONFIG_MTD_NAND_ECC=y
|
|
||||||
CONFIG_MTD_PHYSMAP=y
|
|
||||||
CONFIG_NEED_DMA_MAP_STATE=y
|
|
||||||
CONFIG_NEED_PER_CPU_KM=y
|
|
||||||
CONFIG_NO_EXCEPT_FILL=y
|
|
||||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y
|
|
||||||
# CONFIG_NO_IOPORT_MAP is not set
|
|
||||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
|
||||||
CONFIG_PCI=y
|
|
||||||
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
|
|
||||||
CONFIG_PCI_DOMAINS=y
|
|
||||||
CONFIG_PERF_USE_VMALLOC=y
|
|
||||||
CONFIG_PGTABLE_LEVELS=2
|
|
||||||
CONFIG_PHYLIB=y
|
|
||||||
# CONFIG_RCU_EXPEDITE_BOOT is not set
|
|
||||||
# CONFIG_RCU_STALL_COMMON is not set
|
|
||||||
CONFIG_SCHED_HRTICK=y
|
|
||||||
# CONFIG_SCSI_DMA is not set
|
|
||||||
CONFIG_SERIAL_8250_EXTENDED=y
|
|
||||||
CONFIG_SERIAL_8250_SHARE_IRQ=y
|
|
||||||
CONFIG_SRCU=y
|
|
||||||
CONFIG_SSB=y
|
|
||||||
CONFIG_SSB_B43_PCI_BRIDGE=y
|
|
||||||
CONFIG_SSB_BLOCKIO=y
|
|
||||||
CONFIG_SSB_DEBUG=y
|
|
||||||
CONFIG_SSB_DRIVER_EXTIF=y
|
|
||||||
CONFIG_SSB_DRIVER_GIGE=y
|
|
||||||
CONFIG_SSB_DRIVER_GPIO=y
|
|
||||||
CONFIG_SSB_DRIVER_MIPS=y
|
|
||||||
CONFIG_SSB_DRIVER_PCICORE=y
|
|
||||||
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
|
|
||||||
CONFIG_SSB_EMBEDDED=y
|
|
||||||
CONFIG_SSB_HOST_SOC=y
|
|
||||||
CONFIG_SSB_PCICORE_HOSTMODE=y
|
|
||||||
CONFIG_SSB_PCIHOST=y
|
|
||||||
CONFIG_SSB_PCIHOST_POSSIBLE=y
|
|
||||||
CONFIG_SSB_SERIAL=y
|
|
||||||
CONFIG_SSB_SFLASH=y
|
|
||||||
CONFIG_SSB_SPROM=y
|
|
||||||
CONFIG_SWCONFIG=y
|
|
||||||
CONFIG_SYSCTL_EXCEPTION_TRACE=y
|
|
||||||
CONFIG_SYS_HAS_CPU_BMIPS=y
|
|
||||||
CONFIG_SYS_HAS_CPU_BMIPS32_3300=y
|
|
||||||
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
|
|
||||||
CONFIG_SYS_HAS_CPU_MIPS32_R2=y
|
|
||||||
CONFIG_SYS_HAS_EARLY_PRINTK=y
|
|
||||||
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
|
|
||||||
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
|
|
||||||
CONFIG_SYS_SUPPORTS_HIGHMEM=y
|
|
||||||
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
|
|
||||||
CONFIG_SYS_SUPPORTS_MIPS16=y
|
|
||||||
CONFIG_TICK_CPU_ACCOUNTING=y
|
|
||||||
CONFIG_USB_SUPPORT=y
|
|
||||||
CONFIG_USE_GENERIC_EARLY_PRINTK_8250=y
|
|
||||||
CONFIG_WATCHDOG_CORE=y
|
|
||||||
CONFIG_ZONE_DMA_FLAG=0
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
From 4ddb225376a2802a4e20e16f71c6d37b679e3169 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Tue, 12 May 2015 18:46:11 +0200
|
|
||||||
Subject: [PATCH] MIPS: BCM47XX: Make sure NVRAM buffer ends with \0
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
This will simplify reading its contents.
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Cc: Hante Meuleman <meuleman@broadcom.com>
|
|
||||||
Cc: Ian Kent <raven@themaw.net>
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/10031/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/nvram.c | 9 +++++----
|
|
||||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/nvram.c
|
|
||||||
+++ b/arch/mips/bcm47xx/nvram.c
|
|
||||||
@@ -98,7 +98,7 @@ found:
|
|
||||||
pr_err("The nvram size accoridng to the header seems to be bigger than the partition on flash\n");
|
|
||||||
if (header->len > NVRAM_SPACE)
|
|
||||||
pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
|
|
||||||
- header->len, NVRAM_SPACE);
|
|
||||||
+ header->len, NVRAM_SPACE - 1);
|
|
||||||
|
|
||||||
src = (u32 *)header;
|
|
||||||
dst = (u32 *)nvram_buf;
|
|
||||||
@@ -106,6 +106,7 @@ found:
|
|
||||||
*dst++ = __raw_readl(src++);
|
|
||||||
for (; i < header->len && i < NVRAM_SPACE && i < size; i += 4)
|
|
||||||
*dst++ = readl(src++);
|
|
||||||
+ nvram_buf[NVRAM_SPACE - 1] = '\0';
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@@ -150,10 +151,10 @@ static int nvram_init(void)
|
|
||||||
u8 *dst = (uint8_t *)nvram_buf;
|
|
||||||
size_t len = header.len;
|
|
||||||
|
|
||||||
- if (header.len > NVRAM_SPACE) {
|
|
||||||
+ if (len >= NVRAM_SPACE) {
|
|
||||||
+ len = NVRAM_SPACE - 1;
|
|
||||||
pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
|
|
||||||
- header.len, NVRAM_SPACE);
|
|
||||||
- len = NVRAM_SPACE;
|
|
||||||
+ header.len, len);
|
|
||||||
}
|
|
||||||
|
|
||||||
err = mtd_read(mtd, 0, len, &bytes_read, dst);
|
|
||||||
|
|
@ -1,59 +0,0 @@
|
||||||
From f6f895644230b13618f14f7108f9b23a21a87bfa Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Tue, 12 May 2015 18:46:12 +0200
|
|
||||||
Subject: [PATCH] MIPS: BCM47XX: Simplify function looking for NVRAM entry
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
First of all it shouldn't modify copied NVRAM just to make sure it can
|
|
||||||
loop over all entries. It's enough to just compare current position
|
|
||||||
pointer with the end of buffer address.
|
|
||||||
Secondly buffer is guaranteed to be \0 ended, so we don't need strnchr.
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Cc: Hante Meuleman <meuleman@broadcom.com>
|
|
||||||
Cc: Ian Kent <raven@themaw.net>
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/10032/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/nvram.c | 13 +++++--------
|
|
||||||
1 file changed, 5 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/nvram.c
|
|
||||||
+++ b/arch/mips/bcm47xx/nvram.c
|
|
||||||
@@ -171,7 +171,7 @@ static int nvram_init(void)
|
|
||||||
int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len)
|
|
||||||
{
|
|
||||||
char *var, *value, *end, *eq;
|
|
||||||
- int data_left, err;
|
|
||||||
+ int err;
|
|
||||||
|
|
||||||
if (!name)
|
|
||||||
return -EINVAL;
|
|
||||||
@@ -184,19 +184,16 @@ int bcm47xx_nvram_getenv(const char *nam
|
|
||||||
|
|
||||||
/* Look for name=value and return value */
|
|
||||||
var = &nvram_buf[sizeof(struct nvram_header)];
|
|
||||||
- end = nvram_buf + sizeof(nvram_buf) - 2;
|
|
||||||
- end[0] = '\0';
|
|
||||||
- end[1] = '\0';
|
|
||||||
- for (; *var; var = value + strlen(value) + 1) {
|
|
||||||
- data_left = end - var;
|
|
||||||
-
|
|
||||||
- eq = strnchr(var, data_left, '=');
|
|
||||||
+ end = nvram_buf + sizeof(nvram_buf);
|
|
||||||
+ while (var < end && *var) {
|
|
||||||
+ eq = strchr(var, '=');
|
|
||||||
if (!eq)
|
|
||||||
break;
|
|
||||||
value = eq + 1;
|
|
||||||
if (eq - var == strlen(name) &&
|
|
||||||
strncmp(var, name, eq - var) == 0)
|
|
||||||
return snprintf(val, val_len, "%s", value);
|
|
||||||
+ var = value + strlen(value) + 1;
|
|
||||||
}
|
|
||||||
return -ENOENT;
|
|
||||||
}
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
From ecd06daee04bae00f3dfd0a3cd46f28142f18191 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Tue, 12 May 2015 11:31:02 +0200
|
|
||||||
Subject: [PATCH] MIPS: BCM47xx: Extract all boardflags to new u32 fields
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
For years we planned to get rid of old u16 fields, let's start doing it
|
|
||||||
with MIPS code. This process will take some time, it requires doing the
|
|
||||||
same in ssb/bcma and then switching all drivers to new fields. This will
|
|
||||||
be handled in separated patches submitted to appropriate trees.
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/10026/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/sprom.c | 3 +++
|
|
||||||
include/linux/ssb/ssb.h | 5 ++++-
|
|
||||||
2 files changed, 7 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/sprom.c
|
|
||||||
+++ b/arch/mips/bcm47xx/sprom.c
|
|
||||||
@@ -201,6 +201,9 @@ static void bcm47xx_sprom_fill_auto(stru
|
|
||||||
bool fb = fallback;
|
|
||||||
|
|
||||||
ENTRY(0xfffffffe, u16, pre, "boardrev", board_rev, 0, true);
|
|
||||||
+ ENTRY(0xfffffffe, u32, pre, "boardflags", boardflags, 0, fb);
|
|
||||||
+ ENTRY(0xfffffff0, u32, pre, "boardflags2", boardflags2, 0, fb);
|
|
||||||
+ ENTRY(0xfffff800, u32, pre, "boardflags3", boardflags3, 0, fb);
|
|
||||||
ENTRY(0x00000002, u16, pre, "boardflags", boardflags_lo, 0, fb);
|
|
||||||
ENTRY(0xfffffffc, u16, pre, "boardtype", board_type, 0, true);
|
|
||||||
ENTRY(0xfffffffe, u16, pre, "boardnum", board_num, 0, fb);
|
|
||||||
|
|
@ -1,45 +0,0 @@
|
||||||
From c58ec43eaca5f970911770c17cb3a29ac102656d Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Tue, 12 May 2015 11:54:48 +0200
|
|
||||||
Subject: [PATCH] MIPS: BCM47xx: Extract info about et2 interface
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
New devices may have more than 1 Ethernet core (device). We should
|
|
||||||
extract info about them to make it available to Ethernet drivers.
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Cc: Hante Meuleman <meuleman@broadcom.com>
|
|
||||||
Cc: Ian Kent <raven@themaw.net>
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/10027/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/sprom.c | 6 ++++++
|
|
||||||
include/linux/ssb/ssb.h | 3 +++
|
|
||||||
2 files changed, 9 insertions(+)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/sprom.c
|
|
||||||
+++ b/arch/mips/bcm47xx/sprom.c
|
|
||||||
@@ -531,6 +531,8 @@ static int mac_addr_used = 2;
|
|
||||||
static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,
|
|
||||||
const char *prefix, bool fallback)
|
|
||||||
{
|
|
||||||
+ bool fb = fallback;
|
|
||||||
+
|
|
||||||
nvram_read_macaddr(prefix, "et0macaddr", sprom->et0mac, fallback);
|
|
||||||
nvram_read_u8(prefix, NULL, "et0mdcport", &sprom->et0mdcport, 0,
|
|
||||||
fallback);
|
|
||||||
@@ -543,6 +545,10 @@ static void bcm47xx_fill_sprom_ethernet(
|
|
||||||
nvram_read_u8(prefix, NULL, "et1phyaddr", &sprom->et1phyaddr, 0,
|
|
||||||
fallback);
|
|
||||||
|
|
||||||
+ nvram_read_macaddr(prefix, "et2macaddr", sprom->et2mac, fb);
|
|
||||||
+ nvram_read_u8(prefix, NULL, "et2mdcport", &sprom->et2mdcport, 0, fb);
|
|
||||||
+ nvram_read_u8(prefix, NULL, "et2phyaddr", &sprom->et2phyaddr, 0, fb);
|
|
||||||
+
|
|
||||||
nvram_read_macaddr(prefix, "macaddr", sprom->il0mac, fallback);
|
|
||||||
nvram_read_macaddr(prefix, "il0macaddr", sprom->il0mac, fallback);
|
|
||||||
|
|
||||||
|
|
@ -1,132 +0,0 @@
|
||||||
From 12e1ab54dcd414c3579cfd26be9d9c9e1cab92ad Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Tue, 12 May 2015 13:05:18 +0200
|
|
||||||
Subject: [PATCH] MIPS: BCM47xx: Read board info for all bcma buses
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Extra bcma buses may be totally different models, see following dump:
|
|
||||||
boardtype=0x0646
|
|
||||||
pci/1/1/boardtype=0x0545
|
|
||||||
pci/2/1/boardtype=0x62b
|
|
||||||
We need to detect them properly to allow drivers apply some board
|
|
||||||
specific hacks.
|
|
||||||
|
|
||||||
[ralf@linux-mips.org: folded in Rafal's fix.]
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/10028/
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/10048/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/setup.c | 3 --
|
|
||||||
arch/mips/bcm47xx/sprom.c | 44 ++++++++++++++--------------
|
|
||||||
arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 4 ---
|
|
||||||
3 files changed, 22 insertions(+), 29 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/setup.c
|
|
||||||
+++ b/arch/mips/bcm47xx/setup.c
|
|
||||||
@@ -206,9 +206,6 @@ void __init bcm47xx_bus_setup(void)
|
|
||||||
err = bcma_host_soc_init(&bcm47xx_bus.bcma);
|
|
||||||
if (err)
|
|
||||||
panic("Failed to initialize BCMA bus (err %d)", err);
|
|
||||||
-
|
|
||||||
- bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo,
|
|
||||||
- NULL);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/sprom.c
|
|
||||||
+++ b/arch/mips/bcm47xx/sprom.c
|
|
||||||
@@ -640,19 +640,6 @@ void bcm47xx_fill_ssb_boardinfo(struct s
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#ifdef CONFIG_BCM47XX_BCMA
|
|
||||||
-void bcm47xx_fill_bcma_boardinfo(struct bcma_boardinfo *boardinfo,
|
|
||||||
- const char *prefix)
|
|
||||||
-{
|
|
||||||
- nvram_read_u16(prefix, NULL, "boardvendor", &boardinfo->vendor, 0,
|
|
||||||
- true);
|
|
||||||
- if (!boardinfo->vendor)
|
|
||||||
- boardinfo->vendor = SSB_BOARDVENDOR_BCM;
|
|
||||||
-
|
|
||||||
- nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0, true);
|
|
||||||
-}
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
#if defined(CONFIG_BCM47XX_SSB)
|
|
||||||
static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
|
|
||||||
{
|
|
||||||
@@ -707,33 +694,46 @@ static void bcm47xx_sprom_apply_prefix_a
|
|
||||||
|
|
||||||
static int bcm47xx_get_sprom_bcma(struct bcma_bus *bus, struct ssb_sprom *out)
|
|
||||||
{
|
|
||||||
- char prefix[10];
|
|
||||||
+ struct bcma_boardinfo *binfo = &bus->boardinfo;
|
|
||||||
struct bcma_device *core;
|
|
||||||
+ char buf[10];
|
|
||||||
+ char *prefix;
|
|
||||||
+ bool fallback = false;
|
|
||||||
|
|
||||||
switch (bus->hosttype) {
|
|
||||||
case BCMA_HOSTTYPE_PCI:
|
|
||||||
memset(out, 0, sizeof(struct ssb_sprom));
|
|
||||||
- snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
|
|
||||||
+ snprintf(buf, sizeof(buf), "pci/%u/%u/",
|
|
||||||
bus->host_pci->bus->number + 1,
|
|
||||||
PCI_SLOT(bus->host_pci->devfn));
|
|
||||||
- bcm47xx_sprom_apply_prefix_alias(prefix, sizeof(prefix));
|
|
||||||
- bcm47xx_fill_sprom(out, prefix, false);
|
|
||||||
- return 0;
|
|
||||||
+ bcm47xx_sprom_apply_prefix_alias(buf, sizeof(buf));
|
|
||||||
+ prefix = buf;
|
|
||||||
+ break;
|
|
||||||
case BCMA_HOSTTYPE_SOC:
|
|
||||||
memset(out, 0, sizeof(struct ssb_sprom));
|
|
||||||
core = bcma_find_core(bus, BCMA_CORE_80211);
|
|
||||||
if (core) {
|
|
||||||
- snprintf(prefix, sizeof(prefix), "sb/%u/",
|
|
||||||
+ snprintf(buf, sizeof(buf), "sb/%u/",
|
|
||||||
core->core_index);
|
|
||||||
- bcm47xx_fill_sprom(out, prefix, true);
|
|
||||||
+ prefix = buf;
|
|
||||||
+ fallback = true;
|
|
||||||
} else {
|
|
||||||
- bcm47xx_fill_sprom(out, NULL, false);
|
|
||||||
+ prefix = NULL;
|
|
||||||
}
|
|
||||||
- return 0;
|
|
||||||
+ break;
|
|
||||||
default:
|
|
||||||
pr_warn("Unable to fill SPROM for given bustype.\n");
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ nvram_read_u16(prefix, NULL, "boardvendor", &binfo->vendor, 0, true);
|
|
||||||
+ if (!binfo->vendor)
|
|
||||||
+ binfo->vendor = SSB_BOARDVENDOR_BCM;
|
|
||||||
+ nvram_read_u16(prefix, NULL, "boardtype", &binfo->type, 0, true);
|
|
||||||
+
|
|
||||||
+ bcm47xx_fill_sprom(out, prefix, fallback);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
|
|
||||||
+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
|
|
||||||
@@ -52,10 +52,6 @@ void bcm47xx_fill_sprom(struct ssb_sprom
|
|
||||||
void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,
|
|
||||||
const char *prefix);
|
|
||||||
#endif
|
|
||||||
-#ifdef CONFIG_BCM47XX_BCMA
|
|
||||||
-void bcm47xx_fill_bcma_boardinfo(struct bcma_boardinfo *boardinfo,
|
|
||||||
- const char *prefix);
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
void bcm47xx_set_system_type(u16 chip_id);
|
|
||||||
|
|
||||||
|
|
@ -1,60 +0,0 @@
|
||||||
From 50d68dfef385127a1da2957813272c610c691157 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
||||||
Date: Mon, 27 Apr 2015 18:47:56 -0400
|
|
||||||
Subject: [PATCH] MIPS: BCM77xx: Remove legacy __cpuinit{,data} sections that
|
|
||||||
crept in
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
We removed __cpuinit support (leaving no-op stubs) quite some time ago.
|
|
||||||
However a few more crept in as of commit 6ee1d93455384cef8a0426effe85da2
|
|
||||||
("MIPS: BCM47XX: Detect more then 128 MiB of RAM (HIGHMEM)")
|
|
||||||
|
|
||||||
Since we want to clobber the stubs soon, get this removed now.
|
|
||||||
|
|
||||||
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
|
||||||
Cc: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: linux-kernel@vger.kernel.org
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/9892/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/prom.c | 2 +-
|
|
||||||
arch/mips/include/asm/pgtable-32.h | 2 +-
|
|
||||||
arch/mips/mm/tlb-r4k.c | 2 +-
|
|
||||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/prom.c
|
|
||||||
+++ b/arch/mips/bcm47xx/prom.c
|
|
||||||
@@ -126,7 +126,7 @@ void __init prom_free_prom_memory(void)
|
|
||||||
/* Stripped version of tlb_init, with the call to build_tlb_refill_handler
|
|
||||||
* dropped. Calling it at this stage causes a hang.
|
|
||||||
*/
|
|
||||||
-void __cpuinit early_tlb_init(void)
|
|
||||||
+void early_tlb_init(void)
|
|
||||||
{
|
|
||||||
write_c0_pagemask(PM_DEFAULT_MASK);
|
|
||||||
write_c0_wired(0);
|
|
||||||
--- a/arch/mips/include/asm/pgtable-32.h
|
|
||||||
+++ b/arch/mips/include/asm/pgtable-32.h
|
|
||||||
@@ -18,7 +18,7 @@
|
|
||||||
|
|
||||||
#include <asm-generic/pgtable-nopmd.h>
|
|
||||||
|
|
||||||
-extern int temp_tlb_entry __cpuinitdata;
|
|
||||||
+extern int temp_tlb_entry;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* - add_temporary_entry() add a temporary TLB entry. We use TLB entries
|
|
||||||
--- a/arch/mips/mm/tlb-r4k.c
|
|
||||||
+++ b/arch/mips/mm/tlb-r4k.c
|
|
||||||
@@ -423,7 +423,7 @@ int __init has_transparent_hugepage(void
|
|
||||||
* lifetime of the system
|
|
||||||
*/
|
|
||||||
|
|
||||||
-int temp_tlb_entry __cpuinitdata;
|
|
||||||
+int temp_tlb_entry;
|
|
||||||
|
|
||||||
__init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
|
|
||||||
unsigned long entryhi, unsigned long pagemask)
|
|
||||||
|
|
@ -1,100 +0,0 @@
|
||||||
From 981de3c2f27af27fa4c5c952d122b35ee573ab7a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dan Haab <dhaab@luxul.com>
|
|
||||||
Date: Wed, 22 Apr 2015 13:58:33 -0600
|
|
||||||
Subject: [PATCH] MIPS: BCM47XX: Support Luxul XWR-1750 board
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Signed-off-by: Dan Haab <dhaab@luxul.com>
|
|
||||||
Acked-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Cc: Dan Haab <dhaab@luxul.com>
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/9831/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/board.c | 1 +
|
|
||||||
arch/mips/bcm47xx/buttons.c | 11 +++++++++++
|
|
||||||
arch/mips/bcm47xx/leds.c | 14 ++++++++++++++
|
|
||||||
arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 2 ++
|
|
||||||
4 files changed, 28 insertions(+)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/board.c
|
|
||||||
+++ b/arch/mips/bcm47xx/board.c
|
|
||||||
@@ -149,6 +149,7 @@ struct bcm47xx_board_type_list2 bcm47xx_
|
|
||||||
/* board_id */
|
|
||||||
static const
|
|
||||||
struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
|
|
||||||
+ {{BCM47XX_BOARD_LUXUL_XWR_1750_V1, "Luxul XWR-1750 V1"}, "luxul_xwr1750_v1"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"},
|
|
||||||
--- a/arch/mips/bcm47xx/buttons.c
|
|
||||||
+++ b/arch/mips/bcm47xx/buttons.c
|
|
||||||
@@ -299,6 +299,13 @@ bcm47xx_buttons_linksys_wrtsl54gs[] __in
|
|
||||||
BCM47XX_GPIO_KEY(6, KEY_RESTART),
|
|
||||||
};
|
|
||||||
|
|
||||||
+/* Luxul */
|
|
||||||
+
|
|
||||||
+static const struct gpio_keys_button
|
|
||||||
+bcm47xx_buttons_luxul_xwr_1750_v1[] = {
|
|
||||||
+ BCM47XX_GPIO_KEY(14, BTN_TASK),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
/* Microsoft */
|
|
||||||
|
|
||||||
static const struct gpio_keys_button
|
|
||||||
@@ -555,6 +562,10 @@ int __init bcm47xx_buttons_register(void
|
|
||||||
err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrtsl54gs);
|
|
||||||
break;
|
|
||||||
|
|
||||||
+ case BCM47XX_BOARD_LUXUL_XWR_1750_V1:
|
|
||||||
+ err = bcm47xx_copy_bdata(bcm47xx_buttons_luxul_xwr_1750_v1);
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
case BCM47XX_BOARD_MICROSOFT_MN700:
|
|
||||||
err = bcm47xx_copy_bdata(bcm47xx_buttons_microsoft_nm700);
|
|
||||||
break;
|
|
||||||
--- a/arch/mips/bcm47xx/leds.c
|
|
||||||
+++ b/arch/mips/bcm47xx/leds.c
|
|
||||||
@@ -370,6 +370,16 @@ bcm47xx_leds_linksys_wrtsl54gs[] __initc
|
|
||||||
BCM47XX_GPIO_LED(7, "orange", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
|
|
||||||
};
|
|
||||||
|
|
||||||
+/* Luxul */
|
|
||||||
+
|
|
||||||
+static const struct gpio_led
|
|
||||||
+bcm47xx_leds_luxul_xwr_1750_v1[] __initconst = {
|
|
||||||
+ BCM47XX_GPIO_LED(5, "green", "5ghz", 0, LEDS_GPIO_DEFSTATE_OFF),
|
|
||||||
+ BCM47XX_GPIO_LED(12, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
|
|
||||||
+ BCM47XX_GPIO_LED_TRIGGER(13, "green", "status", 0, "timer"),
|
|
||||||
+ BCM47XX_GPIO_LED(15, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
/* Microsoft */
|
|
||||||
|
|
||||||
static const struct gpio_led
|
|
||||||
@@ -623,6 +633,10 @@ void __init bcm47xx_leds_register(void)
|
|
||||||
bcm47xx_set_pdata(bcm47xx_leds_linksys_wrtsl54gs);
|
|
||||||
break;
|
|
||||||
|
|
||||||
+ case BCM47XX_BOARD_LUXUL_XWR_1750_V1:
|
|
||||||
+ bcm47xx_set_pdata(bcm47xx_leds_luxul_xwr_1750_v1);
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
case BCM47XX_BOARD_MICROSOFT_MN700:
|
|
||||||
bcm47xx_set_pdata(bcm47xx_leds_microsoft_nm700);
|
|
||||||
break;
|
|
||||||
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
|
|
||||||
+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
|
|
||||||
@@ -80,6 +80,8 @@ enum bcm47xx_board {
|
|
||||||
BCM47XX_BOARD_LINKSYS_WRT610NV2,
|
|
||||||
BCM47XX_BOARD_LINKSYS_WRTSL54GS,
|
|
||||||
|
|
||||||
+ BCM47XX_BOARD_LUXUL_XWR_1750_V1,
|
|
||||||
+
|
|
||||||
BCM47XX_BOARD_MICROSOFT_MN700,
|
|
||||||
|
|
||||||
BCM47XX_BOARD_MOTOROLA_WE800G,
|
|
||||||
|
|
@ -1,132 +0,0 @@
|
||||||
From 2536295c2aeafc769215a6b2883126fa94c90b9a Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hante Meuleman <meuleman@broadcom.com>
|
|
||||||
Date: Thu, 21 May 2015 15:27:23 +0200
|
|
||||||
Subject: [PATCH] mips: bcm47xx: allow retrieval of complete nvram contents
|
|
||||||
|
|
||||||
Host platforms such as routers supported by OpenWrt can
|
|
||||||
support NVRAM reading directly from internal NVRAM store.
|
|
||||||
The brcmfmac for one requires the complete nvram contents
|
|
||||||
to select what needs to be sent to wireless device.
|
|
||||||
|
|
||||||
Signed-off-by: Arend van Spriel <arend@broadcom.com>
|
|
||||||
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
|
|
||||||
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
|
|
||||||
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
|
|
||||||
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
|
|
||||||
Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/10093/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/nvram.c | 60 ++++++++++++++++++++++++++++++++-----------
|
|
||||||
include/linux/bcm47xx_nvram.h | 15 +++++++++++
|
|
||||||
2 files changed, 60 insertions(+), 15 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/nvram.c
|
|
||||||
+++ b/arch/mips/bcm47xx/nvram.c
|
|
||||||
@@ -94,17 +94,22 @@ static int nvram_find_and_copy(void __io
|
|
||||||
return -ENXIO;
|
|
||||||
|
|
||||||
found:
|
|
||||||
- if (header->len > size)
|
|
||||||
- pr_err("The nvram size accoridng to the header seems to be bigger than the partition on flash\n");
|
|
||||||
- if (header->len > NVRAM_SPACE)
|
|
||||||
- pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
|
|
||||||
- header->len, NVRAM_SPACE - 1);
|
|
||||||
-
|
|
||||||
src = (u32 *)header;
|
|
||||||
dst = (u32 *)nvram_buf;
|
|
||||||
for (i = 0; i < sizeof(struct nvram_header); i += 4)
|
|
||||||
*dst++ = __raw_readl(src++);
|
|
||||||
- for (; i < header->len && i < NVRAM_SPACE && i < size; i += 4)
|
|
||||||
+ header = (struct nvram_header *)nvram_buf;
|
|
||||||
+ if (header->len > size) {
|
|
||||||
+ pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");
|
|
||||||
+ header->len = size;
|
|
||||||
+ }
|
|
||||||
+ if (header->len >= NVRAM_SPACE) {
|
|
||||||
+ pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
|
|
||||||
+ header->len, NVRAM_SPACE - 1);
|
|
||||||
+ header->len = NVRAM_SPACE - 1;
|
|
||||||
+ }
|
|
||||||
+ /* proceed reading data after header */
|
|
||||||
+ for (; i < header->len; i += 4)
|
|
||||||
*dst++ = readl(src++);
|
|
||||||
nvram_buf[NVRAM_SPACE - 1] = '\0';
|
|
||||||
|
|
||||||
@@ -139,6 +144,7 @@ static int nvram_init(void)
|
|
||||||
#ifdef CONFIG_MTD
|
|
||||||
struct mtd_info *mtd;
|
|
||||||
struct nvram_header header;
|
|
||||||
+ struct nvram_header *pheader;
|
|
||||||
size_t bytes_read;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
@@ -147,20 +153,21 @@ static int nvram_init(void)
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
err = mtd_read(mtd, 0, sizeof(header), &bytes_read, (uint8_t *)&header);
|
|
||||||
- if (!err && header.magic == NVRAM_MAGIC) {
|
|
||||||
- u8 *dst = (uint8_t *)nvram_buf;
|
|
||||||
- size_t len = header.len;
|
|
||||||
-
|
|
||||||
- if (len >= NVRAM_SPACE) {
|
|
||||||
- len = NVRAM_SPACE - 1;
|
|
||||||
+ if (!err && header.magic == NVRAM_MAGIC &&
|
|
||||||
+ header.len > sizeof(header)) {
|
|
||||||
+ if (header.len >= NVRAM_SPACE) {
|
|
||||||
pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
|
|
||||||
- header.len, len);
|
|
||||||
+ header.len, NVRAM_SPACE);
|
|
||||||
+ header.len = NVRAM_SPACE - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
- err = mtd_read(mtd, 0, len, &bytes_read, dst);
|
|
||||||
+ err = mtd_read(mtd, 0, header.len, &bytes_read,
|
|
||||||
+ (u8 *)nvram_buf);
|
|
||||||
if (err)
|
|
||||||
return err;
|
|
||||||
|
|
||||||
+ pheader = (struct nvram_header *)nvram_buf;
|
|
||||||
+ pheader->len = header.len;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -219,3 +226,26 @@ int bcm47xx_nvram_gpio_pin(const char *n
|
|
||||||
return -ENOENT;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(bcm47xx_nvram_gpio_pin);
|
|
||||||
+
|
|
||||||
+char *bcm47xx_nvram_get_contents(size_t *nvram_size)
|
|
||||||
+{
|
|
||||||
+ int err;
|
|
||||||
+ char *nvram;
|
|
||||||
+ struct nvram_header *header;
|
|
||||||
+
|
|
||||||
+ if (!nvram_buf[0]) {
|
|
||||||
+ err = nvram_init();
|
|
||||||
+ if (err)
|
|
||||||
+ return NULL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ header = (struct nvram_header *)nvram_buf;
|
|
||||||
+ *nvram_size = header->len - sizeof(struct nvram_header);
|
|
||||||
+ nvram = vmalloc(*nvram_size);
|
|
||||||
+ if (!nvram)
|
|
||||||
+ return NULL;
|
|
||||||
+ memcpy(nvram, &nvram_buf[sizeof(struct nvram_header)], *nvram_size);
|
|
||||||
+
|
|
||||||
+ return nvram;
|
|
||||||
+}
|
|
||||||
+EXPORT_SYMBOL(bcm47xx_nvram_get_contents);
|
|
||||||
--- a/include/linux/bcm47xx_nvram.h
|
|
||||||
+++ b/include/linux/bcm47xx_nvram.h
|
|
||||||
@@ -12,7 +12,7 @@
|
|
||||||
#include <linux/kernel.h>
|
|
||||||
#include <linux/vmalloc.h>
|
|
||||||
|
|
||||||
-#ifdef CONFIG_BCM47XX_NVRAM
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
int bcm47xx_nvram_init_from_mem(u32 base, u32 lim);
|
|
||||||
int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len);
|
|
||||||
int bcm47xx_nvram_gpio_pin(const char *name);
|
|
||||||
|
|
@ -1,131 +0,0 @@
|
||||||
From f229d75f1472c4cd30f464e4a0f94f410046bd80 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Sat, 6 Jun 2015 23:16:23 +0200
|
|
||||||
Subject: [PATCH] MIPS: BCM47xx: Add helper variable for storing NVRAM length
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
This simplifies code just a bit (also maybe makes it a bit more
|
|
||||||
intuitive?) and will allow us to stop storing header. Right now we copy
|
|
||||||
whole NVRAM including its header to the internal buffer. It is not
|
|
||||||
needed to store a header as we don't access all these details like CRC,
|
|
||||||
flags, etc. The next improvement that should follow is copying only the
|
|
||||||
real contents.
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: Arend van Spriel <arend@broadcom.com>
|
|
||||||
Cc: Hante Meuleman <meuleman@broadcom.com>
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/10535/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/nvram.c | 37 ++++++++++++++++---------------------
|
|
||||||
1 file changed, 16 insertions(+), 21 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/nvram.c
|
|
||||||
+++ b/arch/mips/bcm47xx/nvram.c
|
|
||||||
@@ -35,6 +35,7 @@ struct nvram_header {
|
|
||||||
};
|
|
||||||
|
|
||||||
static char nvram_buf[NVRAM_SPACE];
|
|
||||||
+static size_t nvram_len;
|
|
||||||
static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000};
|
|
||||||
|
|
||||||
static u32 find_nvram_size(void __iomem *end)
|
|
||||||
@@ -60,7 +61,7 @@ static int nvram_find_and_copy(void __io
|
|
||||||
u32 *src, *dst;
|
|
||||||
u32 size;
|
|
||||||
|
|
||||||
- if (nvram_buf[0]) {
|
|
||||||
+ if (nvram_len) {
|
|
||||||
pr_warn("nvram already initialized\n");
|
|
||||||
return -EEXIST;
|
|
||||||
}
|
|
||||||
@@ -99,17 +100,18 @@ found:
|
|
||||||
for (i = 0; i < sizeof(struct nvram_header); i += 4)
|
|
||||||
*dst++ = __raw_readl(src++);
|
|
||||||
header = (struct nvram_header *)nvram_buf;
|
|
||||||
- if (header->len > size) {
|
|
||||||
+ nvram_len = header->len;
|
|
||||||
+ if (nvram_len > size) {
|
|
||||||
pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");
|
|
||||||
- header->len = size;
|
|
||||||
+ nvram_len = size;
|
|
||||||
}
|
|
||||||
- if (header->len >= NVRAM_SPACE) {
|
|
||||||
+ if (nvram_len >= NVRAM_SPACE) {
|
|
||||||
pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
|
|
||||||
header->len, NVRAM_SPACE - 1);
|
|
||||||
- header->len = NVRAM_SPACE - 1;
|
|
||||||
+ nvram_len = NVRAM_SPACE - 1;
|
|
||||||
}
|
|
||||||
/* proceed reading data after header */
|
|
||||||
- for (; i < header->len; i += 4)
|
|
||||||
+ for (; i < nvram_len; i += 4)
|
|
||||||
*dst++ = readl(src++);
|
|
||||||
nvram_buf[NVRAM_SPACE - 1] = '\0';
|
|
||||||
|
|
||||||
@@ -144,7 +146,6 @@ static int nvram_init(void)
|
|
||||||
#ifdef CONFIG_MTD
|
|
||||||
struct mtd_info *mtd;
|
|
||||||
struct nvram_header header;
|
|
||||||
- struct nvram_header *pheader;
|
|
||||||
size_t bytes_read;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
@@ -155,20 +156,16 @@ static int nvram_init(void)
|
|
||||||
err = mtd_read(mtd, 0, sizeof(header), &bytes_read, (uint8_t *)&header);
|
|
||||||
if (!err && header.magic == NVRAM_MAGIC &&
|
|
||||||
header.len > sizeof(header)) {
|
|
||||||
- if (header.len >= NVRAM_SPACE) {
|
|
||||||
+ nvram_len = header.len;
|
|
||||||
+ if (nvram_len >= NVRAM_SPACE) {
|
|
||||||
pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
|
|
||||||
header.len, NVRAM_SPACE);
|
|
||||||
- header.len = NVRAM_SPACE - 1;
|
|
||||||
+ nvram_len = NVRAM_SPACE - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
- err = mtd_read(mtd, 0, header.len, &bytes_read,
|
|
||||||
+ err = mtd_read(mtd, 0, nvram_len, &nvram_len,
|
|
||||||
(u8 *)nvram_buf);
|
|
||||||
- if (err)
|
|
||||||
- return err;
|
|
||||||
-
|
|
||||||
- pheader = (struct nvram_header *)nvram_buf;
|
|
||||||
- pheader->len = header.len;
|
|
||||||
- return 0;
|
|
||||||
+ return err;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -183,7 +180,7 @@ int bcm47xx_nvram_getenv(const char *nam
|
|
||||||
if (!name)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
- if (!nvram_buf[0]) {
|
|
||||||
+ if (!nvram_len) {
|
|
||||||
err = nvram_init();
|
|
||||||
if (err)
|
|
||||||
return err;
|
|
||||||
@@ -231,16 +228,14 @@ char *bcm47xx_nvram_get_contents(size_t
|
|
||||||
{
|
|
||||||
int err;
|
|
||||||
char *nvram;
|
|
||||||
- struct nvram_header *header;
|
|
||||||
|
|
||||||
- if (!nvram_buf[0]) {
|
|
||||||
+ if (!nvram_len) {
|
|
||||||
err = nvram_init();
|
|
||||||
if (err)
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
- header = (struct nvram_header *)nvram_buf;
|
|
||||||
- *nvram_size = header->len - sizeof(struct nvram_header);
|
|
||||||
+ *nvram_size = nvram_len - sizeof(struct nvram_header);
|
|
||||||
nvram = vmalloc(*nvram_size);
|
|
||||||
if (!nvram)
|
|
||||||
return NULL;
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
From 5521bb0c510ed5c1881636524badfb9bc951f6ac Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Sun, 7 Jun 2015 13:26:44 +0200
|
|
||||||
Subject: [PATCH] MIPS: BCM47xx: Don't select BCMA_HOST_PCI
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
SoC may have non-Broadcom PCI device attached or one may want to use
|
|
||||||
totally different PCI driver.
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/10537/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/Kconfig | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/Kconfig
|
|
||||||
+++ b/arch/mips/bcm47xx/Kconfig
|
|
||||||
@@ -26,7 +26,6 @@ config BCM47XX_BCMA
|
|
||||||
select BCMA
|
|
||||||
select BCMA_HOST_SOC
|
|
||||||
select BCMA_DRIVER_MIPS
|
|
||||||
- select BCMA_HOST_PCI if PCI
|
|
||||||
select BCMA_DRIVER_PCI_HOSTMODE if PCI
|
|
||||||
select BCMA_DRIVER_GPIO
|
|
||||||
default y
|
|
||||||
|
|
@ -1,109 +0,0 @@
|
||||||
From 590605c6bc31d5cbfcb3844ef98eb10ff7ce24c3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Sun, 21 Jun 2015 15:25:49 +0200
|
|
||||||
Subject: [PATCH] MIPS: BCM47xx: Simplify handling SPROM revisions
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
After the big SPROM cleanup moving code to the bcm47xx_sprom_fill_auto
|
|
||||||
we ended up with few tiny functions, two of them being identical. Let's
|
|
||||||
get rid of these [12]-liners.
|
|
||||||
This also stops extracting higher SPROM revisions as revision 1. Now we
|
|
||||||
have that function nicely handling revisions we don't need it.
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/10569/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/sprom.c | 53 ++++++++---------------------------------------
|
|
||||||
1 file changed, 9 insertions(+), 44 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/sprom.c
|
|
||||||
+++ b/arch/mips/bcm47xx/sprom.c
|
|
||||||
@@ -200,6 +200,9 @@ static void bcm47xx_sprom_fill_auto(stru
|
|
||||||
const char *pre = prefix;
|
|
||||||
bool fb = fallback;
|
|
||||||
|
|
||||||
+ /* Broadcom extracts it for rev 8+ but it was found on 2 and 4 too */
|
|
||||||
+ ENTRY(0xfffffffe, u16, pre, "devid", dev_id, 0, fallback);
|
|
||||||
+
|
|
||||||
ENTRY(0xfffffffe, u16, pre, "boardrev", board_rev, 0, true);
|
|
||||||
ENTRY(0xfffffffe, u32, pre, "boardflags", boardflags, 0, fb);
|
|
||||||
ENTRY(0xfffffff0, u32, pre, "boardflags2", boardflags2, 0, fb);
|
|
||||||
@@ -412,27 +415,6 @@ static void bcm47xx_sprom_fill_auto(stru
|
|
||||||
}
|
|
||||||
#undef ENTRY /* It's specififc, uses local variable, don't use it (again). */
|
|
||||||
|
|
||||||
-static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
|
|
||||||
- const char *prefix, bool fallback)
|
|
||||||
-{
|
|
||||||
- nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);
|
|
||||||
- nvram_read_alpha2(prefix, "ccode", sprom->alpha2, fallback);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-static void bcm47xx_fill_sprom_r3(struct ssb_sprom *sprom, const char *prefix,
|
|
||||||
- bool fallback)
|
|
||||||
-{
|
|
||||||
- nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
|
|
||||||
- &sprom->leddc_off_time, fallback);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-static void bcm47xx_fill_sprom_r4589(struct ssb_sprom *sprom,
|
|
||||||
- const char *prefix, bool fallback)
|
|
||||||
-{
|
|
||||||
- nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
|
|
||||||
- &sprom->leddc_off_time, fallback);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
static void bcm47xx_fill_sprom_path_r4589(struct ssb_sprom *sprom,
|
|
||||||
const char *prefix, bool fallback)
|
|
||||||
{
|
|
||||||
@@ -589,39 +571,22 @@ void bcm47xx_fill_sprom(struct ssb_sprom
|
|
||||||
|
|
||||||
nvram_read_u8(prefix, NULL, "sromrev", &sprom->revision, 0, fallback);
|
|
||||||
|
|
||||||
+ /* Entries requiring custom functions */
|
|
||||||
+ nvram_read_alpha2(prefix, "ccode", sprom->alpha2, fallback);
|
|
||||||
+ if (sprom->revision >= 3)
|
|
||||||
+ nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
|
|
||||||
+ &sprom->leddc_off_time, fallback);
|
|
||||||
+
|
|
||||||
switch (sprom->revision) {
|
|
||||||
- case 1:
|
|
||||||
- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
|
|
||||||
- break;
|
|
||||||
- case 2:
|
|
||||||
- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
|
|
||||||
- break;
|
|
||||||
- case 3:
|
|
||||||
- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
|
|
||||||
- bcm47xx_fill_sprom_r3(sprom, prefix, fallback);
|
|
||||||
- break;
|
|
||||||
case 4:
|
|
||||||
case 5:
|
|
||||||
- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
|
|
||||||
- bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
|
|
||||||
bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
|
|
||||||
bcm47xx_fill_sprom_path_r45(sprom, prefix, fallback);
|
|
||||||
break;
|
|
||||||
case 8:
|
|
||||||
- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
|
|
||||||
- bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
|
|
||||||
- bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
|
|
||||||
- break;
|
|
||||||
case 9:
|
|
||||||
- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
|
|
||||||
- bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
|
|
||||||
bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
|
|
||||||
break;
|
|
||||||
- default:
|
|
||||||
- pr_warn("Unsupported SPROM revision %d detected. Will extract v1\n",
|
|
||||||
- sprom->revision);
|
|
||||||
- sprom->revision = 1;
|
|
||||||
- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
|
|
||||||
}
|
|
||||||
|
|
||||||
bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
From e5dd8f2cf65cb228fad881ecd35093d8409d17c6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andrzej Hajda <a.hajda@samsung.com>
|
|
||||||
Date: Fri, 7 Aug 2015 09:59:10 +0200
|
|
||||||
Subject: [PATCH] MIPS: BCM47xx: Use kmemdup rather than duplicating its
|
|
||||||
implementation
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
The patch was generated using fixed coccinelle semantic patch
|
|
||||||
scripts/coccinelle/api/memdup.cocci [1].
|
|
||||||
|
|
||||||
[1]: http://permalink.gmane.org/gmane.linux.kernel/2014320
|
|
||||||
|
|
||||||
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
|
|
||||||
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Cc: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Cc: Andrzej Hajda <a.hajda@samsung.com>
|
|
||||||
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
|
|
||||||
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
|
|
||||||
Cc: linux-kernel@vger.kernel.org
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/10898/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/buttons.c | 3 +--
|
|
||||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/buttons.c
|
|
||||||
+++ b/arch/mips/bcm47xx/buttons.c
|
|
||||||
@@ -396,10 +396,9 @@ static int __init bcm47xx_buttons_copy(c
|
|
||||||
{
|
|
||||||
size_t size = nbuttons * sizeof(*buttons);
|
|
||||||
|
|
||||||
- bcm47xx_button_pdata.buttons = kmalloc(size, GFP_KERNEL);
|
|
||||||
+ bcm47xx_button_pdata.buttons = kmemdup(buttons, size, GFP_KERNEL);
|
|
||||||
if (!bcm47xx_button_pdata.buttons)
|
|
||||||
return -ENOMEM;
|
|
||||||
- memcpy(bcm47xx_button_pdata.buttons, buttons, size);
|
|
||||||
bcm47xx_button_pdata.nbuttons = nbuttons;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
From daa7ce02513d2188fe6f5ff47ce5ef83eb7de739 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Sun, 25 Oct 2015 22:16:47 +0100
|
|
||||||
Subject: [PATCH 1/3] MIPS: BCM47xx: Support on-SoC bus in SPROM reading
|
|
||||||
function
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
To support (extract) SPROM on Broadcom ARM devices we should separate
|
|
||||||
SPROM code and make it a separated module. We won't want to export
|
|
||||||
bcm47xx_fill_sprom symbol so we should support SoC SPROM in the standard
|
|
||||||
fallback function and then modify ssb to use it.
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/11355/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/sprom.c | 8 ++++++--
|
|
||||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/sprom.c
|
|
||||||
+++ b/arch/mips/bcm47xx/sprom.c
|
|
||||||
@@ -610,14 +610,18 @@ static int bcm47xx_get_sprom_ssb(struct
|
|
||||||
{
|
|
||||||
char prefix[10];
|
|
||||||
|
|
||||||
- if (bus->bustype == SSB_BUSTYPE_PCI) {
|
|
||||||
+ switch (bus->bustype) {
|
|
||||||
+ case SSB_BUSTYPE_SSB:
|
|
||||||
+ bcm47xx_fill_sprom(out, NULL, false);
|
|
||||||
+ return 0;
|
|
||||||
+ case SSB_BUSTYPE_PCI:
|
|
||||||
memset(out, 0, sizeof(struct ssb_sprom));
|
|
||||||
snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
|
|
||||||
bus->host_pci->bus->number + 1,
|
|
||||||
PCI_SLOT(bus->host_pci->devfn));
|
|
||||||
bcm47xx_fill_sprom(out, prefix, false);
|
|
||||||
return 0;
|
|
||||||
- } else {
|
|
||||||
+ default:
|
|
||||||
pr_warn("Unable to fill SPROM for given bustype.\n");
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
@ -1,77 +0,0 @@
|
||||||
From 2f94acde42b70c81129b398c44aa09411974a16d Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Sun, 25 Oct 2015 22:16:48 +0100
|
|
||||||
Subject: [PATCH 2/3] MIPS: BCM47xx: Fix some WARNINGs pointed in sprom.c by
|
|
||||||
checkpatch.pl
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
There are still few left:
|
|
||||||
1) Most of them about lines over 80 chars (increased readability exception)
|
|
||||||
2) Wrong parsing of preprocessor macros
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/11356/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/sprom.c | 25 ++++++++++++++++---------
|
|
||||||
1 file changed, 16 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/sprom.c
|
|
||||||
+++ b/arch/mips/bcm47xx/sprom.c
|
|
||||||
@@ -60,9 +60,9 @@ static int get_nvram_var(const char *pre
|
|
||||||
}
|
|
||||||
|
|
||||||
#define NVRAM_READ_VAL(type) \
|
|
||||||
-static void nvram_read_ ## type (const char *prefix, \
|
|
||||||
- const char *postfix, const char *name, \
|
|
||||||
- type *val, type allset, bool fallback) \
|
|
||||||
+static void nvram_read_ ## type(const char *prefix, \
|
|
||||||
+ const char *postfix, const char *name, \
|
|
||||||
+ type *val, type allset, bool fallback) \
|
|
||||||
{ \
|
|
||||||
char buf[100]; \
|
|
||||||
int err; \
|
|
||||||
@@ -422,7 +422,10 @@ static void bcm47xx_fill_sprom_path_r458
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
|
|
||||||
- struct ssb_sprom_core_pwr_info *pwr_info = &sprom->core_pwr_info[i];
|
|
||||||
+ struct ssb_sprom_core_pwr_info *pwr_info;
|
|
||||||
+
|
|
||||||
+ pwr_info = &sprom->core_pwr_info[i];
|
|
||||||
+
|
|
||||||
snprintf(postfix, sizeof(postfix), "%i", i);
|
|
||||||
nvram_read_u8(prefix, postfix, "maxp2ga",
|
|
||||||
&pwr_info->maxpwr_2g, 0, fallback);
|
|
||||||
@@ -470,7 +473,10 @@ static void bcm47xx_fill_sprom_path_r45(
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
|
|
||||||
- struct ssb_sprom_core_pwr_info *pwr_info = &sprom->core_pwr_info[i];
|
|
||||||
+ struct ssb_sprom_core_pwr_info *pwr_info;
|
|
||||||
+
|
|
||||||
+ pwr_info = &sprom->core_pwr_info[i];
|
|
||||||
+
|
|
||||||
snprintf(postfix, sizeof(postfix), "%i", i);
|
|
||||||
nvram_read_u16(prefix, postfix, "pa2gw3a",
|
|
||||||
&pwr_info->pa_2g[3], 0, fallback);
|
|
||||||
@@ -535,10 +541,11 @@ static void bcm47xx_fill_sprom_ethernet(
|
|
||||||
nvram_read_macaddr(prefix, "il0macaddr", sprom->il0mac, fallback);
|
|
||||||
|
|
||||||
/* The address prefix 00:90:4C is used by Broadcom in their initial
|
|
||||||
- configuration. When a mac address with the prefix 00:90:4C is used
|
|
||||||
- all devices from the same series are sharing the same mac address.
|
|
||||||
- To prevent mac address collisions we replace them with a mac address
|
|
||||||
- based on the base address. */
|
|
||||||
+ * configuration. When a mac address with the prefix 00:90:4C is used
|
|
||||||
+ * all devices from the same series are sharing the same mac address.
|
|
||||||
+ * To prevent mac address collisions we replace them with a mac address
|
|
||||||
+ * based on the base address.
|
|
||||||
+ */
|
|
||||||
if (!bcm47xx_is_valid_mac(sprom->il0mac)) {
|
|
||||||
u8 mac[6];
|
|
||||||
|
|
||||||
|
|
@ -1,93 +0,0 @@
|
||||||
From d8cfb5037bfc875e6dc8e09e4caceb443c04ff6a Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Mon, 26 Oct 2015 11:13:16 +0100
|
|
||||||
Subject: [PATCH 3/3] MIPS: BCM47xx: Fetch board info directly in callback
|
|
||||||
function
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
This drops another symbol dependency between setup.c and sprom.c which
|
|
||||||
will allow us to make SPROM code a separated module (and share it with
|
|
||||||
ARM).
|
|
||||||
Patch tested on Linksys WRT300N V1.
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
Cc: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Cc: linux-mips@linux-mips.org
|
|
||||||
Patchwork: https://patchwork.linux-mips.org/patch/11360/
|
|
||||||
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
---
|
|
||||||
arch/mips/bcm47xx/setup.c | 19 ++++++++++++++++++-
|
|
||||||
arch/mips/bcm47xx/sprom.c | 13 -------------
|
|
||||||
arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 5 -----
|
|
||||||
3 files changed, 18 insertions(+), 19 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/setup.c
|
|
||||||
+++ b/arch/mips/bcm47xx/setup.c
|
|
||||||
@@ -105,11 +105,28 @@ static int bcm47xx_get_invariants(struct
|
|
||||||
struct ssb_init_invariants *iv)
|
|
||||||
{
|
|
||||||
char buf[20];
|
|
||||||
+ int len, err;
|
|
||||||
|
|
||||||
/* Fill boardinfo structure */
|
|
||||||
memset(&iv->boardinfo, 0 , sizeof(struct ssb_boardinfo));
|
|
||||||
|
|
||||||
- bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);
|
|
||||||
+ len = bcm47xx_nvram_getenv("boardvendor", buf, sizeof(buf));
|
|
||||||
+ if (len > 0) {
|
|
||||||
+ err = kstrtou16(strim(buf), 0, &iv->boardinfo.vendor);
|
|
||||||
+ if (err)
|
|
||||||
+ pr_warn("Couldn't parse nvram board vendor entry with value \"%s\"\n",
|
|
||||||
+ buf);
|
|
||||||
+ }
|
|
||||||
+ if (!iv->boardinfo.vendor)
|
|
||||||
+ iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;
|
|
||||||
+
|
|
||||||
+ len = bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf));
|
|
||||||
+ if (len > 0) {
|
|
||||||
+ err = kstrtou16(strim(buf), 0, &iv->boardinfo.type);
|
|
||||||
+ if (err)
|
|
||||||
+ pr_warn("Couldn't parse nvram board type entry with value \"%s\"\n",
|
|
||||||
+ buf);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
memset(&iv->sprom, 0, sizeof(struct ssb_sprom));
|
|
||||||
bcm47xx_fill_sprom(&iv->sprom, NULL, false);
|
|
||||||
--- a/arch/mips/bcm47xx/sprom.c
|
|
||||||
+++ b/arch/mips/bcm47xx/sprom.c
|
|
||||||
@@ -599,19 +599,6 @@ void bcm47xx_fill_sprom(struct ssb_sprom
|
|
||||||
bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
|
|
||||||
}
|
|
||||||
|
|
||||||
-#ifdef CONFIG_BCM47XX_SSB
|
|
||||||
-void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,
|
|
||||||
- const char *prefix)
|
|
||||||
-{
|
|
||||||
- nvram_read_u16(prefix, NULL, "boardvendor", &boardinfo->vendor, 0,
|
|
||||||
- true);
|
|
||||||
- if (!boardinfo->vendor)
|
|
||||||
- boardinfo->vendor = SSB_BOARDVENDOR_BCM;
|
|
||||||
-
|
|
||||||
- nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0, true);
|
|
||||||
-}
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
#if defined(CONFIG_BCM47XX_SSB)
|
|
||||||
static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
|
|
||||||
{
|
|
||||||
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
|
|
||||||
+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
|
|
||||||
@@ -48,11 +48,6 @@ extern enum bcm47xx_bus_type bcm47xx_bus
|
|
||||||
void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
|
|
||||||
bool fallback);
|
|
||||||
|
|
||||||
-#ifdef CONFIG_BCM47XX_SSB
|
|
||||||
-void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,
|
|
||||||
- const char *prefix);
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
void bcm47xx_set_system_type(u16 chip_id);
|
|
||||||
|
|
||||||
#endif /* __ASM_BCM47XX_H */
|
|
||||||
|
|
@ -1,391 +0,0 @@
|
||||||
--- a/arch/mips/include/asm/r4kcache.h
|
|
||||||
+++ b/arch/mips/include/asm/r4kcache.h
|
|
||||||
@@ -25,6 +25,20 @@
|
|
||||||
extern void (*r4k_blast_dcache)(void);
|
|
||||||
extern void (*r4k_blast_icache)(void);
|
|
||||||
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+#include <asm/paccess.h>
|
|
||||||
+#include <linux/ssb/ssb.h>
|
|
||||||
+#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE)))
|
|
||||||
+
|
|
||||||
+#define BCM4710_FILL_TLB(addr) (*(volatile unsigned long *)(addr))
|
|
||||||
+#define BCM4710_PROTECTED_FILL_TLB(addr) ({ unsigned long x; get_dbe(x, (volatile unsigned long *)(addr)); })
|
|
||||||
+#else
|
|
||||||
+#define BCM4710_DUMMY_RREG()
|
|
||||||
+
|
|
||||||
+#define BCM4710_FILL_TLB(addr)
|
|
||||||
+#define BCM4710_PROTECTED_FILL_TLB(addr)
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* This macro return a properly sign-extended address suitable as base address
|
|
||||||
* for indexed cache operations. Two issues here:
|
|
||||||
@@ -98,6 +112,7 @@ static inline void flush_icache_line_ind
|
|
||||||
static inline void flush_dcache_line_indexed(unsigned long addr)
|
|
||||||
{
|
|
||||||
__dflush_prologue
|
|
||||||
+ BCM4710_DUMMY_RREG();
|
|
||||||
cache_op(Index_Writeback_Inv_D, addr);
|
|
||||||
__dflush_epilogue
|
|
||||||
}
|
|
||||||
@@ -125,6 +140,7 @@ static inline void flush_icache_line(uns
|
|
||||||
static inline void flush_dcache_line(unsigned long addr)
|
|
||||||
{
|
|
||||||
__dflush_prologue
|
|
||||||
+ BCM4710_DUMMY_RREG();
|
|
||||||
cache_op(Hit_Writeback_Inv_D, addr);
|
|
||||||
__dflush_epilogue
|
|
||||||
}
|
|
||||||
@@ -132,6 +148,7 @@ static inline void flush_dcache_line(uns
|
|
||||||
static inline void invalidate_dcache_line(unsigned long addr)
|
|
||||||
{
|
|
||||||
__dflush_prologue
|
|
||||||
+ BCM4710_DUMMY_RREG();
|
|
||||||
cache_op(Hit_Invalidate_D, addr);
|
|
||||||
__dflush_epilogue
|
|
||||||
}
|
|
||||||
@@ -187,6 +204,7 @@ static inline void protected_flush_icach
|
|
||||||
#ifdef CONFIG_EVA
|
|
||||||
protected_cachee_op(Hit_Invalidate_I, addr);
|
|
||||||
#else
|
|
||||||
+ BCM4710_DUMMY_RREG();
|
|
||||||
protected_cache_op(Hit_Invalidate_I, addr);
|
|
||||||
#endif
|
|
||||||
break;
|
|
||||||
@@ -201,6 +219,7 @@ static inline void protected_flush_icach
|
|
||||||
*/
|
|
||||||
static inline void protected_writeback_dcache_line(unsigned long addr)
|
|
||||||
{
|
|
||||||
+ BCM4710_DUMMY_RREG();
|
|
||||||
#ifdef CONFIG_EVA
|
|
||||||
protected_cachee_op(Hit_Writeback_Inv_D, addr);
|
|
||||||
#else
|
|
||||||
@@ -554,8 +573,51 @@ static inline void invalidate_tcache_pag
|
|
||||||
: "r" (base), \
|
|
||||||
"i" (op));
|
|
||||||
|
|
||||||
+static inline void blast_dcache(void)
|
|
||||||
+{
|
|
||||||
+ unsigned long start = KSEG0;
|
|
||||||
+ unsigned long dcache_size = current_cpu_data.dcache.waysize * current_cpu_data.dcache.ways;
|
|
||||||
+ unsigned long end = (start + dcache_size);
|
|
||||||
+
|
|
||||||
+ do {
|
|
||||||
+ BCM4710_DUMMY_RREG();
|
|
||||||
+ cache_op(Index_Writeback_Inv_D, start);
|
|
||||||
+ start += current_cpu_data.dcache.linesz;
|
|
||||||
+ } while(start < end);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static inline void blast_dcache_page(unsigned long page)
|
|
||||||
+{
|
|
||||||
+ unsigned long start = page;
|
|
||||||
+ unsigned long end = start + PAGE_SIZE;
|
|
||||||
+
|
|
||||||
+ BCM4710_FILL_TLB(start);
|
|
||||||
+ do {
|
|
||||||
+ BCM4710_DUMMY_RREG();
|
|
||||||
+ cache_op(Hit_Writeback_Inv_D, start);
|
|
||||||
+ start += current_cpu_data.dcache.linesz;
|
|
||||||
+ } while(start < end);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static inline void blast_dcache_page_indexed(unsigned long page)
|
|
||||||
+{
|
|
||||||
+ unsigned long start = page;
|
|
||||||
+ unsigned long end = start + PAGE_SIZE;
|
|
||||||
+ unsigned long ws_inc = 1UL << current_cpu_data.dcache.waybit;
|
|
||||||
+ unsigned long ws_end = current_cpu_data.dcache.ways <<
|
|
||||||
+ current_cpu_data.dcache.waybit;
|
|
||||||
+ unsigned long ws, addr;
|
|
||||||
+ for (ws = 0; ws < ws_end; ws += ws_inc) {
|
|
||||||
+ start = page + ws;
|
|
||||||
+ for (addr = start; addr < end; addr += current_cpu_data.dcache.linesz) {
|
|
||||||
+ BCM4710_DUMMY_RREG();
|
|
||||||
+ cache_op(Index_Writeback_Inv_D, addr);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* build blast_xxx, blast_xxx_page, blast_xxx_page_indexed */
|
|
||||||
-#define __BUILD_BLAST_CACHE(pfx, desc, indexop, hitop, lsize, extra) \
|
|
||||||
+#define __BUILD_BLAST_CACHE(pfx, desc, indexop, hitop, lsize, extra, war) \
|
|
||||||
static inline void extra##blast_##pfx##cache##lsize(void) \
|
|
||||||
{ \
|
|
||||||
unsigned long start = INDEX_BASE; \
|
|
||||||
@@ -567,6 +629,7 @@ static inline void extra##blast_##pfx##c
|
|
||||||
\
|
|
||||||
__##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); \
|
|
||||||
@@ -581,6 +644,7 @@ static inline void extra##blast_##pfx##c
|
|
||||||
\
|
|
||||||
__##pfx##flush_prologue \
|
|
||||||
\
|
|
||||||
+ war \
|
|
||||||
do { \
|
|
||||||
cache##lsize##_unroll32(start, hitop); \
|
|
||||||
start += lsize * 32; \
|
|
||||||
@@ -599,6 +663,8 @@ static inline void extra##blast_##pfx##c
|
|
||||||
current_cpu_data.desc.waybit; \
|
|
||||||
unsigned long ws, addr; \
|
|
||||||
\
|
|
||||||
+ war \
|
|
||||||
+ \
|
|
||||||
__##pfx##flush_prologue \
|
|
||||||
\
|
|
||||||
for (ws = 0; ws < ws_end; ws += ws_inc) \
|
|
||||||
@@ -608,26 +674,26 @@ static inline void extra##blast_##pfx##c
|
|
||||||
__##pfx##flush_epilogue \
|
|
||||||
}
|
|
||||||
|
|
||||||
-__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 16, )
|
|
||||||
-__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 16, )
|
|
||||||
-__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 16, )
|
|
||||||
-__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 32, )
|
|
||||||
-__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 32, )
|
|
||||||
-__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I_Loongson2, 32, loongson2_)
|
|
||||||
-__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 32, )
|
|
||||||
-__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 64, )
|
|
||||||
-__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(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 128, )
|
|
||||||
-__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 128, )
|
|
||||||
-__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, , )
|
|
||||||
+__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 32, , )
|
|
||||||
+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 32, , BCM4710_FILL_TLB(start);)
|
|
||||||
+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I_Loongson2, 32, loongson2_, BCM4710_FILL_TLB(start);)
|
|
||||||
+__BUILD_BLAST_CACHE(s, scache, Index_Writeback_Inv_SD, Hit_Writeback_Inv_SD, 32, , )
|
|
||||||
+__BUILD_BLAST_CACHE(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 64, , )
|
|
||||||
+__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(d, dcache, Index_Writeback_Inv_D, Hit_Writeback_Inv_D, 128, , )
|
|
||||||
+__BUILD_BLAST_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 128, , )
|
|
||||||
+__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, , )
|
|
||||||
|
|
||||||
#define __BUILD_BLAST_USER_CACHE(pfx, desc, indexop, hitop, lsize) \
|
|
||||||
static inline void blast_##pfx##cache##lsize##_user_page(unsigned long page) \
|
|
||||||
@@ -656,17 +722,19 @@ __BUILD_BLAST_USER_CACHE(d, dcache, Inde
|
|
||||||
__BUILD_BLAST_USER_CACHE(i, icache, Index_Invalidate_I, Hit_Invalidate_I, 64)
|
|
||||||
|
|
||||||
/* build blast_xxx_range, protected_blast_xxx_range */
|
|
||||||
-#define __BUILD_BLAST_CACHE_RANGE(pfx, desc, hitop, prot, extra) \
|
|
||||||
+#define __BUILD_BLAST_CACHE_RANGE(pfx, desc, hitop, prot, extra, war, war2) \
|
|
||||||
static inline void prot##extra##blast_##pfx##cache##_range(unsigned long start, \
|
|
||||||
unsigned long end) \
|
|
||||||
{ \
|
|
||||||
unsigned long lsize = cpu_##desc##_line_size(); \
|
|
||||||
unsigned long addr = start & ~(lsize - 1); \
|
|
||||||
unsigned long aend = (end - 1) & ~(lsize - 1); \
|
|
||||||
+ war \
|
|
||||||
\
|
|
||||||
__##pfx##flush_prologue \
|
|
||||||
\
|
|
||||||
while (1) { \
|
|
||||||
+ war2 \
|
|
||||||
prot##cache_op(hitop, addr); \
|
|
||||||
if (addr == aend) \
|
|
||||||
break; \
|
|
||||||
@@ -678,8 +746,8 @@ static inline void prot##extra##blast_##
|
|
||||||
|
|
||||||
#ifndef CONFIG_EVA
|
|
||||||
|
|
||||||
-__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, protected_, )
|
|
||||||
-__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I, protected_, )
|
|
||||||
+__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, protected_, , BCM4710_PROTECTED_FILL_TLB(addr); BCM4710_PROTECTED_FILL_TLB(aend);, BCM4710_DUMMY_RREG();)
|
|
||||||
+__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I, protected_, , , )
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
@@ -716,14 +784,14 @@ __BUILD_PROT_BLAST_CACHE_RANGE(d, dcache
|
|
||||||
__BUILD_PROT_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I)
|
|
||||||
|
|
||||||
#endif
|
|
||||||
-__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, protected_, )
|
|
||||||
+__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, protected_, , , )
|
|
||||||
__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I_Loongson2, \
|
|
||||||
- protected_, loongson2_)
|
|
||||||
-__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, , )
|
|
||||||
-__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I, , )
|
|
||||||
-__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, , )
|
|
||||||
+ protected_, loongson2_, , )
|
|
||||||
+__BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, , , BCM4710_FILL_TLB(addr); BCM4710_FILL_TLB(aend);, BCM4710_DUMMY_RREG();)
|
|
||||||
+__BUILD_BLAST_CACHE_RANGE(i, icache, Hit_Invalidate_I, , , , )
|
|
||||||
+__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, , , , )
|
|
||||||
/* blast_inv_dcache_range */
|
|
||||||
-__BUILD_BLAST_CACHE_RANGE(inv_d, dcache, Hit_Invalidate_D, , )
|
|
||||||
-__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD, , )
|
|
||||||
+__BUILD_BLAST_CACHE_RANGE(inv_d, dcache, Hit_Invalidate_D, , , , BCM4710_DUMMY_RREG();)
|
|
||||||
+__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD, , , , )
|
|
||||||
|
|
||||||
#endif /* _ASM_R4KCACHE_H */
|
|
||||||
--- a/arch/mips/include/asm/stackframe.h
|
|
||||||
+++ b/arch/mips/include/asm/stackframe.h
|
|
||||||
@@ -358,6 +358,10 @@
|
|
||||||
.macro RESTORE_SP_AND_RET
|
|
||||||
LONG_L sp, PT_R29(sp)
|
|
||||||
.set arch=r4000
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+ nop
|
|
||||||
+ nop
|
|
||||||
+#endif
|
|
||||||
eret
|
|
||||||
.set mips0
|
|
||||||
.endm
|
|
||||||
--- a/arch/mips/kernel/genex.S
|
|
||||||
+++ b/arch/mips/kernel/genex.S
|
|
||||||
@@ -32,6 +32,10 @@
|
|
||||||
NESTED(except_vec3_generic, 0, sp)
|
|
||||||
.set push
|
|
||||||
.set noat
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+ nop
|
|
||||||
+ nop
|
|
||||||
+#endif
|
|
||||||
#if R5432_CP0_INTERRUPT_WAR
|
|
||||||
mfc0 k0, CP0_INDEX
|
|
||||||
#endif
|
|
||||||
--- a/arch/mips/mm/c-r4k.c
|
|
||||||
+++ b/arch/mips/mm/c-r4k.c
|
|
||||||
@@ -39,6 +39,9 @@
|
|
||||||
#include <asm/dma-coherence.h>
|
|
||||||
#include <asm/mips-cm.h>
|
|
||||||
|
|
||||||
+/* For enabling BCM4710 cache workarounds */
|
|
||||||
+int bcm4710 = 0;
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Special Variant of smp_call_function for use by cache functions:
|
|
||||||
*
|
|
||||||
@@ -157,6 +160,9 @@ static void r4k_blast_dcache_user_page_s
|
|
||||||
{
|
|
||||||
unsigned long dc_lsize = cpu_dcache_line_size();
|
|
||||||
|
|
||||||
+ if (bcm4710)
|
|
||||||
+ r4k_blast_dcache_page = blast_dcache_page;
|
|
||||||
+ else
|
|
||||||
if (dc_lsize == 0)
|
|
||||||
r4k_blast_dcache_user_page = (void *)cache_noop;
|
|
||||||
else if (dc_lsize == 16)
|
|
||||||
@@ -175,6 +181,9 @@ static void r4k_blast_dcache_page_indexe
|
|
||||||
{
|
|
||||||
unsigned long dc_lsize = cpu_dcache_line_size();
|
|
||||||
|
|
||||||
+ if (bcm4710)
|
|
||||||
+ r4k_blast_dcache_page_indexed = blast_dcache_page_indexed;
|
|
||||||
+ else
|
|
||||||
if (dc_lsize == 0)
|
|
||||||
r4k_blast_dcache_page_indexed = (void *)cache_noop;
|
|
||||||
else if (dc_lsize == 16)
|
|
||||||
@@ -194,6 +203,9 @@ static void r4k_blast_dcache_setup(void)
|
|
||||||
{
|
|
||||||
unsigned long dc_lsize = cpu_dcache_line_size();
|
|
||||||
|
|
||||||
+ if (bcm4710)
|
|
||||||
+ r4k_blast_dcache = blast_dcache;
|
|
||||||
+ else
|
|
||||||
if (dc_lsize == 0)
|
|
||||||
r4k_blast_dcache = (void *)cache_noop;
|
|
||||||
else if (dc_lsize == 16)
|
|
||||||
@@ -793,6 +805,8 @@ static void local_r4k_flush_cache_sigtra
|
|
||||||
unsigned long addr = (unsigned long) arg;
|
|
||||||
|
|
||||||
R4600_HIT_CACHEOP_WAR_IMPL;
|
|
||||||
+ BCM4710_PROTECTED_FILL_TLB(addr);
|
|
||||||
+ BCM4710_PROTECTED_FILL_TLB(addr + 4);
|
|
||||||
if (dc_lsize)
|
|
||||||
protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
|
|
||||||
if (!cpu_icache_snoops_remote_store && scache_size)
|
|
||||||
@@ -1599,6 +1613,17 @@ static void coherency_setup(void)
|
|
||||||
* silly idea of putting something else there ...
|
|
||||||
*/
|
|
||||||
switch (current_cpu_type()) {
|
|
||||||
+ case CPU_BMIPS3300:
|
|
||||||
+ {
|
|
||||||
+ u32 cm;
|
|
||||||
+ cm = read_c0_diag();
|
|
||||||
+ /* Enable icache */
|
|
||||||
+ cm |= (1 << 31);
|
|
||||||
+ /* Enable dcache */
|
|
||||||
+ cm |= (1 << 30);
|
|
||||||
+ write_c0_diag(cm);
|
|
||||||
+ }
|
|
||||||
+ break;
|
|
||||||
case CPU_R4000PC:
|
|
||||||
case CPU_R4000SC:
|
|
||||||
case CPU_R4000MC:
|
|
||||||
@@ -1645,6 +1670,15 @@ void r4k_cache_init(void)
|
|
||||||
extern void build_copy_page(void);
|
|
||||||
struct cpuinfo_mips *c = ¤t_cpu_data;
|
|
||||||
|
|
||||||
+ /* Check if special workarounds are required */
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+ if (current_cpu_data.cputype == CPU_BMIPS32 && (current_cpu_data.processor_id & 0xff) == 0) {
|
|
||||||
+ printk("Enabling BCM4710A0 cache workarounds.\n");
|
|
||||||
+ bcm4710 = 1;
|
|
||||||
+ } else
|
|
||||||
+#endif
|
|
||||||
+ bcm4710 = 0;
|
|
||||||
+
|
|
||||||
probe_pcache();
|
|
||||||
setup_scache();
|
|
||||||
|
|
||||||
@@ -1714,7 +1748,15 @@ void r4k_cache_init(void)
|
|
||||||
*/
|
|
||||||
local_r4k___flush_cache_all(NULL);
|
|
||||||
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+ {
|
|
||||||
+ static void (*_coherency_setup)(void);
|
|
||||||
+ _coherency_setup = (void (*)(void)) KSEG1ADDR(coherency_setup);
|
|
||||||
+ _coherency_setup();
|
|
||||||
+ }
|
|
||||||
+#else
|
|
||||||
coherency_setup();
|
|
||||||
+#endif
|
|
||||||
board_cache_error_setup = r4k_cache_error_setup;
|
|
||||||
|
|
||||||
/*
|
|
||||||
--- a/arch/mips/mm/tlbex.c
|
|
||||||
+++ b/arch/mips/mm/tlbex.c
|
|
||||||
@@ -1296,6 +1296,9 @@ static void build_r4000_tlb_refill_handl
|
|
||||||
/* No need for uasm_i_nop */
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+ uasm_i_nop(&p);
|
|
||||||
+#endif
|
|
||||||
#ifdef CONFIG_64BIT
|
|
||||||
build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
|
|
||||||
#else
|
|
||||||
@@ -1868,6 +1871,9 @@ build_r4000_tlbchange_handler_head(u32 *
|
|
||||||
{
|
|
||||||
struct work_registers wr = build_get_work_registers(p);
|
|
||||||
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+ uasm_i_nop(p);
|
|
||||||
+#endif
|
|
||||||
#ifdef CONFIG_64BIT
|
|
||||||
build_get_pmde64(p, l, r, wr.r1, wr.r2); /* get pmd in ptr */
|
|
||||||
#else
|
|
||||||
|
|
@ -1,78 +0,0 @@
|
||||||
From: Jeff Hansen <jhansen@cardaccess-inc.com>
|
|
||||||
Subject: [PATCH] kmap_coherent
|
|
||||||
|
|
||||||
On ASUS WL-500gP there are some "Data bus error"s when executing simple
|
|
||||||
commands liks "ps" or "cat /proc/1/cmdline".
|
|
||||||
|
|
||||||
This fixes OpenWrt ticket #1485: https://dev.openwrt.org/ticket/1485
|
|
||||||
---
|
|
||||||
--- a/arch/mips/include/asm/cpu-features.h
|
|
||||||
+++ b/arch/mips/include/asm/cpu-features.h
|
|
||||||
@@ -158,6 +158,9 @@
|
|
||||||
#ifndef cpu_has_local_ebase
|
|
||||||
#define cpu_has_local_ebase 1
|
|
||||||
#endif
|
|
||||||
+#ifndef cpu_use_kmap_coherent
|
|
||||||
+#define cpu_use_kmap_coherent 1
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* I-Cache snoops remote store. This only matters on SMP. Some multiprocessors
|
|
||||||
--- a/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
|
|
||||||
+++ b/arch/mips/include/asm/mach-bcm47xx/cpu-feature-overrides.h
|
|
||||||
@@ -79,4 +79,6 @@
|
|
||||||
#define cpu_scache_line_size() 0
|
|
||||||
#define cpu_has_vz 0
|
|
||||||
|
|
||||||
+#define cpu_use_kmap_coherent 0
|
|
||||||
+
|
|
||||||
#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
|
|
||||||
--- a/arch/mips/mm/c-r4k.c
|
|
||||||
+++ b/arch/mips/mm/c-r4k.c
|
|
||||||
@@ -600,7 +600,7 @@ static inline void local_r4k_flush_cache
|
|
||||||
*/
|
|
||||||
map_coherent = (cpu_has_dc_aliases &&
|
|
||||||
page_mapped(page) && !Page_dcache_dirty(page));
|
|
||||||
- if (map_coherent)
|
|
||||||
+ if (map_coherent && cpu_use_kmap_coherent)
|
|
||||||
vaddr = kmap_coherent(page, addr);
|
|
||||||
else
|
|
||||||
vaddr = kmap_atomic(page);
|
|
||||||
@@ -625,7 +625,7 @@ static inline void local_r4k_flush_cache
|
|
||||||
}
|
|
||||||
|
|
||||||
if (vaddr) {
|
|
||||||
- if (map_coherent)
|
|
||||||
+ if (map_coherent && cpu_use_kmap_coherent)
|
|
||||||
kunmap_coherent();
|
|
||||||
else
|
|
||||||
kunmap_atomic(vaddr);
|
|
||||||
--- a/arch/mips/mm/init.c
|
|
||||||
+++ b/arch/mips/mm/init.c
|
|
||||||
@@ -160,7 +160,7 @@ void copy_user_highpage(struct page *to,
|
|
||||||
void *vfrom, *vto;
|
|
||||||
|
|
||||||
vto = kmap_atomic(to);
|
|
||||||
- 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);
|
|
||||||
@@ -182,7 +182,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 &&
|
|
||||||
page_mapped(page) && !Page_dcache_dirty(page)) {
|
|
||||||
void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
|
|
||||||
memcpy(vto, src, len);
|
|
||||||
@@ -200,7 +200,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 &&
|
|
||||||
page_mapped(page) && !Page_dcache_dirty(page)) {
|
|
||||||
void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
|
|
||||||
memcpy(dst, vfrom, len);
|
|
||||||
|
|
@ -1,122 +0,0 @@
|
||||||
From b36f694256f41bc71571f467646d015dda128d14 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
||||||
Date: Sat, 9 Nov 2013 17:03:59 +0100
|
|
||||||
Subject: [PATCH 210/210] b44: register adm switch
|
|
||||||
|
|
||||||
---
|
|
||||||
drivers/net/ethernet/broadcom/b44.c | 57 +++++++++++++++++++++++++++++++++++
|
|
||||||
drivers/net/ethernet/broadcom/b44.h | 3 ++
|
|
||||||
2 files changed, 60 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/broadcom/b44.c
|
|
||||||
+++ b/drivers/net/ethernet/broadcom/b44.c
|
|
||||||
@@ -31,6 +31,8 @@
|
|
||||||
#include <linux/ssb/ssb.h>
|
|
||||||
#include <linux/slab.h>
|
|
||||||
#include <linux/phy.h>
|
|
||||||
+#include <linux/platform_device.h>
|
|
||||||
+#include <linux/platform_data/adm6996-gpio.h>
|
|
||||||
|
|
||||||
#include <asm/uaccess.h>
|
|
||||||
#include <asm/io.h>
|
|
||||||
@@ -2240,6 +2242,70 @@ static void b44_adjust_link(struct net_d
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+static int b44_register_adm_switch(struct b44 *bp)
|
|
||||||
+{
|
|
||||||
+ int gpio;
|
|
||||||
+ struct platform_device *pdev;
|
|
||||||
+ struct adm6996_gpio_platform_data adm_data = {0};
|
|
||||||
+ struct platform_device_info info = {0};
|
|
||||||
+
|
|
||||||
+ adm_data.model = ADM6996L;
|
|
||||||
+ gpio = bcm47xx_nvram_gpio_pin("adm_eecs");
|
|
||||||
+ if (gpio >= 0)
|
|
||||||
+ adm_data.eecs = gpio;
|
|
||||||
+ else
|
|
||||||
+ adm_data.eecs = 2;
|
|
||||||
+
|
|
||||||
+ gpio = bcm47xx_nvram_gpio_pin("adm_eesk");
|
|
||||||
+ if (gpio >= 0)
|
|
||||||
+ adm_data.eesk = gpio;
|
|
||||||
+ else
|
|
||||||
+ adm_data.eesk = 3;
|
|
||||||
+
|
|
||||||
+ gpio = bcm47xx_nvram_gpio_pin("adm_eedi");
|
|
||||||
+ if (gpio >= 0)
|
|
||||||
+ adm_data.eedi = gpio;
|
|
||||||
+ else
|
|
||||||
+ adm_data.eedi = 4;
|
|
||||||
+
|
|
||||||
+ gpio = bcm47xx_nvram_gpio_pin("adm_rc");
|
|
||||||
+ if (gpio >= 0)
|
|
||||||
+ adm_data.eerc = gpio;
|
|
||||||
+ else
|
|
||||||
+ adm_data.eerc = 5;
|
|
||||||
+
|
|
||||||
+ info.parent = bp->sdev->dev;
|
|
||||||
+ info.name = "adm6996_gpio";
|
|
||||||
+ info.id = -1;
|
|
||||||
+ info.data = &adm_data;
|
|
||||||
+ info.size_data = sizeof(adm_data);
|
|
||||||
+
|
|
||||||
+ if (!bp->adm_switch) {
|
|
||||||
+ pdev = platform_device_register_full(&info);
|
|
||||||
+ if (IS_ERR(pdev))
|
|
||||||
+ return PTR_ERR(pdev);
|
|
||||||
+
|
|
||||||
+ bp->adm_switch = pdev;
|
|
||||||
+ }
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+static void b44_unregister_adm_switch(struct b44 *bp)
|
|
||||||
+{
|
|
||||||
+ if (bp->adm_switch)
|
|
||||||
+ platform_device_unregister(bp->adm_switch);
|
|
||||||
+}
|
|
||||||
+#else
|
|
||||||
+static int b44_register_adm_switch(struct b44 *bp)
|
|
||||||
+{
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+static void b44_unregister_adm_switch(struct b44 *bp)
|
|
||||||
+{
|
|
||||||
+
|
|
||||||
+}
|
|
||||||
+#endif /* CONFIG_BCM47XX */
|
|
||||||
+
|
|
||||||
static int b44_register_phy_one(struct b44 *bp)
|
|
||||||
{
|
|
||||||
struct mii_bus *mii_bus;
|
|
||||||
@@ -2283,6 +2349,9 @@ static int b44_register_phy_one(struct b
|
|
||||||
if (!bp->mii_bus->phy_map[bp->phy_addr] &&
|
|
||||||
(sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) {
|
|
||||||
|
|
||||||
+ if (sprom->boardflags_lo & B44_BOARDFLAG_ADM)
|
|
||||||
+ b44_register_adm_switch(bp);
|
|
||||||
+
|
|
||||||
dev_info(sdev->dev,
|
|
||||||
"could not find PHY at %i, use fixed one\n",
|
|
||||||
bp->phy_addr);
|
|
||||||
@@ -2479,6 +2548,7 @@ static void b44_remove_one(struct ssb_de
|
|
||||||
unregister_netdev(dev);
|
|
||||||
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
|
|
||||||
b44_unregister_phy_one(bp);
|
|
||||||
+ b44_unregister_adm_switch(bp);
|
|
||||||
ssb_device_disable(sdev, 0);
|
|
||||||
ssb_bus_may_powerdown(sdev->bus);
|
|
||||||
netif_napi_del(&bp->napi);
|
|
||||||
--- a/drivers/net/ethernet/broadcom/b44.h
|
|
||||||
+++ b/drivers/net/ethernet/broadcom/b44.h
|
|
||||||
@@ -404,6 +404,9 @@ struct b44 {
|
|
||||||
struct mii_bus *mii_bus;
|
|
||||||
int old_link;
|
|
||||||
struct mii_if_info mii_if;
|
|
||||||
+
|
|
||||||
+ /* platform device for associated switch */
|
|
||||||
+ struct platform_device *adm_switch;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif /* _B44_H */
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
--- a/drivers/net/ethernet/broadcom/b44.c
|
|
||||||
+++ b/drivers/net/ethernet/broadcom/b44.c
|
|
||||||
@@ -431,10 +431,34 @@ static void b44_wap54g10_workaround(stru
|
|
||||||
error:
|
|
||||||
pr_warn("PHY: cannot reset MII transceiver isolate bit\n");
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+static void b44_bcm47xx_workarounds(struct b44 *bp)
|
|
||||||
+{
|
|
||||||
+ char buf[20];
|
|
||||||
+ struct ssb_device *sdev = bp->sdev;
|
|
||||||
+
|
|
||||||
+ /* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */
|
|
||||||
+ if (sdev->bus->sprom.board_num == 100) {
|
|
||||||
+ bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
|
|
||||||
+ } else {
|
|
||||||
+ /* WL-HDD */
|
|
||||||
+ if (bcm47xx_nvram_getenv("hardware_version", buf, sizeof(buf)) >= 0 &&
|
|
||||||
+ !strncmp(buf, "WL300-", strlen("WL300-"))) {
|
|
||||||
+ if (sdev->bus->sprom.et0phyaddr == 0 &&
|
|
||||||
+ sdev->bus->sprom.et1phyaddr == 1)
|
|
||||||
+ bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return;
|
|
||||||
+}
|
|
||||||
#else
|
|
||||||
static inline void b44_wap54g10_workaround(struct b44 *bp)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+static inline void b44_bcm47xx_workarounds(struct b44 *bp)
|
|
||||||
+{
|
|
||||||
+}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static int b44_setup_phy(struct b44 *bp)
|
|
||||||
@@ -443,6 +467,7 @@ static int b44_setup_phy(struct b44 *bp)
|
|
||||||
int err;
|
|
||||||
|
|
||||||
b44_wap54g10_workaround(bp);
|
|
||||||
+ b44_bcm47xx_workarounds(bp);
|
|
||||||
|
|
||||||
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
|
|
||||||
return 0;
|
|
||||||
@@ -2170,6 +2195,8 @@ static int b44_get_invariants(struct b44
|
|
||||||
* valid PHY address. */
|
|
||||||
bp->phy_addr &= 0x1F;
|
|
||||||
|
|
||||||
+ b44_bcm47xx_workarounds(bp);
|
|
||||||
+
|
|
||||||
memcpy(bp->dev->dev_addr, addr, ETH_ALEN);
|
|
||||||
|
|
||||||
if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
This prevents the options from being delete with make kernel_oldconfig.
|
|
||||||
---
|
|
||||||
drivers/ssb/Kconfig | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/bcma/Kconfig
|
|
||||||
+++ b/drivers/bcma/Kconfig
|
|
||||||
@@ -33,6 +33,7 @@ config BCMA_HOST_PCI
|
|
||||||
config BCMA_HOST_SOC
|
|
||||||
bool "Support for BCMA in a SoC"
|
|
||||||
depends on BCMA
|
|
||||||
+ select USB_HCD_BCMA if USB_EHCI_HCD || USB_OHCI_HCD
|
|
||||||
help
|
|
||||||
Host interface for a Broadcom AIX bus directly mapped into
|
|
||||||
the memory. This only works with the Broadcom SoCs from the
|
|
||||||
--- a/drivers/ssb/Kconfig
|
|
||||||
+++ b/drivers/ssb/Kconfig
|
|
||||||
@@ -156,6 +156,7 @@ config SSB_SFLASH
|
|
||||||
config SSB_EMBEDDED
|
|
||||||
bool
|
|
||||||
depends on SSB_DRIVER_MIPS && SSB_PCICORE_HOSTMODE
|
|
||||||
+ select USB_HCD_SSB if USB_EHCI_HCD || USB_OHCI_HCD
|
|
||||||
default y
|
|
||||||
|
|
||||||
config SSB_DRIVER_EXTIF
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
From: Wolfram Joost <dbox2@frokaschwei.de>
|
|
||||||
Subject: [PATCH] fork_cacheflush
|
|
||||||
|
|
||||||
On ASUS WL-500gP there are many unexpected "Segmentation fault"s that
|
|
||||||
seem to be caused by a kernel. They can be avoided by:
|
|
||||||
1) Disabling highpage
|
|
||||||
2) Using flush_cache_mm in flush_cache_dup_mm
|
|
||||||
|
|
||||||
For details see OpenWrt ticket #2035 https://dev.openwrt.org/ticket/2035
|
|
||||||
---
|
|
||||||
--- a/arch/mips/include/asm/cacheflush.h
|
|
||||||
+++ b/arch/mips/include/asm/cacheflush.h
|
|
||||||
@@ -46,7 +46,7 @@
|
|
||||||
extern void (*flush_cache_all)(void);
|
|
||||||
extern void (*__flush_cache_all)(void);
|
|
||||||
extern void (*flush_cache_mm)(struct mm_struct *mm);
|
|
||||||
-#define flush_cache_dup_mm(mm) do { (void) (mm); } while (0)
|
|
||||||
+#define flush_cache_dup_mm(mm) flush_cache_mm(mm)
|
|
||||||
extern void (*flush_cache_range)(struct vm_area_struct *vma,
|
|
||||||
unsigned long start, unsigned long end);
|
|
||||||
extern void (*flush_cache_page)(struct vm_area_struct *vma, unsigned long page, unsigned long pfn);
|
|
||||||
|
|
@ -1,74 +0,0 @@
|
||||||
From: Jeff Hansen <jhansen@cardaccess-inc.com>
|
|
||||||
Subject: [PATCH] no highpage
|
|
||||||
|
|
||||||
On ASUS WL-500gP there are many unexpected "Segmentation fault"s that
|
|
||||||
seem to be caused by a kernel. They can be avoided by:
|
|
||||||
1) Disabling highpage
|
|
||||||
2) Using flush_cache_mm in flush_cache_dup_mm
|
|
||||||
|
|
||||||
For details see OpenWrt ticket #2035 https://dev.openwrt.org/ticket/2035
|
|
||||||
---
|
|
||||||
--- a/arch/mips/include/asm/page.h
|
|
||||||
+++ b/arch/mips/include/asm/page.h
|
|
||||||
@@ -71,6 +71,7 @@ static inline unsigned int page_size_ftl
|
|
||||||
#endif /* CONFIG_MIPS_HUGE_TLB_SUPPORT */
|
|
||||||
|
|
||||||
#include <linux/pfn.h>
|
|
||||||
+#include <asm/cpu-features.h>
|
|
||||||
|
|
||||||
extern void build_clear_page(void);
|
|
||||||
extern void build_copy_page(void);
|
|
||||||
@@ -105,11 +106,16 @@ static inline void clear_user_page(void
|
|
||||||
flush_data_cache_page((unsigned long)addr);
|
|
||||||
}
|
|
||||||
|
|
||||||
-struct vm_area_struct;
|
|
||||||
-extern void copy_user_highpage(struct page *to, struct page *from,
|
|
||||||
- unsigned long vaddr, struct vm_area_struct *vma);
|
|
||||||
+static inline void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,
|
|
||||||
+ struct page *to)
|
|
||||||
+{
|
|
||||||
+ extern void (*flush_data_cache_page)(unsigned long addr);
|
|
||||||
|
|
||||||
-#define __HAVE_ARCH_COPY_USER_HIGHPAGE
|
|
||||||
+ copy_page(vto, vfrom);
|
|
||||||
+ if (!cpu_has_ic_fills_f_dc ||
|
|
||||||
+ pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
|
|
||||||
+ flush_data_cache_page((unsigned long)vto);
|
|
||||||
+}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* These are used to make use of C type-checking..
|
|
||||||
--- a/arch/mips/mm/init.c
|
|
||||||
+++ b/arch/mips/mm/init.c
|
|
||||||
@@ -154,30 +154,6 @@ void kunmap_coherent(void)
|
|
||||||
pagefault_enable();
|
|
||||||
}
|
|
||||||
|
|
||||||
-void copy_user_highpage(struct page *to, struct page *from,
|
|
||||||
- unsigned long vaddr, struct vm_area_struct *vma)
|
|
||||||
-{
|
|
||||||
- void *vfrom, *vto;
|
|
||||||
-
|
|
||||||
- vto = kmap_atomic(to);
|
|
||||||
- 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();
|
|
||||||
- } else {
|
|
||||||
- vfrom = kmap_atomic(from);
|
|
||||||
- copy_page(vto, vfrom);
|
|
||||||
- kunmap_atomic(vfrom);
|
|
||||||
- }
|
|
||||||
- if ((!cpu_has_ic_fills_f_dc) ||
|
|
||||||
- pages_do_alias((unsigned long)vto, vaddr & PAGE_MASK))
|
|
||||||
- flush_data_cache_page((unsigned long)vto);
|
|
||||||
- kunmap_atomic(vto);
|
|
||||||
- /* Make sure this page is cleared on other CPU's too before using it */
|
|
||||||
- smp_wmb();
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
void copy_to_user_page(struct vm_area_struct *vma,
|
|
||||||
struct page *page, unsigned long vaddr, void *dst, const void *src,
|
|
||||||
unsigned long len)
|
|
||||||
|
|
@ -1,223 +0,0 @@
|
||||||
--- a/arch/mips/bcm47xx/board.c
|
|
||||||
+++ b/arch/mips/bcm47xx/board.c
|
|
||||||
@@ -140,6 +140,7 @@ struct bcm47xx_board_type_list2 bcm47xx_
|
|
||||||
{{BCM47XX_BOARD_LINKSYS_WRT300NV11, "Linksys WRT300N V1.1"}, "WRT300N", "1.1"},
|
|
||||||
{{BCM47XX_BOARD_LINKSYS_WRT310NV1, "Linksys WRT310N V1"}, "WRT310N", "1.0"},
|
|
||||||
{{BCM47XX_BOARD_LINKSYS_WRT310NV2, "Linksys WRT310N V2"}, "WRT310N", "2.0"},
|
|
||||||
+ {{BCM47XX_BOARD_LINKSYS_WRT320N_V1, "Linksys WRT320N V1"}, "WRT320N", "1.0"},
|
|
||||||
{{BCM47XX_BOARD_LINKSYS_WRT54G3GV2, "Linksys WRT54G3GV2-VF"}, "WRT54G3GV2-VF", "1.0"},
|
|
||||||
{{BCM47XX_BOARD_LINKSYS_WRT610NV1, "Linksys WRT610N V1"}, "WRT610N", "1.0"},
|
|
||||||
{{BCM47XX_BOARD_LINKSYS_WRT610NV2, "Linksys WRT610N V2"}, "WRT610N", "2.0"},
|
|
||||||
@@ -150,9 +151,12 @@ struct bcm47xx_board_type_list2 bcm47xx_
|
|
||||||
static const
|
|
||||||
struct bcm47xx_board_type_list1 bcm47xx_board_list_board_id[] __initconst = {
|
|
||||||
{{BCM47XX_BOARD_LUXUL_XWR_1750_V1, "Luxul XWR-1750 V1"}, "luxul_xwr1750_v1"},
|
|
||||||
+ {{BCM47XX_BOARD_NETGEAR_R6300_V1, "Netgear R6300 V1"}, "U12H218T00_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WGR614V8, "Netgear WGR614 V8"}, "U12H072T00_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WGR614V9, "Netgear WGR614 V9"}, "U12H094T00_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WGR614_V10, "Netgear WGR614 V10"}, "U12H139T01_NETGEAR"},
|
|
||||||
+ {{BCM47XX_BOARD_NETGEAR_WN2500RP_V1, "Netgear WN2500RP V1"}, "U12H197T00_NETGEAR"},
|
|
||||||
+ {{BCM47XX_BOARD_NETGEAR_WN2500RP_V2, "Netgear WN2500RP V2"}, "U12H294T00_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WNDR3300, "Netgear WNDR3300"}, "U12H093T00_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WNDR3400V1, "Netgear WNDR3400 V1"}, "U12H155T00_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WNDR3400V2, "Netgear WNDR3400 V2"}, "U12H187T00_NETGEAR"},
|
|
||||||
@@ -162,6 +166,7 @@ struct bcm47xx_board_type_list1 bcm47xx_
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WNDR4000, "Netgear WNDR4000"}, "U12H181T00_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WNDR4500V1, "Netgear WNDR4500 V1"}, "U12H189T00_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WNDR4500V2, "Netgear WNDR4500 V2"}, "U12H224T00_NETGEAR"},
|
|
||||||
+ {{BCM47XX_BOARD_NETGEAR_WNR1000_V3, "Netgear WNR1000 V3"}, "U12H139T50_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WNR2000, "Netgear WNR2000"}, "U12H114T00_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WNR3500L, "Netgear WNR3500L"}, "U12H136T99_NETGEAR"},
|
|
||||||
{{BCM47XX_BOARD_NETGEAR_WNR3500U, "Netgear WNR3500U"}, "U12H136T00_NETGEAR"},
|
|
||||||
--- a/arch/mips/bcm47xx/buttons.c
|
|
||||||
+++ b/arch/mips/bcm47xx/buttons.c
|
|
||||||
@@ -20,6 +20,12 @@
|
|
||||||
/* Asus */
|
|
||||||
|
|
||||||
static const struct gpio_keys_button
|
|
||||||
+bcm47xx_buttons_asus_rtn10u[] __initconst = {
|
|
||||||
+ BCM47XX_GPIO_KEY(20, KEY_WPS_BUTTON),
|
|
||||||
+ BCM47XX_GPIO_KEY(21, KEY_RESTART),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static const struct gpio_keys_button
|
|
||||||
bcm47xx_buttons_asus_rtn12[] __initconst = {
|
|
||||||
BCM47XX_GPIO_KEY(0, KEY_WPS_BUTTON),
|
|
||||||
BCM47XX_GPIO_KEY(1, KEY_RESTART),
|
|
||||||
@@ -270,6 +276,18 @@ bcm47xx_buttons_linksys_wrt310nv1[] __in
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct gpio_keys_button
|
|
||||||
+bcm47xx_buttons_linksys_wrt310n_v2[] __initconst = {
|
|
||||||
+ BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
|
|
||||||
+ BCM47XX_GPIO_KEY(6, KEY_RESTART),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static const struct gpio_keys_button
|
|
||||||
+bcm47xx_buttons_linksys_wrt320n_v1[] __initconst = {
|
|
||||||
+ BCM47XX_GPIO_KEY(5, KEY_WPS_BUTTON),
|
|
||||||
+ BCM47XX_GPIO_KEY(8, KEY_RESTART),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static const struct gpio_keys_button
|
|
||||||
bcm47xx_buttons_linksys_wrt54g3gv2[] __initconst = {
|
|
||||||
BCM47XX_GPIO_KEY(5, KEY_WIMAX),
|
|
||||||
BCM47XX_GPIO_KEY(6, KEY_RESTART),
|
|
||||||
@@ -333,6 +351,17 @@ bcm47xx_buttons_motorola_wr850gv2v3[] __
|
|
||||||
/* Netgear */
|
|
||||||
|
|
||||||
static const struct gpio_keys_button
|
|
||||||
+bcm47xx_buttons_netgear_r6300_v1[] __initconst = {
|
|
||||||
+ BCM47XX_GPIO_KEY(6, KEY_RESTART),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static const struct gpio_keys_button
|
|
||||||
+bcm47xx_buttons_netgear_wn2500rp_v1[] __initconst = {
|
|
||||||
+ BCM47XX_GPIO_KEY(12, KEY_RESTART),
|
|
||||||
+ BCM47XX_GPIO_KEY(31, KEY_WPS_BUTTON),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static const struct gpio_keys_button
|
|
||||||
bcm47xx_buttons_netgear_wndr3400v1[] __initconst = {
|
|
||||||
BCM47XX_GPIO_KEY(4, KEY_RESTART),
|
|
||||||
BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
|
|
||||||
@@ -360,6 +389,11 @@ bcm47xx_buttons_netgear_wndr4500v1[] __i
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct gpio_keys_button
|
|
||||||
+bcm47xx_buttons_netgear_wnr1000_v3[] __initconst = {
|
|
||||||
+ BCM47XX_GPIO_KEY(3, KEY_RESTART),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static const struct gpio_keys_button
|
|
||||||
bcm47xx_buttons_netgear_wnr3500lv1[] __initconst = {
|
|
||||||
BCM47XX_GPIO_KEY(4, KEY_RESTART),
|
|
||||||
BCM47XX_GPIO_KEY(6, KEY_WPS_BUTTON),
|
|
||||||
@@ -413,6 +447,9 @@ int __init bcm47xx_buttons_register(void
|
|
||||||
int err;
|
|
||||||
|
|
||||||
switch (board) {
|
|
||||||
+ case BCM47XX_BOARD_ASUS_RTN10U:
|
|
||||||
+ err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn10u);
|
|
||||||
+ break;
|
|
||||||
case BCM47XX_BOARD_ASUS_RTN12:
|
|
||||||
err = bcm47xx_copy_bdata(bcm47xx_buttons_asus_rtn12);
|
|
||||||
break;
|
|
||||||
@@ -543,6 +580,12 @@ int __init bcm47xx_buttons_register(void
|
|
||||||
case BCM47XX_BOARD_LINKSYS_WRT310NV1:
|
|
||||||
err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310nv1);
|
|
||||||
break;
|
|
||||||
+ case BCM47XX_BOARD_LINKSYS_WRT310NV2:
|
|
||||||
+ err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt310n_v2);
|
|
||||||
+ break;
|
|
||||||
+ case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
|
|
||||||
+ err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt320n_v1);
|
|
||||||
+ break;
|
|
||||||
case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
|
|
||||||
err = bcm47xx_copy_bdata(bcm47xx_buttons_linksys_wrt54g3gv2);
|
|
||||||
break;
|
|
||||||
@@ -579,6 +622,12 @@ int __init bcm47xx_buttons_register(void
|
|
||||||
err = bcm47xx_copy_bdata(bcm47xx_buttons_motorola_wr850gv2v3);
|
|
||||||
break;
|
|
||||||
|
|
||||||
+ case BCM47XX_BOARD_NETGEAR_R6300_V1:
|
|
||||||
+ err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_r6300_v1);
|
|
||||||
+ break;
|
|
||||||
+ case BCM47XX_BOARD_NETGEAR_WN2500RP_V1:
|
|
||||||
+ err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wn2500rp_v1);
|
|
||||||
+ break;
|
|
||||||
case BCM47XX_BOARD_NETGEAR_WNDR3400V1:
|
|
||||||
err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr3400v1);
|
|
||||||
break;
|
|
||||||
@@ -591,6 +640,9 @@ int __init bcm47xx_buttons_register(void
|
|
||||||
case BCM47XX_BOARD_NETGEAR_WNDR4500V1:
|
|
||||||
err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wndr4500v1);
|
|
||||||
break;
|
|
||||||
+ case BCM47XX_BOARD_NETGEAR_WNR1000_V3:
|
|
||||||
+ err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr1000_v3);
|
|
||||||
+ break;
|
|
||||||
case BCM47XX_BOARD_NETGEAR_WNR3500L:
|
|
||||||
err = bcm47xx_copy_bdata(bcm47xx_buttons_netgear_wnr3500lv1);
|
|
||||||
break;
|
|
||||||
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
|
|
||||||
+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
|
|
||||||
@@ -71,6 +71,7 @@ enum bcm47xx_board {
|
|
||||||
BCM47XX_BOARD_LINKSYS_WRT300NV11,
|
|
||||||
BCM47XX_BOARD_LINKSYS_WRT310NV1,
|
|
||||||
BCM47XX_BOARD_LINKSYS_WRT310NV2,
|
|
||||||
+ BCM47XX_BOARD_LINKSYS_WRT320N_V1,
|
|
||||||
BCM47XX_BOARD_LINKSYS_WRT54G3GV2,
|
|
||||||
BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0101,
|
|
||||||
BCM47XX_BOARD_LINKSYS_WRT54G_TYPE_0467,
|
|
||||||
@@ -88,9 +89,12 @@ enum bcm47xx_board {
|
|
||||||
BCM47XX_BOARD_MOTOROLA_WR850GP,
|
|
||||||
BCM47XX_BOARD_MOTOROLA_WR850GV2V3,
|
|
||||||
|
|
||||||
+ BCM47XX_BOARD_NETGEAR_R6300_V1,
|
|
||||||
BCM47XX_BOARD_NETGEAR_WGR614V8,
|
|
||||||
BCM47XX_BOARD_NETGEAR_WGR614V9,
|
|
||||||
BCM47XX_BOARD_NETGEAR_WGR614_V10,
|
|
||||||
+ BCM47XX_BOARD_NETGEAR_WN2500RP_V1,
|
|
||||||
+ BCM47XX_BOARD_NETGEAR_WN2500RP_V2,
|
|
||||||
BCM47XX_BOARD_NETGEAR_WNDR3300,
|
|
||||||
BCM47XX_BOARD_NETGEAR_WNDR3400V1,
|
|
||||||
BCM47XX_BOARD_NETGEAR_WNDR3400V2,
|
|
||||||
@@ -100,6 +104,7 @@ enum bcm47xx_board {
|
|
||||||
BCM47XX_BOARD_NETGEAR_WNDR4000,
|
|
||||||
BCM47XX_BOARD_NETGEAR_WNDR4500V1,
|
|
||||||
BCM47XX_BOARD_NETGEAR_WNDR4500V2,
|
|
||||||
+ BCM47XX_BOARD_NETGEAR_WNR1000_V3,
|
|
||||||
BCM47XX_BOARD_NETGEAR_WNR2000,
|
|
||||||
BCM47XX_BOARD_NETGEAR_WNR3500L,
|
|
||||||
BCM47XX_BOARD_NETGEAR_WNR3500U,
|
|
||||||
--- a/arch/mips/bcm47xx/leds.c
|
|
||||||
+++ b/arch/mips/bcm47xx/leds.c
|
|
||||||
@@ -29,6 +29,14 @@
|
|
||||||
/* Asus */
|
|
||||||
|
|
||||||
static const struct gpio_led
|
|
||||||
+bcm47xx_leds_asus_rtn10u[] __initconst = {
|
|
||||||
+ BCM47XX_GPIO_LED(5, "green", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
|
|
||||||
+ BCM47XX_GPIO_LED(6, "green", "power", 1, LEDS_GPIO_DEFSTATE_ON),
|
|
||||||
+ BCM47XX_GPIO_LED(7, "green", "wps", 0, LEDS_GPIO_DEFSTATE_OFF),
|
|
||||||
+ BCM47XX_GPIO_LED(8, "green", "usb", 0, LEDS_GPIO_DEFSTATE_OFF),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static const struct gpio_led
|
|
||||||
bcm47xx_leds_asus_rtn12[] __initconst = {
|
|
||||||
BCM47XX_GPIO_LED(2, "unk", "power", 1, LEDS_GPIO_DEFSTATE_ON),
|
|
||||||
BCM47XX_GPIO_LED(7, "unk", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),
|
|
||||||
@@ -313,6 +321,13 @@ bcm47xx_leds_linksys_wrt310nv1[] __initc
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct gpio_led
|
|
||||||
+bcm47xx_leds_linksys_wrt320n_v1[] __initconst = {
|
|
||||||
+ BCM47XX_GPIO_LED(1, "blue", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),
|
|
||||||
+ BCM47XX_GPIO_LED(2, "blue", "power", 0, LEDS_GPIO_DEFSTATE_ON),
|
|
||||||
+ BCM47XX_GPIO_LED(4, "amber", "wps", 1, LEDS_GPIO_DEFSTATE_OFF),
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static const struct gpio_led
|
|
||||||
bcm47xx_leds_linksys_wrt54g_generic[] __initconst = {
|
|
||||||
BCM47XX_GPIO_LED(0, "unk", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),
|
|
||||||
BCM47XX_GPIO_LED(1, "unk", "power", 0, LEDS_GPIO_DEFSTATE_ON),
|
|
||||||
@@ -478,6 +493,9 @@ void __init bcm47xx_leds_register(void)
|
|
||||||
enum bcm47xx_board board = bcm47xx_board_get();
|
|
||||||
|
|
||||||
switch (board) {
|
|
||||||
+ case BCM47XX_BOARD_ASUS_RTN10U:
|
|
||||||
+ bcm47xx_set_pdata(bcm47xx_leds_asus_rtn10u);
|
|
||||||
+ break;
|
|
||||||
case BCM47XX_BOARD_ASUS_RTN12:
|
|
||||||
bcm47xx_set_pdata(bcm47xx_leds_asus_rtn12);
|
|
||||||
break;
|
|
||||||
@@ -611,6 +629,9 @@ void __init bcm47xx_leds_register(void)
|
|
||||||
case BCM47XX_BOARD_LINKSYS_WRT310NV1:
|
|
||||||
bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt310nv1);
|
|
||||||
break;
|
|
||||||
+ case BCM47XX_BOARD_LINKSYS_WRT320N_V1:
|
|
||||||
+ bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt320n_v1);
|
|
||||||
+ break;
|
|
||||||
case BCM47XX_BOARD_LINKSYS_WRT54G3GV2:
|
|
||||||
bcm47xx_set_pdata(bcm47xx_leds_linksys_wrt54g3gv2);
|
|
||||||
break;
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
--- a/drivers/mtd/bcm47xxpart.c
|
|
||||||
+++ b/drivers/mtd/bcm47xxpart.c
|
|
||||||
@@ -127,6 +127,7 @@ static int bcm47xxpart_parse(struct mtd_
|
|
||||||
int last_trx_part = -1;
|
|
||||||
int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
|
|
||||||
int err;
|
|
||||||
+ bool found_nvram = false;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Some really old flashes (like AT45DB*) had smaller erasesize-s, but
|
|
||||||
@@ -334,12 +335,23 @@ static int bcm47xxpart_parse(struct mtd_
|
|
||||||
if (buf[0] == NVRAM_HEADER) {
|
|
||||||
bcm47xxpart_add_part(&parts[curr_part++], "nvram",
|
|
||||||
master->size - blocksize, 0);
|
|
||||||
+ found_nvram = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
kfree(buf);
|
|
||||||
|
|
||||||
+ if (!found_nvram) {
|
|
||||||
+ pr_err("can not find a nvram partition reserve last block\n");
|
|
||||||
+ bcm47xxpart_add_part(&parts[curr_part++], "nvram_guess",
|
|
||||||
+ master->size - blocksize * 2, MTD_WRITEABLE);
|
|
||||||
+ for (i = 0; i < curr_part; i++) {
|
|
||||||
+ if (parts[i].size + parts[i].offset == master->size)
|
|
||||||
+ parts[i].offset -= blocksize * 2;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* Assume that partitions end at the beginning of the one they are
|
|
||||||
* followed by.
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
||||||
From: b.sander
|
|
||||||
Subject: [PATCH] pci: IDE fix
|
|
||||||
|
|
||||||
These are standard probing messages when using pdc202xx_old:
|
|
||||||
pdc202xx_old 0000:00:01.0: IDE controller (0x105a:0x0d30 rev 0x02)
|
|
||||||
PCI: Enabling device 0000:00:01.0 (0004 -> 0007)
|
|
||||||
PCI: Fixing up device 0000:00:01.0
|
|
||||||
0000:00:01.0: (U)DMA Burst Bit DISABLED Primary PCI Mode Secondary PCI Mode.
|
|
||||||
0000:00:01.0: FORCING BURST BIT 0x00->0x01 ACTIVE
|
|
||||||
pdc202xx_old 0000:00:01.0: 100% native mode on irq 6
|
|
||||||
|
|
||||||
With the default MAX_HWIFS value after above we get:
|
|
||||||
ide2: BM-DMA at 0x0400-0x0407
|
|
||||||
ide3: BM-DMA at 0x0408-0x040f
|
|
||||||
Probing IDE interface ide2...
|
|
||||||
hde: CF500, CFA DISK drive
|
|
||||||
|
|
||||||
As you can see it's ide2 + ide3 and hde.
|
|
||||||
|
|
||||||
With this patch applied we get:
|
|
||||||
ide0: BM-DMA at 0x0400-0x0407
|
|
||||||
ide1: BM-DMA at 0x0408-0x040f
|
|
||||||
Probing IDE interface ide0...
|
|
||||||
hda: CF500, CFA DISK drive
|
|
||||||
|
|
||||||
This fixes OpenWrt ticket #7061: https://dev.openwrt.org/ticket/7061
|
|
||||||
---
|
|
||||||
--- a/include/linux/ide.h
|
|
||||||
+++ b/include/linux/ide.h
|
|
||||||
@@ -191,7 +191,11 @@ static inline void ide_std_init_ports(st
|
|
||||||
hw->io_ports.ctl_addr = ctl_addr;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if defined CONFIG_BCM47XX
|
|
||||||
+# define MAX_HWIFS 2
|
|
||||||
+#else
|
|
||||||
#define MAX_HWIFS 10
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Now for the data we need to maintain per-drive: ide_drive_t
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
When the Ethernet controller is powered down and someone wants to
|
|
||||||
access the mdio bus like the witch driver (b53) the system crashed if
|
|
||||||
PCI_D3hot was set before. This patch deactivates this power sawing mode
|
|
||||||
when a switch driver is in use.
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/broadcom/tg3.c
|
|
||||||
+++ b/drivers/net/ethernet/broadcom/tg3.c
|
|
||||||
@@ -4263,7 +4263,8 @@ static int tg3_power_down_prepare(struct
|
|
||||||
static void tg3_power_down(struct tg3 *tp)
|
|
||||||
{
|
|
||||||
pci_wake_from_d3(tp->pdev, tg3_flag(tp, WOL_ENABLE));
|
|
||||||
- pci_set_power_state(tp->pdev, PCI_D3hot);
|
|
||||||
+ if (!tg3_flag(tp, ROBOSWITCH))
|
|
||||||
+ pci_set_power_state(tp->pdev, PCI_D3hot);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8 *duplex)
|
|
||||||
|
|
@ -1,73 +0,0 @@
|
||||||
From 597715c61ae75a05ab3310a34ff3857a006f0f63 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Thu, 20 Nov 2014 21:32:42 +0100
|
|
||||||
Subject: [PATCH] bcma: add table of serial flashes with smaller blocks
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/bcma/driver_chipcommon_sflash.c | 29 +++++++++++++++++++++++++++++
|
|
||||||
1 file changed, 29 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/bcma/driver_chipcommon_sflash.c
|
|
||||||
+++ b/drivers/bcma/driver_chipcommon_sflash.c
|
|
||||||
@@ -9,6 +9,7 @@
|
|
||||||
|
|
||||||
#include <linux/platform_device.h>
|
|
||||||
#include <linux/bcma/bcma.h>
|
|
||||||
+#include <bcm47xx_board.h>
|
|
||||||
|
|
||||||
static struct resource bcma_sflash_resource = {
|
|
||||||
.name = "bcma_sflash",
|
|
||||||
@@ -42,6 +43,13 @@ static const struct bcma_sflash_tbl_e bc
|
|
||||||
{ NULL },
|
|
||||||
};
|
|
||||||
|
|
||||||
+/* Some devices use smaller blocks (and have more of them) */
|
|
||||||
+static const struct bcma_sflash_tbl_e bcma_sflash_st_shrink_tbl[] = {
|
|
||||||
+ { "M25P16", 0x14, 0x1000, 512, },
|
|
||||||
+ { "M25P32", 0x15, 0x1000, 1024, },
|
|
||||||
+ { NULL },
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
|
|
||||||
{ "SST25WF512", 1, 0x1000, 16, },
|
|
||||||
{ "SST25VF512", 0x48, 0x1000, 16, },
|
|
||||||
@@ -85,6 +93,24 @@ static void bcma_sflash_cmd(struct bcma_
|
|
||||||
bcma_err(cc->core->bus, "SFLASH control command failed (timeout)!\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
+const struct bcma_sflash_tbl_e *bcma_sflash_shrink_flash(u32 id)
|
|
||||||
+{
|
|
||||||
+ enum bcm47xx_board board = bcm47xx_board_get();
|
|
||||||
+ const struct bcma_sflash_tbl_e *e;
|
|
||||||
+
|
|
||||||
+ switch (board) {
|
|
||||||
+ case BCM47XX_BOARD_NETGEAR_WGR614_V10:
|
|
||||||
+ case BCM47XX_BOARD_NETGEAR_WNR1000_V3:
|
|
||||||
+ for (e = bcma_sflash_st_shrink_tbl; e->name; e++) {
|
|
||||||
+ if (e->id == id)
|
|
||||||
+ return e;
|
|
||||||
+ }
|
|
||||||
+ return NULL;
|
|
||||||
+ default:
|
|
||||||
+ return NULL;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* Initialize serial flash access */
|
|
||||||
int bcma_sflash_init(struct bcma_drv_cc *cc)
|
|
||||||
{
|
|
||||||
@@ -115,6 +141,10 @@ int bcma_sflash_init(struct bcma_drv_cc
|
|
||||||
case 0x13:
|
|
||||||
return -ENOTSUPP;
|
|
||||||
default:
|
|
||||||
+ e = bcma_sflash_shrink_flash(id);
|
|
||||||
+ if (e)
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
for (e = bcma_sflash_st_tbl; e->name; e++) {
|
|
||||||
if (e->id == id)
|
|
||||||
break;
|
|
||||||
|
|
@ -1,295 +0,0 @@
|
||||||
The Netgear wgt634u uses a different format for storing the
|
|
||||||
configuration. This patch is needed to read out the correct
|
|
||||||
configuration. The cfe_env.c file uses a different method way to read
|
|
||||||
out the configuration than the in kernel cfe config reader.
|
|
||||||
|
|
||||||
--- a/arch/mips/bcm47xx/Makefile
|
|
||||||
+++ b/arch/mips/bcm47xx/Makefile
|
|
||||||
@@ -5,3 +5,4 @@
|
|
||||||
|
|
||||||
obj-y += irq.o nvram.o prom.o serial.o setup.o time.o sprom.o
|
|
||||||
obj-y += board.o buttons.o leds.o workarounds.o
|
|
||||||
+obj-y += cfe_env.o
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/arch/mips/bcm47xx/cfe_env.c
|
|
||||||
@@ -0,0 +1,228 @@
|
|
||||||
+/*
|
|
||||||
+ * CFE environment variable access
|
|
||||||
+ *
|
|
||||||
+ * Copyright 2001-2003, Broadcom Corporation
|
|
||||||
+ * Copyright 2006, Felix Fietkau <nbd@nbd.name>
|
|
||||||
+ *
|
|
||||||
+ * 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.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include <linux/init.h>
|
|
||||||
+#include <linux/module.h>
|
|
||||||
+#include <linux/kernel.h>
|
|
||||||
+#include <linux/string.h>
|
|
||||||
+#include <asm/io.h>
|
|
||||||
+#include <asm/uaccess.h>
|
|
||||||
+
|
|
||||||
+#define NVRAM_SIZE (0x1ff0)
|
|
||||||
+static char _nvdata[NVRAM_SIZE];
|
|
||||||
+static char _valuestr[256];
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * TLV types. These codes are used in the "type-length-value"
|
|
||||||
+ * encoding of the items stored in the NVRAM device (flash or EEPROM)
|
|
||||||
+ *
|
|
||||||
+ * The layout of the flash/nvram is as follows:
|
|
||||||
+ *
|
|
||||||
+ * <type> <length> <data ...> <type> <length> <data ...> <type_end>
|
|
||||||
+ *
|
|
||||||
+ * The type code of "ENV_TLV_TYPE_END" marks the end of the list.
|
|
||||||
+ * The "length" field marks the length of the data section, not
|
|
||||||
+ * including the type and length fields.
|
|
||||||
+ *
|
|
||||||
+ * Environment variables are stored as follows:
|
|
||||||
+ *
|
|
||||||
+ * <type_env> <length> <flags> <name> = <value>
|
|
||||||
+ *
|
|
||||||
+ * If bit 0 (low bit) is set, the length is an 8-bit value.
|
|
||||||
+ * If bit 0 (low bit) is clear, the length is a 16-bit value
|
|
||||||
+ *
|
|
||||||
+ * Bit 7 set indicates "user" TLVs. In this case, bit 0 still
|
|
||||||
+ * indicates the size of the length field.
|
|
||||||
+ *
|
|
||||||
+ * Flags are from the constants below:
|
|
||||||
+ *
|
|
||||||
+ */
|
|
||||||
+#define ENV_LENGTH_16BITS 0x00 /* for low bit */
|
|
||||||
+#define ENV_LENGTH_8BITS 0x01
|
|
||||||
+
|
|
||||||
+#define ENV_TYPE_USER 0x80
|
|
||||||
+
|
|
||||||
+#define ENV_CODE_SYS(n,l) (((n)<<1)|(l))
|
|
||||||
+#define ENV_CODE_USER(n,l) ((((n)<<1)|(l)) | ENV_TYPE_USER)
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * The actual TLV types we support
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#define ENV_TLV_TYPE_END 0x00
|
|
||||||
+#define ENV_TLV_TYPE_ENV ENV_CODE_SYS(0,ENV_LENGTH_8BITS)
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Environment variable flags
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#define ENV_FLG_NORMAL 0x00 /* normal read/write */
|
|
||||||
+#define ENV_FLG_BUILTIN 0x01 /* builtin - not stored in flash */
|
|
||||||
+#define ENV_FLG_READONLY 0x02 /* read-only - cannot be changed */
|
|
||||||
+
|
|
||||||
+#define ENV_FLG_MASK 0xFF /* mask of attributes we keep */
|
|
||||||
+#define ENV_FLG_ADMIN 0x100 /* lets us internally override permissions */
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/* *********************************************************************
|
|
||||||
+ * _nvram_read(buffer,offset,length)
|
|
||||||
+ *
|
|
||||||
+ * Read data from the NVRAM device
|
|
||||||
+ *
|
|
||||||
+ * Input parameters:
|
|
||||||
+ * buffer - destination buffer
|
|
||||||
+ * offset - offset of data to read
|
|
||||||
+ * length - number of bytes to read
|
|
||||||
+ *
|
|
||||||
+ * Return value:
|
|
||||||
+ * number of bytes read, or <0 if error occured
|
|
||||||
+ ********************************************************************* */
|
|
||||||
+static int
|
|
||||||
+_nvram_read(unsigned char *nv_buf, unsigned char *buffer, int offset, int length)
|
|
||||||
+{
|
|
||||||
+ int i;
|
|
||||||
+ if (offset > NVRAM_SIZE)
|
|
||||||
+ return -1;
|
|
||||||
+
|
|
||||||
+ for ( i = 0; i < length; i++) {
|
|
||||||
+ buffer[i] = ((volatile unsigned char*)nv_buf)[offset + i];
|
|
||||||
+ }
|
|
||||||
+ return length;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static char*
|
|
||||||
+_strnchr(const char *dest,int c,size_t cnt)
|
|
||||||
+{
|
|
||||||
+ while (*dest && (cnt > 0)) {
|
|
||||||
+ if (*dest == c) return (char *) dest;
|
|
||||||
+ dest++;
|
|
||||||
+ cnt--;
|
|
||||||
+ }
|
|
||||||
+ return NULL;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Core support API: Externally visible.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Get the value of an NVRAM variable
|
|
||||||
+ * @param name name of variable to get
|
|
||||||
+ * @return value of variable or NULL if undefined
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+char *cfe_env_get(unsigned char *nv_buf, const char *name)
|
|
||||||
+{
|
|
||||||
+ int size;
|
|
||||||
+ unsigned char *buffer;
|
|
||||||
+ unsigned char *ptr;
|
|
||||||
+ unsigned char *envval;
|
|
||||||
+ unsigned int reclen;
|
|
||||||
+ unsigned int rectype;
|
|
||||||
+ int offset;
|
|
||||||
+ int flg;
|
|
||||||
+
|
|
||||||
+ if (!strcmp(name, "nvram_type"))
|
|
||||||
+ return "cfe";
|
|
||||||
+
|
|
||||||
+ size = NVRAM_SIZE;
|
|
||||||
+ buffer = &_nvdata[0];
|
|
||||||
+
|
|
||||||
+ ptr = buffer;
|
|
||||||
+ offset = 0;
|
|
||||||
+
|
|
||||||
+ /* Read the record type and length */
|
|
||||||
+ if (_nvram_read(nv_buf, ptr,offset,1) != 1) {
|
|
||||||
+ goto error;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ while ((*ptr != ENV_TLV_TYPE_END) && (size > 1)) {
|
|
||||||
+
|
|
||||||
+ /* Adjust pointer for TLV type */
|
|
||||||
+ rectype = *(ptr);
|
|
||||||
+ offset++;
|
|
||||||
+ size--;
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Read the length. It can be either 1 or 2 bytes
|
|
||||||
+ * depending on the code
|
|
||||||
+ */
|
|
||||||
+ if (rectype & ENV_LENGTH_8BITS) {
|
|
||||||
+ /* Read the record type and length - 8 bits */
|
|
||||||
+ if (_nvram_read(nv_buf, ptr,offset,1) != 1) {
|
|
||||||
+ goto error;
|
|
||||||
+ }
|
|
||||||
+ reclen = *(ptr);
|
|
||||||
+ size--;
|
|
||||||
+ offset++;
|
|
||||||
+ }
|
|
||||||
+ else {
|
|
||||||
+ /* Read the record type and length - 16 bits, MSB first */
|
|
||||||
+ if (_nvram_read(nv_buf, ptr,offset,2) != 2) {
|
|
||||||
+ goto error;
|
|
||||||
+ }
|
|
||||||
+ reclen = (((unsigned int) *(ptr)) << 8) + (unsigned int) *(ptr+1);
|
|
||||||
+ size -= 2;
|
|
||||||
+ offset += 2;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (reclen > size)
|
|
||||||
+ break; /* should not happen, bad NVRAM */
|
|
||||||
+
|
|
||||||
+ switch (rectype) {
|
|
||||||
+ case ENV_TLV_TYPE_ENV:
|
|
||||||
+ /* Read the TLV data */
|
|
||||||
+ if (_nvram_read(nv_buf, ptr,offset,reclen) != reclen)
|
|
||||||
+ goto error;
|
|
||||||
+ flg = *ptr++;
|
|
||||||
+ envval = (unsigned char *) _strnchr(ptr,'=',(reclen-1));
|
|
||||||
+ if (envval) {
|
|
||||||
+ *envval++ = '\0';
|
|
||||||
+ memcpy(_valuestr,envval,(reclen-1)-(envval-ptr));
|
|
||||||
+ _valuestr[(reclen-1)-(envval-ptr)] = '\0';
|
|
||||||
+#if 0
|
|
||||||
+ printk(KERN_INFO "NVRAM:%s=%s\n", ptr, _valuestr);
|
|
||||||
+#endif
|
|
||||||
+ if(!strcmp(ptr, name)){
|
|
||||||
+ return _valuestr;
|
|
||||||
+ }
|
|
||||||
+ if((strlen(ptr) > 1) && !strcmp(&ptr[1], name))
|
|
||||||
+ return _valuestr;
|
|
||||||
+ }
|
|
||||||
+ break;
|
|
||||||
+
|
|
||||||
+ default:
|
|
||||||
+ /* Unknown TLV type, skip it. */
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Advance to next TLV
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+ size -= (int)reclen;
|
|
||||||
+ offset += reclen;
|
|
||||||
+
|
|
||||||
+ /* Read the next record type */
|
|
||||||
+ ptr = buffer;
|
|
||||||
+ if (_nvram_read(nv_buf, ptr,offset,1) != 1)
|
|
||||||
+ goto error;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+error:
|
|
||||||
+ return NULL;
|
|
||||||
+
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
--- a/arch/mips/bcm47xx/nvram.c
|
|
||||||
+++ b/arch/mips/bcm47xx/nvram.c
|
|
||||||
@@ -37,6 +37,8 @@ struct nvram_header {
|
|
||||||
static char nvram_buf[NVRAM_SPACE];
|
|
||||||
static size_t nvram_len;
|
|
||||||
static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000};
|
|
||||||
+static int cfe_env;
|
|
||||||
+extern char *cfe_env_get(char *nv_buf, const char *name);
|
|
||||||
|
|
||||||
static u32 find_nvram_size(void __iomem *end)
|
|
||||||
{
|
|
||||||
@@ -66,6 +68,26 @@ static int nvram_find_and_copy(void __io
|
|
||||||
return -EEXIST;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ cfe_env = 0;
|
|
||||||
+
|
|
||||||
+ /* XXX: hack for supporting the CFE environment stuff on WGT634U */
|
|
||||||
+ if (lim >= 8 * 1024 * 1024) {
|
|
||||||
+ src = (u32 *)(iobase + 8 * 1024 * 1024 - 0x2000);
|
|
||||||
+ dst = (u32 *)nvram_buf;
|
|
||||||
+
|
|
||||||
+ if ((*src & 0xff00ff) == 0x000001) {
|
|
||||||
+ printk("early_nvram_init: WGT634U NVRAM found.\n");
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < 0x1ff0; i++) {
|
|
||||||
+ if (*src == 0xFFFFFFFF)
|
|
||||||
+ break;
|
|
||||||
+ *dst++ = *src++;
|
|
||||||
+ }
|
|
||||||
+ cfe_env = 1;
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* TODO: when nvram is on nand flash check for bad blocks first. */
|
|
||||||
off = FLASH_MIN;
|
|
||||||
while (off <= lim) {
|
|
||||||
@@ -180,6 +202,13 @@ int bcm47xx_nvram_getenv(const char *nam
|
|
||||||
if (!name)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
+ if (cfe_env) {
|
|
||||||
+ value = cfe_env_get(nvram_buf, name);
|
|
||||||
+ if (!value)
|
|
||||||
+ return -ENOENT;
|
|
||||||
+ return snprintf(val, val_len, "%s", value);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (!nvram_len) {
|
|
||||||
err = nvram_init();
|
|
||||||
if (err)
|
|
||||||
|
|
@ -1,101 +0,0 @@
|
||||||
--- a/arch/mips/bcm47xx/setup.c
|
|
||||||
+++ b/arch/mips/bcm47xx/setup.c
|
|
||||||
@@ -36,6 +36,7 @@
|
|
||||||
#include <linux/ssb/ssb.h>
|
|
||||||
#include <linux/ssb/ssb_embedded.h>
|
|
||||||
#include <linux/bcma/bcma_soc.h>
|
|
||||||
+#include <linux/old_gpio_wdt.h>
|
|
||||||
#include <asm/bootinfo.h>
|
|
||||||
#include <asm/idle.h>
|
|
||||||
#include <asm/prom.h>
|
|
||||||
@@ -262,6 +263,33 @@ static struct fixed_phy_status bcm47xx_f
|
|
||||||
.duplex = DUPLEX_FULL,
|
|
||||||
};
|
|
||||||
|
|
||||||
+static struct gpio_wdt_platform_data gpio_wdt_data;
|
|
||||||
+
|
|
||||||
+static struct platform_device gpio_wdt_device = {
|
|
||||||
+ .name = "gpio-wdt",
|
|
||||||
+ .id = 0,
|
|
||||||
+ .dev = {
|
|
||||||
+ .platform_data = &gpio_wdt_data,
|
|
||||||
+ },
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static int __init bcm47xx_register_gpio_watchdog(void)
|
|
||||||
+{
|
|
||||||
+ enum bcm47xx_board board = bcm47xx_board_get();
|
|
||||||
+
|
|
||||||
+ switch (board) {
|
|
||||||
+ case BCM47XX_BOARD_HUAWEI_E970:
|
|
||||||
+ pr_info("bcm47xx: detected Huawei E970 or similar, starting early gpio_wdt timer\n");
|
|
||||||
+ gpio_wdt_data.gpio = 7;
|
|
||||||
+ gpio_wdt_data.interval = HZ;
|
|
||||||
+ gpio_wdt_data.first_interval = HZ / 5;
|
|
||||||
+ return platform_device_register(&gpio_wdt_device);
|
|
||||||
+ default:
|
|
||||||
+ /* Nothing to do */
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int __init bcm47xx_register_bus_complete(void)
|
|
||||||
{
|
|
||||||
switch (bcm47xx_bus_type) {
|
|
||||||
@@ -281,6 +309,7 @@ static int __init bcm47xx_register_bus_c
|
|
||||||
bcm47xx_workarounds();
|
|
||||||
|
|
||||||
fixed_phy_add(PHY_POLL, 0, &bcm47xx_fixed_phy_status);
|
|
||||||
+ bcm47xx_register_gpio_watchdog();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
device_initcall(bcm47xx_register_bus_complete);
|
|
||||||
--- a/arch/mips/configs/bcm47xx_defconfig
|
|
||||||
+++ b/arch/mips/configs/bcm47xx_defconfig
|
|
||||||
@@ -67,6 +67,7 @@ CONFIG_HW_RANDOM=y
|
|
||||||
CONFIG_GPIO_SYSFS=y
|
|
||||||
CONFIG_WATCHDOG=y
|
|
||||||
CONFIG_BCM47XX_WDT=y
|
|
||||||
+CONFIG_GPIO_WDT=y
|
|
||||||
CONFIG_SSB_DEBUG=y
|
|
||||||
CONFIG_SSB_DRIVER_GIGE=y
|
|
||||||
CONFIG_BCMA_DRIVER_GMAC_CMN=y
|
|
||||||
--- a/drivers/ssb/embedded.c
|
|
||||||
+++ b/drivers/ssb/embedded.c
|
|
||||||
@@ -34,11 +34,36 @@ int ssb_watchdog_timer_set(struct ssb_bu
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(ssb_watchdog_timer_set);
|
|
||||||
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+#include <bcm47xx_board.h>
|
|
||||||
+
|
|
||||||
+static bool ssb_watchdog_supported(void)
|
|
||||||
+{
|
|
||||||
+ enum bcm47xx_board board = bcm47xx_board_get();
|
|
||||||
+
|
|
||||||
+ /* The Huawei E970 has a hardware watchdog using a GPIO */
|
|
||||||
+ switch (board) {
|
|
||||||
+ case BCM47XX_BOARD_HUAWEI_E970:
|
|
||||||
+ return false;
|
|
||||||
+ default:
|
|
||||||
+ return true;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+#else
|
|
||||||
+static bool ssb_watchdog_supported(void)
|
|
||||||
+{
|
|
||||||
+ return true;
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
int ssb_watchdog_register(struct ssb_bus *bus)
|
|
||||||
{
|
|
||||||
struct bcm47xx_wdt wdt = {};
|
|
||||||
struct platform_device *pdev;
|
|
||||||
|
|
||||||
+ if (!ssb_watchdog_supported())
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
if (ssb_chipco_available(&bus->chipco)) {
|
|
||||||
wdt.driver_data = &bus->chipco;
|
|
||||||
wdt.timer_set = ssb_chipco_watchdog_timer_set_wdt;
|
|
||||||
|
|
@ -1,360 +0,0 @@
|
||||||
This generic GPIO watchdog is used on Huawei E970 (brcm47xx)
|
|
||||||
|
|
||||||
Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
|
|
||||||
|
|
||||||
--- a/drivers/watchdog/Kconfig
|
|
||||||
+++ b/drivers/watchdog/Kconfig
|
|
||||||
@@ -1150,6 +1150,15 @@ config WDT_MTX1
|
|
||||||
Hardware driver for the MTX-1 boards. This is a watchdog timer that
|
|
||||||
will reboot the machine after a 100 seconds timer expired.
|
|
||||||
|
|
||||||
+config GPIO_WDT
|
|
||||||
+ tristate "GPIO Hardware Watchdog"
|
|
||||||
+ help
|
|
||||||
+ Hardware driver for GPIO-controlled watchdogs. GPIO pin and
|
|
||||||
+ toggle interval settings are platform-specific. The driver
|
|
||||||
+ will stop toggling the GPIO (i.e. machine reboots) after a
|
|
||||||
+ 100 second timer expired and no process has written to
|
|
||||||
+ /dev/watchdog during that time.
|
|
||||||
+
|
|
||||||
config PNX833X_WDT
|
|
||||||
tristate "PNX833x Hardware Watchdog"
|
|
||||||
depends on SOC_PNX8335
|
|
||||||
--- a/drivers/watchdog/Makefile
|
|
||||||
+++ b/drivers/watchdog/Makefile
|
|
||||||
@@ -135,6 +135,7 @@ obj-$(CONFIG_RC32434_WDT) += rc32434_wdt
|
|
||||||
obj-$(CONFIG_INDYDOG) += indydog.o
|
|
||||||
obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o
|
|
||||||
obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
|
|
||||||
+obj-$(CONFIG_GPIO_WDT) += old_gpio_wdt.o
|
|
||||||
obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
|
|
||||||
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
|
|
||||||
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/drivers/watchdog/old_gpio_wdt.c
|
|
||||||
@@ -0,0 +1,301 @@
|
|
||||||
+/*
|
|
||||||
+ * Driver for GPIO-controlled Hardware Watchdogs.
|
|
||||||
+ *
|
|
||||||
+ * Copyright (C) 2013 Mathias Adam <m.adam--linux@adamis.de>
|
|
||||||
+ *
|
|
||||||
+ * Replaces mtx1_wdt (driver for the MTX-1 Watchdog):
|
|
||||||
+ *
|
|
||||||
+ * (C) Copyright 2005 4G Systems <info@4g-systems.biz>,
|
|
||||||
+ * All Rights Reserved.
|
|
||||||
+ * http://www.4g-systems.biz
|
|
||||||
+ *
|
|
||||||
+ * (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.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.
|
|
||||||
+ *
|
|
||||||
+ * Neither Michael Stickel nor 4G Systems admit liability nor provide
|
|
||||||
+ * warranty for any of this software. This material is provided
|
|
||||||
+ * "AS-IS" and at no charge.
|
|
||||||
+ *
|
|
||||||
+ * (c) Copyright 2005 4G Systems <info@4g-systems.biz>
|
|
||||||
+ *
|
|
||||||
+ * Release 0.01.
|
|
||||||
+ * Author: Michael Stickel michael.stickel@4g-systems.biz
|
|
||||||
+ *
|
|
||||||
+ * Release 0.02.
|
|
||||||
+ * Author: Florian Fainelli florian@openwrt.org
|
|
||||||
+ * use the Linux watchdog/timer APIs
|
|
||||||
+ *
|
|
||||||
+ * Release 0.03.
|
|
||||||
+ * Author: Mathias Adam <m.adam--linux@adamis.de>
|
|
||||||
+ * make it a generic gpio watchdog driver
|
|
||||||
+ *
|
|
||||||
+ * The Watchdog is configured to reset the MTX-1
|
|
||||||
+ * if it is not triggered for 100 seconds.
|
|
||||||
+ * It should not be triggered more often than 1.6 seconds.
|
|
||||||
+ *
|
|
||||||
+ * A timer triggers the watchdog every 5 seconds, until
|
|
||||||
+ * it is opened for the first time. After the first open
|
|
||||||
+ * it MUST be triggered every 2..95 seconds.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include <linux/module.h>
|
|
||||||
+#include <linux/moduleparam.h>
|
|
||||||
+#include <linux/types.h>
|
|
||||||
+#include <linux/errno.h>
|
|
||||||
+#include <linux/miscdevice.h>
|
|
||||||
+#include <linux/fs.h>
|
|
||||||
+#include <linux/init.h>
|
|
||||||
+#include <linux/ioport.h>
|
|
||||||
+#include <linux/timer.h>
|
|
||||||
+#include <linux/completion.h>
|
|
||||||
+#include <linux/jiffies.h>
|
|
||||||
+#include <linux/watchdog.h>
|
|
||||||
+#include <linux/platform_device.h>
|
|
||||||
+#include <linux/io.h>
|
|
||||||
+#include <linux/uaccess.h>
|
|
||||||
+#include <linux/gpio.h>
|
|
||||||
+#include <linux/old_gpio_wdt.h>
|
|
||||||
+
|
|
||||||
+static int ticks = 100 * HZ;
|
|
||||||
+
|
|
||||||
+static struct {
|
|
||||||
+ struct completion stop;
|
|
||||||
+ spinlock_t lock;
|
|
||||||
+ int running;
|
|
||||||
+ struct timer_list timer;
|
|
||||||
+ int queue;
|
|
||||||
+ int default_ticks;
|
|
||||||
+ unsigned long inuse;
|
|
||||||
+ unsigned gpio;
|
|
||||||
+ unsigned int gstate;
|
|
||||||
+ int interval;
|
|
||||||
+ int first_interval;
|
|
||||||
+} gpio_wdt_device;
|
|
||||||
+
|
|
||||||
+static void gpio_wdt_trigger(unsigned long unused)
|
|
||||||
+{
|
|
||||||
+ spin_lock(&gpio_wdt_device.lock);
|
|
||||||
+ if (gpio_wdt_device.running && ticks > 0)
|
|
||||||
+ ticks -= gpio_wdt_device.interval;
|
|
||||||
+
|
|
||||||
+ /* toggle wdt gpio */
|
|
||||||
+ gpio_wdt_device.gstate = !gpio_wdt_device.gstate;
|
|
||||||
+ gpio_set_value(gpio_wdt_device.gpio, gpio_wdt_device.gstate);
|
|
||||||
+
|
|
||||||
+ if (gpio_wdt_device.queue && ticks > 0)
|
|
||||||
+ mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.interval);
|
|
||||||
+ else
|
|
||||||
+ complete(&gpio_wdt_device.stop);
|
|
||||||
+ spin_unlock(&gpio_wdt_device.lock);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void gpio_wdt_reset(void)
|
|
||||||
+{
|
|
||||||
+ ticks = gpio_wdt_device.default_ticks;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static void gpio_wdt_start(void)
|
|
||||||
+{
|
|
||||||
+ unsigned long flags;
|
|
||||||
+
|
|
||||||
+ spin_lock_irqsave(&gpio_wdt_device.lock, flags);
|
|
||||||
+ if (!gpio_wdt_device.queue) {
|
|
||||||
+ gpio_wdt_device.queue = 1;
|
|
||||||
+ gpio_wdt_device.gstate = 1;
|
|
||||||
+ gpio_set_value(gpio_wdt_device.gpio, 1);
|
|
||||||
+ mod_timer(&gpio_wdt_device.timer, jiffies + gpio_wdt_device.first_interval);
|
|
||||||
+ }
|
|
||||||
+ gpio_wdt_device.running++;
|
|
||||||
+ spin_unlock_irqrestore(&gpio_wdt_device.lock, flags);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int gpio_wdt_stop(void)
|
|
||||||
+{
|
|
||||||
+ unsigned long flags;
|
|
||||||
+
|
|
||||||
+ spin_lock_irqsave(&gpio_wdt_device.lock, flags);
|
|
||||||
+ if (gpio_wdt_device.queue) {
|
|
||||||
+ gpio_wdt_device.queue = 0;
|
|
||||||
+ gpio_wdt_device.gstate = 0;
|
|
||||||
+ gpio_set_value(gpio_wdt_device.gpio, 0);
|
|
||||||
+ }
|
|
||||||
+ ticks = gpio_wdt_device.default_ticks;
|
|
||||||
+ spin_unlock_irqrestore(&gpio_wdt_device.lock, flags);
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/* Filesystem functions */
|
|
||||||
+
|
|
||||||
+static int gpio_wdt_open(struct inode *inode, struct file *file)
|
|
||||||
+{
|
|
||||||
+ if (test_and_set_bit(0, &gpio_wdt_device.inuse))
|
|
||||||
+ return -EBUSY;
|
|
||||||
+ return nonseekable_open(inode, file);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static int gpio_wdt_release(struct inode *inode, struct file *file)
|
|
||||||
+{
|
|
||||||
+ clear_bit(0, &gpio_wdt_device.inuse);
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static long gpio_wdt_ioctl(struct file *file, unsigned int cmd,
|
|
||||||
+ unsigned long arg)
|
|
||||||
+{
|
|
||||||
+ void __user *argp = (void __user *)arg;
|
|
||||||
+ int __user *p = (int __user *)argp;
|
|
||||||
+ unsigned int value;
|
|
||||||
+ static const struct watchdog_info ident = {
|
|
||||||
+ .options = WDIOF_CARDRESET,
|
|
||||||
+ .identity = "GPIO WDT",
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ switch (cmd) {
|
|
||||||
+ case WDIOC_GETSUPPORT:
|
|
||||||
+ if (copy_to_user(argp, &ident, sizeof(ident)))
|
|
||||||
+ return -EFAULT;
|
|
||||||
+ break;
|
|
||||||
+ case WDIOC_GETSTATUS:
|
|
||||||
+ case WDIOC_GETBOOTSTATUS:
|
|
||||||
+ put_user(0, p);
|
|
||||||
+ break;
|
|
||||||
+ case WDIOC_SETOPTIONS:
|
|
||||||
+ if (get_user(value, p))
|
|
||||||
+ return -EFAULT;
|
|
||||||
+ if (value & WDIOS_ENABLECARD)
|
|
||||||
+ gpio_wdt_start();
|
|
||||||
+ else if (value & WDIOS_DISABLECARD)
|
|
||||||
+ gpio_wdt_stop();
|
|
||||||
+ else
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ return 0;
|
|
||||||
+ case WDIOC_KEEPALIVE:
|
|
||||||
+ gpio_wdt_reset();
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ return -ENOTTY;
|
|
||||||
+ }
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static ssize_t gpio_wdt_write(struct file *file, const char *buf,
|
|
||||||
+ size_t count, loff_t *ppos)
|
|
||||||
+{
|
|
||||||
+ if (!count)
|
|
||||||
+ return -EIO;
|
|
||||||
+ gpio_wdt_reset();
|
|
||||||
+ return count;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static const struct file_operations gpio_wdt_fops = {
|
|
||||||
+ .owner = THIS_MODULE,
|
|
||||||
+ .llseek = no_llseek,
|
|
||||||
+ .unlocked_ioctl = gpio_wdt_ioctl,
|
|
||||||
+ .open = gpio_wdt_open,
|
|
||||||
+ .write = gpio_wdt_write,
|
|
||||||
+ .release = gpio_wdt_release,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static struct miscdevice gpio_wdt_misc = {
|
|
||||||
+ .minor = WATCHDOG_MINOR,
|
|
||||||
+ .name = "watchdog",
|
|
||||||
+ .fops = &gpio_wdt_fops,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static int gpio_wdt_probe(struct platform_device *pdev)
|
|
||||||
+{
|
|
||||||
+ int ret;
|
|
||||||
+ struct gpio_wdt_platform_data *gpio_wdt_data = pdev->dev.platform_data;
|
|
||||||
+
|
|
||||||
+ gpio_wdt_device.gpio = gpio_wdt_data->gpio;
|
|
||||||
+ gpio_wdt_device.interval = gpio_wdt_data->interval;
|
|
||||||
+ gpio_wdt_device.first_interval = gpio_wdt_data->first_interval;
|
|
||||||
+ if (gpio_wdt_device.first_interval <= 0) {
|
|
||||||
+ gpio_wdt_device.first_interval = gpio_wdt_device.interval;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ ret = gpio_request(gpio_wdt_device.gpio, "gpio-wdt");
|
|
||||||
+ if (ret < 0) {
|
|
||||||
+ dev_err(&pdev->dev, "failed to request gpio");
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ spin_lock_init(&gpio_wdt_device.lock);
|
|
||||||
+ init_completion(&gpio_wdt_device.stop);
|
|
||||||
+ gpio_wdt_device.queue = 0;
|
|
||||||
+ clear_bit(0, &gpio_wdt_device.inuse);
|
|
||||||
+ setup_timer(&gpio_wdt_device.timer, gpio_wdt_trigger, 0L);
|
|
||||||
+ gpio_wdt_device.default_ticks = ticks;
|
|
||||||
+
|
|
||||||
+ gpio_wdt_start();
|
|
||||||
+ dev_info(&pdev->dev, "GPIO Hardware Watchdog driver (gpio=%i interval=%i/%i)\n",
|
|
||||||
+ gpio_wdt_data->gpio, gpio_wdt_data->first_interval, gpio_wdt_data->interval);
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int gpio_wdt_remove(struct platform_device *pdev)
|
|
||||||
+{
|
|
||||||
+ /* FIXME: do we need to lock this test ? */
|
|
||||||
+ if (gpio_wdt_device.queue) {
|
|
||||||
+ gpio_wdt_device.queue = 0;
|
|
||||||
+ wait_for_completion(&gpio_wdt_device.stop);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ gpio_free(gpio_wdt_device.gpio);
|
|
||||||
+ misc_deregister(&gpio_wdt_misc);
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static struct platform_driver gpio_wdt_driver = {
|
|
||||||
+ .probe = gpio_wdt_probe,
|
|
||||||
+ .remove = gpio_wdt_remove,
|
|
||||||
+ .driver.name = "gpio-wdt",
|
|
||||||
+ .driver.owner = THIS_MODULE,
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static int __init gpio_wdt_init(void)
|
|
||||||
+{
|
|
||||||
+ return platform_driver_register(&gpio_wdt_driver);
|
|
||||||
+}
|
|
||||||
+arch_initcall(gpio_wdt_init);
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * We do wdt initialization in two steps: arch_initcall probes the wdt
|
|
||||||
+ * very early to start pinging the watchdog (misc devices are not yet
|
|
||||||
+ * available), and later module_init() just registers the misc device.
|
|
||||||
+ */
|
|
||||||
+static int gpio_wdt_init_late(void)
|
|
||||||
+{
|
|
||||||
+ int ret;
|
|
||||||
+
|
|
||||||
+ ret = misc_register(&gpio_wdt_misc);
|
|
||||||
+ if (ret < 0) {
|
|
||||||
+ pr_err("GPIO_WDT: failed to register misc device\n");
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+#ifndef MODULE
|
|
||||||
+module_init(gpio_wdt_init_late);
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+static void __exit gpio_wdt_exit(void)
|
|
||||||
+{
|
|
||||||
+ platform_driver_unregister(&gpio_wdt_driver);
|
|
||||||
+}
|
|
||||||
+module_exit(gpio_wdt_exit);
|
|
||||||
+
|
|
||||||
+MODULE_AUTHOR("Michael Stickel, Florian Fainelli, Mathias Adam");
|
|
||||||
+MODULE_DESCRIPTION("Driver for GPIO hardware watchdogs");
|
|
||||||
+MODULE_LICENSE("GPL");
|
|
||||||
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
|
|
||||||
+MODULE_ALIAS("platform:gpio-wdt");
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/include/linux/old_gpio_wdt.h
|
|
||||||
@@ -0,0 +1,21 @@
|
|
||||||
+/*
|
|
||||||
+ * Definitions for the GPIO watchdog driver
|
|
||||||
+ *
|
|
||||||
+ * Copyright (C) 2013 Mathias Adam <m.adam--linux@adamis.de>
|
|
||||||
+ *
|
|
||||||
+ * This program is free software; you can redistribute it and/or modify
|
|
||||||
+ * it under the terms of the GNU General Public License version 2 as
|
|
||||||
+ * published by the Free Software Foundation.
|
|
||||||
+ *
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#ifndef _GPIO_WDT_H_
|
|
||||||
+#define _GPIO_WDT_H_
|
|
||||||
+
|
|
||||||
+struct gpio_wdt_platform_data {
|
|
||||||
+ int gpio; /* GPIO line number */
|
|
||||||
+ int interval; /* watchdog reset interval in system ticks */
|
|
||||||
+ int first_interval; /* first wd reset interval in system ticks */
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+#endif /* _GPIO_WDT_H_ */
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
From 5c81397a0147ea59c778d1de14ef54e2268221f6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
||||||
Date: Wed, 8 Apr 2015 06:58:11 +0200
|
|
||||||
Subject: [PATCH] ssb: reject PCI writes setting CardBus bridge resources
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
If SoC has a CardBus we can set resources of device at slot 1 only. It's
|
|
||||||
impossigle to set bridge resources as it simply overwrites device 1
|
|
||||||
configuration and usually results in Data bus error-s.
|
|
||||||
|
|
||||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/ssb/driver_pcicore.c | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/ssb/driver_pcicore.c
|
|
||||||
+++ b/drivers/ssb/driver_pcicore.c
|
|
||||||
@@ -164,6 +164,10 @@ static int ssb_extpci_write_config(struc
|
|
||||||
SSB_WARN_ON(!pc->hostmode);
|
|
||||||
if (unlikely(len != 1 && len != 2 && len != 4))
|
|
||||||
goto out;
|
|
||||||
+ /* CardBus SoCs allow configuring dev 1 resources only */
|
|
||||||
+ if (extpci_core->cardbusmode && dev != 1 &&
|
|
||||||
+ off >= PCI_BASE_ADDRESS_0 && off <= PCI_BASE_ADDRESS_5)
|
|
||||||
+ goto out;
|
|
||||||
addr = get_cfgspace_addr(pc, bus, dev, func, off);
|
|
||||||
if (unlikely(!addr))
|
|
||||||
goto out;
|
|
||||||
|
|
@ -1,138 +0,0 @@
|
||||||
--- a/arch/mips/include/asm/r4kcache.h
|
|
||||||
+++ b/arch/mips/include/asm/r4kcache.h
|
|
||||||
@@ -28,10 +28,28 @@ extern void (*r4k_blast_icache)(void);
|
|
||||||
#ifdef CONFIG_BCM47XX
|
|
||||||
#include <asm/paccess.h>
|
|
||||||
#include <linux/ssb/ssb.h>
|
|
||||||
-#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE)))
|
|
||||||
+#define BCM4710_DUMMY_RREG() bcm4710_dummy_rreg()
|
|
||||||
+
|
|
||||||
+static inline unsigned long bcm4710_dummy_rreg(void)
|
|
||||||
+{
|
|
||||||
+ return *(volatile unsigned long *)(KSEG1ADDR(SSB_ENUM_BASE));
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#define BCM4710_FILL_TLB(addr) bcm4710_fill_tlb((void *)(addr))
|
|
||||||
+
|
|
||||||
+static inline unsigned long bcm4710_fill_tlb(void *addr)
|
|
||||||
+{
|
|
||||||
+ return *(unsigned long *)addr;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#define BCM4710_PROTECTED_FILL_TLB(addr) bcm4710_protected_fill_tlb((void *)(addr))
|
|
||||||
+
|
|
||||||
+static inline void bcm4710_protected_fill_tlb(void *addr)
|
|
||||||
+{
|
|
||||||
+ unsigned long x;
|
|
||||||
+ get_dbe(x, (unsigned long *)addr);;
|
|
||||||
+}
|
|
||||||
|
|
||||||
-#define BCM4710_FILL_TLB(addr) (*(volatile unsigned long *)(addr))
|
|
||||||
-#define BCM4710_PROTECTED_FILL_TLB(addr) ({ unsigned long x; get_dbe(x, (volatile unsigned long *)(addr)); })
|
|
||||||
#else
|
|
||||||
#define BCM4710_DUMMY_RREG()
|
|
||||||
|
|
||||||
--- a/arch/mips/mm/tlbex.c
|
|
||||||
+++ b/arch/mips/mm/tlbex.c
|
|
||||||
@@ -936,6 +936,9 @@ build_get_pgde32(u32 **p, unsigned int t
|
|
||||||
uasm_i_srl(p, ptr, ptr, SMP_CPUID_PTRSHIFT);
|
|
||||||
uasm_i_addu(p, ptr, tmp, ptr);
|
|
||||||
#else
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+ uasm_i_nop(p);
|
|
||||||
+#endif
|
|
||||||
UASM_i_LA_mostly(p, ptr, pgdc);
|
|
||||||
#endif
|
|
||||||
uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
|
|
||||||
@@ -1296,12 +1299,12 @@ static void build_r4000_tlb_refill_handl
|
|
||||||
/* No need for uasm_i_nop */
|
|
||||||
}
|
|
||||||
|
|
||||||
-#ifdef CONFIG_BCM47XX
|
|
||||||
- uasm_i_nop(&p);
|
|
||||||
-#endif
|
|
||||||
#ifdef CONFIG_64BIT
|
|
||||||
build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
|
|
||||||
#else
|
|
||||||
+# ifdef CONFIG_BCM47XX
|
|
||||||
+ uasm_i_nop(&p);
|
|
||||||
+# endif
|
|
||||||
build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -1313,6 +1316,9 @@ static void build_r4000_tlb_refill_handl
|
|
||||||
build_update_entries(&p, K0, K1);
|
|
||||||
build_tlb_write_entry(&p, &l, &r, tlb_random);
|
|
||||||
uasm_l_leave(&l, p);
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+ uasm_i_nop(&p);
|
|
||||||
+#endif
|
|
||||||
uasm_i_eret(&p); /* return from trap */
|
|
||||||
}
|
|
||||||
#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
|
|
||||||
@@ -1871,12 +1877,12 @@ build_r4000_tlbchange_handler_head(u32 *
|
|
||||||
{
|
|
||||||
struct work_registers wr = build_get_work_registers(p);
|
|
||||||
|
|
||||||
-#ifdef CONFIG_BCM47XX
|
|
||||||
- uasm_i_nop(p);
|
|
||||||
-#endif
|
|
||||||
#ifdef CONFIG_64BIT
|
|
||||||
build_get_pmde64(p, l, r, wr.r1, wr.r2); /* get pmd in ptr */
|
|
||||||
#else
|
|
||||||
+# ifdef CONFIG_BCM47XX
|
|
||||||
+ uasm_i_nop(p);
|
|
||||||
+# endif
|
|
||||||
build_get_pgde32(p, wr.r1, wr.r2); /* get pgd in ptr */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -1923,6 +1929,9 @@ build_r4000_tlbchange_handler_tail(u32 *
|
|
||||||
build_tlb_write_entry(p, l, r, tlb_indexed);
|
|
||||||
uasm_l_leave(l, *p);
|
|
||||||
build_restore_work_registers(p);
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+ uasm_i_nop(p);
|
|
||||||
+#endif
|
|
||||||
uasm_i_eret(p); /* return from trap */
|
|
||||||
|
|
||||||
#ifdef CONFIG_64BIT
|
|
||||||
--- a/arch/mips/kernel/genex.S
|
|
||||||
+++ b/arch/mips/kernel/genex.S
|
|
||||||
@@ -21,6 +21,19 @@
|
|
||||||
#include <asm/war.h>
|
|
||||||
#include <asm/thread_info.h>
|
|
||||||
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+# ifdef eret
|
|
||||||
+# undef eret
|
|
||||||
+# endif
|
|
||||||
+# define eret \
|
|
||||||
+ .set push; \
|
|
||||||
+ .set noreorder; \
|
|
||||||
+ nop; \
|
|
||||||
+ nop; \
|
|
||||||
+ eret; \
|
|
||||||
+ .set pop;
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
__INIT
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -34,7 +47,6 @@ NESTED(except_vec3_generic, 0, sp)
|
|
||||||
.set noat
|
|
||||||
#ifdef CONFIG_BCM47XX
|
|
||||||
nop
|
|
||||||
- nop
|
|
||||||
#endif
|
|
||||||
#if R5432_CP0_INTERRUPT_WAR
|
|
||||||
mfc0 k0, CP0_INDEX
|
|
||||||
@@ -59,6 +71,9 @@ NESTED(except_vec3_r4000, 0, sp)
|
|
||||||
.set push
|
|
||||||
.set arch=r4000
|
|
||||||
.set noat
|
|
||||||
+#ifdef CONFIG_BCM47XX
|
|
||||||
+ nop
|
|
||||||
+#endif
|
|
||||||
mfc0 k1, CP0_CAUSE
|
|
||||||
li k0, 31<<2
|
|
||||||
andi k1, k1, 0x7c
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
--- a/drivers/pcmcia/yenta_socket.c
|
|
||||||
+++ b/drivers/pcmcia/yenta_socket.c
|
|
||||||
@@ -920,6 +920,8 @@ static unsigned int yenta_probe_irq(stru
|
|
||||||
* Probe for usable interrupts using the force
|
|
||||||
* register to generate bogus card status events.
|
|
||||||
*/
|
|
||||||
+#ifndef CONFIG_BCM47XX
|
|
||||||
+ /* WRT54G3G does not like this */
|
|
||||||
cb_writel(socket, CB_SOCKET_EVENT, -1);
|
|
||||||
cb_writel(socket, CB_SOCKET_MASK, CB_CSTSMASK);
|
|
||||||
reg = exca_readb(socket, I365_CSCINT);
|
|
||||||
@@ -935,6 +937,7 @@ static unsigned int yenta_probe_irq(stru
|
|
||||||
}
|
|
||||||
cb_writel(socket, CB_SOCKET_MASK, 0);
|
|
||||||
exca_writeb(socket, I365_CSCINT, reg);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
mask = probe_irq_mask(val) & 0xffff;
|
|
||||||
|
|
||||||
@@ -1019,6 +1022,10 @@ static void yenta_get_socket_capabilitie
|
|
||||||
else
|
|
||||||
socket->socket.irq_mask = 0;
|
|
||||||
|
|
||||||
+ /* irq mask probing is broken for the WRT54G3G */
|
|
||||||
+ if (socket->socket.irq_mask == 0)
|
|
||||||
+ socket->socket.irq_mask = 0x6f8;
|
|
||||||
+
|
|
||||||
dev_printk(KERN_INFO, &socket->dev->dev,
|
|
||||||
"ISA IRQ mask 0x%04x, PCI irq %d\n",
|
|
||||||
socket->socket.irq_mask, socket->cb_irq);
|
|
||||||
@@ -1255,6 +1262,15 @@ static int yenta_probe(struct pci_dev *d
|
|
||||||
dev_printk(KERN_INFO, &dev->dev,
|
|
||||||
"Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));
|
|
||||||
|
|
||||||
+ /* Generate an interrupt on card insert/remove */
|
|
||||||
+ config_writew(socket, CB_SOCKET_MASK, CB_CSTSMASK | CB_CDMASK);
|
|
||||||
+
|
|
||||||
+ /* Set up Multifunction Routing Status Register */
|
|
||||||
+ config_writew(socket, 0x8C, 0x1000 /* MFUNC3 to GPIO3 */ | 0x2 /* MFUNC0 to INTA */);
|
|
||||||
+
|
|
||||||
+ /* Switch interrupts to parallelized */
|
|
||||||
+ config_writeb(socket, 0x92, 0x64);
|
|
||||||
+
|
|
||||||
yenta_fixup_parent_bridge(dev->subordinate);
|
|
||||||
|
|
||||||
/* Register it with the pcmcia layer.. */
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/drivers/ssb/driver_pcicore.c
|
|
||||||
+++ b/drivers/ssb/driver_pcicore.c
|
|
||||||
@@ -389,7 +389,7 @@ static void ssb_pcicore_init_hostmode(st
|
|
||||||
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);
|
|
||||||
+ mdelay(300);
|
|
||||||
register_pci_controller(&ssb_pcicore_controller);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
--- a/arch/mips/bcm47xx/nvram.c
|
|
||||||
+++ b/arch/mips/bcm47xx/nvram.c
|
|
||||||
@@ -34,7 +34,8 @@ struct nvram_header {
|
|
||||||
u32 config_ncdl; /* ncdl values for memc */
|
|
||||||
};
|
|
||||||
|
|
||||||
-static char nvram_buf[NVRAM_SPACE];
|
|
||||||
+char nvram_buf[NVRAM_SPACE];
|
|
||||||
+EXPORT_SYMBOL(nvram_buf);
|
|
||||||
static size_t nvram_len;
|
|
||||||
static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000};
|
|
||||||
static int cfe_env;
|
|
||||||
--- a/arch/mips/mm/cache.c
|
|
||||||
+++ b/arch/mips/mm/cache.c
|
|
||||||
@@ -59,6 +59,7 @@ void (*_dma_cache_wback)(unsigned long s
|
|
||||||
void (*_dma_cache_inv)(unsigned long start, unsigned long size);
|
|
||||||
|
|
||||||
EXPORT_SYMBOL(_dma_cache_wback_inv);
|
|
||||||
+EXPORT_SYMBOL(_dma_cache_inv);
|
|
||||||
|
|
||||||
#endif /* CONFIG_DMA_NONCOHERENT || CONFIG_DMA_MAYBE_COHERENT */
|
|
||||||
|
|
||||||
Loading…
Reference in a new issue